Changeset 53dfd4b

Timestamp:

Sep 16, 2009 9:56:39 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

5a03ea5

Parents:

0e366a6

Message:

optional emulab section (temporary)

Files:

• fedd/fedd_client.py (modified) (1 diff)
• wsdl/fedd_types.xsd (modified) (1 diff)

fedd/fedd_client.py

@@ -1403 +1403 @@
         """Print the response as input to the splitter script"""
 
-        e = resp['emulab']
-        p = e['project']
-        fields = { 
-                "Boss": e['boss'],
-                "OpsNode": e['ops'],
-                "Domain": e['domain'],
-                "FileServer": e['fileServer'],
-                "EventServer": e['eventServer'],
-                "Project": unpack_id(p['name'])
-                }
-        if (label != None): print >> out, "[%s]" % label
-
-        for l, v in fields.iteritems():
-            print >>out, "%s: %s" % (l, v)
-
-        for u in p['user']:
-            print >>out, "User: %s" % unpack_id(u['userID'])
-
-        for a in e['fedAttr']:
-            print >>out, "%s: %s" % (a['attribute'], a['value'])
+        e = resp.get('emulab', None)
+        if e:
+            p = e['project']
+            fields = { 
+                    "Boss": e['boss'],
+                    "OpsNode": e['ops'],
+                    "Domain": e['domain'],
+                    "FileServer": e['fileServer'],
+                    "EventServer": e['eventServer'],
+                    "Project": unpack_id(p['name'])
+                    }
+            if (label != None): print >> out, "[%s]" % label
+
+            for l, v in fields.iteritems():
+                print >>out, "%s: %s" % (l, v)
+
+            for u in p['user']:
+                print >>out, "User: %s" % unpack_id(u['userID'])
+
+            for a in e['fedAttr']:
+                print >>out, "%s: %s" % (a['attribute'], a['value'])
 
     def __call__(self):

wsdl/fedd_types.xsd

@@ -397 +397 @@
     <xsd:sequence>
       <xsd:element name="allocID" type="tns:IDType"/>
-      <xsd:element name="emulab" type="tns:emulabType"/>
+      <xsd:element name="emulab" type="tns:emulabType" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="when" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="until" type="xsd:dateTime" minOccurs="0"