Changeset 58e5a4f for fedd/federation/proxy_emulab_segment.py
- Timestamp:
- Oct 7, 2011 5:30:13 PM (13 years ago)
- Branches:
- compt_changes, info-ops, master
- Children:
- 451fb96
- Parents:
- 05c41f5 (diff), 1fed67b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fedd/federation/proxy_emulab_segment.py
r1fed67b r58e5a4f 330 330 proxy_segment.__init__(self, log=log, keyfile=keyfile, debug=debug) 331 331 332 def __call__(self, parent, user, pid, eid, gid=None ):332 def __call__(self, parent, user, pid, eid, gid=None, terminate=False): 333 333 """ 334 334 Stop a sub experiment by calling swapexp on the federant … … 343 343 rv = self.ssh_cmd(user, host, 344 344 "/usr/testbed/bin/swapexp -w %s %s out" % (pid, eid)) 345 if terminate: 346 rv = self.ssh_cmd(user, host, 347 "/usr/testbed/bin/endexp -w %s %s" % (pid, eid)) 345 348 except self.ssh_cmd_timeout: 346 349 rv = False
Note: See TracChangeset
for help on using the changeset viewer.