Changeset 72ed6e4 for fedd/fedd_deter_impl.py

Timestamp:

Oct 20, 2008 1:33:21 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:

f4f4117

Parents:

4700b3b

Message:

refactor configuration parsing to make code extensions more modular

File:

• fedd/fedd_deter_impl.py (modified) (2 diffs)

fedd/fedd_deter_impl.py

@@ -3 +3 @@
 from fedd_access import *
 from fedd_experiment_control import *
-from fedd_config_file import *
 
 class fedd_deter_impl:
@@ -16 +15 @@
             'http://www.isi.edu/faber/fedd_internal.wsdl')
 
-    def __init__(self, config_path=None):
+    def __init__(self, config=None):
         """
         Initializer.  Parses a configuration if one is given.
         """
-        if config_path:
-            self.soap_services = { }
-            self.xmlrpc_services = { }
-            config = config_file(config_path)
+        self.soap_services = { }
+        self.xmlrpc_services = { }
 
-            self.cert_file = config.cert_file;
-            self.cert_pwd = config.cert_pwd;
-            self.trusted_certs = config.trusted_certs;
+        if config:
+            self.cert_file = config.get("globals", "cert_file");
+            self.cert_pwd = config.get("globals", "cert_pwd");
+            self.trusted_certs = config.get("globals", "trusted_certs");
 
-            self.access = fedd_access(config)
-            self.experiment = fedd_experiment_control_local(config)
+            if config.has_section("access"):
+                self.access = fedd_access(config)
+                self.soap_services.update(self.access.soap_services) 
+                self.xmlrpc_services.update(self.access.xmlrpc_services) 
 
-            self.soap_services.update(self.access.soap_services) 
-            self.soap_services.update(self.experiment.soap_services) 
+            if config.has_section("experiment_control"):
+                self.experiment = fedd_experiment_control_local(config)
+                self.soap_services.update(self.experiment.soap_services) 
+                self.xmlrpc_services.update(self.experiment.xmlrpc_services) 
 
-            self.xmlrpc_services.update(self.access.xmlrpc_services) 
-            self.xmlrpc_services.update(self.experiment.xmlrpc_services) 
-
-def new_feddservice(configfile):
-    return fedd_deter_impl(configfile)
+def new_feddservice(config):
+    return fedd_deter_impl(config)