Changeset ec4fb42

Timestamp:

Nov 30, 2008 9:19:33 AM (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:

7454054

Parents:

f0dc2ca

Message:

Clean up some names that start with fedd_ that are ugly with the new package
structure. A couple other bugs cleaned up, too.

Location:

fedd

Files:

• Makefile (modified) (1 diff)
• fedd.py (modified) (4 diffs)
• fedd/access.py (moved) (moved from fedd/fedd/fedd_access.py) (6 diffs)
• fedd/access_project.py (moved) (moved from fedd/fedd/fedd_access_project.py)
• fedd/allocate_project.py (moved) (moved from fedd/fedd/fedd_allocate_project.py) (6 diffs)
• fedd/config_parser.py (moved) (moved from fedd/fedd/fedd_config_parser.py) (1 diff)
• fedd/experiment_control.py (moved) (moved from fedd/fedd/fedd_experiment_control.py) (3 diffs)
• fedd/fedd_deter_impl.py (modified) (4 diffs)
• fedd/remote_service.py (modified) (1 diff)
• fedd/server.py (moved) (moved from fedd/fedd/fedd_server.py) (3 diffs)
• fedd/split.py (moved) (moved from fedd/fedd/fedd_split.py) (2 diffs)
• fedd/util.py (moved) (moved from fedd/fedd/fedd_util.py)
• fedd_client.py (modified) (1 diff)

fedd/Makefile

@@ -10 +10 @@
 
 ${GENERATED_MODS}:      ${WSDL_FILES}
-        /usr/local/bin/wsdl2py --file fedd.wsdl --complexType --output-dir=fedd
-        /usr/local/bin/wsdl2py --file fedd_internal.wsdl --complexType \
+        wsdl2py --file fedd.wsdl --complexType --output-dir=fedd
+        wsdl2py --file fedd_internal.wsdl --complexType \
                 --types=fedd_services_types --output-dir=fedd
 

fedd/fedd.py

@@ -5 +5 @@
 from optparse import OptionParser
 
-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.server import server, xmlrpc_handler, soap_handler
+from fedd.config_parser import config_parser
+from fedd.util import fedd_ssl_context
 from fedd.fedd_deter_impl import new_feddservice
 
@@ -35 +35 @@
 
 servers_active = True       # Sub-servers run while this is True
-servers = [ ]               # fedd_server instances instantiated from services
+servers = [ ]               # server instances instantiated from services
 servers_lock = Lock()       # Lock to manipulate servers from sub-server threads
 
@@ -101 +101 @@
 if opts.configfile != None: 
     try:
-        config= fedd_config_parser()
+        config= config_parser()
         config.read(opts.configfile)
-    except e:
-        sys.exit("Cannot parse confgi file: %s" % e)
+    except Exception, e:
+        sys.exit("Cannot parse config file: %s" % e)
 else: 
     sys.exit("--configfile is required")
@@ -163 +163 @@
     try:
         if t == 'soap':
-            servers.append(fedd_server((h, p), fedd_soap_handler, ctx, impl))
+            servers.append(server((h, p), soap_handler, ctx, impl))
         elif t == 'xmlrpc':
-            servers.append(fedd_server((h, p), fedd_xmlrpc_handler, ctx, impl))
+            servers.append(server((h, p), xmlrpc_handler, ctx, impl))
         else:
             flog.error("Invalid transport specification (%s) in service %s" % \

fedd/fedd/access.py

@@ -11 +11 @@
 
 from fedd_services import *
-from fedd_util import *
-from fedd_allocate_project import *
-from fedd_access_project import access_project
+from util import *
+from allocate_project import allocate_project_local, allocate_project_remote
+from access_project import access_project
 from fedid import fedid, generate_fedid
 from authorizer import authorizer
@@ -28 +28 @@
 fl.addHandler(nullHandler())
 
-class fedd_access:
+class access:
     """
     The implementation of access control based on mapping users to projects.
@@ -68 +68 @@
                 config.add_section("globals")
         else:
-            raise RunTimeError("No config to fedd_access")
+            raise RunTimeError("No config to fedd.access")
 
         # Create instance attributes from the static lists
-        for a in fedd_access.bool_attrs:
+        for a in access.bool_attrs:
             if config.has_option("access", a):
                 setattr(self, a, config.get("access", a))
@@ -77 +77 @@
                 setattr(self, a, False)
 
-        for a in fedd_access.emulab_attrs + fedd_access.id_attrs:
+        for a in access.emulab_attrs + access.id_attrs:
             if config.has_option("access", a):
                 setattr(self, a, config.get("access",a))
@@ -174 +174 @@
         if not config.has_option("access", "project_allocation_uri"):
             self.allocate_project = \
-                fedd_allocate_project_local(config, auth)
+                allocate_project_local(config, auth)
         else:
             self.allocate_project = \
-                fedd_allocate_project_remote(config, auth)
+                allocate_project_remote(config, auth)
 
         # If the project allocator exports services, put them in this object's
@@ -291 +291 @@
         Dump the state read from a configuration file.  Mostly for debugging.
         """
-        for a in fedd_access.bool_attrs:
+        for a in access.bool_attrs:
             print "%s: %s" % (a, getattr(self, a ))
-        for a in fedd_access.emulab_attrs + fedd_access.id_attrs:
+        for a in access.emulab_attrs + access.id_attrs:
             print "%s: %s" % (a, getattr(self, a))
         for k, v in self.attrs.iteritems():

fedd/fedd/allocate_project.py

@@ -10 +10 @@
 from fedd_services import *
 from fedd_internal_services import *
-from fedd_util import *
+from util import *
 from fedid import fedid
 from fixed_resource import read_key_db, read_project_db
 from remote_service import xmlrpc_handler, soap_handler, service_caller
-from service_error import *
+from service_error import service_error
 import logging
 
@@ -29 +29 @@
 
 
-class fedd_allocate_project_local:
+class allocate_project_local:
     """
     Allocate projects on this machine in response to an access request.
@@ -168 +168 @@
                         uid.get('uri', None)
                 if uname == None:
-                    raise fedd_proj.service_error(fedd_proj.service_error.req, 
-                            "No ID for user");
+                    raise service_error(service_error.req, "No ID for user");
 
             access = user.get('access', None)
@@ -175 +174 @@
                 ssh = access[0].get('sshPubkey', None)
                 if ssh == None:
-                    raise fedd_proj.service_error(fedd_proj.service_error.req, 
+                    raise service_error(service_error.req, 
                             "No ssh key for user");
         else:
-            raise fedd_proj.service_error(fedd_proj.service_error.req, 
+            raise service_error(service_error.req, 
                     "No access information for project");
 
@@ -378 +377 @@
         return { 'project': req['ReleaseProjectRequestBody']['project']}
 
-class fedd_allocate_project_remote:
+class allocate_project_remote:
     """
     Allocate projects on a remote machine using the internal SOAP interface
@@ -426 +425 @@
                         "Bad proxy response")
 
-    # back to defining the fedd_allocate_project_remote class
+    # back to defining the allocate_project_remote class
     def __init__(self, config, auth=None):
         """

fedd/fedd/config_parser.py

@@ -3 +3 @@
 from ConfigParser import *
 
-class fedd_config_parser(SafeConfigParser):
+class config_parser(SafeConfigParser):
     """
     A SafeConfig parser with a more forgiving get attribute

fedd/fedd/experiment_control.py

@@ -21 +21 @@
 from fedd_services import *
 from fedd_internal_services import *
-from fedd_util import *
+from util import *
 from fedid import fedid, generate_fedid
 from remote_service import xmlrpc_handler, soap_handler, service_caller
@@ -34 +34 @@
 fl.addHandler(nullHandler())
 
-class fedd_experiment_control_local:
+class experiment_control_local:
     """
     Control of experiments that this system can directly access.
@@ -157 +157 @@
         Intialize the various attributes, most from the config object
         """
-        self.thread_with_rv = fedd_experiment_control_local.pooled_thread
-        self.thread_pool = fedd_experiment_control_local.thread_pool
+        self.thread_with_rv = experiment_control_local.pooled_thread
+        self.thread_pool = experiment_control_local.thread_pool
 
         self.cert_file = None

fedd/fedd/fedd_deter_impl.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-from fedd_access import fedd_access
-from fedd_experiment_control import fedd_experiment_control_local
-from fedd_split import fedd_split_local
+from access import access
+from experiment_control import experiment_control_local
+from split import split_local
 
 from authorizer import authorizer
@@ -20 +20 @@
     def __init__(self, config=None):
         """
-        Initializer.  Parses a configuration if one is given.
+        Initializer.  Uses the parsed configuration to create appropriate
+        components.
         """
         self.soap_services = { }
@@ -32 +33 @@
 
             if config.has_section("access"):
-                self.access = fedd_access(config, self.auth)
+                self.access = access(config, self.auth)
                 self.soap_services.update(self.access.soap_services) 
                 self.xmlrpc_services.update(self.access.xmlrpc_services) 
@@ -38 +39 @@
             if config.has_section("experiment_control"):
                 self.experiment = \
-                        fedd_experiment_control_local(config, self.auth)
+                        experiment_control_local(config, self.auth)
                 self.soap_services.update(self.experiment.soap_services) 
                 self.xmlrpc_services.update(self.experiment.xmlrpc_services) 
 
             if config.has_section("splitter"):
-                self.splitter = fedd_split_local(config, self.auth)
+                self.splitter = split_local(config, self.auth)
                 self.soap_services.update(self.splitter.soap_services) 
                 self.xmlrpc_services.update(self.splitter.xmlrpc_services) 

fedd/fedd/remote_service.py

@@ -13 +13 @@
 from xmlrpclib import ServerProxy, dumps, loads, Fault, Error, Binary
 
-from fedd_util import fedd_ssl_context
+from util import fedd_ssl_context
 from fedid import fedid
 

fedd/fedd/server.py

@@ -24 +24 @@
 SSL.Connection.clientPostConnectionCheck = None
 
-class fedd_server(ThreadingSSLServer):
+class server(ThreadingSSLServer):
     """
     Interface the fedd services to the XMLRPC and SOAP interfaces
@@ -52 +52 @@
                     "(Likely SSL error)")
 
-class fedd_soap_handler(BaseHTTPRequestHandler):
+class soap_handler(BaseHTTPRequestHandler):
     """
     Standard connection between SOAP and the fedd services in impl.
@@ -152 +152 @@
 
 
-class fedd_xmlrpc_handler(BaseHTTPRequestHandler):
+class xmlrpc_handler(BaseHTTPRequestHandler):
     """
     Standard connection between XMLRPC and the fedd services in impl.

fedd/fedd/split.py

@@ -8 +8 @@
 from fedd_services import *
 from fedd_internal_services import *
-from fedd_util import *
+from util import *
 from fedid import fedid
 from remote_service import xmlrpc_handler, soap_handler
@@ -21 +21 @@
 fl.addHandler(nullHandler())
 
-class fedd_split_local:
+class split_local:
     def __init__(self, config=None, auth=None):
         """

fedd/fedd_client.py

@@ -19 +19 @@
 import xmlrpclib
 
-from fedd.fedd_util import fedd_ssl_context, pack_id, unpack_id
+from fedd.util import fedd_ssl_context, pack_id, unpack_id
 from fedd.fedid import fedid
 from fedd.remote_service import service_caller