Changeset 7f57435


Ignore:
Timestamp:
Dec 1, 2011 5:33:07 PM (12 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:
2 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/emulab_access.py

    rcebcdce r7f57435  
    13101310        self.state_lock.release()
    13111311
    1312         return {
     1312        rv = {
    13131313                'allocID': req['allocID'],
    1314                 'segmentdescription':
    1315                     { 'topdldescription' : topo.to_dict() },
    13161314                'proof': proof.to_dict(),
    13171315                }
     1316        if topo:
     1317            rv['segmentdescription'] = { 'topdldescription' : topo.to_dict() }
     1318        return rv
    13181319
    13191320    def OperationSegment(self, req, fid):
  • wsdl/fedd_types.xsd

    rcebcdce r7f57435  
    901901      <xsd:element name="allocID" type="tns:IDType"/>
    902902      <xsd:element name="segmentdescription"
    903         type="tns:experimentDescriptionType"/>
     903        type="tns:experimentDescriptionType" minOccurs="0" maxOccurs="1"/>
    904904      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
    905905        maxOccurs="unbounded"/>
Note: See TracChangeset for help on using the changeset viewer.