Changeset b4b19c7 for fedd/federation/emulab_access.py

Timestamp:

Apr 21, 2010 5:31:03 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

f7a54c6

Parents:

f54e8e4

Message:

Get topology information into the info operation, as annotations of a topology description. This required adding such information to the start segment replies as well

File:

• fedd/federation/emulab_access.py (modified) (2 diffs)

fedd/federation/emulab_access.py

@@ -1552 +1552 @@
                     debug=self.create_debug, log=alloc_log)
             rv = starter(self, ename, proj, user, expfile, tmpdir)
+            # Copy the assigned names into the return topology
+            rvtopo = topo.clone()
+            for e in [ e for e in rvtopo.elements \
+                   if isinstance(e, topdl.Computer)]:
+                for n in e.name:
+                    if n in starter.node:
+                        e.set_attribute('hostname', starter.node[n])
         except service_error, e:
             err = e
@@ -1581 +1588 @@
                     'allocationLog': logv,
                     }
-            retval = self.allocation[aid]['started']
+            retval = copy.copy(self.allocation[aid]['started'])
             self.write_state()
             self.state_lock.release()
-
+            retval['segmentdescription'] =  \
+                    { 'topdldescription': rvtopo.to_dict() }
             return retval
         elif err: