Changeset 06cc65b for fedd/federation/access.py

Timestamp:

May 28, 2010 2:23:12 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

5bf359d

Parents:

d6990a4

Message:

more refactoring - beaking code into smaller chunks for digestibility

File:

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

fedd/federation/access.py

@@ -205 +205 @@
                 f = open(self.state_filename, 'w')
                 pickle.dump(self.state, f)
+                self.log.debug("Wrote state to %s" % self.state_filename)
             except EnvironmentError, e:
                 self.log.error("Can't write file %s: %s" % \
@@ -224 +225 @@
                 f = open(self.state_filename, "r")
                 self.state = pickle.load(f)
-
+                self.log.debug("[read_state]: Read state from %s" % \
+                        self.state_filename)
             except EnvironmentError, e:
                 self.log.warning(("[read_state]: No saved state: " +\
@@ -236 +238 @@
                         "Unpickling failed: %s") % e)
 
-            self.log.debug("[read_state]: Read state from %s" % \
-                    self.state_filename)
-
-            self.allocation = self.state['allocation']
-            self.projects = self.state['projects']
-            self.keys = self.state['keys']
-            self.types = self.state['types']
-
-            # Add the ownership attributes to the authorizer.  Note that the
-            # indices of the allocation dict are strings, but the attributes are
-            # fedids, so there is a conversion.
-            for k in self.allocation.keys():
-                for o in self.allocation[k].get('owners', []):
-                    self.auth.set_attribute(o, fedid(hexstr=k))
-                if self.allocation[k].has_key('userconfig'):
-                    sfid = self.allocation[k]['userconfig']
-                    fid = fedid(hexstr=sfid)
-                    self.auth.set_attribute(fid, "/%s" % sfid)