Changeset 0c0b13c for fedd/fedd_client.py

Timestamp:

Jul 16, 2008 5:59:59 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:

dc8c3e6

Parents:

bb3769a

Message:

cross transport proxy operations work!

File:

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

fedd/fedd_client.py

@@ -147 +147 @@
         print >>out, "%s: %s" % (a['attribute'], a['value'])
 
+def exit_with_fault(dict, out=sys.stderr):
+    """ Print an error message and exit.
+
+    The dictionary contains the RequestAccessFaultBody elements."""
+    codestr = ""
+
+    if dict.has_key('errstr'):
+        codestr = "Error: %s" % dict['errstr']
+
+    if dict.has_key('code'):
+        if len(codestr) > 0 : 
+            codestr += " (%d)" % dict['code']
+        else:
+            codestr = "Error Code: %d" % dict['code']
+
+    print>>out, codestr
+    print>>out, "Description: %s" % dict['desc']
+    sys.exit(dict.get('code', 20))
+
 def add_ssh_key(option, opt_str, value, parser, access_keys):
     try:
@@ -274 +293 @@
 if opts.debug > 1: print >>sys.stderr, msg
 
-print FaultType.typecode;
-
 if opts.transport == "soap":
     loc = feddServiceLocator();
@@ -299 +316 @@
         sys.exit("Malformed response (XMLPRC?): %s" % e)
     except ZSI.FaultException, e:
-        print dir(e.fault.detail[0])
-        print e.fault.detail[0].RequestAccessFaultBody.get_element_code()
-        d = unpack_soap(e.fault.detail[0].get_element_RequestAccessFaultBody())
-        f = unpack_soap(e.fault.detail[0])
-        print "unpack ", d
-        print "unpack ", f
-        sys.exit("Fault: %s %s" % (str(e.fault.code), str(e.fault.string)))
-
+        resp = e.fault.detail[0]
 
     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!?")
+        if 'get_element_RequestAccessResponseBody' in dir(resp): 
+            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.message)
+        elif 'get_element_RequestAccessFaultBody' in dir(resp): 
+            resp_body = resp.get_element_RequestAccessFaultBody()
+            if resp_body != None: 
+                exit_with_fault(unpack_soap(resp_body))
+        else: sys.exit("No body in response!?")
     else: sys.exit("No response?!?")
 elif opts.transport == "xmlrpc":
@@ -331 +346 @@
         resp, method = loads(resp)
     except Error, e:
-        sys.exit("Fault: %s" % e)
+        resp = { 'RequestAccessFaultBody': \
+                { 'errstr' : e.faultCode, 'desc' : e.faultString } }
 
 
     if (resp != None):
-        try:
-            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)
+        if resp.has_key('RequestAccessReponseBody'): 
+            try:
+                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)
+        elif resp.has_key('RequestAccessFaultBody'):
+            exit_with_fault(resp['RequestAccessFaultBody'])
+        else: sys.exit("No body in response!?")
+
     else: sys.exit("No response?!?")