Changeset c6f867c

Timestamp:

Nov 23, 2011 2:44:40 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

45e880d

Parents:

f769cb3

Message:

beginnings of info requests.

Files:

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

fedd/federation/emulab_access.py

@@ -1017 +1017 @@
         """
         i = 0
+        t = topo.clone()
         # Copy the assigned names into the return topology
-        for e in topo.elements:
+        for e in t.elements:
             if isinstance(e, topdl.Computer):
                 if not self.create_debug:
@@ -1043 +1044 @@
                 'allocationLog': logv,
                 'segmentdescription': { 
-                    'topdldescription': topo.clone().to_dict()
+                    'topdldescription': t.clone().to_dict()
                     },
                 'proof': proof.to_dict(),
                 }
+        self.allocation[aid]['topo'] = topo.clone()
         retval = copy.copy(self.allocation[aid]['started'])
         self.write_state()

wsdl/fedd_types.xsd

@@ -816 +816 @@
       <xsd:element name="deallocationLog" type="xsd:string" minOccurs="0"
         maxOccurs="1"/>
+      <xsd:element name="proof" type="tns:proofType" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="infoSegmentRequestType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Request current status of the segment
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="allocID" type="tns:IDType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="startSegmentResponseType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Current status of the allocation
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="allocID" type="tns:IDType"/>
+      <xsd:element name="segmentdescription" 
+        type="tns:experimentDescriptionType"/>
+      <xsd:element name="fedAttr" type="tns:fedAttrType" minOccurs="0"
+        maxOccurs="unbounded"/>
       <xsd:element name="proof" type="tns:proofType" />
     </xsd:sequence>