change the optical topology configuration for packet layer recovery
Change-Id: I077ded9fe05854fb524e6cd25954923df0184061
diff --git a/tools/test/topos/oe-nonlinear-10.json b/tools/test/topos/oe-nonlinear-10.json
index 9bf291e..474631d 100644
--- a/tools/test/topos/oe-nonlinear-10.json
+++ b/tools/test/topos/oe-nonlinear-10.json
@@ -144,6 +144,13 @@
{ "src": "of:0000ffffffff0003/2", "dst": "of:0000ffffffffff06/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
{ "src": "of:0000ffffffff0004/2", "dst": "of:0000ffffffffff07/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
{ "src": "of:0000ffffffff0005/2", "dst": "of:0000ffffffffff09/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
- { "src": "of:0000ffffffff0006/2", "dst": "of:0000ffffffffff0A/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }
+ { "src": "of:0000ffffffff0006/2", "dst": "of:0000ffffffffff0A/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
+
+ { "src": "of:0000ffffffff0001/3", "dst": "of:0000ffffffffff01/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
+ { "src": "of:0000ffffffff0002/3", "dst": "of:0000ffffffffff04/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
+ { "src": "of:0000ffffffff0003/3", "dst": "of:0000ffffffffff06/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
+ { "src": "of:0000ffffffff0004/3", "dst": "of:0000ffffffffff07/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
+ { "src": "of:0000ffffffff0005/3", "dst": "of:0000ffffffffff09/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
+ { "src": "of:0000ffffffff0006/3", "dst": "of:0000ffffffffff0A/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }
]
}
diff --git a/tools/test/topos/optical2.py b/tools/test/topos/optical2.py
index 36cdbad..b491cca 100644
--- a/tools/test/topos/optical2.py
+++ b/tools/test/topos/optical2.py
@@ -64,12 +64,19 @@
self.addIntf(s5,'tap33')
self.addIntf(s6,'tap34')
+ self.addIntf(s1,'tap35')
+ self.addIntf(s2,'tap36')
+ self.addIntf(s3,'tap37')
+ self.addIntf(s4,'tap38')
+ self.addIntf(s5,'tap39')
+ self.addIntf(s6,'tap40')
+
# if you use, sudo mn --custom custom/optical.py, then register the topo:
topos = {'optical': ( lambda: OpticalTopo() )}
def run():
- c = RemoteController('c','127.0.0.1',6633)
+ c = RemoteController('c','192.168.56.101',6633)
net = Mininet( topo=OpticalTopo(),controller=None,autoSetMacs=True)
net.addController(c)
net.start()
diff --git a/tools/test/topos/sys.config b/tools/test/topos/sys.config
index 2b999d3..4ded670 100644
--- a/tools/test/topos/sys.config
+++ b/tools/test/topos/sys.config
@@ -35,7 +35,13 @@
{port,31,[{interface,"tap31"}]},
{port,32,[{interface,"tap32"}]},
{port,33,[{interface,"tap33"}]},
- {port,34,[{interface,"tap34"}]}]},
+ {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"}]}]},
{capable_switch_queues,[]},
{optical_links,
[{{1,50},{2,30}},
@@ -56,17 +62,18 @@
[{switch,1,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",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,29,[{queues,[]},{port_no,10}]},
+ {port,35,[{queues,[]},{port_no,11}]}]}]},
{switch,2,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -76,7 +83,7 @@
{switch,3,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -86,17 +93,18 @@
{switch,4,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",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,30,[{queues,[]},{port_no,10}]},
+ {port,36,[{queues,[]},{port_no,11}]}]}]},
{switch,5,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:05"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -107,18 +115,19 @@
{switch,7,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:07"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",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,32,[{queues,[]},{port_no,10}]},
+ {port,38,[{queues,[]},{port_no,11}]}]}]},
{switch,8,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:08"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -128,27 +137,29 @@
{switch,9,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:09"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",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,33,[{queues,[]},{port_no,10}]},
+ {port,39,[{queues,[]},{port_no,11}]}]}]},
{switch,10,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:0A"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",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,34,[{queues,[]},{port_no,10}]},
+ {port,40,[{queues,[]},{port_no,11}]}]}]},
{switch,6,
[{backend,linc_us4_oe},
{datapath_id,"00:00:ff:ff:ff:ff:ff:06"},
- {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+ {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
{controllers_listener,disabled},
{queues_status,disabled},
{ports,
@@ -156,7 +167,8 @@
{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,31,[{queues,[]},{port_no,10}]},
+ {port,37,[{queues,[]},{port_no,11}]}]}]}]}]},
{epcap,[{verbose,false},{stats_interval,10}]},
{enetconf,
[{capabilities,