Changeset f069052 for fedd/fedd/access.py

Timestamp:

Nov 30, 2008 5:38:16 PM (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:

05191a6

Parents:

edbc841

Message:

Two changes. Get allow_any_CA checking to work (i.e., self signed certs or
certs signed by an unknown entity) and put more of the ZSI-dependent stuff into
the hidden parts or remote_services. Now those routines will find all the
relevant classes and part names from the naming conventions.

File:

• fedd/fedd/access.py (modified) (4 diffs)

fedd/fedd/access.py

@@ -10 +10 @@
 from threading import *
 
-from fedd_services import *
 from util import *
 from allocate_project import allocate_project_local, allocate_project_remote
@@ -45 +44 @@
     id_list_attrs = ("restricted",)
 
-    proxy_RequestAccess= \
-            service_caller('RequestAccess', 'getfeddPortType', 
-                    feddServiceLocator, RequestAccessRequestMessage,
-                    'RequestAccessRequestBody')
-
-    proxy_ReleaseAccess= \
-            service_caller('ReleaseAccess', 'getfeddPortType', 
-                    feddServiceLocator, ReleaseAccessRequestMessage,
-                    'ReleaseAccessRequestBody')
+    proxy_RequestAccess= service_caller('RequestAccess')
+    proxy_ReleaseAccess= service_caller('ReleaseAccess')
 
     def __init__(self, config=None, auth=None):
@@ -154 +146 @@
 
         self.soap_services = {\
-            'RequestAccess': soap_handler(\
-                RequestAccessRequestMessage.typecode,\
-                self.RequestAccess, RequestAccessResponseMessage,\
-                "RequestAccessResponseBody"), \
-            'ReleaseAccess': soap_handler(\
-                ReleaseAccessRequestMessage.typecode,\
-                self.ReleaseAccess, ReleaseAccessResponseMessage,\
-                "ReleaseAccessResponseBody")\
+            'RequestAccess': soap_handler("RequestAccess", self.RequestAccess),
+            'ReleaseAccess': soap_handler("ReleaseAccess", self.ReleaseAccess),
             }
         self.xmlrpc_services =  {\
-            'RequestAccess': xmlrpc_handler(\
-                self.RequestAccess, "RequestAccessResponseBody"),\
-            'ReleaseAccess': xmlrpc_handler(\
-                self.ReleaseAccess, "ReleaseAccessResponseBody")\
+            'RequestAccess': xmlrpc_handler('RequestAccess',
+                self.RequestAccess),
+            'ReleaseAccess': xmlrpc_handler('ReleaseAccess',
+                self.ReleaseAccess),
             }
 
@@ -518 +504 @@
 
         Build the dictionary description of the response and use
-        fedd_utils.pack_soap to create the soap message.  NB that alloc_id is
-        a fedd_services_types.IDType_Holder pulled from the incoming message.
-        ap is the allocate project message returned from a remote project
-        allocation (even if that allocation was done locally).
+        fedd_utils.pack_soap to create the soap message.  ap is the allocate
+        project message returned from a remote project allocation (even if that
+        allocation was done locally).
         """
         # Because alloc_id is already a fedd_services_types.IDType_Holder,