commit b03cecd58829437d3bfe53d3dd6cbc8c5edeb19e
author A R Karthick <kramanar@ciena.com> Wed Jul 27 10:27:55 2016 -0700
committer A R Karthick <kramanar@ciena.com> Wed Jul 27 10:27:55 2016 -0700
tree c3272d6c7de46b9fb65027e8039f76da70371ba3
parent b50f559ae837fd754eba1a055550504767c86dd2

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

src/test/flows/flowsTest.py

diff --git a/src/test/flows/flowsTest.py b/src/test/flows/flowsTest.py
index 78eec17..8fa51fb 100644
--- a/src/test/flows/flowsTest.py
+++ b/src/test/flows/flowsTest.py
@@ -23,7 +23,7 @@
 import threading
 import os
 from OnosCtrl import OnosCtrl
-from OnosFlowCtrl import OnosFlowCtrl, get_mac
+from OnosFlowCtrl import OnosFlowCtrl
 from OltConfig import OltConfig
 import random
 from threading import current_thread
@@ -98,15 +98,13 @@
         return '.'.join(lst)
 
 
-
-
     @classmethod
     def setUpClass(cls):
         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 = cls.default_port_map
-        cls.device_id = 'of:' + get_mac() ##match against our device id
+        cls.device_id = OnosCtrl.get_device_id()
 
     def test_flow_mac(self):
         '''Test Add and verify flows with MAC selectors'''