Changeset bcbf543 for fedd/fedd_create_experiment.py

Timestamp:

Sep 4, 2008 11:20:54 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

4fc2250

Parents:

4d48e01

Message:

initial SEER integration

File:

• fedd/fedd_create_experiment.py (modified) (3 diffs)

fedd/fedd_create_experiment.py

@@ -467 +467 @@
                 self.element = { }
                 self.topo = { \
-                        'nodes': { 'node': self.nodes  },\
-                        'lans' : { 'lan' : self.lans },\
+                        'node': self.nodes,\
+                        'lan' : self.lans,\
                     }
                 self.chars = ""
@@ -517 +517 @@
         try:
             # Node names
-            nodes = [ n['vname'] for n in topo['nodes']['node'] ]
-            topo_lans = topo['lans']['lan']
+            nodes = [ n['vname'] for n in topo['node'] ]
+            topo_lans = topo['lan']
         except KeyError:
             raise service_error(service_error.internal, "Bad topology")
@@ -582 +582 @@
                 vn = m.group(1)
                 vis_node = {'name': vn, \
-                        'x': int(m.group(2)),\
-                        'y' : int(m.group(3)),\
+                        'x': float(m.group(2)),\
+                        'y' : float(m.group(3)),\
                     }
                 if vn in links.keys() or vn in lans.keys():