Changeset 058f58e for fedd/fedd_access.py

Timestamp:

Nov 20, 2008 7:14:58 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:

cfabc40

Parents:

c922f23

Message:

Unify the code for calling SOAP and XMLRPC services into a couple classes.
Before there were slightly different semantics everywhere.

Also make the handlers classes rather than the output of stub compiling
functions.

File:

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

fedd/fedd_access.py

@@ -52 +52 @@
     id_list_attrs = ("restricted",)
 
-    proxy_request, proxy_xmlrpc_request = make_service_callers('RequestAccess', 
-            'getfeddPortType', RequestAccessRequestMessage,
-            'RequestAccessRequestBody')
+    proxy_RequestAccess= \
+            service_caller('RequestAccess', 'getfeddPortType', 
+                    feddServiceLocator, RequestAccessRequestMessage,
+                    'RequestAccessRequestBody')
 
     def __init__(self, config=None):
@@ -153 +154 @@
 
         self.soap_services = {\
-            'RequestAccess': make_soap_handler(\
+            'RequestAccess': soap_handler(\
                 RequestAccessRequestMessage.typecode,\
                 self.RequestAccess, RequestAccessResponseMessage,\
                 "RequestAccessResponseBody"), \
-            'ReleaseAccess': make_soap_handler(\
+            'ReleaseAccess': soap_handler(\
                 ReleaseAccessRequestMessage.typecode,\
                 self.ReleaseAccess, ReleaseAccessResponseMessage,\
@@ -163 +164 @@
             }
         self.xmlrpc_services =  {\
-            'RequestAccess': make_xmlrpc_handler(\
+            'RequestAccess': xmlrpc_handler(\
                 self.RequestAccess, "RequestAccessResponseBody"),\
-            'ReleaseAccess': make_xmlrpc_handler(\
+            'ReleaseAccess': xmlrpc_handler(\
                 self.ReleaseAccess, "ReleaseAccessResponseBody")\
             }
@@ -698 +699 @@
             return resp
         else:
-            p_fault = None      # Any SOAP failure (sent unless XMLRPC works)
-            try:
-                # Proxy the request using SOAP
-                self.log.debug("Sending proxy message to %s" % dt)
-                resp = self.proxy_request(dt, req, feddServiceLocator,
+            resp = self.proxy_RequestAccess.call_service(dt, req,
                         self.proxy_cert_file, self.proxy_cert_pwd,
                         self.proxy_trusted_certs)
-                if resp.has_key('RequestAccessResponseBody'):
-                    return resp['RequestAccessResponseBody']
-                elif resp.has_key('Fedd_FaultBody'):
-                    raise service_error(resp['FeddFaultBody']['code'],
-                            resp['FeddFaultBody']['desc'])
-            except service_error, e:
-                if e.code == service_error.proxy: p_fault = None
-                else: raise
-            except ZSI.FaultException, f:
-                p_fault = f.fault.detail[0]
-                    
-
-            # If we could not get a valid SOAP response to the request above,
-            # try the same address using XMLRPC and let any faults flow back
-            # out.
-            if p_fault == None:
-                resp = self.proxy_xmlrpc_request(dt, req, self.proxy_cert_file,
-                    self.proxy_cert_pwd, self.proxy_trusted_certs)
-                if resp.has_key('RequestAccessResponseBody'):
-                    return resp['RequestAccessResponseBody']
+            if resp.has_key('RequestAccessResponseBody'):
+                return resp['RequestAccessResponseBody']
             else:
-                # Build the fault
-                body = p_fault.get_element_FeddFaultBody()
-                if body != None:
-                    raise service_error(body.get_element_code(),
-                                body.get_element_desc());
-                else:
-                    raise service_error(\
-                            service_error.proxy,
-                            "Undefined fault from proxy??");
+                return None
 
     def ReleaseAccess(self, req, fid):