Changeset 027b87b for fedd

Timestamp:

Nov 30, 2010 10:25:47 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

78f2668

Parents:

725c55d

Message:

This little class added a useless complexity. While I'm in here I removed it.

Location:

fedd/federation

Files:

• access.py (modified) (1 diff)
• access_project.py (deleted)
• deter_internal_access.py (modified) (1 diff)
• dragon_access.py (modified) (1 diff)
• emulab_access.py (modified) (7 diffs)
• protogeni_access.py (modified) (1 diff)

fedd/federation/access.py

@@ -16 +16 @@
 from util import *
 from allocate_project import allocate_project_local, allocate_project_remote
-from access_project import access_project
 from fedid import fedid, generate_fedid
 from authorizer import authorizer

fedd/federation/deter_internal_access.py

@@ -14 +14 @@
 from util import *
 from allocate_project import allocate_project_local, allocate_project_remote
-from access_project import access_project
 from fedid import fedid, generate_fedid
 from authorizer import authorizer

fedd/federation/dragon_access.py

@@ -15 +15 @@
 from util import *
 from allocate_project import allocate_project_local, allocate_project_remote
-from access_project import access_project
 from fedid import fedid, generate_fedid
 from authorizer import authorizer

fedd/federation/emulab_access.py

@@ -19 +19 @@
 from util import *
 from allocate_project import allocate_project_local, allocate_project_remote
-from access_project import access_project
 from fedid import fedid, generate_fedid
 from authorizer import authorizer, abac_authorizer
@@ -208 +207 @@
     def make_access_project(str):
         """
-        Convert a string of the form (id[:resources:resouces], id, id) into an
-        access_project.  This is called by read_access to convert to local
-        attributes.  It returns a tuple of the form (project, user, user) where
-        users may be names or fedids.
+        Convert a string of the form (id[:resources:resouces], id, id) into a
+        tuple of the form (project, user, user) where users may be names or
+        fedids.  The resources strings are obsolete and ignored.
         """
         def parse_name(n):
@@ -227 +225 @@
                 del first[0]
                 first[0] = fedid(hexstr=first[0])
-            names[0] = access_project(first[0], first[1:])
+            names[0] = first[0]
 
             for i in range(1,2):
@@ -249 +247 @@
             # The slice takes the parens off the string.
             proj, user = str[1:-1].split(',')
-            return (access_project(proj.strip(), []), 
-                    user.strip(), user.strip())
+            return (proj.strip(), user.strip(), user.strip())
         else:
             raise self.parse_error(
@@ -270 +267 @@
         """
         # Return values
-        rp = access_project(None, ())
+        rp = None
         ru = None
         # This maps a valid user to the Emulab projects and users to use
@@ -285 +282 @@
         dyn_service_user = False
 
-        if found[0].name == "<same>":
+        if found[0] == "<same>":
             if project != None:
-                rp.name = project
+                rp = project
             else : 
                 raise service_error(\
                         service_error.server_config,
                         "Project matched <same> when no project given")
-        elif found[0].name == "<dynamic>":
-            rp.name = None
+        elif found[0] == "<dynamic>":
+            rp = None
             dyn_proj = True
         else:
-            rp.name = found[0].name
-        rp.node_types = found[0].node_types;
+            rp = found[0]
 
         if found[1] == "<same>":
@@ -503 +499 @@
         ap = None
 
-        print "%s %s %s" % (found, dyn, owners)
-
         # if this includes a project export request and the exported
         # project is not the access project, access denied.
         if 'service' in req:
             ep = get_export_project(req['service'])
-            if ep and ep != found[0].name:
+            if ep and ep != found[0]:
                 raise service_error(service_error.access,
                         "Cannot export %s" % ep)
 
         if self.ssh_pubkey_file:
-            ap = self.do_project_allocation(dyn[1], found[0].name, found[1])
+            ap = self.do_project_allocation(dyn[1], found[0], found[1])
         else:
             raise service_error(service_error.internal, 

fedd/federation/protogeni_access.py

@@ -17 +17 @@
 
 from util import *
-from access_project import access_project
 from fedid import fedid, generate_fedid
 from authorizer import authorizer