Changeset ec4fb42 for fedd/fedd/access.py

Timestamp:

Nov 30, 2008 9:19:33 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

7454054

Parents:

f0dc2ca

Message:

Clean up some names that start with fedd_ that are ugly with the new package
structure. A couple other bugs cleaned up, too.

File:

• fedd/fedd/access.py (moved) (moved from fedd/fedd/fedd_access.py) (6 diffs)

fedd/fedd/access.py

@@ -11 +11 @@
 
 from fedd_services import *
-from fedd_util import *
-from fedd_allocate_project import *
-from fedd_access_project import access_project
+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
@@ -28 +28 @@
 fl.addHandler(nullHandler())
 
-class fedd_access:
+class access:
     """
     The implementation of access control based on mapping users to projects.
@@ -68 +68 @@
                 config.add_section("globals")
         else:
-            raise RunTimeError("No config to fedd_access")
+            raise RunTimeError("No config to fedd.access")
 
         # Create instance attributes from the static lists
-        for a in fedd_access.bool_attrs:
+        for a in access.bool_attrs:
             if config.has_option("access", a):
                 setattr(self, a, config.get("access", a))
@@ -77 +77 @@
                 setattr(self, a, False)
 
-        for a in fedd_access.emulab_attrs + fedd_access.id_attrs:
+        for a in access.emulab_attrs + access.id_attrs:
             if config.has_option("access", a):
                 setattr(self, a, config.get("access",a))
@@ -174 +174 @@
         if not config.has_option("access", "project_allocation_uri"):
             self.allocate_project = \
-                fedd_allocate_project_local(config, auth)
+                allocate_project_local(config, auth)
         else:
             self.allocate_project = \
-                fedd_allocate_project_remote(config, auth)
+                allocate_project_remote(config, auth)
 
         # If the project allocator exports services, put them in this object's
@@ -291 +291 @@
         Dump the state read from a configuration file.  Mostly for debugging.
         """
-        for a in fedd_access.bool_attrs:
+        for a in access.bool_attrs:
             print "%s: %s" % (a, getattr(self, a ))
-        for a in fedd_access.emulab_attrs + fedd_access.id_attrs:
+        for a in access.emulab_attrs + access.id_attrs:
             print "%s: %s" % (a, getattr(self, a))
         for k, v in self.attrs.iteritems():