Show
Ignore:
Timestamp:
11/17/11 17:26:43 (6 months ago)
Author:
Ted Faber <faber@…>
Children:
f37e9bf901a44a31dd31968c1aafbf084a3f5c81
Parents:
db974edc26fcf2042b9973dac0048afab98ded7e
git-committer:
Ted Faber <faber@isi.edu> / 2011-11-17T17:26:43Z-0800
Message:

Initial wsdl changes for new info.

Location:
wsdl
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • wsdl/fedd_types.xsd

    re83f2f2 rcb0aafb  
    4343  </xsd:complexType> 
    4444 
     45  <xsd:complexType name="projectAllocType"> 
     46    <xsd:annotation> 
     47      <xsd:documentation> 
     48        The information needed to create a dynamic project, specifically 
     49        a project description and the resources in needs access to. 
     50        This is used by an internal fedd interface. 
     51      </xsd:documentation> 
     52    </xsd:annotation> 
     53    <xsd:sequence> 
     54      <xsd:element name="project" type="tns:projectType"/> 
     55      <xsd:element name="resources" type="tns:resourcesType"  
     56        minOccurs="0" maxOccurs="1"/> 
     57    </xsd:sequence> 
     58  </xsd:complexType> 
     59 
    4560  <xsd:complexType name="nodeType"> 
    4661    <xsd:annotation> 
    … …  
    156171      <xsd:enumeration value="empty"/> 
    157172      <xsd:enumeration value="active"/> 
     173      <xsd:enumeration value="inactive"/> 
    158174      <xsd:enumeration value="starting"/> 
    159175      <xsd:enumeration value="terminating"/> 
    … …  
    306322      <xsd:element name="node" type="tns:visnodeType" minOccurs="0" 
    307323        maxOccurs="unbounded"/> 
    308     </xsd:sequence> 
    309   </xsd:complexType> 
    310  
    311   <xsd:complexType name="projectAllocType"> 
    312     <xsd:annotation> 
    313       <xsd:documentation> 
    314         The information needed to create a dynamic project, specifically 
    315         a project description and the resources in needs access to. 
    316         This is used by an internal fedd interface. 
    317       </xsd:documentation> 
    318     </xsd:annotation> 
    319     <xsd:sequence> 
    320       <xsd:element name="project" type="tns:projectType"/> 
    321       <xsd:element name="resources" type="tns:resourcesType"  
    322         minOccurs="0" maxOccurs="1"/> 
    323324    </xsd:sequence> 
    324325  </xsd:complexType> 
    … …  
    676677  </xsd:complexType> 
    677678 
    678   <!-- This needs to go away as well.  It's only part of an infoResponseType, 
    679   which needs to be reworked overall --> 
    680   <xsd:complexType name="federatedExperimentType"> 
    681     <xsd:annotation> 
    682       <xsd:documentation> 
    683         Naming and Emulab instantiation information about a federant. 
    684         This is returned by various informational requests and as part 
    685         of a successful creation message. 
    686       </xsd:documentation> 
    687     </xsd:annotation> 
    688     <xsd:sequence> 
    689       <xsd:element name="name" type="tns:IDType" minOccurs="1"  
    690         maxOccurs="unbounded"/> 
    691       <xsd:element name="proof" type="tns:proofType" minOccurs="1"  
    692         maxOccurs="unbounded"/> 
    693     </xsd:sequence> 
    694   </xsd:complexType> 
    695  
    696   <!-- end go away --> 
    697  
    698   <xsd:complexType name="embeddingMapType"> 
    699     <xsd:annotation> 
    700       <xsd:documentation> 
    701         A mapping between a name in the topology and the physical resource to 
    702         which it has been mapped. 
    703       </xsd:documentation> 
    704     </xsd:annotation> 
    705     <xsd:sequence> 
    706       <xsd:element name="toponame" type="xsd:string"/> 
    707       <xsd:element name="physname" type="xsd:string" minOccurs="0"  
    708         maxOccurs="unbounded"/> 
    709       <xsd:element name="testbed" type="xsd:string" minOccurs="0"  
    710         maxOccurs="1"/> 
    711     </xsd:sequence> 
    712   </xsd:complexType> 
    713  
    714679  <xsd:complexType name="infoResponseType"> 
    715680    <xsd:annotation> 
    … …  
    726691    </xsd:annotation> 
    727692    <xsd:sequence> 
    728       <xsd:element name="federant" type="tns:federatedExperimentType"  
    729         minOccurs="0" maxOccurs="unbounded"/> 
    730693      <xsd:element name="vtopo" type="tns:vtopoType" minOccurs="0" 
    731694        maxOccurs="1"/> 
    … …  
    741704      <xsd:element name="experimentdescription"  
    742705        type="tns:experimentDescriptionType" minOccurs="0" maxOccurs="1"/> 
    743       <xsd:element name="embedding" type="tns:embeddingMapType" minOccurs="0" 
    744         maxOccurs="unbounded"/> 
    745706      <xsd:element name="proof" type="tns:proofType"/> 
    746707    </xsd:sequence> 
    … …  
    829790      <xsd:element name="segmentdescription"  
    830791        type="tns:experimentDescriptionType"/> 
    831       <xsd:element name="embedding" type="tns:embeddingMapType" minOccurs="0" 
    832         maxOccurs="unbounded"/> 
    833792      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0" 
    834793        maxOccurs="unbounded"/> 

  • wsdl/topdl.xsd

    rd69ce97 rcb0aafb  
    6060  </xsd:complexType> 
    6161 
     62  <xsd:simpleType name="serviceParamTypeType"> 
     63    <xsd:annotation> 
     64      <xsd:documentation> 
     65        The set of valid types for a service parameter 
     66      </xsd:documentation> 
     67    </xsd:annotation> 
     68    <xsd:restriction base="xsd:string"> 
     69      <xsd:enumeration value="string"/> 
     70      <xsd:enumeration value="int"/> 
     71      <xsd:enumeration value="float"/> 
     72    </xsd:restriction> 
     73  </xsd:simpleType> 
     74 
     75  <xsd:complexType name="serviceParamType"> 
     76    <xsd:annotation> 
     77      <xsd:documentation> 
     78        A parameter type for a service, gives the name and parameter type 
     79      </xsd:documentation> 
     80    </xsd:annotation> 
     81    <xsd:sequence> 
     82      <xsd:element name="name" type="xsd:string"/> 
     83      <xsd:element name="type" type="tns:serviceParamTypeType"/> 
     84    </xsd:sequence> 
     85  </xsd:complexType> 
     86 
     87  <xsd:complexType name="serviceType"> 
     88    <xsd:annotation> 
     89      <xsd:documentation> 
     90        Description of a service exported from an element 
     91      </xsd:documentation> 
     92    </xsd:annotation> 
     93    <xsd:sequence> 
     94      <xsd:element name="name" type="xsd:string" /> 
     95      <xsd:element name="importer" type="xsd:string"  
     96        minOccurs="0" maxOccurs="unbounded"/> 
     97      <xsd:element name="param" type="tns:serviceParamTypeType"  
     98        minOccurs="0" maxOccurs="unbounded"/> 
     99      <xsd:element name="description" type="xsd:string"  
     100        minOccurs="0" maxOccurs="1"/> 
     101      <xsd:element name="status" type="fns:statusType"/> 
     102    </xsd:sequence> 
     103  </xsd:complexType> 
     104 
    62105  <xsd:complexType name="substrateType"> 
    63106    <xsd:annotation> 
    … …  
    73116        minOccurs="0" maxOccurs="1"/> 
    74117      <xsd:element name="attribute" type="tns:attributeType"  
     118        minOccurs="0" maxOccurs="unbounded"/> 
     119      <xsd:element name="localname" type="xsd:string" 
     120        minOccurs="0" maxOccurs="unbounded"/> 
     121      <xsd:element name="status" type="fns:statusType" 
     122        minOccurs="0" maxOccurs="1"/> 
     123      <xsd:element name="service" type="tns:serviceType"  
     124        minOccurs="0" maxOccurs="unbounded"/> 
     125      <xsd:element name="operation" type="xsd:string"  
    75126        minOccurs="0" maxOccurs="unbounded"/> 
    76127    </xsd:sequence> 
    … …  
    197248      <xsd:element name="attribute" type="tns:attributeType"  
    198249        minOccurs="0" maxOccurs="unbounded"/> 
     250      <xsd:element name="localname" type="xsd:string" 
     251        minOccurs="0" maxOccurs="unbounded"/> 
     252      <xsd:element name="status" type="fns:statusType" 
     253        minOccurs="0" maxOccurs="1"/> 
     254      <xsd:element name="service" type="tns:serviceType"  
     255        minOccurs="0" maxOccurs="unbounded"/> 
     256      <xsd:element name="operation" type="xsd:string"  
     257        minOccurs="0" maxOccurs="unbounded"/> 
    199258    </xsd:sequence> 
    200259  </xsd:complexType> 
    … …  
    212271        minOccurs="0" maxOccurs="unbounded"/> 
    213272      <xsd:element name="attribute" type="tns:attributeType"  
     273        minOccurs="0" maxOccurs="unbounded"/> 
     274      <xsd:element name="localname" type="xsd:string" 
     275        minOccurs="0" maxOccurs="unbounded"/> 
     276      <xsd:element name="status" type="fns:statusType" 
     277        minOccurs="0" maxOccurs="1"/> 
     278      <xsd:element name="service" type="tns:serviceType"  
     279        minOccurs="0" maxOccurs="unbounded"/> 
     280      <xsd:element name="operation" type="xsd:string"  
    214281        minOccurs="0" maxOccurs="unbounded"/> 
    215282    </xsd:sequence>