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.
diff --git a/tests/detailed_contr_sw_messages.py b/tests/detailed_contr_sw_messages.py
index b13659d..c99b9b7 100644
--- a/tests/detailed_contr_sw_messages.py
+++ b/tests/detailed_contr_sw_messages.py
@@ -9,6 +9,7 @@
import unittest
import random
+from oftest import config
import oftest.controller as controller
import oftest.cstruct as ofp
import oftest.message as message
@@ -21,21 +22,6 @@
from time import sleep
from FuncUtils import *
-cs_port_map = None
-cs_config = None
-
-def test_set_init(config):
-
-
- basic.test_set_init(config)
-
- global cs_port_map
- global cs_config
-
- cs_port_map = config["port_map"]
- cs_config = config
-
-
class OverlapChecking(basic.SimpleDataPlane):
"""Verify that if overlap check flag is set in the flow entry and an overlapping flow is inserted then an error
@@ -45,7 +31,7 @@
logging.info("Running Overlap_Checking test")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -105,7 +91,7 @@
logging.info("Running No_Overlap_Checking test")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -137,7 +123,7 @@
logging.info("Running Identical_Flows test ")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -178,7 +164,7 @@
logging.info("Running Emergency_Flow_Timeout test")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -230,7 +216,7 @@
logging.info("Running Missing_Modify_Add test")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -270,7 +256,7 @@
logging.info("Running Modify_Action test ")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -308,7 +294,7 @@
logging.info("Running Strict_Modify_Action test")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -352,7 +338,7 @@
logging.info("Delete_NonExisting_Flow test begins")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -388,7 +374,7 @@
logging.info("Running Send_Flow_Rem test ")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -448,7 +434,7 @@
logging.info("Running Delete_Emer_Flow")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
#Clear switch state
@@ -491,7 +477,7 @@
logging.info("Strict_Vs_Nonstrict test begins")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -578,7 +564,7 @@
logging.info("Outport1 test begins")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -636,7 +622,7 @@
logging.info("Running Idle_Timeout test ")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -680,7 +666,7 @@
logging.info("Running Outport2 test ")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -720,7 +706,7 @@
logging.info("Running Hard_Timeout test ")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")
@@ -767,7 +753,7 @@
logging.info("Running Flow_Timeout test ")
- of_ports = cs_port_map.keys()
+ of_ports = config["port_map"].keys()
of_ports.sort()
self.assertTrue(len(of_ports) > 1, "Not enough ports for test")