Changeset 2d5c8b6

Timestamp:

Aug 28, 2008 3:03:25 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:

fca8740

Parents:

b234bb9

Message:

generic fault support (they're not all named RequestAccessFault? any more)

Location:

fedd

Files:

• fedd.py (modified) (1 diff)
• fedd_bindings.wsdl (modified) (2 diffs)
• fedd_client.py (modified) (4 diffs)
• fedd_create_experiment.py (modified) (1 diff)
• fedd_messages.wsdl (modified) (2 diffs)
• fedd_proj.py (modified) (2 diffs)
• parse_detail.py (modified) (2 diffs)

fedd/fedd.py

@@ -123 +123 @@
                             fedid(cert=self.request.get_peer_cert()))
                 data = xmlrpclib.dumps((resp,), methodresponse=True)
-            #except Fault, f:
-        #       xf = xmlrpclib.Fault(f.code, f.string)
-        #       data = xmlrpclib.dumps(xf, methodresponse=True)
-        #       resp = None
             except xmlrpclib.Fault, f:
                 data = xmlrpclib.dumps(f, methodresponse=True)

fedd/fedd_bindings.wsdl

@@ -32 +32 @@
         </output>
         <fault>
-          <soap:fault use="encoded"  name="tns:RequestAccessFault"
+          <soap:fault use="encoded"  name="tns:FeddFault"
             namespace="http://www.isi.edu/faber/fedd.wsdl"
             encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
@@ -53 +53 @@
         </output>
         <fault>
-          <soap:fault use="encoded"  name="tns:CreateFault"
+          <soap:fault use="encoded"  name="tns:FeddFault"
             namespace="http://www.isi.edu/faber/fedd.wsdl"
             encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>

fedd/fedd_client.py

@@ -150 +150 @@
     """ Print an error message and exit.
 
-    The dictionary contains the RequestAccessFaultBody elements."""
+    The dictionary contains the FeddFaultBody elements."""
     codestr = ""
 
@@ -328 +328 @@
                 except RuntimeError, e:
                     sys.exit("Bad response. %s" % e.message)
-        elif 'get_element_RequestAccessFaultBody' in dir(resp): 
-            resp_body = resp.get_element_RequestAccessFaultBody()
+        elif 'get_element_FeddFaultBody' in dir(resp): 
+            resp_body = resp.get_element_FeddFaultBody()
             if resp_body != None: 
                 exit_with_fault(unpack_soap(resp_body))
@@ -346 +346 @@
         resp, method = loads(resp)
     except Error, e:
-        resp = { 'RequestAccessFaultBody': \
+        resp = { 'FeddFaultBody': \
                 { 'errstr' : e.faultCode, 'desc' : e.faultString } }
 
@@ -358 +358 @@
             except RuntimeError, e:
                 sys.exit("Bad response. %s" % e.messgae)
-        elif resp.has_key('RequestAccessFaultBody'):
-            exit_with_fault(resp['RequestAccessFaultBody'])
+        elif resp.has_key('FeddFaultBody'):
+            exit_with_fault(resp['FeddFaultBody'])
         else: sys.exit("No body in response!?")
 

fedd/fedd_create_experiment.py

@@ -1091 +1091 @@
         req = req.get('CreateRequestBody', None)
         if not req:
-            raise service_error(service_error.request,
+            raise service_error(service_error.req,
                     "Bad request format (no CreateRequestBody)")
         # The tcl parser needs to read a file so put the content into that file

fedd/fedd_messages.wsdl

@@ -34 +34 @@
       <input message="tns:RequestAccessRequestMessage"/>
       <output message="tns:RequestAccessResponseMessage"/>
-      <fault name="RequestAccessFault" 
-        message="tns:FaultMessage"/>
+      <fault name="FeddFault" message="tns:FaultMessage"/>
     </operation>
     <operation name="Create">
@@ -43 +42 @@
       <input message="tns:CreateRequestMessage"/>
       <output message="tns:CreateResponseMessage"/>
-      <fault name="CreateFault" message="tns:FaultMessage"/>
+      <fault name="FeddFault" message="tns:FaultMessage"/>
     </operation>
   </portType>

fedd/fedd_proj.py

@@ -527 +527 @@
             else:
                 # Build the fault
-                body = p_fault.get_element_RequestAccessFaultBody()
+                body = p_fault.get_element_FeddFaultBody()
                 if body != None:
                     raise service_error(body.get_element_code(),
@@ -753 +753 @@
                 de = ns0.faultType_Def(
                         (ns0.faultType_Def.schema,
-                            "RequestAccessFaultBody")).pyclass()
+                            "FeddFaultBody")).pyclass()
                 de._code=e.code
                 de._errstr=e.code_string()

fedd/parse_detail.py

@@ -17 +17 @@
 class detail_faultType:
     def __init__(self):
-        self.RequestAccessFaultBody = None
+        self.FeddFaultBody = None
         self.any = self
-    def get_element_RequestAccessFaultBody(self):
-        return self.RequestAccessFaultBody
+    def get_element_FeddFaultBody(self):
+        return self.FeddFaultBody
 
 # Override ZSI.fault.FaultType.typecode - give a parser that speaks our
@@ -30 +30 @@
     URI(pname=(SOAP.ENV,'faultactor'), minOccurs=0),
     Struct(pname='detail', aname='detail', 
-        ofwhat=[ns0.faultType_Def((ns0.faultType_Def.schema,
-            "RequestAccessFaultBody"))],
+        ofwhat=[ns0.faultType_Def((ns0.faultType_Def.schema, "FeddFaultBody"))],
         pyclass=detail_faultType, minOccurs=0),
     ],