Changeset 9e5e251

Timestamp:

Mar 5, 2012 4:40:35 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

a3b31ed

Parents:

6527d60

Message:

Actually annotate substrates

File:

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

fedd/federation/experiment_control.py

@@ -825 +825 @@
             self.response = None
             self.node = { }
+            self.subs = { }
             self.proof = None
 
@@ -839 +840 @@
                 if isinstance(e, topdl.Computer):
                     self.node[e.name] = e
+            for s in top.substrates:
+                self.subs[s.name] = s
 
         def __call__(self, uri, aid, topo, masters, attrs=None, connInfo=None):
@@ -1042 +1045 @@
                         if ne.os: merge_oses(ne, e)
                         break
+        # Annotate substrates 
+        for s in top.substrates:
+            for d in data:
+                ss = d.subs.get(s.name, None)
+                if ss is not None:
+                    if ss.capacity is not None:
+                        s.capacity = ss.capacity
+                    if s.latency is not None:
+                        s.latency = ss.latency