Changeset ec3aa4d for fedd/federation

Timestamp:

Nov 29, 2011 2:52:20 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

ab3d6c5

Parents:

6e33086

Message:

Don't need those params.

File:

• fedd/federation/experiment_control.py (modified) (3 diffs)

fedd/federation/experiment_control.py

@@ -1999 +1999 @@
 
     
-    def save_federant_information(self, allocated, tbparams, eid, vtopo, vis,
-            top):
+    def save_federant_information(self, allocated, tbparams, eid, top):
         """
         Store the various data that have changed in the experiment state
@@ -2010 +2009 @@
         """
         self.state_lock.acquire()
-        # XXX:
-        #self.state[eid]['vtopo'] = vtopo
-        #self.state[eid]['vis'] = vis
         exp = self.state[eid]
-        exp.topology = top
+        exp.top = top.clone()
         # save federant information
         for k in allocated.keys():
             exp.add_allocation(tbparams[k])
+            top.elements.append(topdl.Testbed(uri=tbparams[k].uri,
+                type="testbed", localname=[k]))
 
         # Access proofs for the response message
@@ -2149 +2147 @@
             self.wrangle_software(expid, top, topo, tbparams)
 
-            vtopo = topdl.topology_to_vtopo(top)
-            vis = self.genviz(vtopo)
             proofs = self.save_federant_information(allocated, tbparams, 
-                    eid, vtopo, vis, top)
+                    eid, top)
         except service_error, e:
             # If something goes wrong in the parse (usually an access error)