Test: Reorg. cord-tester code in general.
Change test cases to use olt configuration as appropriate when switch isn't running in the test container.
Remove olt multitable config and fold into olt_config.
Rename subscriberMultiTable to cordSubscriber test.
Change the eval script to reflect the new changes/design in cord tester.
Change-Id: I4849b32603ac790a31ba7cfb65b3f87a7c9e2076
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index ba8e2ee..022a192 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -59,7 +59,7 @@
self.olt = True
olt_conf_file = os.path.join(self.tester_base, 'olt_config.json')
olt_config = OltConfig(olt_conf_file)
- self.port_map = olt_config.olt_port_map()
+ self.port_map, _ = olt_config.olt_port_map()
else:
self.olt = False
self.port_map = None
@@ -130,7 +130,7 @@
def cleanup_intfs(cls):
olt_conf_file = os.path.join(cls.tester_base, 'olt_config.json')
olt_config = OltConfig(olt_conf_file)
- port_map = olt_config.olt_port_map()
+ port_map, _ = olt_config.olt_port_map()
port_num = 0
intf_host = port_map['host']
start_vlan = port_map['start_vlan']
@@ -275,7 +275,7 @@
test_containers = []
#These tests end up restarting ONOS/quagga/radius
- tests_exempt = ('vrouter',)
+ tests_exempt = ('vrouter', 'cordSubscriber', 'proxyarp')
if args.test_type.lower() == 'all':
tests = CordTester.ALL_TESTS
args.quagga = True