Changeset 329f61d for fedd/fedd_client.py

Timestamp:

Jun 27, 2008 6:34:17 PM (16 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:

0a47d52

Parents:

4f4b977

Message:

basic XMLRPC

File:

• fedd/fedd_client.py (modified) (5 diffs)

fedd/fedd_client.py

@@ -8 +8 @@
 
 from M2Crypto import SSL, X509
+from M2Crypto.m2xmlrpclib import SSL_Transport
 import M2Crypto.httpslib
+
+from xmlrpclib import ServerProxy, Error, dumps, loads
 from ZSI import SoapWriter
 
@@ -69 +72 @@
 
         self.set_defaults(url="https://localhost:23235", anonymous=False,
-                serialize_only=False, use_fedid=False, debug=0)
+                serialize_only=False, transport="soap", use_fedid=False,
+                debug=0)
 
         self.add_option("-a","--anonymous", action="store_true",
@@ -108 +112 @@
         self.add_option("-U", "--username", action="store", dest="user",
                 type="string", help="Use this username instead of the uid")
+        self.add_option("-x","--transport", action="store", type="choice",
+                choices=("xmlrpc", "soap"),
+                help="Transport for request (xmlrpc|soap) (Default: %default)")
         self.add_option("--trace", action="store_const", dest="tracefile", 
                 const=sys.stderr, help="Print SOAP exchange to stderr")
@@ -230 +237 @@
         else: raise
 
-loc = feddServiceLocator();
-port = loc.getfeddPortType(opts.url,
-        transport=M2Crypto.httpslib.HTTPSConnection, 
-        transdict={ 'ssl_context' : context },
-        tracefile=opts.tracefile)
-
-req = RequestAccessRequestMessage()
-
 msg = {
         'allocID': pack_id('test alloc'),
@@ -268 +267 @@
         msg['user'] = [];
 
-req.set_element_RequestAccessRequestBody(
-        pack_soap(req, "RequestAccessRequestBody", msg))
-
 if opts.debug > 1: print >>sys.stderr, msg
 
-if opts.serialize_only:
-    sw = SoapWriter()
-    sw.serialize(req)
-    print str(sw)
-    sys.exit(0)
-
-try:
-    resp = port.RequestAccess(req)
-except ZSI.FaultException, e:
-    sys.exit("Fault: %s" % e)
-
-
-if (resp != None):
-    resp_body = resp.get_element_RequestAccessResponseBody()
-    if ( resp_body != None): 
+if opts.transport == "soap":
+    loc = feddServiceLocator();
+    port = loc.getfeddPortType(opts.url,
+            transport=M2Crypto.httpslib.HTTPSConnection, 
+            transdict={ 'ssl_context' : context },
+            tracefile=opts.tracefile)
+
+    req = RequestAccessRequestMessage()
+
+    req.set_element_RequestAccessRequestBody(
+            pack_soap(req, "RequestAccessRequestBody", msg))
+
+    if opts.serialize_only:
+        sw = SoapWriter()
+        sw.serialize(req)
+        print str(sw)
+        sys.exit(0)
+
+    try:
+        resp = port.RequestAccess(req)
+    except ZSI.FaultException, e:
+        sys.exit("Fault: %s" % e)
+
+
+    if (resp != None):
+        resp_body = resp.get_element_RequestAccessResponseBody()
+        if ( resp_body != None): 
+            try:
+                resp_dict = unpack_soap(resp_body)
+                if opts.debug > 1: print >>sys.stderr, resp_dict
+                print_response_as_testbed(resp_dict, opts.label)
+            except RuntimeError, e:
+                sys.exit("Bad response. %s" % e.messgae)
+        else: sys.exit("No body in resonpse!?")
+    else: sys.exit("No response?!?")
+elif opts.transport == "xmlrpc":
+    if opts.serialize_only:
+        ser = dumps((msg,))
+        sys.exit(0)
+
+    transport = SSL_Transport(context)
+    port = ServerProxy(opts.url, transport=transport)
+
+    try:
+        resp = port.RequestAccess({ 'RequestAccessRequestBody': msg})
+        resp, method = loads(resp)
+    except Error, e:
+        sys.exit("Fault: %s" % e)
+
+
+    if (resp != None):
         try:
-            resp_dict = unpack_soap(resp_body)
+            print resp
+            resp_dict = resp[0]['RequestAccessResponseBody']
             if opts.debug > 1: print >>sys.stderr, resp_dict
             print_response_as_testbed(resp_dict, opts.label)
         except RuntimeError, e:
             sys.exit("Bad response. %s" % e.messgae)
-    else: sys.exit("No body in resonpse!?")
-else: sys.exit("No response?!?")
+    else: sys.exit("No response?!?")