Changeset 5ecb9a3 for fedd/federation/experiment_control_legacy.py

Timestamp:

Dec 6, 2010 1:56:04 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

cf0ff4f

Parents:

d31a171

Message:

Checkpoint along the path to #10

Several create_experiment subtasks have been brokern out and the
get_access and get_legacy access signatures have been unified.

Part of #10

File:

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

fedd/federation/experiment_control_legacy.py

@@ -48 +48 @@
     """
 
-    def get_legacy_access(self, tb, tbparam, access_user, masters, tbmap):
+    def get_legacy_access(self, tb, tbparam, fid, masters, tbmap, expid=None,
+            expcert=None):
         """
         Get access to testbed through fedd and set the parameters for that tb
@@ -67 +68 @@
                 raise service_error(service_error.req,
                         "More than one project export is not supported")
+
+        try:
+            access_user = self.accessdb[fid]
+        except KeyError:
+            raise service_error(service_error.internal,
+                    "Access map and authorizer out of sync in " + \
+                            "create_experiment for fedid %s"  % fid)
 
         uri = tbmap.get(testbed_base(tb), None)
@@ -187 +195 @@
 
 
-    def get_legacy_access_to_testbeds(self, testbeds, access_user, allocated, 
-            tbparams, masters, tbmap):
-        """
-        Request access to the various testbeds required for this instantiation
-        (passed in as testbeds).  User, access_user, expoert_project and master
-        are used to construct the correct requests.  Per-testbed parameters are
-        returned in tbparams.
-        """
-        for tb in testbeds:
-            self.get_access(tb, tbparams, access_user, masters, tbmap)
-            allocated[tb] = 1
-