Changeset f069052 for fedd/fedd/allocate_project.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/allocate_project.py (modified) (4 diffs)

fedd/fedd/allocate_project.py

@@ -8 +8 @@
 import tempfile
 
-from fedd_services import *
-from fedd_internal_services import *
 from util import *
 from fedid import fedid
@@ -92 +90 @@
         # Internal services are SOAP only
         self.soap_services = {\
-                "AllocateProject": soap_handler(\
-                AllocateProjectRequestMessage.typecode,\
-                self.dynamic_project, AllocateProjectResponseMessage,\
-                "AllocateProjectResponseBody"), 
-                "StaticProject": soap_handler(\
-                StaticProjectRequestMessage.typecode,\
-                self.static_project, StaticProjectResponseMessage,\
-                "StaticProjectResponseBody"),\
-                "ReleaseProject": soap_handler(\
-                ReleaseProjectRequestMessage.typecode,\
-                self.release_project, ReleaseProjectResponseMessage,\
-                "ReleaseProjectResponseBody")\
+                "AllocateProject": soap_handler("AllocateProject", 
+                    self.dynamic_project),
+                "StaticProject": soap_handler("StaticProject", 
+                    self.static_project),
+                "ReleaseProject": soap_handler("ReleaseProject", 
+                    self.release_project),
                 }
         self.xmlrpc_services = { }
@@ -388 +380 @@
         """
 
-        def __init__(self, url, cert_file, cert_pwd, trusted_certs, 
-                method, req_name, req_alloc, resp_name):
-            service_caller.__init__(self, method, 'getfeddInternalPortType',
-                    feddInternalServiceLocator, req_alloc, req_name)
+        def __init__(self, url, cert_file, cert_pwd, trusted_certs, method):
+            service_caller.__init__(self, method)
             self.url = url
             self.cert_file = cert_file
@@ -471 +461 @@
         # The specializations of the proxy functions
         self.dynamic_project = self.proxy(self.url, self.cert_file, 
-                self.cert_pwd, self.trusted_certs, "AllocateProject",
-                "AllocateProjectRequestBody", AllocateProjectRequestMessage,
-                "AllocateProjectResponseBody")
+                self.cert_pwd, self.trusted_certs, "AllocateProject")
         self.static_project = self.proxy(self.url, self.cert_file, 
-                self.cert_pwd, self.trusted_certs, "StaticProject",
-                "StaticProjectRequestBody", StaticProjectRequestMessage,
-                "StaticProjectResponseBody")
+                self.cert_pwd, self.trusted_certs, "StaticProject")
         self.release_project = self.proxy(self.url, self.cert_file,
-                self.cert_pwd, self.trusted_certs, "ReleaseProject",
-                "ReleaseProjectRequestBody", ReleaseProjectRequestMessage,
-                "ReleaseProjectResponseBody")
-
+                self.cert_pwd, self.trusted_certs, "ReleaseProject")
+