Changeset 5fffd82

Timestamp:

Dec 1, 2008 10:21:28 PM (16 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:

5a6b75b

Parents:

77a7634

Message:

Call access control routines locally rather than trying to remotely access this
process. Currently calling a remote service on ourselves seems to tangle the
threading up in knots. This should remove that problem.

Location:

fedd/federation

Files:

• deter_impl.py (modified) (1 diff)
• experiment_control.py (modified) (3 diffs)

fedd/federation/deter_impl.py

@@ -52 +52 @@
                 self.experiment = \
                         experiment_control_local(config, self.auth)
+                # Tell the experiment control where local access control is and
+                # what testbed it pertains to.
+                if self.access:
+                    self.experiment.local_access[self.access.testbed] = \
+                            self.access
+
                 self.soap_services.update(self.experiment.soap_services) 
                 self.xmlrpc_services.update(self.experiment.xmlrpc_services) 

fedd/federation/experiment_control.py

@@ -217 +217 @@
         self.def_gwimage = "FBSD61-TUNNEL2";
         self.def_gwtype = "pc";
+        self.local_access = { }
 
         if auth:
@@ -945 +946 @@
 
             try:
-                r = self.call_RequestAccess(uri, req, 
-                        self.cert_file, self.cert_pwd, self.trusted_certs)
+                if self.local_access.has_key(uri):
+                    # Local access call
+                    req = { 'RequestAccessRequestBody' : req }
+                    r = self.local_access[uri].RequestAccess(req, 
+                            fedid(file=self.cert_file))
+                    r = { 'RequestAccessResponseBody' : r }
+                else:
+                    r = self.call_RequestAccess(uri, req, 
+                            self.cert_file, self.cert_pwd, self.trusted_certs)
             except service_error, e:
                 if e.code == service_error.access:
@@ -1004 +1012 @@
                     "Unknown testbed: %s" % tb)
 
-        resp = self.call_ReleaseAccess(uri, {'allocID': aid},
-                self.cert_file, self.cert_pwd, self.trusted_certs)
+        if self.local_access.has_key(uri):
+            resp = self.local_access[uri].ReleaseAccess(\
+                    { 'ReleaseAccessRequestBody' : {'allocID': aid},}, 
+                    fedid(file=self.cert_file))
+            resp = { 'ReleaseAccessResponseBody': resp } 
+        else:
+            resp = self.call_ReleaseAccess(uri, {'allocID': aid},
+                    self.cert_file, self.cert_pwd, self.trusted_certs)
 
         # better error coding