Changeset f069052 for fedd/fedd/remote_service.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/remote_service.py (modified) (5 diffs)

fedd/fedd/remote_service.py

@@ -11 +11 @@
 from ZSI import ParseException, FaultException, SoapWriter
 
-from service_error import *
+from service_error import service_error
 from xmlrpclib import ServerProxy, dumps, loads, Fault, Error, Binary
 
+import fedd_services
+import fedd_internal_services
 from util import fedd_ssl_context
 from fedid import fedid
@@ -181 +183 @@
     created constructors will result in None being returned.
     """
-    def __init__(self, typecode, method, constructor, body_name):
-        self.typecode = typecode
+    def __init__(self, service_name, method, typecode=None,
+            constructor=None, body_name=None):
         self.method = method
-        self.constructor = constructor
-        self.body_name = body_name
+
+        response_class_name = "%sResponseMessage" % service_name
+        request_class_name = "%sRequestMessage" % service_name
+
+        if body_name: self.body_name = body_name
+        else: self.body_name = "%sResponseBody" % service_name
+
+        if constructor: self.constructor = constructor
+        else:
+            self.constructor = self.get_class(response_class_name)
+            if not self.constructor:
+                raise service_error(service_error.internal,
+                        "Cannot find class for %s" % response_class_name)
+
+        if typecode: self.typecode = typecode
+        else: 
+            req = self.get_class(request_class_name)
+            if req:
+                self.typecode = req.typecode
+            else:
+                raise service_error(service_error.internal,
+                        "Cannot find class for %s" % request_class_name)
+
+            if not self.typecode:
+                raise service_error(service_error.internal,
+                        "Cannot get typecode for %s" % class_name)
+
+    def get_class(self, class_name):
+        return getattr(fedd_services, class_name, None) or \
+                getattr(fedd_internal_services, class_name, None)
 
     def __call__(self, ps, fid):
@@ -197 +227 @@
         resp = self.constructor()
         set_element = getattr(resp, "set_element_%s" % self.body_name, None)
+        print "set_element_%s" % self.body_name
         if set_element and callable(set_element):
             try:
@@ -220 +251 @@
     to fedid objects on input and encapsulated as Binaries on output.
     """
-    def __init__(self, method, body_name):
+    def __init__(self, service_name, method):
         self.method = method
-        self.body_name = body_name
+        self.body_name = "%sResponseBody" % service_name
 
     def __call__(self, params, fid):
@@ -239 +270 @@
 
 class service_caller(remote_service_base):
-    def __init__(self, service_name, port_name, locator, request_message, 
-            request_body_name, tracefile=None):
+    def __init__(self, service_name, request_message=None, 
+            request_body_name=None, tracefile=None):
         self.service_name = service_name
-        self.port_name = port_name
-        self.locator = locator
-        self.request_message = request_message
-        self.request_body_name = request_body_name
+
+        if getattr(fedd_services.feddBindingSOAP, service_name, None):
+            self.locator = fedd_services.feddServiceLocator
+            self.port_name = 'getfeddPortType'
+        elif getattr(fedd_internal_services.feddInternalBindingSOAP, 
+                service_name, None):
+            self.locator = fedd_internal_services.feddInternalServiceLocator
+            self.port_name = 'getfeddInternalPortType'
+
+        if request_message: self.request_message = request_message
+        else:
+            request_message_name = "%sRequestMessage" % service_name
+            self.request_message = \
+                    getattr(fedd_services, request_message_name, None) or \
+                    getattr(fedd_internal_services, request_message_name, None)
+            if not self.request_message:
+                raise service_error(service_error.internal,
+                        "Cannot find class for %s" % request_message_name)
+
+        if request_body_name: self.request_body_name = request_body_name
+        else: self.request_body_name = "%sRequestBody" % service_name
+
         self.tracefile = tracefile
         self.__call__ = self.call_service