Changeset 822d31b

Timestamp:

Nov 30, 2010 11:54:31 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

c002cb2

Parents:

78f2668

Message:

fix legacy mode

Location:

fedd/federation

Files:

• authorizer.py (modified) (1 diff)
• emulab_access.py (modified) (1 diff)
• experiment_control.py (modified) (3 diffs)

fedd/federation/authorizer.py

@@ -170 +170 @@
         return rv
 
-    def save(self, fn):
-        f = open(fn, "w")
-        pickle.dump(self, f)
-        f.close()
-
-    def load(self, fn):
-        f = open(fn, "r")
-        a = pickle.load(f)
-        f.close()
-        self.attrs = a.attrs
-        self.globals = a.globals
+    def save(self, fn=None):
+        if fn:
+            f = open(fn, "w")
+            pickle.dump(self, f)
+            f.close()
+
+    def load(self, fn=None):
+        if fn:
+            f = open(fn, "r")
+            a = pickle.load(f)
+            f.close()
+            self.attrs = a.attrs
+            self.globals = a.globals
         
 

fedd/federation/emulab_access.py

@@ -534 +534 @@
         for o in owners:
             self.auth.set_attribute(o, allocID)
-            print "Set delete rights on %s for %s" % (o, allocID)
         self.auth.save()
         try:

fedd/federation/experiment_control.py

@@ -1150 +1150 @@
         else:
             cert = self.cert_file
-            pw = self.cert_pw
+            pw = self.cert_pwd
 
         for tb in allocated.keys():
@@ -1849 +1849 @@
         # make a protected copy of the access certificate so the experiment
         # controller can act as the experiment principal.
-        if expcert:
+        if expcert and self.auth_type != 'legacy':
             expcert_file = self.make_temp_certfile(expcert, tmpdir)
             if not expcert_file:
@@ -2486 +2486 @@
                 # If no expcert, try the deallocation as the experiment
                 # controller instance.
-                if expcert: 
+                if expcert and self.auth_type != 'legacy': 
                     cert_file = self.make_temp_certfile(expcert, tmpdir)
                     pw = None
                 else: 
                     cert_file = self.cert_file
-                    pw = self.cert_pw
+                    pw = self.cert_pwd
 
                 # Stop everyone.  NB, wait_for_all waits until a thread starts