Changeset 7aec37d for fedd/fedd_allocate_project.py

Timestamp:

Aug 1, 2008 2:50:26 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:

e5a8b44

Parents:

808889e

Message:

split out internal interfaces

File:

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

fedd/fedd_allocate_project.py

@@ -19 +19 @@
 
 from fedd_services import *
+from fedd_internal_services import *
 from fedd_util import *
 import parse_detail
@@ -195 +196 @@
         if certs != None and isinstance(certs, type(tuple())):
             self.cert_file, self.trusted_certs, self.cert_pwd = certs
-            # self.cert_file = certs[0]
-            # self.trusted_certs = certs[1]
-            # self.cert_pwd = certs[2]
-        else:
-            self.cert_file = None
-            self.trusted_certs = None
-            self.cert_pwd = None
+        else:
+            self.cert_file, self.trusted_certs, self.cert_pwd = \
+                    (None, None, None)
 
     def dynamic_project(self, req, fedid=None):
@@ -219 +216 @@
                     "Server certificates misconfigured")
 
-        loc = feddServiceLocator();
-        port = loc.getfeddPortType(self.url,
+        loc = feddInternalServiceLocator();
+        port = loc.getfeddInternalPortType(self.url,
                 transport=M2Crypto.httpslib.HTTPSConnection, 
                 transdict={ 'ssl_context' : ctx })