Changeset b6a6206 for fedd/federation/proxy_emulab_segment.py
- Timestamp:
- Oct 6, 2011 3:58:02 PM (13 years ago)
- Branches:
- compt_changes, info-ops, master
- Children:
- 3df9b33
- Parents:
- 2933343 (diff), f3898f7 (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
r2933343 rb6a6206 158 158 159 159 160 def make_null_experiment(self, user, host, pid, eid, tmpdir ):160 def make_null_experiment(self, user, host, pid, eid, tmpdir, gid=None): 161 161 """ 162 162 Create a null copy of the experiment so that we capture any logs there … … 164 164 startexp 165 165 """ 166 167 if gid is not None: gparam = '-g %s' % gid 168 else: gparam = '' 169 166 170 try: 167 171 f = open("%s/null.tcl" % tmpdir, "w") … … 179 183 if not self.ssh_cmd(user, host, 180 184 ("/usr/testbed/bin/startexp -i -f -w -p %s " + 181 "-e %s null.tcl") % (pid, eid), "startexp",185 "-e %s %s null.tcl") % (pid, eid, gparam), "startexp", 182 186 timeout=60 * 10): 183 187 return False … … 276 280 277 281 278 def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0): 282 def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0, 283 gid=None): 279 284 """ 280 285 Start a sub-experiment on a federant. … … 294 299 # Put a dummy in place to capture logs, and establish an experiment 295 300 # directory. 296 if not self.make_null_experiment(user, host, pid, eid, tmpdir ):301 if not self.make_null_experiment(user, host, pid, eid, tmpdir, gid): 297 302 return False 298 303 … … 325 330 proxy_segment.__init__(self, log=log, keyfile=keyfile, debug=debug) 326 331 327 def __call__(self, parent, user, pid, eid ):332 def __call__(self, parent, user, pid, eid, gid=None): 328 333 """ 329 334 Stop a sub experiment by calling swapexp on the federant
Note: See TracChangeset
for help on using the changeset viewer.