Changeset 2453416 for fedd/federation/experiment_control.py

Timestamp:

Dec 7, 2010 12:50:48 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

9556f2a

Parents:

c179764 (diff), 1660f7c (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 tardis.deterlab.net:/var/local/git/fedd

File:

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

fedd/federation/experiment_control.py

@@ -1609 +1609 @@
         return top
 
-    def get_testbed_services(self, req):
+    def get_testbed_services(self, req, testbeds):
         """
         Parse the services section of the request into into two dicts mapping
@@ -1924 +1924 @@
                         testbeds.append(tb)
 
-            masters, pmasters = self.get_testbed_services(req)
+            masters, pmasters = self.get_testbed_services(req, testbeds)
             allocated = { }         # Testbeds we can access
             topo ={ }               # Sub topologies