Changeset 2729e48

Timestamp:

Nov 29, 2008 11:31:03 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:

2dd442f

Parents:

0a20ef8

Message:

Move things around to make a python module encapsulation easier. More to do,
but this mostly works.

Location:

fedd

Files:

• Makefile (modified) (2 diffs)
• fedd.py (modified) (3 diffs)
• fedd/__init__.py (added)
• fedd/asn1_raw.py (moved) (moved from fedd/asn1_raw.py)
• fedd/authorizer.py (moved) (moved from fedd/authorizer.py)
• fedd/confirm_sshkey.py (moved) (moved from fedd/confirm_sshkey.py)
• fedd/exp_access_db.py (moved) (moved from fedd/exp_access_db.py)
• fedd/fedd_access.py (moved) (moved from fedd/fedd_access.py)
• fedd/fedd_access_project.py (moved) (moved from fedd/fedd_access_project.py)
• fedd/fedd_allocate_project.py (moved) (moved from fedd/fedd_allocate_project.py)
• fedd/fedd_config_parser.py (moved) (moved from fedd/fedd_config_parser.py)
• fedd/fedd_deter_impl.py (moved) (moved from fedd/fedd_deter_impl.py)
• fedd/fedd_experiment_control.py (moved) (moved from fedd/fedd_experiment_control.py)
• fedd/fedd_server.py (moved) (moved from fedd/fedd_server.py)
• fedd/fedd_split.py (moved) (moved from fedd/fedd_split.py)
• fedd/fedd_util.py (moved) (moved from fedd/fedd_util.py)
• fedd/fedid.py (moved) (moved from fedd/fedid.py)
• fedd/fixed_resource.py (moved) (moved from fedd/fixed_resource.py)
• fedd/parse_detail.py (moved) (moved from fedd/parse_detail.py)
• fedd/remote_service.py (moved) (moved from fedd/remote_service.py)
• fedd/service_error.py (moved) (moved from fedd/service_error.py)
• fedd_client.py (modified) (2 diffs)

fedd/Makefile

@@ -1 +1 @@
 
-GENERATED_MODS= fedd_services.py fedd_internal_services.py \
-                fedd_services_types.py
+GENERATED_MODS= fedd/fedd_services.py fedd/fedd_internal_services.py \
+                fedd/fedd_services_types.py
 WSDL_FILES= fedd.wsdl fedd_bindings.wsdl fedd_messages.wsdl fedd_types.xsd \
             fedd_internal.wsdl fedd_internal_bindings.wsdl \
@@ -10 +10 @@
 
 ${GENERATED_MODS}:      ${WSDL_FILES}
-        /usr/local/bin/wsdl2py --file fedd.wsdl --complexType
+        /usr/local/bin/wsdl2py --file fedd.wsdl --complexType --output-dir=fedd
         /usr/local/bin/wsdl2py --file fedd_internal.wsdl --complexType \
-                --types=fedd_services_types
+                --types=fedd_services_types --output-dir=fedd
 
 clean:
-        rm -f ${GENERATED_MODS} *.pyc
+        rm -f ${GENERATED_MODS} fedd/*.pyc *.pyc

fedd/fedd.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-import sys
+import os,sys
 
 from optparse import OptionParser
 
-from fedd_server import fedd_server, fedd_xmlrpc_handler, fedd_soap_handler
-from fedd_config_parser import fedd_config_parser
-from fedd_util import fedd_ssl_context
-from fedd_deter_impl import new_feddservice
+from fedd.fedd_server import fedd_server, fedd_xmlrpc_handler, fedd_soap_handler
+from fedd.fedd_config_parser import fedd_config_parser
+from fedd.fedd_util import fedd_ssl_context
+from fedd.fedd_deter_impl import new_feddservice
 
 from threading import *
@@ -115 +115 @@
     sys.exit("Error configuring fedd: %s" % str)
 
-if impl.cert_file == None:
+if impl.cert_file:
+    if not os.access(impl.cert_file, os.R_OK):
+        sys.exit("Cannot read certificate file: %s" % impl.cert_file)
+else:
     sys.exit("Must supply certificate file (probably in config)")
+
+if impl.trusted_certs:
+    if not os.access(impl.trusted_certs, os.R_OK):
+        sys.exit("Cannot read trusted certificate file: %s" % \
+                impl.trusted_certs)
 
 # Create the SSL credentials
@@ -124 +132 @@
         ctx = fedd_ssl_context(impl.cert_file, impl.trusted_certs, 
                 password=impl.cert_pwd)
-    except SSL.SSLError, e:
+    except Exception, e:
         if str(e) != "bad decrypt" or impl.cert_pwd != None:
             raise

fedd/fedd_client.py

@@ -5 +5 @@
 import pwd
 
-from fedd_services import *
-from fedd_internal_services import *
+from fedd.fedd_services import *
+from fedd.fedd_internal_services import *
 
 from M2Crypto import SSL, X509
@@ -19 +19 @@
 import xmlrpclib
 
-from fedd_util import fedd_ssl_context, pack_id, unpack_id
-from fedid import fedid
-from remote_service import service_caller
-from service_error import *
+from fedd.fedd_util import fedd_ssl_context, pack_id, unpack_id
+from fedd.fedid import fedid
+from fedd.remote_service import service_caller
+from fedd.service_error import *
+import fedd.parse_detail
 
 from optparse import OptionParser, OptionValueError
 
-import parse_detail
 
 # Turn off the matching of hostname to certificate ID