Changeset 29d5f7c for fedd/federation/emulab_access.py

Timestamp:

Nov 18, 2011 6:43:19 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

80b1e82

Parents:

2ac64d1a

Message:

More new Info stuff. Create, terminate, ftopo all work.

File:

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

fedd/federation/emulab_access.py

@@ -1016 +1016 @@
         the response that may need to be replayed, and return the response.
         """
+        i = 0
         # Copy the assigned names into the return topology
-        embedding = [ ]
-        for n in starter.node:
-            embedding.append({ 
-                'toponame': n,
-                'physname': ["%s%s" %  (starter.node[n], self.domain)],
-                })
+        for e in topo.elements:
+            if isinstance(e, topdl.Computer):
+                if not self.create_debug:
+                    if e.name in starter.node:
+                        e.localname.append("%s%s" % \
+                                (starter.node[e.name], self.domain))
+                        e.status = 'active'
+                else:
+                    # Simple debugging assignment
+                    e.localname.append("node%d%s" % (i, self.domain))
+                    e.status = 'active'
+                    e.operation.extend(('testop1', 'testop2'))
+                    i += 1
+
         # Grab the log (this is some anal locking, but better safe than
         # sorry)
@@ -1036 +1045 @@
                     'topdldescription': topo.clone().to_dict()
                     },
-                'embedding': embedding,
                 'proof': proof.to_dict(),
                 }