Changeset eeab22e

Timestamp:

Apr 19, 2010 2:37:35 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

eda00e1

Parents:

bc0b21b

Message:

remove references to emulab data structure

Files:

• fedd/federation/experiment_control.py (modified) (1 diff)
• wsdl/fedd_types.xsd (modified) (3 diffs)

fedd/federation/experiment_control.py

@@ -1757 +1757 @@
                         'uri': tbparams[k]['uri'],
                     }
-                if tbparams[k].has_key('emulab'):
-                        tbparams[k]['federant']['emulab'] = \
-                                tbparams[k]['emulab']
 
             self.state_lock.acquire()

wsdl/fedd_types.xsd

@@ -39 +39 @@
       <xsd:element name="name" type="tns:IDType" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="user" type="tns:userType" minOccurs="0"
-        maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="emulabType">
-    <xsd:annotation>
-      <xsd:documentation>
-        A description of an Emulab sufficient for the federation system
-        to create a sub experiment on it.  Note that fedAttrs provide an
-        extension mechanism by which testbeds may communicate additional
-        information and preferences to federation systems that
-        understand it.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="project" type="tns:projectType"/>
-      <xsd:element name="domain" type="xsd:string"/>
-      <xsd:element name="boss" type="xsd:string"/>
-      <xsd:element name="ops" type="xsd:string"/>
-      <xsd:element name="fileServer" type="xsd:string"/>
-      <xsd:element name="eventServer" type="xsd:string"/>
-      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
         maxOccurs="unbounded"/>
     </xsd:sequence>
@@ -540 +518 @@
     <xsd:sequence>
       <xsd:element name="allocID" type="tns:IDType"/>
-      <!-- begin deprecated -->
-      <xsd:element name="emulab" type="tns:emulabType" minOccurs="0" maxOccurs="1"/>
-      <!-- end deprecated -->
       <xsd:element name="service" type="tns:serviceInfoType" minOccurs="0"
         maxOccurs="unbounded" />
@@ -692 +667 @@
       <xsd:element name="name" type="tns:IDType" minOccurs="1" 
         maxOccurs="unbounded"/>
-      <!-- begin deprecated -->
-      <xsd:element name="emulab" type="tns:emulabType" minOccurs="0" 
-        maxOccurs="1"/>
-      <!-- end deprecated -->
     </xsd:sequence>
   </xsd:complexType>