Making room for request-specific input in the test rspec.

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

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 1c0b9c9..d58243e 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -41,14 +41,16 @@ class Config:
         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_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')):