Changeset c5869ef

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

Location:

fedd/federation

Files:

• emulab_access.py (modified) (2 diffs)
• experiment_control.py (modified) (2 diffs)
• protogeni_access.py (modified) (2 diffs)

fedd/federation/emulab_access.py

@@ -1713 +1713 @@
                     debug=self.create_debug, log=alloc_log)
             rv = starter(self, ename, proj, user, expfile, tmpdir)
+            rvtopo = topo.clone()
+
             # Copy the assigned names into the return topology
-            rvtopo = topo.clone()
-            for e in [ e for e in rvtopo.elements \
-                   if isinstance(e, topdl.Computer)]:
-                for n in e.name:
-                    if n in starter.node:
-                        e.set_attribute('hostname', "%s%s" % \
-                                (starter.node[n], self.domain))
+            embedding = [ ]
+            for n in starter.node:
+                embedding.append({ 
+                    'toponame': n,
+                    'physname': ["%s%s" %  (starter.node[n], self.domain)],
+                    })
+
+
         except service_error, e:
             err = e
@@ -1752 +1755 @@
                         'topdldescription': rvtopo.to_dict()
                         }
+                    'embedding': embedding
                     }
             retval = copy.copy(self.allocation[aid]['started'])

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)]:

fedd/federation/protogeni_access.py

@@ -1099 +1099 @@
             # Copy the assigned names into the return topology
             rvtopo = topo.clone()
-            for e in [ e for e in rvtopo.elements \
-                   if isinstance(e, topdl.Computer)]:
-                for n in e.name:
-                    if n in starter.node:
-                        e.set_attribute('hostname', starter.node[n])
+            for e in rvtopo.elements:
+                if isinstance(e, topdl.Computer) and e.get_attribute('testbed'):
+                    myname = e.get_attribute('testbed')
+                    break
+            else: myname = None
+
+            embedding = [ ]
+            for n in starter.node:
+                embedding.append({ 
+                    'toponame': n,
+                    'physname': ["%s%s" %  (starter.node[n], self.domain)],
+                    })
+
         except service_error, e:
             err = e
@@ -1134 +1142 @@
                     'segmentdescription': { 
                         'topdldescription': rvtopo.to_dict() }
+                    'embedding': embedding,
                     }
             self.write_state()