merged namespace

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

diff --git a/sfa/util/config.py b/sfa/util/config.py
index d772346..a3fe098 100644 (file)
--- 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$
@@ -20,8 +20,6 @@
 import os.path
 import traceback
 
-from sfa.util.debug import log
-
 class Config:
     """
     Parse the bash/Python/PHP version of the configuration file. Very
@@ -94,9 +92,9 @@ class Config:
 
         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
+    def get_aggregate_type(self):
+        if (hasattr(self,'SFA_AGGREGATE_TYPE')):
+            return self.SFA_AGGREGATE_TYPE
         else:
             return "pl"
 
@@ -110,12 +108,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.