use sfa.client.return_value.ReturnValue to parse aggregate return values

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

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 42d2c87..693bbc2 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -14,9 +14,6 @@
 # Note that SFA does not access any of the PLC databases directly via
 # a mysql connection; All PLC databases are accessed via PLCAPI.
 
-### $Id$
-### $URL$
-
 import os.path
 import traceback
 
@@ -72,6 +69,9 @@ class Config:
             if not hasattr(self, 'SFA_MAX_SLICE_RENEW'):
                 self.SFA_MAX_SLICE_RENEW=60
 
+            if not hasattr(self, 'SFA_AGGREGATE_API_VERSION'):
+                self.SFA_AGGREGATE_API_VERSION=1 
+
             # create the data directory if it doesnt exist
             if not os.path.isdir(self.SFA_DATA_DIR):
                 try:
@@ -79,7 +79,7 @@ class Config:
                 except: pass
              
         except IOError, e:
-            raise IOError, "Could not find the configuration file: %s" % config_file
+            raise IOError, "Could not find or load the configuration file: %s" % config_file
 
     def get_trustedroots_dir(self):
         return self.config_path + os.sep + 'trusted_roots'
@@ -109,11 +109,11 @@ class Config:
 
     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
+            'dbname' : self.SFA_DB_NAME,
+            'address' : self.SFA_DB_HOST,
+            'port' : self.SFA_DB_PORT,
+            'user' : self.SFA_DB_USER,
+            'password' : self.SFA_DB_PASSWORD
             }
 
     # TODO: find a better place to put this method
@@ -128,20 +128,3 @@ class Config:
 
         return (am_apiclient_path,am_url)
 
-    ##
-    # 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.
-    # 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. 
-
-    def get_plc_auth(self):
-        return {
-            'AuthMethod': 'capability',
-            'Username': self.SFA_PLC_USER,
-            'AuthString':  self.SFA_PLC_PASSWORD,
-            "Url": self.SFA_PLC_URL
-            }