Changeset 329f61d for fedd/fedd_proj.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_proj.py (modified) (5 diffs)

fedd/fedd_proj.py

@@ -8 +8 @@
 from M2Crypto.SSL.SSLServer import SSLServer
 import M2Crypto.httpslib
+import xmlrpclib
 
 import re
@@ -30 +31 @@
     id_attrs = ("testbed", "cert_file", "trusted_certs", "proxy",
             "proxy_trusted_certs", "cert_pwd")
+
+    # Used by the SOAP caller
+    soap_namespace = 'http://www.isi.edu/faber/fedd.wsdl'
+    soap_methods = { 'RequestAccess': 'soap_RequestAccess' }
+    xmlrpc_methods = { 'RequestAccess': 'xmlrpc_RequestAccess' }
 
     class access_project:
@@ -407 +413 @@
         return msg
 
-
-    def soap_RequestAccess(self, ps, fid):
-        req = ps.Parse(RequestAccessRequestMessage.typecode)
-
-
-        #if req == None: raise Fault(Fault.Client, "No request??")
-        #req = req.get_element_RequestAccessRequestBody()
-        # if req == None: raise Fault(Fault.Client, "No request body??")
-
-        msg = self.RequestAccess(unpack_soap(req), fedid)
-        resp = RequestAccessResponseMessage()
-
-        resp.set_element_RequestAccessResponseBody(
-                pack_soap(resp, "RequestAccessResponseBody", msg))
-        return resp
-
     def RequestAccess(self, req, fid):
 
@@ -466 +456 @@
             # Proxy the request
             return self.proxy_request(dt, req)
+
+    def soap_RequestAccess(self, ps, fid):
+        req = ps.Parse(RequestAccessRequestMessage.typecode)
+
+        msg = self.RequestAccess(unpack_soap(req), fedid)
+        resp = RequestAccessResponseMessage()
+
+        resp.set_element_RequestAccessResponseBody(
+                pack_soap(resp, "RequestAccessResponseBody", msg))
+        return resp
+
+    def xmlrpc_RequestAccess(self, params, fid):
+        msg = self.RequestAccess(params[0], fedid)
+        if msg != None:
+            return xmlrpclib.dumps(({ "RequestAccessResponseBody": msg },))
 
     def read_trust(self, trust):
@@ -634 +639 @@
         f.close()
 
+    def soap_dispatch(self, method, req, fid):
+        if fedd_proj.soap_methods.has_key(method):
+            return getattr(self, fedd_proj.soap_methods[method])(req, fid)
+        else:
+            raise Fault(Fault.Client, "Unknown method: %s" % method)
+
+    def xmlrpc_dispatch(self, method, req, fid):
+        if fedd_proj.xmlrpc_methods.has_key(method):
+            return getattr(self, fedd_proj.xmlrpc_methods[method])(req, fid)
+        else:
+            raise xmlrpclib.Fault(100, "Unknown method: %s" % method)
+
 def new_feddservice(configfile):
     return fedd_proj(configfile)