Changeset b6a6206 for fedd/federation/local_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/local_emulab_segment.py (modified) (3 diffs)

fedd/federation/local_emulab_segment.py

@@ -58 +58 @@
         return True
 
-    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.
@@ -70 +71 @@
 
         if state == 'none':
-            if not self.make_null_experiment(pid, eid, tmpdir):
+            if not self.make_null_experiment(pid, eid, tmpdir, gid):
                 return False
 
@@ -102 +103 @@
         emulab_segment.__init__(self, boss=boss, cert=cert)
 
-    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
         """
+
         self.log.info("[stop_segment]: Stopping %s" % eid)
         rv = False