Changeset c5869ef for fedd/federation/experiment_control.py

Timestamp:

May 26, 2010 3:18:49 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

cf00ddd

Parents:

fefa026

Message:

checkpoint and debugging

File:

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

fedd/federation/experiment_control.py

@@ -1017 +1017 @@
             self.node = { }
 
+        #def make_map(self, resp):
+            #if 'segmentdescription' in resp and \
+                    #'topdldescription' in resp['segmentdescription']:
+                #top = topdl.Topology(\
+                        #**resp['segmentdescription']['topdldescription'])
+                #for e in [e for e in top.elements \
+                        #if isinstance(e, topdl.Computer)]:
+                    #hn = e.get_attribute('hostname')
+                    #if hn:
+                        #for n in e.name:
+                            #self.node[n] = hn
+
         def make_map(self, resp):
-            if 'segmentdescription' in resp and \
-                    'topdldescription' in resp['segmentdescription']:
-                top = topdl.Topology(\
-                        **resp['segmentdescription']['topdldescription'])
-                for e in [e for e in top.elements \
-                        if isinstance(e, topdl.Computer)]:
-                    hn = e.get_attribute('hostname')
-                    if hn:
-                        for n in e.name:
-                            self.node[n] = hn
+            for e in resp.get('embedding', []):
+                if 'toponame' in e and 'physname' in e:
+                    self.node[e['toponame']] = e['physname'][0]
 
         def __call__(self, uri, aid, topo, masters, attrs=None, connInfo=None):
@@ -1226 +1231 @@
             for s in starters:
                 node.update(s.node)
-            # Assigng the mapping as a hostname attribute
+            # Assign the mapping as a hostname attribute
             for e in [ e for e in top.elements \
                     if isinstance(e, topdl.Computer)]: