Changeset b709861 for fedd/federation/experiment_control.py

Timestamp:

Nov 30, 2011 4:45:15 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

1ae1aa2

Parents:

22a1a77

Message:

Rebooting works

File:

• fedd/federation/experiment_control.py (modified) (10 diffs)

fedd/federation/experiment_control.py

@@ -2391 +2391 @@
                     results.append(operation_status(t, 
                         operation_status.federant,
-                        'Unexpected error ion %s' % tb))
+                        'Unexpected error on %s' % tb))
         # Clean up the tmpdir no matter what
         finally:
@@ -2412 +2412 @@
             else: return { }
 
+        def element_name(e):
+            if isinstance(e, topdl.Computer): return e.name
+            elif isinstance(e, topdl.Testbed): 
+                if e.localname: return e.localname[0]
+                else: return None
+            else: return None
+
         req = req.get('OperationRequestBody', None)
         if not req:
@@ -2418 +2425 @@
         exp = req.get('experiment', None)
         op = req.get('operation', None)
-        target = set(req.get('target', []))
+        targets = set(req.get('target', []))
         params = req.get('parameter', None)
 
@@ -2433 +2440 @@
             raise service_error(service_error.req, "No request?")
 
-        if op is None or not target
+        if op is None or not targets:
             raise service_error(service_error.req, "No request?")
 
@@ -2440 +2447 @@
         if key in self.state:
             d1, op_params, cert, d2 = \
-                    self.get_segment_info(self.state[key], need_lock=False)
+                    self.get_segment_info(self.state[key], need_lock=False,
+                            key='tb')
             top = self.state[key].top
             if top is not None:
@@ -2453 +2461 @@
         results = []
         for e in top.elements:
-            if e.name in targets:
+            ename = element_name(e)
+            if ename in targets:
                 tb = element_to_tb(e)
+                targets.remove(ename)
                 if tb is not None:
-                    if tb in testbeds: testbeds[tb].append(e.name)
-                    else: testbeds[tb] = [ e.name ]
+                    if tb in testbeds: testbeds[tb].append(ename)
+                    else: testbeds[tb] = [ ename ]
                 else:
                     results.append(operation_status(e.name, 
@@ -2463 +2473 @@
                         description='Cannot map target to testbed'))
 
+        for t in targets:
+            results.append(operation_status(t, operation_status.no_target))
+
         self.operate_on_segments(op_params, cert, op, testbeds, params,
                 results)
@@ -2468 +2481 @@
         return { 
                 'experiment': exp, 
-                'status': [make_dict(r) for r in results]
+                'status': [make_dict(r) for r in results],
                 'proof': proof.to_dict()
                 }
@@ -2524 +2537 @@
                     "Experiment has no status!?")
 
-    def get_segment_info(self, fed_exp, need_lock=True):
+    def get_segment_info(self, fed_exp, need_lock=True, key='aid'):
         ids = []
         term_params = { }
@@ -2537 +2550 @@
             uri = fed.uri
             aid = fed.allocID
-            term_params[aid] = (uri, aid)
+            if key == 'aid': term_params[aid] = (uri, aid)
+            elif key == 'tb': term_params[fed.tb] = (uri, aid)
+
         if need_lock: self.state_lock.release()
         return ids, term_params, expcert, repo