fix large optical config
Change-Id: I8c264ad0228defb4fe9087a6d070912d3c3b9e75
diff --git a/tools/test/topos/oe-nonlinear-10.json b/tools/test/topos/oe-nonlinear-10.json
index 52e8b99..29086bb 100644
--- a/tools/test/topos/oe-nonlinear-10.json
+++ b/tools/test/topos/oe-nonlinear-10.json
@@ -4,55 +4,85 @@
"uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SFO-W10",
"annotations": { "latitude": 37.6, "longitude": 122.3, "optical.regens": 0 },
- "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" },
+ { "port": 20, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed":100000, "type": "FIBER" } ]
},
{
"uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SJC-W10",
"annotations": { "latitude": 37.3, "longitude": 121.9, "optical.regens": 0 },
- "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 20, "speed": 100000, "type": "FIBER" },
+ { "port": 30, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed": 0, "type": "FIBER" } ]
},
{
"uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "LAX-W10",
"annotations": { "latitude": 33.9, "longitude": 118.4, "optical.regens": 0 },
- "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 30, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed": 0, "type": "FIBER" },
+ { "port": 20, "speed": 0, "type": "FIBER" } ]
},
{
"uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SDG-W10",
"annotations": { "latitude": 32.8, "longitude": 117.1, "optical.regens": 3 },
- "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 30, "speed": 0, "type": "FIBER" },
+ { "port":50, "speed": 0, "type": "FIBER" },
+ { "port":20, "speed": 0, "type": "FIBER" }]
},
{
"uri": "of:0000ffffffffff05", "mac": "ffffffffffff05", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "MSP-M10",
"annotations": { "latitude": 44.8, "longitude": 93.1, "optical.regens": 3 },
- "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 20, "speed": 0, "type": "FIBER" },
+ { "port": 30, "speed": 0, "type": "FIBER" },
+ { "port": 40, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed": 0, "type": "FIBER" }]
+ },
+ {
+ "uri": "of:0000ffffffffff06", "mac": "ffffffffffff06", "type": "ROADM",
+ "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "DFW-M10",
+ "annotations": { "latitude": 32.8, "longitude": 97.1, "optical.regens": 3 },
+ "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
+ { "port": 20, "speed": 0, "type": "FIBER" },
+ { "port": 30, "speed": 0, "type": "FIBER" },
+ { "port": 40, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed": 0, "type": "FIBER" }]
},
{
"uri": "of:0000ffffffffff07", "mac": "ffffffffffff07", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "CHG-N10",
"annotations": { "latitude": 41.8, "longitude": 120.1, "optical.regens": 3 },
- "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
+ { "port": 20, "speed": 0, "type": "FIBER" },
+ { "port": 30, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed": 0, "type": "FIBER" }]
},
{
"uri": "of:0000ffffffffff08", "mac": "ffffffffffff08", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "IAD-M10",
"annotations": { "latitude": 38.8, "longitude": 77.1, "optical.regens": 3 },
- "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 20, "speed": 0, "type": "FIBER" },
+ { "port": 30, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed": 0, "type": "FIBER" }]
},
{
"uri": "of:0000ffffffffff09", "mac": "ffffffffffff09", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "JFK-M10",
"annotations": { "latitude": 40.8, "longitude": 73.1, "optical.regens": 0 },
- "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
+ { "port": 20, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed": 0, "type": "FIBER" }]
},
{
"uri": "of:0000ffffffffff0A", "mac": "ffffffffffff0A", "type": "ROADM",
"mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ATL-S10",
"annotations": { "latitude": 33.8, "longitude": 84.1, "optical.regens": 0 },
- "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
+ "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
+ { "port": 20, "speed": 0, "type": "FIBER" },
+ { "port": 50, "speed": 0, "type": "FIBER" }]
},
{
"uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",