Changeset ce81d09 for fedd

Timestamp:

May 26, 2010 7:46:44 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

b3227fd

Parents:

2fd8f8c

Message:

topo using the embedding field.

File:

• fedd/fedd_ftopo.py (modified) (1 diff)

fedd/fedd_ftopo.py

@@ -45 +45 @@
     sys.exit("Error processing RPC: %s" % e)
 
+emap = { }
+if 'embedding' in resp_dict:
+    for e in resp_dict['embedding']:
+        tn = e.get('toponame', None)
+        if tn: 
+            emap[tn] = ":".join((tn, 
+                ",".join(e.get('physname', [])),e.get('testbed',"")))
+else:
+    sys.exit("No embedding")
+
 if 'experimentdescription' in resp_dict and \
         'topdldescription' in resp_dict['experimentdescription']:
-    top = \
-        topdl.Topology(\
-        **resp_dict['experimentdescription']['topdldescription'])
-
-    for e in [ e for e in top.elements \
-            if isinstance(e, topdl.Computer)]:
-        hn = e.get_attribute('hostname') or "-"
-        tb = e.get_attribute('testbed') or "-"
-        print ":".join((e.name, hn, tb))
+    top = topdl.Topology(
+            **resp_dict['experimentdescription']['topdldescription'])
+    for e in top.elements:
+        if isinstance(e, topdl.Computer) and e.name in emap:
+            print emap[e.name]
 else:
-    sys.exit("Badly formatted response!?")
+    sys.exit("Badly formatted response (no experiment descrption)!?")