commit 477f4817eedc0ef6306459de1f88d77739bee7cf
author Rich Lane <rich.lane@bigswitch.com> Thu Oct 04 22:49:00 2012 -0700
committer Rich Lane <rich.lane@bigswitch.com> Fri Oct 05 12:30:31 2012 -0700
tree 2133c905fdd5da93949bd4cc8bb343be93370b1c
parent d1d9c287220588b5e8cff337f4f136ab9660a235

add a global config dictionary

There was no need for each test module to keep a copy for itself. This means we
can also get rid of test_set_init.

src/python/oftest/__init__.py

diff --git a/src/python/oftest/__init__.py b/src/python/oftest/__init__.py
index 802dc75..c1cbb78 100644
--- a/src/python/oftest/__init__.py
+++ b/src/python/oftest/__init__.py
@@ -1 +1,5 @@
 '''Docstring to silence pylint; ignores --ignore option for __init__.py'''
+
+# Global config dictionary
+# Populated by oft.
+config = {}

src/python/oftest/testutils.py

diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index 2fdc9ce..d7e5e9d 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -10,6 +10,7 @@
     except:
         sys.exit("Need to install scapy for packet parsing")
 
+from oftest import config
 import oftest.controller as controller
 import oftest.cstruct as ofp
 import oftest.message as message
@@ -65,7 +66,7 @@
     self.assertEqual(rv, 0, "Failed to reset port config")
 
 def required_wildcards(parent):
-    w = test_param_get(parent.config, 'required_wildcards', default='default')
+    w = test_param_get(config, 'required_wildcards', default='default')
     if w == 'l3-l4':
         return (ofp.OFPFW_NW_SRC_ALL | ofp.OFPFW_NW_DST_ALL | ofp.OFPFW_NW_TOS
                 | ofp.OFPFW_NW_PROTO | ofp.OFPFW_TP_SRC | ofp.OFPFW_TP_DST)
@@ -294,7 +295,7 @@
     parent must implement dataplane, assertTrue and assertEqual
     """
     exp_pkt_arg = None
-    if parent.config["relax"]:
+    if config["relax"]:
         exp_pkt_arg = exp_pkt
 
     if type(egr_ports) == type([]):
@@ -501,7 +502,7 @@
     @param clear_table If true, clear the flow table before installing
     """
 
-    clear_table = test_param_get(parent.config, 'clear_table', default=True)
+    clear_table = test_param_get(config, 'clear_table', default=True)
     if(clear_table_override != None):
         clear_table = clear_table_override
 
@@ -603,7 +604,7 @@
     test_count = 0
 
     if egr_count == -1:
-        egr_count = test_param_get(parent.config, 'egr_count', default=2)
+        egr_count = test_param_get(config, 'egr_count', default=2)
     
     for ing_idx in range(len(of_ports)):
         ingress_port = of_ports[ing_idx]
@@ -752,9 +753,9 @@
     # Check for test param modifications
     strip = False
     if check_test_params:
-        add_vlan = test_param_get(parent.config, 'add_vlan')
-        strip_vlan = test_param_get(parent.config, 'strip_vlan')
-        vid = test_param_get(parent.config, 'vid')
+        add_vlan = test_param_get(config, 'add_vlan')
+        strip_vlan = test_param_get(config, 'strip_vlan')
+        vid = test_param_get(config, 'vid')
 
         if add_vlan and strip_vlan:
             parent.assertTrue(0, "Add and strip VLAN both specified")
@@ -818,7 +819,7 @@
 
     skipped_test_count += 1
     logging.info("Skipping: " + s)
-    if parent.config["dbg_level"] < logging.WARNING:
+    if config["dbg_level"] < logging.WARNING:
         sys.stderr.write("(skipped) ")
     else:
         sys.stderr.write("(S)")