Changeset 6a8a9ec for fedd/federation/remote_service.py

Timestamp:

Feb 16, 2010 9:18:22 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

2fdf4b3

Parents:

c3a3fe3

Message:

Put a few more escapes in here to let the code be used with non-SOAP
non-autogenerated XMLRPC services.

File:

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

fedd/federation/remote_service.py

@@ -270 +270 @@
 class service_caller(remote_service_base):
     def __init__(self, service_name, request_message=None, 
-            request_body_name=None, tracefile=None):
+            request_body_name=None, tracefile=None, strict=True):
         self.service_name = service_name
 
@@ -287 +287 @@
                     getattr(fedd_services, request_message_name, None) or \
                     getattr(fedd_internal_services, request_message_name, None)
-            if not self.request_message:
+            if not self.request_message and strict:
                 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
+        if request_body_name is not None:
+            self.request_body_name = request_body_name
+        else: 
+            self.request_body_name = "%sRequestBody" % service_name
 
         self.tracefile = tracefile
@@ -343 +345 @@
         try:
             remote_method = getattr(port, self.service_name, None)
-            resp = remote_method(self.apply_to_tags(\
-                    { self.request_body_name: r}, self.encap_fedids))
+            if self.request_body_name:
+                resp = remote_method(self.apply_to_tags(\
+                        { self.request_body_name: r}, self.encap_fedids))
+            else:
+                resp = remote_method(self.apply_to_tags(r, self.encap_fedids))
         except socket_error, e:
             raise service_error(service_error.connect, 
@@ -369 +374 @@
 
         tf = tracefile or self.tracefile or None
+
+        if not self.request_body_name:
+            raise service_error(service_error.internal, 
+                    "Call to soap service without a configured request body");
 
         # If a context is given, use it.  Otherwise construct one from