Changeset 2fd8f8c

Timestamp:

May 26, 2010 6:42:48 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

ce81d09

Parents:

f432e51

Message:

ftopo improvements

Location:

fedd

Files:

• fedd_info.py (modified) (2 diffs)
• federation/client_lib.py (modified) (2 diffs)
• federation/experiment_control.py (modified) (3 diffs)

fedd/fedd_info.py

@@ -17 +17 @@
                 action="append", type="choice",
                 choices=("id", "experimentdescription", "federant", "vtopo", 
-                    "vis", "log", "status"),
+                    "vis", "log", "status", "embedding"),
                 help="data to extract")
         
@@ -48 +48 @@
 formatter = info_format()
 for d in opts.data:
-    formatter(resp_dict, d)
+    try:
+        formatter(resp_dict, d)
+    except RuntimeError, e:
+        print >>sys.stderr, "Warning: %s" % e

fedd/federation/client_lib.py

@@ -204 +204 @@
                 'status': 'experimentStatus',
                 'log': 'allocationLog',
+                'embedding': 'embedding',
             }
         self.formatter = {
@@ -213 +214 @@
                 'status': self.print_string,
                 'log': self.print_string,
+                'embedding':  self.print_xml,
             }
 

fedd/federation/experiment_control.py

@@ -1016 +1016 @@
             self.response = None
             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):
@@ -1228 +1216 @@
             # Walk through the successes and gather the virtual to physical
             # mapping.
-            node = { }
+            embedding = [ ]
             for s in starters:
-                node.update(s.node)
-            # Assign the mapping as a hostname attribute
-            for e in [ e for e in top.elements \
-                    if isinstance(e, topdl.Computer)]:
-                for n in e.name:
-                    if n in node:
-                        e.set_attribute('hostname', node[n])
+                for k, v in s.node.items():
+                    embedding.append({
+                        'toponame': k, 
+                        'physname': [ v],
+                        'testbed': s.testbed
+                        })
             log.info("[start_segment]: Experiment %s active" % eid)
 
@@ -1258 +1245 @@
         self.state[eid]['experimentdescription']['topdldescription'] = \
                 top.to_dict()
+        self.state[eid]['embedding'] = embedding
         if self.state_filename: self.write_state()
         self.state_lock.release()