Changeset 1ae1aa2 for fedd/federation/emulab_access.py

Timestamp:

Nov 30, 2011 5:55:13 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

f671ef7

Parents:

b709861

Message:

Reload interface works

File:

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

fedd/federation/emulab_access.py

@@ -1037 +1037 @@
                 if not self.create_debug:
                     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]
+                        add_new(("%s%s" % 
+                            (info.node[e.name].pname, self.domain),),
+                            e.localname)
+                        e.status = info.node[e.name].status
+                        os = info.node[e.name].getOS()
+                        if os: e.os = [ os ]
                 else:
                     # Simple debugging assignment
@@ -1270 +1273 @@
         info(self, user, proj, ename)
         self.decorate_topology(info, topo)
+        self.state_lock.acquire()
+        if aid in self.allocation:
+            self.allocation[aid]['topo'] = topo
+            self.write_state()
+        self.state_lock.release()
+
         return { 
                 'allocID': req['allocID'], 
@@ -1330 +1339 @@
                 debug=self.create_debug, boss=self.boss, 
                 cert=self.xmlrpc_cert)
-        ops(self, op, ptargets, params)
+        ops(self, op, ptargets, params, topo)
         
         status.extend(ops.status)