Changeset f069052 for fedd/fedd_client.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_client.py (modified) (8 diffs)

fedd/fedd_client.py

@@ -4 +4 @@
 import os
 import pwd
-
-from fedd.fedd_services import *
-from fedd.fedd_internal_services import *
 
 from fedd import fedid, service_error
@@ -177 +174 @@
         Specialize the class for the pre method
         """
-        self.RequestMessage = globals()["%sRequestMessage" % pre]
-        self.ResponseMessage = globals()["%sResponseMessage" % pre]
         self.RequestBody="%sRequestBody" % pre
         self.ResponseBody="%sResponseBody" % pre
         self.method = pre
 
-        method_call = getattr(feddServiceLocator().getfeddPortType(),
-                self.method, None)
-        if method_call:
-            # The pre method is a fedd external service
-            self.caller = service_caller(self.method, 'getfeddPortType', 
-                    feddServiceLocator, self.RequestMessage, self.RequestBody)
-        else:
-            # The pre method is a fedd internal service
-            self.caller = service_caller(self.method, 
-                    'getfeddInternalPortType', feddInternalServiceLocator,
-                    self.RequestMessage, self.RequestBody)
-
+        self.caller = service_caller(self.method)
         self.RPCException = fedd_rpc.RPCException
 
@@ -255 +239 @@
             try:
                 context = fedd_ssl_context(cert, trusted)
-            except SSL.SSLError, e:
+            except Exception, e:
                 # Yes, doing this on message type is not ideal.  The string
                 # comes from OpenSSL, so check there is this stops working.
@@ -343 +327 @@
         (opts, args) = parser.parse_args()
 
-        if opts.trusted != None:
+        if opts.trusted:
             if ( not os.access(opts.trusted, os.R_OK) ) :
                 sys.exit("Cannot read trusted certificates (%s)" % opts.trusted)
-        else:
-            parser.error("--trusted is required")
 
         if opts.debug > 0: opts.tracefile=sys.stderr
@@ -411 +393 @@
         (opts, args) = parser.parse_args()
 
-        if opts.trusted != None:
+        if opts.trusted:
             if ( not os.access(opts.trusted, os.R_OK) ) :
                 sys.exit("Cannot read trusted certificates (%s)" % opts.trusted)
-        else:
-            parser.error("--trusted is required")
 
         if opts.debug > 0: opts.tracefile=sys.stderr
@@ -471 +451 @@
         (opts, args) = parser.parse_args()
 
-        if opts.trusted != None:
+        if opts.trusted:
             if ( not os.access(opts.trusted, os.R_OK) ) :
                 sys.exit("Cannot read trusted certificates (%s)" % opts.trusted)
-        else:
-            parser.error("--trusted is required")
 
         if not opts.project :
@@ -568 +546 @@
         (opts, args) = parser.parse_args()
 
-        if opts.trusted != None:
+        if opts.trusted:
             if ( not os.access(opts.trusted, os.R_OK) ) :
                 sys.exit("Cannot read trusted certificates (%s)" % opts.trusted)
-        else:
-            parser.error("--trusted is required")
 
         if opts.debug > 0: opts.tracefile=sys.stderr
@@ -674 +650 @@
             parser.error("--testbed is required")
 
-        if opts.trusted != None:
+        if opts.trusted:
             if ( not os.access(opts.trusted, os.R_OK) ) :
                 sys.exit("Cannot read trusted certificates (%s)" % opts.trusted)
-        else:
-            parser.error("--trusted is required")
 
         if opts.debug > 0: opts.tracefile=sys.stderr