Changeset 6e33086 for fedd/federation/emulab_access.py

Timestamp:

Nov 28, 2011 7:34:11 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

ec3aa4d

Parents:

45e880d

Message:

InfoSegment? to emulab access controllers

File:

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

fedd/federation/emulab_access.py

@@ -101 +101 @@
             self.start_segment = proxy_emulab_segment.start_segment
             self.stop_segment = proxy_emulab_segment.stop_segment
+            self.info_segment = proxy_emulab_segment.info_segment
         elif self.access_type == 'local_emulab':
             self.start_segment = local_emulab_segment.start_segment
             self.stop_segment = local_emulab_segment.stop_segment
+            self.info_segment = local_emulab_segment.info_segment
         else:
             self.start_segment = None
             self.stop_segment = None
+            self.info_segment = None
 
         self.restricted = [ ]
@@ -181 +184 @@
             'TerminateSegment': soap_handler("TerminateSegment",
                 self.TerminateSegment),
+            'InfoSegment': soap_handler("InfoSegment", self.InfoSegment),
             }
         self.xmlrpc_services =  {\
@@ -190 +194 @@
             'TerminateSegment': xmlrpc_handler('TerminateSegment',
                 self.TerminateSegment),
+            'InfoSegment': xmlrpc_handler("InfoSegment", self.InfoSegment),
             }
 
@@ -1011 +1016 @@
         return (ename, proj, user, pubkey_base, secretkey_base, alloc_log)
 
-    def finalize_experiment(self, starter, topo, aid, alloc_id, proof):
-        """
-        Store key bits of experiment state in the global repository, including
-        the response that may need to be replayed, and return the response.
-        """
-        i = 0
-        t = topo.clone()
+    def decorate_topology(self, info, t):
+        """
+        Copy the physical mapping and status onto the topology.  Used by
+        StartSegment and InfoSegment
+        """
+        def add_new(ann, attr):
+            for a in ann:
+                if a not in attr: attr.append(a)
+
         # Copy the assigned names into the return topology
         for e in t.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][0], self.domain))
-                        e.status = starter.node[e.name][1]
+                    if e.name in info.node:
+                        add_new(("%s%s" % (info.node[e.name][0], self.domain),),
+                                e.localname)
+                        e.status = info.node[e.name][1]
                 else:
                     # Simple debugging assignment
-                    e.localname.append("node%d%s" % (i, self.domain))
+                    add_new(("node%d%s" % (i, self.domain),), e.localname)
                     e.status = 'active'
-                    e.operation.extend(('testop1', 'testop2'))
+                    add_new(('testop1', 'testop2'), e.operation)
                     i += 1
 
+
+    def finalize_experiment(self, starter, topo, aid, alloc_id, proof):
+        """
+        Store key bits of experiment state in the global repository, including
+        the response that may need to be replayed, and return the response.
+        """
+        i = 0
+        t = topo.clone()
+        self.decorate_topology(starter, t)
         # Grab the log (this is some anal locking, but better safe than
         # sorry)
@@ -1246 +1262 @@
         info = self.info_segment(keyfile=self.ssh_privkey_file,
                 debug=self.create_debug, boss=self.boss, cert=self.xmlrpc_cert)
-        info(self, user, proj, ename, gid, nonce)
+        info(self, user, proj, ename)
+        self.decorate_topology(info, topo)
         return { 
                 'allocID': req['allocID'], 
-                'experimentdescription' { 'topdldescription' : topo.to_dict() },
+                'segmentdescription': 
+                    { 'topdldescription' : topo.to_dict() },
                 'proof': proof.to_dict(),
                 }
-