Changeset 934dd99

Timestamp:

Apr 13, 2012 6:10:09 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

b035f90

Parents:

9c3e77f

Message:

Merge information from testbed objects into experiment descriptiuon

File:

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

fedd/federation/experiment_control.py

@@ -759 +759 @@
             self.node = { }
             self.subs = { }
+            self.tb = { }
             self.proof = None
 
@@ -773 +774 @@
                 if isinstance(e, topdl.Computer):
                     self.node[e.name] = e
+                elif isinstance(e, topdl.Testbed):
+                    self.tb[e.uri] = e
             for s in top.substrates:
                 self.subs[s.name] = s
@@ -978 +981 @@
                         if ne.os: merge_oses(ne, e)
                         break
+            elif isinstance(e,topdl.Testbed):
+                for s in data:
+                    ne = s.tb.get(e.uri, None)
+                    if ne is not None:
+                        add_new_names(ne.localname, e.localname)
+                        add_new_names(ne.operation, e.operation)
+                        merge_services(ne, e)
+                        for a in ne.attribute:
+                            e.set_attribute(a.attribute, a.value)
         # Annotate substrates 
         for s in top.substrates: