Changeset b6a6206 for fedd/federation/proxy_emulab_segment.py

Timestamp:

Oct 6, 2011 3:58:02 PM (13 years ago)

Author:

Ted Faber <faber@…>

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.

Message:

Merge branch 'master' of ​git://fedd.deterlab.net/fedd

File:

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

fedd/federation/proxy_emulab_segment.py

@@ -158 +158 @@
 
 
-    def make_null_experiment(self, user, host, pid, eid, tmpdir):
+    def make_null_experiment(self, user, host, pid, eid, tmpdir, gid=None):
         """
         Create a null copy of the experiment so that we capture any logs there
@@ -164 +164 @@
         startexp
         """
+
+        if gid is not None: gparam = '-g %s' % gid
+        else: gparam = ''
+
         try:
             f = open("%s/null.tcl" % tmpdir, "w")
@@ -179 +183 @@
             if not self.ssh_cmd(user, host,
                     ("/usr/testbed/bin/startexp -i -f -w -p %s " + 
-                    "-e %s null.tcl") % (pid, eid), "startexp",
+                    "-e %s %s null.tcl") % (pid, eid, gparam), "startexp",
                     timeout=60 * 10):
                 return False
@@ -276 +280 @@
 
 
-    def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0):
+    def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0,
+            gid=None):
         """
         Start a sub-experiment on a federant.
@@ -294 +299 @@
             # Put a dummy in place to capture logs, and establish an experiment
             # directory.
-            if not self.make_null_experiment(user, host, pid, eid, tmpdir):
+            if not self.make_null_experiment(user, host, pid, eid, tmpdir, gid):
                 return False
 
@@ -325 +330 @@
         proxy_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
 
-    def __call__(self, parent, user, pid, eid):
+    def __call__(self, parent, user, pid, eid, gid=None):
         """
         Stop a sub experiment by calling swapexp on the federant