Changeset 19cc408 for fedd/fedd.py

Timestamp:

Oct 3, 2008 4:46:21 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:

ea0a821

Parents:

01073f7

Message:

refactoring

File:

• fedd/fedd.py (modified) (6 diffs)

fedd/fedd.py

@@ -15 +15 @@
 
 from fedd_util import fedd_ssl_context, fedid
-from fedd_proj import new_feddservice
+from fedd_deter_impl import new_feddservice
+from service_error import *
 
 # The SSL server here is based on the implementation described at
@@ -27 +28 @@
         SSLServer.__init__(self, ME, handler, ssl_ctx)
         self.impl = impl
+        self.soap_methods = impl.get_soap_services()
+        self.xmlrpc_methods = impl.get_xmlrpc_services()
 
 class fedd_soap_handler(BaseHTTPRequestHandler):
     server_version = "ZSI/2.0 fedd/0.1 " + BaseHTTPRequestHandler.server_version
-
 
     def send_xml(self, text, code=200):
@@ -80 +82 @@
         if not self.check_method(ps): return
         try:
-            resp = self.server.impl.soap_dispatch(ps.body_root.localName, ps,
+            resp = self.soap_dispatch(ps.body_root.localName, ps,
                     fedid(cert=self.request.get_peer_cert()))
         except Fault, f:
@@ -91 +93 @@
             self.send_xml(str(sw))
 
+    def soap_dispatch(self, method, req, fid):
+        if self.server.soap_methods.has_key(method):
+            try:
+                return self.server.soap_methods[method](req, fid)
+            except service_error, e:
+                de = ns0.faultType_Def(
+                        (ns0.faultType_Def.schema,
+                            "FeddFaultBody")).pyclass()
+                de._code=e.code
+                de._errstr=e.code_string()
+                de._desc=e.desc
+                if  e.is_server_error():
+                    raise Fault(Fault.Server, e.code_string(), detail=de)
+                else:
+                    raise Fault(Fault.Client, e.code_string(), detail=de)
+        else:
+            raise Fault(Fault.Client, "Unknown method: %s" % method)
+
+
 class fedd_xmlrpc_handler(BaseHTTPRequestHandler):
     server_version = "ZSI/2.0 fedd/0.1 " + BaseHTTPRequestHandler.server_version
@@ -120 +141 @@
         if method != None:
             try:
-                resp = self.server.impl.xmlrpc_dispatch(method, params,
+                resp = self.xmlrpc_dispatch(method, params,
                             fedid(cert=self.request.get_peer_cert()))
                 data = xmlrpclib.dumps((resp,), encoding='UTF-8', 
@@ -129 +150 @@
         self.send_xml(data)
 
+
+    def xmlrpc_dispatch(self, method, req, fid):
+        if self.server.xmlrpc_methods.has_key(method):
+            try:
+                return self.server.xmlrpc_methods[method](req, fid)
+            except service_error, e:
+                raise xmlrpclib.Fault(e.code_string(), e.desc)
+        else:
+            raise xmlrpclib.Fault(100, "Unknown method: %s" % method)
 
 class fedd_opts(OptionParser):