Changeset f069052 for fedd/fedd/experiment_control.py

Timestamp:

Nov 30, 2008 5:38:16 PM (15 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:

05191a6

Parents:

edbc841

Message:

Two changes. Get allow_any_CA checking to work (i.e., self signed certs or
certs signed by an unknown entity) and put more of the ZSI-dependent stuff into
the hidden parts or remote_services. Now those routines will find all the
relevant classes and part names from the naming conventions.

File:

• fedd/fedd/experiment_control.py (modified) (3 diffs)

fedd/fedd/experiment_control.py

@@ -19 +19 @@
 from subprocess import *
 
-from fedd_services import *
-from fedd_internal_services import *
 from util import *
 from fedid import fedid, generate_fedid
@@ -140 +138 @@
                 self.pdata.terminate()
 
-    call_RequestAccess = service_caller('RequestAccess',
-            'getfeddPortType', feddServiceLocator, 
-            RequestAccessRequestMessage, 'RequestAccessRequestBody')
-
-    call_ReleaseAccess = service_caller('ReleaseAccess',
-            'getfeddPortType', feddServiceLocator, 
-            ReleaseAccessRequestMessage, 'ReleaseAccessRequestBody')
-
-    call_Ns2Split = service_caller('Ns2Split',
-            'getfeddInternalPortType', feddInternalServiceLocator, 
-            Ns2SplitRequestMessage, 'Ns2SplitRequestBody')
+    call_RequestAccess = service_caller('RequestAccess')
+    call_ReleaseAccess = service_caller('ReleaseAccess')
+    call_Ns2Split = service_caller('Ns2Split')
 
     def __init__(self, config=None, auth=None):
@@ -275 +265 @@
         # Dispatch tables
         self.soap_services = {\
-                'Create': soap_handler(\
-                        CreateRequestMessage.typecode,
-                        getattr(self, "create_experiment"), 
-                        CreateResponseMessage,
-                        "CreateResponseBody"),
-                'Vtopo': soap_handler(\
-                        VtopoRequestMessage.typecode,
-                        getattr(self, "get_vtopo"),
-                        VtopoResponseMessage,
-                        "VtopoResponseBody"),
-                'Vis': soap_handler(\
-                        VisRequestMessage.typecode,
-                        getattr(self, "get_vis"),
-                        VisResponseMessage,
-                        "VisResponseBody"),
-                'Info': soap_handler(\
-                        InfoRequestMessage.typecode,
-                        getattr(self, "get_info"),
-                        InfoResponseMessage,
-                        "InfoResponseBody"),
-                'Terminate': soap_handler(\
-                        TerminateRequestMessage.typecode,
-                        getattr(self, "terminate_experiment"),
-                        TerminateResponseMessage,
-                        "TerminateResponseBody"),
+                'Create': soap_handler('Create', self.create_experiment),
+                'Vtopo': soap_handler('Vtopo', self.get_vtopo),
+                'Vis': soap_handler('Vis', self.get_vis),
+                'Info': soap_handler('Info', self.get_info),
+                'Terminate': soap_handler('Terminate', 
+                    self.terminate_experiment),
         }
 
         self.xmlrpc_services = {\
-                'Create': xmlrpc_handler(\
-                        getattr(self, "create_experiment"), 
-                        "CreateResponseBody"),
-                'Vtopo': xmlrpc_handler(\
-                        getattr(self, "get_vtopo"),
-                        "VtopoResponseBody"),
-                'Vis': xmlrpc_handler(\
-                        getattr(self, "get_vis"),
-                        "VisResponseBody"),
-                'Info': xmlrpc_handler(\
-                        getattr(self, "get_info"),
-                        "InfoResponseBody"),
-                'Terminate': xmlrpc_handler(\
-                        getattr(self, "terminate_experiment"),
-                        "TerminateResponseBody"),
+                'Create': xmlrpc_handler('Create', self.create_experiment),
+                'Vtopo': xmlrpc_handler('Vtopo', self.get_vtopo),
+                'Vis': xmlrpc_handler('Vis', self.get_vis),
+                'Info': xmlrpc_handler('Info', self.get_info),
+                'Terminate': xmlrpc_handler('Terminate',
+                    self.terminate_experiment),
         }