Changeset c122b0c


Ignore:
Timestamp:
Jan 27, 2010 2:52:09 AM (15 years ago)
Author:
Ted Faber <faber@…>
Branches:
axis_example, compt_changes, info-ops, master, version-3.01, version-3.02
Children:
8d85187
Parents:
4afcfc4
Message:

Initial commit of new services and plugin organization. Expect debugging changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • wsdl/fedd_types.xsd

    r4afcfc4 rc122b0c  
    2323  </xsd:complexType>
    2424
     25  <!-- begin deprecated -->
     26
     27  <xsd:complexType name="projectType">
     28    <xsd:annotation>
     29      <xsd:documentation>
     30        A description of the project used to access a testbed.  Includes
     31        the testbed being accessed, the project name (often a local
     32        name, scoped by the testbed), and any users who have been
     33        granted access or for whom access is being requested.
     34      </xsd:documentation>
     35    </xsd:annotation>
     36    <xsd:sequence>
     37      <xsd:element name="testbed" type="tns:IDType" minOccurs="0"
     38        maxOccurs="1"/>
     39      <xsd:element name="name" type="tns:IDType" minOccurs="0" maxOccurs="1"/>
     40      <xsd:element name="user" type="tns:userType" minOccurs="0"
     41        maxOccurs="unbounded"/>
     42    </xsd:sequence>
     43  </xsd:complexType>
     44
     45  <xsd:complexType name="emulabType">
     46    <xsd:annotation>
     47      <xsd:documentation>
     48        A description of an Emulab sufficient for the federation system
     49        to create a sub experiment on it.  Note that fedAttrs provide an
     50        extension mechanism by which testbeds may communicate additional
     51        information and preferences to federation systems that
     52        understand it.
     53      </xsd:documentation>
     54    </xsd:annotation>
     55    <xsd:sequence>
     56      <xsd:element name="project" type="tns:projectType"/>
     57      <xsd:element name="domain" type="xsd:string"/>
     58      <xsd:element name="boss" type="xsd:string"/>
     59      <xsd:element name="ops" type="xsd:string"/>
     60      <xsd:element name="fileServer" type="xsd:string"/>
     61      <xsd:element name="eventServer" type="xsd:string"/>
     62      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
     63        maxOccurs="unbounded"/>
     64    </xsd:sequence>
     65  </xsd:complexType>
     66
    2567  <xsd:complexType name="nodeType">
    2668    <xsd:annotation>
    … …  
    4385  </xsd:complexType>
    4486
     87  <xsd:complexType name="capacityType">
     88    <xsd:annotation>
     89      <xsd:documentation>
     90        A strawman network capacity description for access negotiation.
     91        This will come to include more and more interesting parameters.
     92      </xsd:documentation>
     93    </xsd:annotation>
     94    <xsd:sequence>
     95      <xsd:element name="rate" type="xsd:double"/>
     96      <xsd:element name="kind" type="tns:kindType"/>
     97    </xsd:sequence>
     98  </xsd:complexType>
     99
     100
     101  <xsd:simpleType name="userRole">
     102    <xsd:annotation>
     103      <xsd:documentation>
     104        This defines the role the user/account is playing in the
     105        federated experiment.  An account being accessed by the
     106        federation system to create the experiment is in the
     107        experimentCreation role and the accounts that experimenters will
     108        use to access local testbed services (e.g., rebooting a local
     109        node) are serviceAccess roles.
     110      </xsd:documentation>
     111    </xsd:annotation>
     112    <xsd:restriction base="xsd:string">
     113      <xsd:enumeration value="serviceAccess"/>
     114      <xsd:enumeration value="experimentCreation"/>
     115    </xsd:restriction>
     116  </xsd:simpleType>
     117
    45118  <xsd:simpleType name="kindType">
    46119    <xsd:annotation>
    … …  
    55128    </xsd:restriction>
    56129  </xsd:simpleType>
     130
     131  <!-- end deprecated -->
    57132
    58133  <xsd:simpleType name="statusType">
    … …  
    71146  </xsd:simpleType>
    72147
    73   <xsd:complexType name="capacityType">
    74     <xsd:annotation>
    75       <xsd:documentation>
    76         A strawman network capacity description for access negotiation.
    77         This will come to include more and more interesting parameters.
    78       </xsd:documentation>
    79     </xsd:annotation>
    80     <xsd:sequence>
    81       <xsd:element name="rate" type="xsd:double"/>
    82       <xsd:element name="kind" type="tns:kindType"/>
    83     </xsd:sequence>
    84   </xsd:complexType>
    85 
    86148  <xsd:complexType name="accessType">
    87149    <xsd:annotation>
    … …  
    98160      <xsd:element name="sshPubkey" type="xsd:base64Binary"/>
    99161      <xsd:element name="pgpPubkey" type="xsd:base64Binary"/>
     162      <xsd:element name="passwordHash" type="xsd:string"/>
    100163    </xsd:choice>
    101164  </xsd:complexType>
    102 
    103   <xsd:simpleType name="userRole">
    104     <xsd:annotation>
    105       <xsd:documentation>
    106         This defines the role the user/account is playing in the
    107         federated experiment.  An account being accessed by the
    108         federation system to create the experiment is in the
    109         experimentCreation role and the accounts that experimenters will
    110         use to access local testbed services (e.g., rebooting a local
    111         node) are serviceAccess roles.
    112       </xsd:documentation>
    113     </xsd:annotation>
    114     <xsd:restriction base="xsd:string">
    115       <xsd:enumeration value="serviceAccess"/>
    116       <xsd:enumeration value="experimentCreation"/>
    117     </xsd:restriction>
    118   </xsd:simpleType>
    119 
    120165
    121166  <xsd:complexType name="userType">
    … …  
    136181      <xsd:element name="access" type="tns:accessType" minOccurs="0"
    137182        maxOccurs="unbounded"/>
     183      <!-- begin deprecated -->
    138184      <xsd:element name="role" type="tns:userRole" minOccurs="0" maxOccurs="1"/>
     185      <!-- end deprecated -->
    139186    </xsd:sequence>
    140187  </xsd:complexType>
    … …  
    165212    </xsd:annotation>
    166213    <xsd:sequence>
     214      <!-- replace with topdl -->
    167215      <xsd:element name="node" type="tns:nodeType" minOccurs="0"
    168216        maxOccurs="unbounded" />
    169217      <xsd:element name="capacity" type="tns:capacityType" minOccurs="0"
    170218        maxOccurs="unbounded"/>
     219      <!-- replace with topdl -->
    171220    </xsd:sequence>
    172221  </xsd:complexType>
    … …  
    190239    </xsd:sequence>
    191240  </xsd:complexType>
    192 
    193 
    194   <xsd:complexType name="projectType">
    195     <xsd:annotation>
    196       <xsd:documentation>
    197         A description of the project used to access a testbed.  Includes
    198         the testbed being accessed, the project name (often a local
    199         name, scoped by the testbed), and any users who have been
    200         granted access or for whom access is being requested.
    201       </xsd:documentation>
    202     </xsd:annotation>
    203     <xsd:sequence>
    204       <xsd:element name="testbed" type="tns:IDType" minOccurs="0"
    205         maxOccurs="1"/>
    206       <xsd:element name="name" type="tns:IDType" minOccurs="0" maxOccurs="1"/>
    207       <xsd:element name="user" type="tns:userType" minOccurs="0"
    208         maxOccurs="unbounded"/>
    209     </xsd:sequence>
    210   </xsd:complexType>
    211 
    212   <xsd:complexType name="emulabType">
    213     <xsd:annotation>
    214       <xsd:documentation>
    215         A description of an Emulab sufficient for the federation system
    216         to create a sub experiment on it.  Note that fedAttrs provide an
    217         extension mechanism by which testbeds may communicate additional
    218         information and preferences to federation systems that
    219         understand it.
    220       </xsd:documentation>
    221     </xsd:annotation>
    222     <xsd:sequence>
    223       <xsd:element name="project" type="tns:projectType"/>
    224       <xsd:element name="domain" type="xsd:string"/>
    225       <xsd:element name="boss" type="xsd:string"/>
    226       <xsd:element name="ops" type="xsd:string"/>
    227       <xsd:element name="fileServer" type="xsd:string"/>
    228       <xsd:element name="eventServer" type="xsd:string"/>
    229       <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
    230         maxOccurs="unbounded"/>
    231     </xsd:sequence>
    232   </xsd:complexType>
    233 
    234   <xsd:complexType name="federatedExperimentType">
    235     <xsd:annotation>
    236       <xsd:documentation>
    237         Naming and Emulab instantiation information about a federant.
    238         This is returned by various informational requests and as part
    239         of a successful creation message.
    240       </xsd:documentation>
    241     </xsd:annotation>
    242     <xsd:sequence>
    243       <xsd:element name="name" type="tns:IDType" minOccurs="1"
    244         maxOccurs="unbounded"/>
    245       <xsd:element name="emulab" type="tns:emulabType" minOccurs="0"
    246         maxOccurs="1"/>
    247       <xsd:element name="master" type="xsd:boolean"/>
    248     </xsd:sequence>
    249   </xsd:complexType>
    250 
    251 
     241 
    252242  <xsd:complexType name="vtoponodeType">
    253243    <xsd:annotation>
    … …  
    352342    </xsd:choice>
    353343  </xsd:complexType>
     344
     345  <xsd:simpleType name="connectionType">
     346    <xsd:annotation>
     347      <xsd:documentation>
     348        Known subexperiment interconnection mechanisms
     349      </xsd:documentation>
     350    </xsd:annotation>
     351    <xsd:restriction base="xsd:string">
     352      <xsd:enumeration value="ssh"/>
     353      <xsd:enumeration value="transit"/>
     354    </xsd:restriction>
     355  </xsd:simpleType>
     356
     357  <xsd:complexType name="connectionInfoType">
     358    <xsd:annotation>
     359      <xsd:documentation>
     360        The information needed to stitch together two segments.  It is both
     361        exported from the nmaster and reported by the experiment controller to
     362        the access controller and by the access controller into the world.
     363      </xsd:documentation>
     364    </xsd:annotation>
     365    <xsd:sequence>
     366      <xsd:element name="type" type="tns:connectionType"/>
     367      <xsd:element name="peer" type="xsd:string" minOccurs="0" maxOccurs="1"/>
     368      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
     369        maxOccurs="unbounded"/>
     370    </xsd:sequence>
     371  </xsd:complexType>
     372
     373  <xsd:complexType name="serviceInfoType">
     374    <xsd:annotation>
     375      <xsd:documentation>
     376        A generic service entry, basically a name and server
     377      </xsd:documentation>
     378    </xsd:annotation>
     379    <xsd:sequence>
     380      <xsd:element name="name" type="xsd:string"/>
     381      <xsd:element name="server" type="xsd:string" minOccurs="0"
     382        maxOccurs="1"/>
     383      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
     384        maxOccurs="unbounded"/>
     385      <xsd:element name="visibility" type="xsd:string">
     386        <xsd:restriction>
     387          <xsd:enumeration value="export"/>     <!-- server -->
     388          <xsd:enumeration value="import"/>     <!-- client -->
     389          <xsd:enumeration value="composition"/><!-- both -->
     390        </xsd:restriction>
     391      </xsd:element>
     392    </xsd:sequence>
     393  </xsd:complexType>
     394
    354395
    355396  <xsd:complexType name="newRequestType">
    … …  
    408449      <xsd:element name="resources" type="tns:resourcesType" minOccurs="0"
    409450        maxOccurs="1"/>
     451      <xsd:element name="service" type="tns:serviceInfoType" minOccurs="0"
     452        maxOccurs="unbounded" />
     453      <!-- begin deprecated -->
    410454      <xsd:element name="exportProject" type="tns:IDType"
    411455        minOccurs="0" maxOccurs="1"/>
     456      <!-- end deprecated -->
    412457      <xsd:element name="allocID" type="tns:IDType"/>
    413458      <xsd:element name="when" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
    … …  
    427472    <xsd:sequence>
    428473      <xsd:element name="allocID" type="tns:IDType"/>
     474      <!-- begin deprecated -->
    429475      <xsd:element name="emulab" type="tns:emulabType" minOccurs="0" maxOccurs="1"/>
     476      <!-- end deprecated -->
     477      <xsd:element name="service" type="tns:serviceInfoType" minOccurs="0"
     478        maxOccurs="unbounded" />
    430479      <xsd:element name="when" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
    431480      <xsd:element name="until" type="xsd:dateTime" minOccurs="0"
    432481        maxOccurs="1"/>
     482      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
     483        maxOccurs="unbounded"/>
    433484    </xsd:sequence>
    434485  </xsd:complexType>
    … …  
    474525      <xsd:element name="experimentdescription"
    475526        type="tns:experimentDescriptionType"/>
     527      <!-- begin deprecated -->
    476528      <xsd:element name="master" type="xsd:string"/>
    477529      <xsd:element name='exportProject' type="tns:IDType"/>
     530      <!-- end deprecated -->
    478531      <xsd:element name="experimentID" type="tns:IDType"/>
    479532    </xsd:sequence>
    … …  
    483536    <xsd:annotation>
    484537      <xsd:documentation>
    485         Returned to let the caller know that the request is underway and what
    486         credentials will eventauly be able to be used to access them.
     538        Returned to let the caller know that the request is underway.
    487539      </xsd:documentation>
    488540    </xsd:annotation>
    … …  
    560612    </xsd:sequence>
    561613  </xsd:complexType>
     614
     615  <!-- This needs to go away as well.  It's only part of an infoResponseType,
     616  which needs to be reworked overall -->
     617  <xsd:complexType name="federatedExperimentType">
     618    <xsd:annotation>
     619      <xsd:documentation>
     620        Naming and Emulab instantiation information about a federant.
     621        This is returned by various informational requests and as part
     622        of a successful creation message.
     623      </xsd:documentation>
     624    </xsd:annotation>
     625    <xsd:sequence>
     626      <xsd:element name="name" type="tns:IDType" minOccurs="1"
     627        maxOccurs="unbounded"/>
     628      <!-- begin deprecated -->
     629      <xsd:element name="emulab" type="tns:emulabType" minOccurs="0"
     630        maxOccurs="1"/>
     631      <xsd:element name="master" type="xsd:boolean"/>
     632      <!-- end deprecated -->
     633    </xsd:sequence>
     634  </xsd:complexType>
     635
     636  <!-- end go away -->
    562637
    563638  <xsd:complexType name="infoResponseType">
    … …  
    649724      <xsd:element name="segmentdescription"
    650725        type="tns:experimentDescriptionType"/>
     726      <!-- begin deprecated -->
    651727      <xsd:element name="master" type="xsd:boolean"/>
     728      <!-- begin deprecated -->
     729      <xsd:element name="service" type="tns:serviceInfoType" minOccurs="0"
     730        maxOccurs="unbounded" />
     731      <xsd:element name="connectivity" type="tns:connectivityInfoType"
     732        minOccurs="0" maxOccurs="unbounded"/>
    652733      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
    653734        maxOccurs="unbounded"/>
Note: See TracChangeset for help on using the changeset viewer.