X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fconfig.py;h=aec8556f940825e4eb00f583735db9d14d9f5afb;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=37f30386c61f2abc5c965d2cf3fb6fd926a30995;hpb=11e61e035999da5aff22522efeaeadbbe5ba6f85;p=sfa.git

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 37f30386..aec8556f 100644
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -1,17 +1,17 @@
 ##
-# Geniwrapper Configuration Info
+# SFA Configuration Info
 #
-# This module holds configuration parameters for geniwrapper. There are two
+# This module holds configuration parameters for SFA. There are two
 # main pieces of information that are used: the database connection and
 # the PLCAPI connection
 ##
 
 ##
-# Geniwrapper uses a MYSQL database to store records. This database may be
+# SFA uses a MYSQL database to store records. This database may be
 # co-located with the PLC database, or it may be a separate database. The
 # following parameters define the connection to the database.
 #
-# Note that Geniwrapper does not access any of the PLC databases directly via
+# Note that SFA does not access any of the PLC databases directly via
 # a mysql connection; All PLC databases are accessed via PLCAPI.
 
 ### $Id$
@@ -28,7 +28,7 @@ class Config:
     fast but no type conversions.
     """
 
-    def __init__(self, config_file = "/etc/sfa/sfa_config"):
+    def __init__(self, config_file = "/etc/sfa/sfa_config.py"):
         self.config_file = None
         self.config_path = None
         self.data_path = None
@@ -40,14 +40,42 @@ class Config:
             self.config_file = config_file
             # path to configuration data
             self.config_path = os.path.dirname(config_file)
+            
             # path to server data
             if not hasattr(self, 'SFA_DATA_DIR'):
                 # default to /var/lib/sfa not specified in config
                 self.SFA_DATA_DIR="/var/lib/sfa"
+                self.data_path = self.SFA_DATA_DIR
+            else:
+                self.data_path = self.SFA_DATA_DIR
+                
             # path to config data
             if not hasattr(self, 'SFA_CONFIG_DIR'):
                 # default to /var/lib/sfa not specified in config
                 self.SFA_CONFIG_DIR="/etc/sfa"
+
+            if not hasattr(self, 'SFA_REGISTRY_LEVEL1_AUTH'):
+                self.SFA_REGISTRY_LEVEL1_AUTH=None
+
+            # define interface types
+            # this will determine which manager to use
+            if not hasattr(self, 'SFA_REGISTRY_TYPE'):
+                self.SFA_REGISTRY_TYPE='pl'
+
+            if not hasattr(self, 'SFA_AGGREGATE_TYPE'):
+                self.SFA_AGGREGATE_TYPE='pl'
+
+            if not hasattr(self, 'SFA_SM_TYPE'):
+                self.SFA_SM_TYPE='pl'
+
+            if not hasattr(self, 'SFA_CM_TYPE'):
+                self.SFA_COMPONENT_TYPE='pl'
+
+            # create the data directory if it doesnt exist
+            if not os.path.isdir(self.SFA_DATA_DIR):
+                try:
+                    os.mkdir(self.SFA_DATA_DIR)
+                except: pass
              
         except IOError, e:
             raise IOError, "Could not find the configuration file: %s" % config_file
@@ -82,12 +110,12 @@ class Config:
             }
 
     ##
-    # Geniwrapper uses a PLCAPI connection to perform operations on the registry,
+    # SFA uses a PLCAPI connection to perform operations on the registry,
     # such as creating and deleting slices. This connection requires an account
     # on the PLC server with full administrator access.
     #
     # The Url parameter controls whether the connection uses PLCAPI directly (i.e.
-    # Geniwrapper is located on the same machine as PLC), or uses a XMLRPC connection
+    # SFA is located on the same machine as PLC), or uses a XMLRPC connection
     # to the PLC machine. If you wish to use the API directly, then remove the Url
     # field from the dictionary.