Changeset eeab22e


Ignore:
Timestamp:
Apr 19, 2010 2:37:35 AM (15 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:
2 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/experiment_control.py

    rbc0b21b reeab22e  
    17571757                        'uri': tbparams[k]['uri'],
    17581758                    }
    1759                 if tbparams[k].has_key('emulab'):
    1760                         tbparams[k]['federant']['emulab'] = \
    1761                                 tbparams[k]['emulab']
    17621759
    17631760            self.state_lock.acquire()
  • wsdl/fedd_types.xsd

    rbc0b21b reeab22e  
    3939      <xsd:element name="name" type="tns:IDType" minOccurs="0" maxOccurs="1"/>
    4040      <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"
    6341        maxOccurs="unbounded"/>
    6442    </xsd:sequence>
     
    540518    <xsd:sequence>
    541519      <xsd:element name="allocID" type="tns:IDType"/>
    542       <!-- begin deprecated -->
    543       <xsd:element name="emulab" type="tns:emulabType" minOccurs="0" maxOccurs="1"/>
    544       <!-- end deprecated -->
    545520      <xsd:element name="service" type="tns:serviceInfoType" minOccurs="0"
    546521        maxOccurs="unbounded" />
     
    692667      <xsd:element name="name" type="tns:IDType" minOccurs="1"
    693668        maxOccurs="unbounded"/>
    694       <!-- begin deprecated -->
    695       <xsd:element name="emulab" type="tns:emulabType" minOccurs="0"
    696         maxOccurs="1"/>
    697       <!-- end deprecated -->
    698669    </xsd:sequence>
    699670  </xsd:complexType>
Note: See TracChangeset for help on using the changeset viewer.