Changeset 05c41f5 for fedd/federation/proxy_emulab_segment.py

Timestamp:

Oct 7, 2011 5:29:41 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

58e5a4f

Parents:

743a102

Message:

Terminate nonce experiments #36

File:

• fedd/federation/proxy_emulab_segment.py (modified) (2 diffs)

fedd/federation/proxy_emulab_segment.py

@@ -330 +330 @@
         proxy_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
 
-    def __call__(self, parent, user, pid, eid, gid=None):
+    def __call__(self, parent, user, pid, eid, gid=None, terminate=False):
         """
         Stop a sub experiment by calling swapexp on the federant
@@ -343 +343 @@
             rv = self.ssh_cmd(user, host,
                     "/usr/testbed/bin/swapexp -w %s %s out" % (pid, eid))
+            if terminate:
+                rv = self.ssh_cmd(user, host,
+                        "/usr/testbed/bin/endexp -w %s %s" % (pid, eid))
         except self.ssh_cmd_timeout:
             rv = False