Changeset 9556f2a

Timestamp:

Dec 7, 2010 12:53:58 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

8445caf

Parents:

2453416

Message:

Deal with ZSI 2.1 by name aliases. The 2.1 function seems the same, so these simply alias the new names to the old if the old are unavailable.

Location:

fedd/federation

Files:

• remote_service.py (modified) (2 diffs)
• server.py (modified) (1 diff)

fedd/federation/remote_service.py

@@ -21 +21 @@
     import fedd_services
     import fedd_internal_services
+    service_port_name = 'getfeddPortType'
+    internal_service_port_name = 'getfeddInternalPortType'
 except ImportError:
-    import fedd_server
     import fedd_client
+    import fedd_internal_client
+    fedd_services = fedd_client
+    fedd_internal_services = fedd_internal_client
+    service_port_name = 'getfeddPort'
+    internal_service_port_name = 'getfedd_internalPort'
 
 from util import fedd_ssl_context
@@ -283 +289 @@
         self.service_name = service_name
 
-        try:
-            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'
-        except NameError:
-            if getattr(fedd_client.feddBindingSOAP, service_name, None):
-                self.locator = fedd_client.feddServiceLocator
-                self.port_name = 'getfeddPort'
-            elif getattr(fedd_internal_client.feddInternalBindingSOAP, 
-                    service_name, None):
-                self.locator = fedd_internal_client.feddInternalServiceLocator
-                self.port_name = 'getfedd_internalPort'
-
+        if getattr(fedd_services.feddBindingSOAP, service_name, None):
+            self.locator = fedd_services.feddServiceLocator
+            self.port_name = service_port_name
+        elif getattr(fedd_internal_services.feddInternalBindingSOAP, 
+                service_name, None):
+            self.locator = fedd_internal_services.feddInternalServiceLocator
+            self.port_name = internal_service_port_name
 
         if request_message: self.request_message = request_message

fedd/federation/server.py

@@ -13 +13 @@
 
 from fedid import fedid
-from fedd_services import ns0
+try:
+    from fedd_services import ns0
+except ImportError:
+    from fedd_server import ns0
+
 from service_error import *