Fixed GUI labels for nodes and fixed a few GPS coordinates.
Change-Id: I3fd03e8551febaead4f81dc6d0e80a689cf6ee14
diff --git a/tools/test/topos/oe-linear-3.json b/tools/test/topos/oe-linear-3.json
index 71addcb..44fccd9 100644
--- a/tools/test/topos/oe-linear-3.json
+++ b/tools/test/topos/oe-linear-3.json
@@ -2,33 +2,33 @@
"devices" : [
{
"uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
- "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM1",
- "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
+ "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+ "annotations": { "name": "ROADM1", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
"ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" } ]
},
{
"uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
- "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM2",
- "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
+ "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+ "annotations": { "name": "ROADM2", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
"ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" } ]
},
{
"uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
- "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM3",
- "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
+ "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
+ "annotations": { "name": "ROADM3", "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
"ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
},
{
"uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
- "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1",
- "annotations": { "latitude": 37.6, "longitude": -122.3 },
+ "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+ "annotations": { "name": "ROUTER1", "latitude": 37.6, "longitude": -122.3 },
"ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
},
{
"uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH",
- "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER2",
- "annotations": { "latitude": 37.3, "longitude": -121.9 },
+ "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
+ "annotations": { "name": "ROUTER2", "latitude": 37.3, "longitude": -121.9 },
"ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
}
],