opticalUtils.py:
allow Linc to be aware of switches that are in the same domain as it, so that it
doesn't wait for OVS devices not in its domain during startup.
Change-Id: I542da075c65b54a866ac1f400e4e71a7f2164709
diff --git a/tools/test/topos/opticalUtils.py b/tools/test/topos/opticalUtils.py
index dddf755..87903cc 100644
--- a/tools/test/topos/opticalUtils.py
+++ b/tools/test/topos/opticalUtils.py
@@ -356,13 +356,17 @@
return configDict
@staticmethod
- def bootOE(net):
+ def bootOE(net, domain=None):
"""
Start the LINC optical emulator within a mininet instance
This involves 1. converting the information stored in Linc* to configs
for both LINC and the network config system, 2. starting Linc, 3. connecting
cross-connects, and finally pushing the network configs to ONOS.
+
+ Inevitably, there are times when we have OVS switches that should not be
+ under the control of the controller in charge of the Linc switches. We
+ hint at these by passing domain information.
"""
LINCSwitch.opticalJSON = {}
linkConfig = []
@@ -371,6 +375,8 @@
LINCSwitch.controllers = net.controllers
for switch in net.switches:
+ if domain and switch not in domain:
+ continue
if isinstance(switch, OpticalSwitch):
devices.append(switch.json())
elif isinstance(switch, OVSSwitch):