All of my changes from this point on will apply only to the max/vini aggregates.

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

diff --git a/sfa/util/config.py b/sfa/util/config.py
index b832d8f..1c0b9c9 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -35,40 +35,50 @@ class Config:
 
     def load(self, config_file):
         try:
-            execfile(self.config_file, self.__dict__)
+            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
 
+    ##
+    #
+    # Very hacky - to change after July 21.
+    # 
+    # The generation/parsing of RSpecs is based on the value returned by this function. vini and max
+    # use some new code, while pl uses old code. As long as you don't set SFA_AGGREGATE_RSPEC_TYPE in your
+    # config file, the new code will not apply to your deployment.
+    #
 
-def get_default_dbinfo():
-    config = Config()
-    dbinfo={
-        'dbname' : config.GENI_PLC_DB_NAME,
-        'address' : config.GENI_PLC_DB_HOST,
-        'port' : config.GENI_PLC_DB_PORT,
-        'user' : config.GENI_PLC_DB_USER,
-        'password' : config.GENI_PLC_DB_PASSWORD
-        }
-    return dbinfo
+    def get_aggregate_rspec_type(self):
+        if (hasattr(self,'SFA_AGGREGATE_RSPEC_TYPE')):
+            return self.SFA_AGGREGATE_RSPEC_TYPE
+        else:
+            return "pl"
 
-##
-# 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_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_pl_auth():
-    config = Config()
-    pl_auth = {
-        'Username': config.GENI_PLC_USER,
-        'AuthMethod': 'capability',
-        'AuthString':  config.GENI_PLC_PASSWORD,
-        "Url": config.GENI_PLC_URL
-        }
-    return pl_auth
+    def get_plc_auth(self):
+        return {
+            'AuthMethod': 'capability',
+            'Username': self.SFA_PLC_USER,
+            'AuthString':  self.SFA_PLC_PASSWORD,
+            "Url": self.SFA_PLC_URL
+            }