Changeset 99eb8cf for fedd/federation/experiment_control.py

Timestamp:

Dec 8, 2009 6:11:35 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

23356cb

Parents:

3bddd24

Message:

More credential changes and removal of user/project stuff

File:

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

fedd/federation/experiment_control.py

@@ -725 +725 @@
         else: return None
 
-    def get_access(self, tb, nodes, user, tbparam, master, export_project,
+    def get_access(self, tb, nodes, tbparam, master, export_project,
             access_user):
         """
@@ -734 +734 @@
             raise service_error(serice_error.server_config, 
                     "Unknown testbed: %s" % tb)
-
-        # currently this lumps all users into one service access group
-        service_keys = [ a for u in user \
-                for a in u.get('access', []) \
-                    if a.has_key('sshPubkey')]
-
-        if len(service_keys) == 0:
-            raise service_error(service_error.req, 
-                    "Must have at least one SSH pubkey for services")
 
         # Tweak search order so that if there are entries in access_user that 
@@ -1327 +1318 @@
         return hosts, ips
 
-    def get_access_to_testbeds(self, testbeds, user, access_user, 
+    def get_access_to_testbeds(self, testbeds, access_user, 
             export_project, master, allocated, tbparams):
         """
@@ -1336 +1327 @@
         """
         for tb in testbeds:
-            self.get_access(tb, None, user, tbparams, master,
+            self.get_access(tb, None, tbparams, master,
                     export_project, access_user)
             allocated[tb] = 1
@@ -2017 +2008 @@
                         "Bad key type (%s)" % self.ssh_type)
 
-            user = req.get('user', None)
-            if user == None:
-                raise service_error(service_error.req, "No user")
-
             master = req.get('master', None)
             if not master:
@@ -2067 +2054 @@
             allocated = { }         # Testbeds we can access
             topo ={ }               # Sub topologies
-            self.get_access_to_testbeds(testbeds, user, access_user, 
+            self.get_access_to_testbeds(testbeds, access_user, 
                     export_project, master, allocated, tbparams)
             self.split_topology(top, topo, testbeds, eid, master, tbparams)