Fixing an issue with OpticalLinkProvider and reverting some topo changes.
Change-Id: If57d529127323d0d2b0f8778ce68527de6284c77
diff --git a/tools/test/topos/sys.config b/tools/test/topos/sys.config
index 4ded670..2b999d3 100644
--- a/tools/test/topos/sys.config
+++ b/tools/test/topos/sys.config
@@ -35,13 +35,7 @@
{port,31,[{interface,"tap31"}]},
{port,32,[{interface,"tap32"}]},
{port,33,[{interface,"tap33"}]},
- {port,34,[{interface,"tap34"}]},
- {port,35,[{interface,"tap35"}]},
- {port,36,[{interface,"tap36"}]},
- {port,37,[{interface,"tap37"}]},
- {port,38,[{interface,"tap38"}]},
- {port,39,[{interface,"tap39"}]},
- {port,40,[{interface,"tap40"}]}]},
+ {port,34,[{interface,"tap34"}]}]},
{capable_switch_queues,[]},
{optical_links,
[{{1,50},{2,30}},
@@ -62,18 +56,17 @@
[{switch,1,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
[{port,1,[{queues,[]},{port_no,50}]},
{port,7,[{queues,[]},{port_no,20}]},
- {port,29,[{queues,[]},{port_no,10}]},
- {port,35,[{queues,[]},{port_no,11}]}]}]},
+ {port,29,[{queues,[]},{port_no,10}]}]}]},
{switch,2,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -83,7 +76,7 @@
{switch,3,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -93,18 +86,17 @@
{switch,4,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
[{port,6,[{queues,[]},{port_no,50}]},
{port,13,[{queues,[]},{port_no,20}]},
- {port,30,[{queues,[]},{port_no,10}]},
- {port,36,[{queues,[]},{port_no,11}]}]}]},
+ {port,30,[{queues,[]},{port_no,10}]}]}]},
{switch,5,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:05"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -115,19 +107,18 @@
{switch,7,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:07"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
[{port,18,[{queues,[]},{port_no,50}]},
{port,21,[{queues,[]},{port_no,20}]},
{port,23,[{queues,[]},{port_no,30}]},
- {port,32,[{queues,[]},{port_no,10}]},
- {port,38,[{queues,[]},{port_no,11}]}]}]},
+ {port,32,[{queues,[]},{port_no,10}]}]}]},
{switch,8,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:08"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -137,29 +128,27 @@
{switch,9,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:09"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
[{port,24,[{queues,[]},{port_no,50}]},
{port,27,[{queues,[]},{port_no,20}]},
- {port,33,[{queues,[]},{port_no,10}]},
- {port,39,[{queues,[]},{port_no,11}]}]}]},
+ {port,33,[{queues,[]},{port_no,10}]}]}]},
{switch,10,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:0A"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
[{port,26,[{queues,[]},{port_no,50}]},
{port,28,[{queues,[]},{port_no,20}]},
- {port,34,[{queues,[]},{port_no,10}]},
- {port,40,[{queues,[]},{port_no,11}]}]}]},
+ {port,34,[{queues,[]},{port_no,10}]}]}]},
{switch,6,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:06"},
- {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -167,8 +156,7 @@
{port,14,[{queues,[]},{port_no,20}]},
{port,16,[{queues,[]},{port_no,40}]},
{port,19,[{queues,[]},{port_no,30}]},
- {port,31,[{queues,[]},{port_no,10}]},
- {port,37,[{queues,[]},{port_no,11}]}]}]}]}]},
+ {port,31,[{queues,[]},{port_no,10}]}]}]}]}]},
{epcap,[{verbose,false},{stats_interval,10}]},
{enetconf,
[{capabilities,