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/vrouter/vrouterTest.py b/src/test/vrouter/vrouterTest.py
index b69bf5c..8e602ee 100644
--- a/src/test/vrouter/vrouterTest.py
+++ b/src/test/vrouter/vrouterTest.py
@@ -16,9 +16,9 @@
import unittest
from nose.tools import *
from scapy.all import *
-from OnosCtrl import OnosCtrl
+from OnosCtrl import OnosCtrl, get_mac
from OltConfig import OltConfig
-from OnosFlowCtrl import OnosFlowCtrl, get_mac
+from OnosFlowCtrl import OnosFlowCtrl
from onosclidriver import OnosCliDriver
#from quaggaclidriver import QuaggaCliDriver
from CordContainer import Container, Onos, Quagga
@@ -82,16 +82,30 @@
def setUpClass(cls):
''' Activate the vrouter apps'''
cls.olt = OltConfig()
- cls.port_map = cls.olt.olt_port_map()
+ cls.port_map, _ = cls.olt.olt_port_map()
if not cls.port_map:
cls.port_map = g_subscriber_port_map
time.sleep(3)
+ cls.load_device_id()
@classmethod
def tearDownClass(cls):
'''Deactivate the vrouter apps'''
#cls.vrouter_host_unload()
+ @classmethod
+ def load_device_id(cls):
+ did = OnosCtrl.get_device_id()
+ cls.device_id = did
+ cls.vrouter_device_dict = { "devices" : {
+ "{}".format(did) : {
+ "basic" : {
+ "driver" : "softrouter"
+ }
+ }
+ },
+ }
+
def cliEnter(self):
retries = 0
while retries < 3: