Changeset 7f57435

Timestamp:

Dec 1, 2011 5:33:07 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

06c1dba

Parents:

cebcdce

Message:

Allow empty descriptions in InfoSegment? - for example if nothing has
been created yet.

Files:

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

fedd/federation/emulab_access.py

@@ -1310 +1310 @@
         self.state_lock.release()
 
-        return { 
+        rv = { 
                 'allocID': req['allocID'], 
-                'segmentdescription': 
-                    { 'topdldescription' : topo.to_dict() },
                 'proof': proof.to_dict(),
                 }
+        if topo:
+            rv['segmentdescription'] = { 'topdldescription' : topo.to_dict() }
+        return rv
 
     def OperationSegment(self, req, fid):

wsdl/fedd_types.xsd

@@ -901 +901 @@
       <xsd:element name="allocID" type="tns:IDType"/>
       <xsd:element name="segmentdescription" 
-        type="tns:experimentDescriptionType"/>
+        type="tns:experimentDescriptionType" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
         maxOccurs="unbounded"/>