X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fconfig.py;h=b6c62c0b6b7b94c2b2e6f92ff459da0a1117ad65;hb=3362ea9f82ec8faeb4c9d7bba069766dbe1a81fc;hp=cef2fdd8b0d68e538ba6a0baba519477dc429bdf;hpb=f13173726f8382eef380f1e754f24dd2b126a77b;p=sfa.git

diff --git a/sfa/util/config.py b/sfa/util/config.py
index cef2fdd8..b6c62c0b 100644
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -22,80 +22,68 @@ import traceback
 
 from sfa.util.debug import log
 
-# xxx the path-search part could use a cleanup; 
-# why would anyone want to store the config in /usr/share/geniwrapper at all ?
-# also, if users want to use this, it might help to store stuff in ~/.sfirc or something
-
-# this would denote "/usr/share/geniwrapper/geni"
-# geni =  join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "geni")
-
 class Config:
     """
     Parse the bash/Python/PHP version of the configuration file. Very
     fast but no type conversions.
     """
 
-    def __init__(self, filepath = "/etc/sfa/sfa_config"):
-        # Load plc_config
-
-        loaded = False
-        # path to config.py source - this would be '/usr/share/geniwrapper/geni/util'
-        path = os.path.dirname(os.path.abspath(__file__))
-        # parent directory of config.py source
-        self.basepath = os.path.dirname(path)
-        # path to actual config file
-        filename = os.path.basename(filepath)
-        alt_file = os.path.join(path, 'util', filename)
-        files = [filepath, alt_file]
-
-        for config_file in files:
-            try:
-                execfile(config_file, self.__dict__)
-                loaded = True
-                self.config_file = config_file
-                self.config_path = os.path.dirname(config_file)
-                break
-            except:
-                pass
+    def __init__(self, config_file = "/etc/sfa/sfa_config"):
+        self.config_file = None
+        self.config_path = None
+        self.load(config_file)
 
-        if not loaded:
-            raise Exception, "Could not find config in " + ", ".join(files)
-
-        # set up some useful variables
-
-    def load(self, filepath):
+    def load(self, config_file):
         try:
-            execfile(filepath, self.__dict__)
-        except:
-            raise Exception, "Could not find config in " + filepath
-
-plcConfig = Config("/etc/planetlab/plc_config")
-
-def get_default_dbinfo():
-    dbinfo={ 'dbname' : plcConfig.PLC_DB_NAME,
-    'address' : plcConfig.PLC_DB_HOST,
-    'port' : plcConfig.PLC_DB_PORT,
-    'user' : plcConfig.PLC_DB_USER,
-    'password' : plcConfig.PLC_DB_PASSWORD
-	}
-
-    return dbinfo
-
-##
-# Geniwrapper 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
-# to the PLC machine. If you wish to use the API directly, then remove the Url
-# field from the dictionary. 
-
-def get_pl_auth():
-    pl_auth = {'Username': plcConfig.PLC_API_MAINTENANCE_USER,
-               'AuthMethod': 'capability',
-               'AuthString':  plcConfig.PLC_API_MAINTENANCE_PASSWORD,
-               "Url": 'https://%s:%s%s' %(plcConfig.PLC_API_HOST, plcConfig.PLC_API_PORT, plcConfig.PLC_API_PATH)
-               }
-
-    return pl_auth
+            execfile(config_file, self.__dict__)
+            self.config_file = config_file
+            self.config_path = os.path.dirname(config_file)
+        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
+        else:
+            return "pl"
+
+    def get_plc_dbinfo(self):
+        return {
+            'dbname' : self.SFA_PLC_DB_NAME,
+            'address' : self.SFA_PLC_DB_HOST,
+            'port' : self.SFA_PLC_DB_PORT,
+            'user' : self.SFA_PLC_DB_USER,
+            'password' : self.SFA_PLC_DB_PASSWORD
+            }
+
+    ##
+    # Geniwrapper 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
+    # to the PLC machine. If you wish to use the API directly, then remove the Url
+    # field from the dictionary. 
+
+    def get_plc_auth(self):
+        return {
+            'AuthMethod': 'capability',
+            'Username': self.SFA_PLC_USER,
+            'AuthString':  self.SFA_PLC_PASSWORD,
+            "Url": self.SFA_PLC_URL
+            }