Changeset 57facae

Timestamp:

Nov 29, 2011 4:28:34 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

22a1a77

Parents:

ab3d6c5

Message:

Put pmasters back into get_testbed_services - too much can go wrong the
other way.

File:

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

fedd/federation/experiment_control.py

@@ -1745 +1745 @@
     def get_testbed_services(self, req, testbeds):
         """
-        Parse the services section of the request into a dict mapping
-        testbed to lists of federated_service objects.  The dict maps all
-        exporters of services to those service objects.
-        """
+        Parse the services section of the request into two dicts mapping
+        testbed to lists of federated_service objects.  The first dict maps all
+        exporters of services to those service objects, the second maps
+        testbeds to service objects only for services requiring portals.
+        """
+        # We construct both dicts here because deriving the second is more
+        # comples than it looks - both the keys and lists can differ, and it's
+        # much easier to generate both in one pass.
         masters = { }
+        pmasters = { }
         for s in req.get('service', []):
             # If this is a service request with the importall field
@@ -1776 +1781 @@
                     if tb in masters: masters[tb].append(fser)
                     else: masters[tb] = [fser]
+
+                    if fser.portal:
+                        if tb in pmasters: pmasters[tb].append(fser)
+                        else: pmasters[tb] = [fser]
                 else:
                     self.log.error('Testbed service does not have name " + \
                             "and importers')
-        return masters
+        return masters, pmasters
 
     def generate_keys_and_hosts(self, tmpdir, expid, hosts, tbparams):
@@ -2079 +2088 @@
                         testbeds.append(tb)
 
-            masters = self.get_testbed_services(req, testbeds)
-            # The exporters who need portals
-            pmasters = dict([(k, [s for s in l if s.portal] ) \
-                    for k, l in masters.items()])
+            masters, pmasters = self.get_testbed_services(req, testbeds)
             allocated = { }         # Testbeds we can access
             topo ={ }               # Sub topologies