Changeset 1ae1aa2 for fedd/federation/experiment_control.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/experiment_control.py (modified) (2 diffs)

fedd/federation/experiment_control.py

@@ -829 +829 @@
             for e in top.elements:
                 if isinstance(e, topdl.Computer):
-                    self.node[e.name] = \
-                            (e.localname, e.status, e.service, e.operation)
+                    self.node[e.name] = e
 
         def __call__(self, uri, aid, topo, masters, attrs=None, connInfo=None):
@@ -990 +989 @@
                     ann = s.node.get(e.name, None)
                     if ann is not None:
-                        add_new(ann[0], e.localname)
-                        e.status = ann[1]
-                        add_new(ann[2], e.service)
-                        add_new(ann[3], e.operation)
+                        add_new(ann.localname, e.localname)
+                        e.status = ann.status
+                        add_new(ann.service, e.service)
+                        add_new(ann.operation, e.operation)
+                        if ann.os:
+                            e.os = ann.os
                         break