if SFA_DATA_DIR is defined in sfa_config use it

[sfa.git] / sfa / util / config.py

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 919c348..929b899 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -31,16 +31,63 @@ class Config:
     def __init__(self, config_file = "/etc/sfa/sfa_config"):
         self.config_file = None
         self.config_path = None
+        self.data_path = None
         self.load(config_file)
 
     def load(self, config_file):
         try:
             execfile(config_file, self.__dict__)
             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"
+
+            # 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):
+                os.mkdir(self.SFA_DATA_DIR)
+             
         except IOError, e:
             raise IOError, "Could not find the configuration file: %s" % config_file
 
+    def get_trustedroots_dir(self):
+        return self.config_path + os.sep + 'trusted_roots'
+
+    def get_openflow_aggrMgr_info(self):
+        aggr_mgr_ip = 'localhost'
+        if (hasattr(self,'OPENFLOW_AGGREGATE_MANAGER_IP')):
+            aggr_mgr_ip = self.OPENFLOW_AGGREGATE_MANAGER_IP
+
+        aggr_mgr_port = 2603
+        if (hasattr(self,'OPENFLOW_AGGREGATE_MANAGER_PORT')):
+            aggr_mgr_port = self.OPENFLOW_AGGREGATE_MANAGER_PORT
+
+        return (aggr_mgr_ip,aggr_mgr_port)
+
     def get_aggregate_rspec_type(self):
         if (hasattr(self,'SFA_AGGREGATE_RSPEC_TYPE')):
             return self.SFA_AGGREGATE_RSPEC_TYPE