Changeset ecf679e for fedd

Timestamp:

Sep 23, 2009 2:13:21 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

46bc576

Parents:

8c9933c

Message:

fix terminate/multistatus

File:

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

fedd/federation/experiment_control.py

@@ -1473 +1473 @@
                         ],
                     attribute=[ topdl.Attribute(
-                        attribute='dragon_endpoint', value='true'),
+                        attribute='dragon_endpoint', 
+                        value=tbparams[tb]['dragon']),
                         ]
                     )
@@ -2028 +2029 @@
             # save federant information
             for k in allocated.keys():
-                tbparams[k]['federant'] = {\
-                        'name': [ { 'localname' : eid} ],\
-                        'allocID' : tbparams[k]['allocID'],\
-                        'master' : k == master,\
+                tbparams[k]['federant'] = {
+                        'name': [ { 'localname' : eid} ],
+                        'allocID' : tbparams[k]['allocID'],
+                        'master' : k == master,
+                        'uri': tbparams[k]['uri'],
                     }
                 if tbparams[k].has_key('emulab'):
@@ -2437 +2439 @@
                     # Create and start a thread to stop the segment
                     thread_pool.wait_for_slot()
-                    uri = self.tbmap.get(tb, None)
+                    #uri = self.tbmap.get(tb, None)
+                    uri = tb
                     t  = self.pooled_thread(\
                             target=self.terminate_segment(log=dealloc_log,
@@ -2456 +2459 @@
             try: 
                 for tb in tbparams.keys():
-                    self.release_access(tb, tbparams[tb])
+                    # This releases access by uri
+                    self.release_access(None, tbparams[tb], uri=tb)
             except service_error, e:
                 if status != 'failed' and not force: