We use/configure the relay port for the dhcp server that actually maps to the ovs switch port map!
Change-Id: I634506edd1e7dfb33e13f917339a2c91c6567e99
diff --git a/src/test/utils/OnosCtrl.py b/src/test/utils/OnosCtrl.py
index 2bc9c0e..15b55d7 100644
--- a/src/test/utils/OnosCtrl.py
+++ b/src/test/utils/OnosCtrl.py
@@ -121,9 +121,9 @@
return None
@classmethod
- def get_device_id(cls, controller = None, mfr = None):
+ def get_device_id(cls, controller = None, mfr = None, olt_conf_file = ''):
'''If running under olt, we get the first switch connected to onos'''
- olt = OltConfig()
+ olt = OltConfig(olt_conf_file = olt_conf_file)
did = 'of:' + get_mac()
if olt.on_olt():
devices = cls.get_devices(controller = controller, mfr = mfr)
@@ -138,9 +138,9 @@
return did
@classmethod
- def get_device_ids(cls, controller = None):
+ def get_device_ids(cls, controller = None, olt_conf_file = ''):
'''If running under olt, we get the first switch connected to onos'''
- olt = OltConfig()
+ olt = OltConfig(olt_conf_file = olt_conf_file)
did = 'of:' + get_mac()
device_ids = []
if olt.on_olt():