Changeset 0a49bd7 for fedd/federation/remote_service.py

Timestamp:

Jan 15, 2011 5:52:15 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

aaf7f41

Parents:

ac15159 (diff), 944b746 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Ted Faber <faber@…> (01/15/11 17:51:40)

git-committer:

Ted Faber <faber@…> (01/15/11 17:52:15)

Message:

merge from current

File:

• fedd/federation/remote_service.py (modified) (8 diffs)

fedd/federation/remote_service.py

@@ -16 +16 @@
 import httplib
 
+from proof import proof
 from service_error import service_error
 from xmlrpclib import ServerProxy, dumps, loads, Fault, Error, Binary
@@ -21 +22 @@
     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
@@ -60 +67 @@
     # A map used to encapsulate fedids into xmlrpclib.Binary objects
     encap_fedids = (('fedid', to_binary),)
+
+    # fields that are never unicoded, because they represent non strings.
+    do_not_unicode = set(['credential'])
 
     @staticmethod
@@ -166 +176 @@
         if isinstance(obj, dict):
             for k in obj.keys():
-                obj[k] = remote_service_base.make_unicode(obj[k])
+                if k not in remote_service_base.do_not_unicode:
+                    obj[k] = remote_service_base.make_unicode(obj[k])
             return obj
         elif isinstance(obj, basestring) and not isinstance(obj, unicode):
@@ -283 +294 @@
         self.service_name = service_name
 
+<<<<<<< HEAD
         try:
             if getattr(fedd_services.feddBindingSOAP, service_name, None):
@@ -300 +312 @@
                 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
+>>>>>>> 944b746d2f97c5803ca28f587dd7100a57e25a69
 
         if request_message: self.request_message = request_message
         else:
             request_message_name = "%sRequestMessage" % service_name
+<<<<<<< HEAD
             try:
                 self.request_message = \
@@ -314 +336 @@
                         getattr(fedd_internal_client, request_message_name, 
                                 None)
+=======
+            self.request_message = \
+                    getattr(fedd_services, request_message_name, None) or \
+                    getattr(fedd_internal_services, request_message_name,
+                            None)
+>>>>>>> 944b746d2f97c5803ca28f587dd7100a57e25a69
             if not self.request_message and strict:
                 raise service_error(service_error.internal,
@@ -523 +551 @@
                             'desc': e.fault.string or "Something Weird" }
                 if ee:
+                    if 'proof' in ee: 
+                        pl = [ proof.from_dict(p) for p in ee['proof']]
+                    else: 
+                        pl = None
                     raise service_error(ee.get('code', 'no code'), 
-                            ee.get('desc','no desc'))
+                            ee.get('desc','no desc'), proof=pl)
                 else:
                     raise service_error(service_error.internal,