Changed location to locations in json files in topos
Change-Id: Iebe2ae9dfc7937e2199e4038488559c2fbc8014c
diff --git a/tools/test/topos/bmv2-demo-cfg.json b/tools/test/topos/bmv2-demo-cfg.json
index afdbf5b..6c745b5 100644
--- a/tools/test/topos/bmv2-demo-cfg.json
+++ b/tools/test/topos/bmv2-demo-cfg.json
@@ -127,7 +127,7 @@
"hosts": {
"00:00:00:00:00:01/-1": {
"basic": {
- "location": "bmv2:192.168.123.4:9090#11/5",
+ "locations": ["bmv2:192.168.123.4:9090#11/5"],
"ips": [
"10.0.0.1"
],
@@ -138,7 +138,7 @@
},
"00:00:00:00:00:02/-1": {
"basic": {
- "location": "bmv2:192.168.123.4:9091#12/5",
+ "locations": ["bmv2:192.168.123.4:9091#12/5"],
"ips": [
"10.0.0.2"
],
@@ -149,7 +149,7 @@
},
"00:00:00:00:00:03/-1": {
"basic": {
- "location": "bmv2:192.168.123.4:9092#13/5",
+ "locations": ["bmv2:192.168.123.4:9092#13/5"],
"ips": [
"10.0.0.3"
],
diff --git a/tools/test/topos/cord.json b/tools/test/topos/cord.json
index 418a6b4..9e0788b 100644
--- a/tools/test/topos/cord.json
+++ b/tools/test/topos/cord.json
@@ -10,15 +10,15 @@
{ "uri": "of:00010001e88b27e3", "mac": "0001e88b27e3", "annotations": { "name": "s108", "latitude": 41.996877, "longitude": -84.169273 }}
],
"hosts": [
- { "id": "00:1f:29:e1:2c:36/-1", "mac": "00:1f:29:e1:2c:36", "vlan": -1, "location": "of:00010001e88b9368/46", "ip": "10.200.1.11", "annotations": { "name": "h11", "latitude": 34.384830, "longitude": -104.019262 }},
- { "id": "00:1e:0b:cb:9d:64/-1", "mac": "00:1e:0b:cb:9d:64", "vlan": -1, "location": "of:00010001e88b9368/45", "ip": "10.200.1.12", "annotations": { "name": "h12", "latitude": 34.384830, "longitude": -104.019262 }},
- { "id": "00:1c:c4:6b:d8:12/-1", "mac": "00:1c:c4:6b:d8:12", "vlan": -1, "location": "of:00010001e88b939b/46", "ip": "10.200.2.21", "annotations": { "name": "h21", "latitude": 34.133376, "longitude": -89.442032 }},
- { "id": "00:1e:0b:ca:90:44/-1", "mac": "00:1e:0b:ca:90:44", "vlan": -1, "location": "of:00010001e88b939b/45", "ip": "10.200.2.22", "annotations": { "name": "h22", "latitude": 34.133376, "longitude": -89.442032 }},
- { "id": "00:1e:0b:ca:e5:1a/-1", "mac": "00:1e:0b:ca:e5:1a", "vlan": -1, "location": "of:00010001e88b938c/46", "ip": "10.200.3.31", "annotations": { "name": "h31", "latitude": 34.166625, "longitude": -91.983293 }},
- { "id": "2c:44:fd:e0:90:40/-1", "mac": "2c:44:fd:e0:90:40", "vlan": -1, "location": "of:00010001e88b938c/45", "ip": "10.200.3.32", "annotations": { "name": "h32", "latitude": 34.166625, "longitude": -91.983293 }},
- { "id": "2c:44:fd:e0:90:44/-1", "mac": "2c:44:fd:e0:90:44", "vlan": -1, "location": "of:00010001e88b938c/47", "ip": "10.200.3.33", "annotations": { "name": "h33", "latitude": 34.166625, "longitude": -91.983293 }},
- { "id": "00:1e:0b:cb:3f:ac/-1", "mac": "00:1e:0b:cb:3f:ac", "vlan": -1, "location": "of:00010001e88b93ad/46", "ip": "10.200.4.41", "annotations": { "name": "h41", "latitude": 34.225065, "longitude": -97.492882 }},
- { "id": "c8:1f:66:e2:9b:d0/-1", "mac": "c8:1f:66:e2:9b:d0", "vlan": -1, "location": "of:00010001e88b93ad/45", "ip": "10.200.4.42", "annotations": { "name": "h42", "latitude": 34.249236, "longitude": -84.253025 }},
- { "id": "c8:1f:66:e2:9b:d2/-1", "mac": "c8:1f:66:e2:9b:d2", "vlan": -1, "location": "of:00010001e88b93ad/47", "ip": "10.200.4.43", "annotations": { "name": "h43", "latitude": 34.249236, "longitude": -84.253025 }}
+ { "id": "00:1f:29:e1:2c:36/-1", "mac": "00:1f:29:e1:2c:36", "vlan": -1, "locations": ["of:00010001e88b9368/46"], "ip": "10.200.1.11", "annotations": { "name": "h11", "latitude": 34.384830, "longitude": -104.019262 }},
+ { "id": "00:1e:0b:cb:9d:64/-1", "mac": "00:1e:0b:cb:9d:64", "vlan": -1, "locations": ["of:00010001e88b9368/45"], "ip": "10.200.1.12", "annotations": { "name": "h12", "latitude": 34.384830, "longitude": -104.019262 }},
+ { "id": "00:1c:c4:6b:d8:12/-1", "mac": "00:1c:c4:6b:d8:12", "vlan": -1, "locations": ["of:00010001e88b939b/46"], "ip": "10.200.2.21", "annotations": { "name": "h21", "latitude": 34.133376, "longitude": -89.442032 }},
+ { "id": "00:1e:0b:ca:90:44/-1", "mac": "00:1e:0b:ca:90:44", "vlan": -1, "locations": ["of:00010001e88b939b/45"], "ip": "10.200.2.22", "annotations": { "name": "h22", "latitude": 34.133376, "longitude": -89.442032 }},
+ { "id": "00:1e:0b:ca:e5:1a/-1", "mac": "00:1e:0b:ca:e5:1a", "vlan": -1, "locations": ["of:00010001e88b938c/46"], "ip": "10.200.3.31", "annotations": { "name": "h31", "latitude": 34.166625, "longitude": -91.983293 }},
+ { "id": "2c:44:fd:e0:90:40/-1", "mac": "2c:44:fd:e0:90:40", "vlan": -1, "locations": ["of:00010001e88b938c/45"], "ip": "10.200.3.32", "annotations": { "name": "h32", "latitude": 34.166625, "longitude": -91.983293 }},
+ { "id": "2c:44:fd:e0:90:44/-1", "mac": "2c:44:fd:e0:90:44", "vlan": -1, "locations": ["of:00010001e88b938c/47"], "ip": "10.200.3.33", "annotations": { "name": "h33", "latitude": 34.166625, "longitude": -91.983293 }},
+ { "id": "00:1e:0b:cb:3f:ac/-1", "mac": "00:1e:0b:cb:3f:ac", "vlan": -1, "locations": ["of:00010001e88b93ad/46"], "ip": "10.200.4.41", "annotations": { "name": "h41", "latitude": 34.225065, "longitude": -97.492882 }},
+ { "id": "c8:1f:66:e2:9b:d0/-1", "mac": "c8:1f:66:e2:9b:d0", "vlan": -1, "locations": ["of:00010001e88b93ad/45"], "ip": "10.200.4.42", "annotations": { "name": "h42", "latitude": 34.249236, "longitude": -84.253025 }},
+ { "id": "c8:1f:66:e2:9b:d2/-1", "mac": "c8:1f:66:e2:9b:d2", "vlan": -1, "locations": ["of:00010001e88b93ad/47"], "ip": "10.200.4.43", "annotations": { "name": "h43", "latitude": 34.249236, "longitude": -84.253025 }}
]
}
diff --git a/tools/test/topos/default.json b/tools/test/topos/default.json
index c144606..d668f6a 100644
--- a/tools/test/topos/default.json
+++ b/tools/test/topos/default.json
@@ -28,30 +28,30 @@
},
"hosts": {
- "00:00:00:00:00:01/-1": { "basic": { "location": "of:0000000000000001/1", "ips": [ "10.0.0.1" ], "name": "CMBR", "latitude": 43.355715, "longitude": -69.528243 }},
- "00:00:00:00:00:02/-1": { "basic": { "location": "of:0000000000000002/1", "ips": [ "10.0.0.2" ], "name": "CHCG", "latitude": 43.632679, "longitude": -88.772526 }},
- "00:00:00:00:00:03/-1": { "basic": { "location": "of:0000000000000003/1", "ips": [ "10.0.0.3" ], "name": "CLEV", "latitude": 42.756945, "longitude": -79.831317 }},
- "00:00:00:00:00:04/-1": { "basic": { "location": "of:0000000000000004/1", "ips": [ "10.0.0.4" ], "name": "RLGH", "latitude": 36.972249, "longitude": -76.667163 }},
- "00:00:00:00:00:05/-1": { "basic": { "location": "of:0000000000000005/1", "ips": [ "10.0.0.5" ], "name": "ATLN", "latitude": 35.427493, "longitude": -83.885831 }},
- "00:00:00:00:00:06/-1": { "basic": { "location": "of:0000000000000006/1", "ips": [ "10.0.0.6" ], "name": "PHLA", "latitude": 39.208113, "longitude": -73.421341 }},
- "00:00:00:00:00:07/-1": { "basic": { "location": "of:0000000000000007/1", "ips": [ "10.0.0.7" ], "name": "WASH", "latitude": 40.133860, "longitude": -79.238299 }},
- "00:00:00:00:00:08/-1": { "basic": { "location": "of:0000000000000008/1", "ips": [ "10.0.0.8" ], "name": "NSVL", "latitude": 37.407589, "longitude": -84.415068 }},
- "00:00:00:00:00:09/-1": { "basic": { "location": "of:0000000000000009/1", "ips": [ "10.0.0.9" ], "name": "STLS", "latitude": 40.066810, "longitude": -90.932405 }},
- "00:00:00:00:00:0a/-1": { "basic": { "location": "of:000000000000000a/1", "ips": [ "10.0.0.10" ], "name": "NWOR", "latitude": 31.470982, "longitude": -88.779353 }},
- "00:00:00:00:00:0b/-1": { "basic": { "location": "of:000000000000000b/1", "ips": [ "10.0.0.11" ], "name": "HSTN", "latitude": 31.136858, "longitude": -94.351656 }},
- "00:00:00:00:00:0c/-1": { "basic": { "location": "of:000000000000000c/1", "ips": [ "10.0.0.12" ], "name": "SNAN", "latitude": 28.040975, "longitude": -99.169527 }},
- "00:00:00:00:00:0d/-1": { "basic": { "location": "of:000000000000000d/1", "ips": [ "10.0.0.13" ], "name": "DLLS", "latitude": 31.899825, "longitude": -99.287263 }},
- "00:00:00:00:00:0e/-1": { "basic": { "location": "of:000000000000000e/1", "ips": [ "10.0.0.14" ], "name": "ORLD", "latitude": 26.670509, "longitude": -81.291920 }},
- "00:00:00:00:00:0f/-1": { "basic": { "location": "of:000000000000000f/1", "ips": [ "10.0.0.15" ], "name": "DNVR", "latitude": 40.888148, "longitude": -103.459878 }},
- "00:00:00:00:00:10/-1": { "basic": { "location": "of:0000000000000010/1", "ips": [ "10.0.0.16" ], "name": "KSCY", "latitude": 40.545088, "longitude": -93.734002 }},
- "00:00:00:00:00:11/-1": { "basic": { "location": "of:0000000000000011/1", "ips": [ "10.0.0.17" ], "name": "SNFN", "latitude": 39.081743, "longitude": -124.330172 }},
- "00:00:00:00:00:12/-1": { "basic": { "location": "of:0000000000000012/1", "ips": [ "10.0.0.18" ], "name": "SCRM", "latitude": 40.107468, "longitude": -120.424689 }},
- "00:00:00:00:00:13/-1": { "basic": { "location": "of:0000000000000013/1", "ips": [ "10.0.0.19" ], "name": "PTLD", "latitude": 44.383051, "longitude": -124.767594 }},
- "00:00:00:00:00:14/-1": { "basic": { "location": "of:0000000000000014/1", "ips": [ "10.0.0.20" ], "name": "STTL", "latitude": 48.832627, "longitude": -120.298441 }},
- "00:00:00:00:00:15/-1": { "basic": { "location": "of:0000000000000015/1", "ips": [ "10.0.0.21" ], "name": "SLKC", "latitude": 42.301734, "longitude": -111.217297 }},
- "00:00:00:00:00:16/-1": { "basic": { "location": "of:0000000000000016/1", "ips": [ "10.0.0.22" ], "name": "LA03", "latitude": 33.224634, "longitude": -121.532943 }},
- "00:00:00:00:00:17/-1": { "basic": { "location": "of:0000000000000017/1", "ips": [ "10.0.0.23" ], "name": "SNDG", "latitude": 31.834607, "longitude": -118.847982 }},
- "00:00:00:00:00:18/-1": { "basic": { "location": "of:0000000000000018/1", "ips": [ "10.0.0.24" ], "name": "PHNX", "latitude": 34.662290, "longitude": -110.946662 }},
- "00:00:00:00:00:19/-1": { "basic": { "location": "of:0000000000000019/1", "ips": [ "10.0.0.25" ], "name": "NY54", "latitude": 42.395459, "longitude": -75.293563 }}
+ "00:00:00:00:00:01/-1": { "basic": { "locations": ["of:0000000000000001/1"], "ips": [ "10.0.0.1" ], "name": "CMBR", "latitude": 43.355715, "longitude": -69.528243 }},
+ "00:00:00:00:00:02/-1": { "basic": { "locations": ["of:0000000000000002/1"], "ips": [ "10.0.0.2" ], "name": "CHCG", "latitude": 43.632679, "longitude": -88.772526 }},
+ "00:00:00:00:00:03/-1": { "basic": { "locations": ["of:0000000000000003/1"], "ips": [ "10.0.0.3" ], "name": "CLEV", "latitude": 42.756945, "longitude": -79.831317 }},
+ "00:00:00:00:00:04/-1": { "basic": { "locations": ["of:0000000000000004/1"], "ips": [ "10.0.0.4" ], "name": "RLGH", "latitude": 36.972249, "longitude": -76.667163 }},
+ "00:00:00:00:00:05/-1": { "basic": { "locations": ["of:0000000000000005/1"], "ips": [ "10.0.0.5" ], "name": "ATLN", "latitude": 35.427493, "longitude": -83.885831 }},
+ "00:00:00:00:00:06/-1": { "basic": { "locations": ["of:0000000000000006/1"], "ips": [ "10.0.0.6" ], "name": "PHLA", "latitude": 39.208113, "longitude": -73.421341 }},
+ "00:00:00:00:00:07/-1": { "basic": { "locations": ["of:0000000000000007/1"], "ips": [ "10.0.0.7" ], "name": "WASH", "latitude": 40.133860, "longitude": -79.238299 }},
+ "00:00:00:00:00:08/-1": { "basic": { "locations": ["of:0000000000000008/1"], "ips": [ "10.0.0.8" ], "name": "NSVL", "latitude": 37.407589, "longitude": -84.415068 }},
+ "00:00:00:00:00:09/-1": { "basic": { "locations": ["of:0000000000000009/1"], "ips": [ "10.0.0.9" ], "name": "STLS", "latitude": 40.066810, "longitude": -90.932405 }},
+ "00:00:00:00:00:0a/-1": { "basic": { "locations": ["of:000000000000000a/1"], "ips": [ "10.0.0.10" ], "name": "NWOR", "latitude": 31.470982, "longitude": -88.779353 }},
+ "00:00:00:00:00:0b/-1": { "basic": { "locations": ["of:000000000000000b/1"], "ips": [ "10.0.0.11" ], "name": "HSTN", "latitude": 31.136858, "longitude": -94.351656 }},
+ "00:00:00:00:00:0c/-1": { "basic": { "locations": ["of:000000000000000c/1"], "ips": [ "10.0.0.12" ], "name": "SNAN", "latitude": 28.040975, "longitude": -99.169527 }},
+ "00:00:00:00:00:0d/-1": { "basic": { "locations": ["of:000000000000000d/1"], "ips": [ "10.0.0.13" ], "name": "DLLS", "latitude": 31.899825, "longitude": -99.287263 }},
+ "00:00:00:00:00:0e/-1": { "basic": { "locations": ["of:000000000000000e/1"], "ips": [ "10.0.0.14" ], "name": "ORLD", "latitude": 26.670509, "longitude": -81.291920 }},
+ "00:00:00:00:00:0f/-1": { "basic": { "locations": ["of:000000000000000f/1"], "ips": [ "10.0.0.15" ], "name": "DNVR", "latitude": 40.888148, "longitude": -103.459878 }},
+ "00:00:00:00:00:10/-1": { "basic": { "locations": ["of:0000000000000010/1"], "ips": [ "10.0.0.16" ], "name": "KSCY", "latitude": 40.545088, "longitude": -93.734002 }},
+ "00:00:00:00:00:11/-1": { "basic": { "locations": ["of:0000000000000011/1"], "ips": [ "10.0.0.17" ], "name": "SNFN", "latitude": 39.081743, "longitude": -124.330172 }},
+ "00:00:00:00:00:12/-1": { "basic": { "locations": ["of:0000000000000012/1"], "ips": [ "10.0.0.18" ], "name": "SCRM", "latitude": 40.107468, "longitude": -120.424689 }},
+ "00:00:00:00:00:13/-1": { "basic": { "locations": ["of:0000000000000013/1"], "ips": [ "10.0.0.19" ], "name": "PTLD", "latitude": 44.383051, "longitude": -124.767594 }},
+ "00:00:00:00:00:14/-1": { "basic": { "locations": ["of:0000000000000014/1"], "ips": [ "10.0.0.20" ], "name": "STTL", "latitude": 48.832627, "longitude": -120.298441 }},
+ "00:00:00:00:00:15/-1": { "basic": { "locations": ["of:0000000000000015/1"], "ips": [ "10.0.0.21" ], "name": "SLKC", "latitude": 42.301734, "longitude": -111.217297 }},
+ "00:00:00:00:00:16/-1": { "basic": { "locations": ["of:0000000000000016/1"], "ips": [ "10.0.0.22" ], "name": "LA03", "latitude": 33.224634, "longitude": -121.532943 }},
+ "00:00:00:00:00:17/-1": { "basic": { "locations": ["of:0000000000000017/1"], "ips": [ "10.0.0.23" ], "name": "SNDG", "latitude": 31.834607, "longitude": -118.847982 }},
+ "00:00:00:00:00:18/-1": { "basic": { "locations": ["of:0000000000000018/1"], "ips": [ "10.0.0.24" ], "name": "PHNX", "latitude": 34.662290, "longitude": -110.946662 }},
+ "00:00:00:00:00:19/-1": { "basic": { "locations": ["of:0000000000000019/1"], "ips": [ "10.0.0.25" ], "name": "NY54", "latitude": 42.395459, "longitude": -75.293563 }}
}
}
diff --git a/tools/test/topos/geant.json b/tools/test/topos/geant.json
index a3d9bee..da25b0b 100644
--- a/tools/test/topos/geant.json
+++ b/tools/test/topos/geant.json
@@ -36,39 +36,39 @@
"of:000000000000001f": { "basic": { "name": "HEL", "latitude": 60.1666277, "longitude": 24.9435079 }}
},
"hosts": {
- "00:00:00:00:00:01/-1": { "basic": { "location": "of:0000000000000001/1", "ips": [ "10.0.0.1" ], "name": "ATH", "latitude": 34.9841493, "longitude": 24.7279843 }},
- "00:00:00:00:00:02/-1": { "basic": { "location": "of:0000000000000002/1", "ips": [ "10.0.0.2" ], "name": "LIS", "latitude": 37.7077926, "longitude": -7.1365069 }},
- "00:00:00:00:00:03/-1": { "basic": { "location": "of:0000000000000003/1", "ips": [ "10.0.0.3" ], "name": "LON", "latitude": 53.5073219, "longitude": -1.1276473 }},
- "00:00:00:00:00:04/-1": { "basic": { "location": "of:0000000000000004/1", "ips": [ "10.0.0.4" ], "name": "BRU", "latitude": 49.0465565, "longitude": 4.351697 }},
- "00:00:00:00:00:05/-1": { "basic": { "location": "of:0000000000000005/1", "ips": [ "10.0.0.5" ], "name": "PAR", "latitude": 46.8566101, "longitude": 2.3514992 }},
- "00:00:00:00:00:06/-1": { "basic": { "location": "of:0000000000000006/1", "ips": [ "10.0.0.6" ], "name": "DUB", "latitude": 54.3497645, "longitude": -8.2602731 }},
- "00:00:00:00:00:07/-1": { "basic": { "location": "of:0000000000000007/1", "ips": [ "10.0.0.7" ], "name": "MAD", "latitude": 37.4167047, "longitude": -3.7035824 }},
- "00:00:00:00:00:08/-1": { "basic": { "location": "of:0000000000000008/1", "ips": [ "10.0.0.8" ], "name": "GEN", "latitude": 45.0017559, "longitude": 4.1466014 }},
- "00:00:00:00:00:09/-1": { "basic": { "location": "of:0000000000000009/1", "ips": [ "10.0.0.9" ], "name": "MIL", "latitude": 45.4667971, "longitude": 6.6904984 }},
- "00:00:00:00:00:0a/-1": { "basic": { "location": "of:000000000000000a/1", "ips": [ "10.0.0.10" ], "name": "SOF", "latitude": 42.6977211, "longitude": 27.9225964 }},
- "00:00:00:00:00:0b/-1": { "basic": { "location": "of:000000000000000b/1", "ips": [ "10.0.0.11" ], "name": "BUC", "latitude": 47.4361414, "longitude": 26.1027443 }},
- "00:00:00:00:00:0c/-1": { "basic": { "location": "of:000000000000000c/1", "ips": [ "10.0.0.12" ], "name": "VIE", "latitude": 48.2083537, "longitude": 13.3725042 }},
- "00:00:00:00:00:0d/-1": { "basic": { "location": "of:000000000000000d/1", "ips": [ "10.0.0.13" ], "name": "FRA", "latitude": 48.1106529, "longitude": 9.2820934 }},
- "00:00:00:00:00:0e/-1": { "basic": { "location": "of:000000000000000e/1", "ips": [ "10.0.0.14" ], "name": "COP", "latitude": 57.1867243, "longitude": 9.5700724 }},
- "00:00:00:00:00:0f/-1": { "basic": { "location": "of:000000000000000f/1", "ips": [ "10.0.0.15" ], "name": "TLN", "latitude": 59.4372155, "longitude": 26.7453688 }},
- "00:00:00:00:00:10/-1": { "basic": { "location": "of:0000000000000010/1", "ips": [ "10.0.0.16" ], "name": "RIG", "latitude": 56.9493977, "longitude": 26.1051846 }},
- "00:00:00:00:00:11/-1": { "basic": { "location": "of:0000000000000011/1", "ips": [ "10.0.0.17" ], "name": "KAU", "latitude": 52.8981061, "longitude": 24.9117515 }},
- "00:00:00:00:00:12/-1": { "basic": { "location": "of:0000000000000012/1", "ips": [ "10.0.0.18" ], "name": "POZ", "latitude": 50.4082663, "longitude": 19.3335199 }},
- "00:00:00:00:00:13/-1": { "basic": { "location": "of:0000000000000013/1", "ips": [ "10.0.0.19" ], "name": "PRA", "latitude": 50.0874654, "longitude": 16.4212503 }},
- "00:00:00:00:00:14/-1": { "basic": { "location": "of:0000000000000014/1", "ips": [ "10.0.0.20" ], "name": "BRA", "latitude": 48.8359085, "longitude": 19.1597440625 }},
- "00:00:00:00:00:15/-1": { "basic": { "location": "of:0000000000000015/1", "ips": [ "10.0.0.21" ], "name": "ZAG", "latitude": 43.2131545, "longitude": 16.4770298 }},
- "00:00:00:00:00:16/-1": { "basic": { "location": "of:0000000000000016/1", "ips": [ "10.0.0.22" ], "name": "LJU", "latitude": 46.049865, "longitude": 13.2068921 }},
- "00:00:00:00:00:17/-1": { "basic": { "location": "of:0000000000000017/1", "ips": [ "10.0.0.23" ], "name": "BUD", "latitude": 47.8983815, "longitude": 20.2404707 }},
- "00:00:00:00:00:18/-1": { "basic": { "location": "of:0000000000000018/1", "ips": [ "10.0.0.24" ], "name": "MLT", "latitude": 32.8987546, "longitude": 14.5134889 }},
- "00:00:00:00:00:19/-1": { "basic": { "location": "of:0000000000000019/1", "ips": [ "10.0.0.25" ], "name": "LUX", "latitude": 48.8158683, "longitude": 6.5296751 }},
- "00:00:00:00:00:20/-1": { "basic": { "location": "of:0000000000000020/1", "ips": [ "10.0.0.26" ], "name": "MAR", "latitude": 43.2961743, "longitude": 5.3699525 }},
- "00:00:00:00:00:22/-1": { "basic": { "location": "of:0000000000000022/1", "ips": [ "10.0.0.27" ], "name": "BDE", "latitude": 50.8285252, "longitude": -4.546936 }},
- "00:00:00:00:00:1a/-1": { "basic": { "location": "of:000000000000001a/1", "ips": [ "10.0.0.28" ], "name": "MAR", "latitude": 43.374436, "longitude": 3.3699525 }},
- "00:00:00:00:00:1b/-1": { "basic": { "location": "of:000000000000001b/1", "ips": [ "10.0.0.27" ], "name": "HAM", "latitude": 52.6996415, "longitude": 11.6301627 }},
- "00:00:00:00:00:1c/-1": { "basic": { "location": "of:000000000000001c/1", "ips": [ "10.0.0.29" ], "name": "AMS", "latitude": 51.374436, "longitude": 7.3979956033677 }},
- "00:00:00:00:00:1d/-1": { "basic": { "location": "of:000000000000001d/1", "ips": [ "10.0.0.30" ], "name": "STO", "latitude": 61.3251172, "longitude": 16.0710935 }},
- "00:00:00:00:00:1e/-1": { "basic": { "location": "of:000000000000001e/1", "ips": [ "10.0.0.31" ], "name": "OSL", "latitude": 61.9132694, "longitude": 9.7391112 }},
- "00:00:00:00:00:1f/-1": { "basic": { "location": "of:000000000000001f/1", "ips": [ "10.0.0.32" ], "name": "HEL", "latitude": 62.1666277, "longitude": 24.9435079 }}
+ "00:00:00:00:00:01/-1": { "basic": { "locations": ["of:0000000000000001/1"], "ips": [ "10.0.0.1" ], "name": "ATH", "latitude": 34.9841493, "longitude": 24.7279843 }},
+ "00:00:00:00:00:02/-1": { "basic": { "locations": ["of:0000000000000002/1"], "ips": [ "10.0.0.2" ], "name": "LIS", "latitude": 37.7077926, "longitude": -7.1365069 }},
+ "00:00:00:00:00:03/-1": { "basic": { "locations": ["of:0000000000000003/1"], "ips": [ "10.0.0.3" ], "name": "LON", "latitude": 53.5073219, "longitude": -1.1276473 }},
+ "00:00:00:00:00:04/-1": { "basic": { "locations": ["of:0000000000000004/1"], "ips": [ "10.0.0.4" ], "name": "BRU", "latitude": 49.0465565, "longitude": 4.351697 }},
+ "00:00:00:00:00:05/-1": { "basic": { "locations": ["of:0000000000000005/1"], "ips": [ "10.0.0.5" ], "name": "PAR", "latitude": 46.8566101, "longitude": 2.3514992 }},
+ "00:00:00:00:00:06/-1": { "basic": { "locations": ["of:0000000000000006/1"], "ips": [ "10.0.0.6" ], "name": "DUB", "latitude": 54.3497645, "longitude": -8.2602731 }},
+ "00:00:00:00:00:07/-1": { "basic": { "locations": ["of:0000000000000007/1"], "ips": [ "10.0.0.7" ], "name": "MAD", "latitude": 37.4167047, "longitude": -3.7035824 }},
+ "00:00:00:00:00:08/-1": { "basic": { "locations": ["of:0000000000000008/1"], "ips": [ "10.0.0.8" ], "name": "GEN", "latitude": 45.0017559, "longitude": 4.1466014 }},
+ "00:00:00:00:00:09/-1": { "basic": { "locations": ["of:0000000000000009/1"], "ips": [ "10.0.0.9" ], "name": "MIL", "latitude": 45.4667971, "longitude": 6.6904984 }},
+ "00:00:00:00:00:0a/-1": { "basic": { "locations": ["of:000000000000000a/1"], "ips": [ "10.0.0.10" ], "name": "SOF", "latitude": 42.6977211, "longitude": 27.9225964 }},
+ "00:00:00:00:00:0b/-1": { "basic": { "locations": ["of:000000000000000b/1"], "ips": [ "10.0.0.11" ], "name": "BUC", "latitude": 47.4361414, "longitude": 26.1027443 }},
+ "00:00:00:00:00:0c/-1": { "basic": { "locations": ["of:000000000000000c/1"], "ips": [ "10.0.0.12" ], "name": "VIE", "latitude": 48.2083537, "longitude": 13.3725042 }},
+ "00:00:00:00:00:0d/-1": { "basic": { "locations": ["of:000000000000000d/1"], "ips": [ "10.0.0.13" ], "name": "FRA", "latitude": 48.1106529, "longitude": 9.2820934 }},
+ "00:00:00:00:00:0e/-1": { "basic": { "locations": ["of:000000000000000e/1"], "ips": [ "10.0.0.14" ], "name": "COP", "latitude": 57.1867243, "longitude": 9.5700724 }},
+ "00:00:00:00:00:0f/-1": { "basic": { "locations": ["of:000000000000000f/1"], "ips": [ "10.0.0.15" ], "name": "TLN", "latitude": 59.4372155, "longitude": 26.7453688 }},
+ "00:00:00:00:00:10/-1": { "basic": { "locations": ["of:0000000000000010/1"], "ips": [ "10.0.0.16" ], "name": "RIG", "latitude": 56.9493977, "longitude": 26.1051846 }},
+ "00:00:00:00:00:11/-1": { "basic": { "locations": ["of:0000000000000011/1"], "ips": [ "10.0.0.17" ], "name": "KAU", "latitude": 52.8981061, "longitude": 24.9117515 }},
+ "00:00:00:00:00:12/-1": { "basic": { "locations": ["of:0000000000000012/1"], "ips": [ "10.0.0.18" ], "name": "POZ", "latitude": 50.4082663, "longitude": 19.3335199 }},
+ "00:00:00:00:00:13/-1": { "basic": { "locations": ["of:0000000000000013/1"], "ips": [ "10.0.0.19" ], "name": "PRA", "latitude": 50.0874654, "longitude": 16.4212503 }},
+ "00:00:00:00:00:14/-1": { "basic": { "locations": ["of:0000000000000014/1"], "ips": [ "10.0.0.20" ], "name": "BRA", "latitude": 48.8359085, "longitude": 19.1597440625 }},
+ "00:00:00:00:00:15/-1": { "basic": { "locations": ["of:0000000000000015/1"], "ips": [ "10.0.0.21" ], "name": "ZAG", "latitude": 43.2131545, "longitude": 16.4770298 }},
+ "00:00:00:00:00:16/-1": { "basic": { "locations": ["of:0000000000000016/1"], "ips": [ "10.0.0.22" ], "name": "LJU", "latitude": 46.049865, "longitude": 13.2068921 }},
+ "00:00:00:00:00:17/-1": { "basic": { "locations": ["of:0000000000000017/1"], "ips": [ "10.0.0.23" ], "name": "BUD", "latitude": 47.8983815, "longitude": 20.2404707 }},
+ "00:00:00:00:00:18/-1": { "basic": { "locations": ["of:0000000000000018/1"], "ips": [ "10.0.0.24" ], "name": "MLT", "latitude": 32.8987546, "longitude": 14.5134889 }},
+ "00:00:00:00:00:19/-1": { "basic": { "locations": ["of:0000000000000019/1"], "ips": [ "10.0.0.25" ], "name": "LUX", "latitude": 48.8158683, "longitude": 6.5296751 }},
+ "00:00:00:00:00:20/-1": { "basic": { "locations": ["of:0000000000000020/1"], "ips": [ "10.0.0.26" ], "name": "MAR", "latitude": 43.2961743, "longitude": 5.3699525 }},
+ "00:00:00:00:00:22/-1": { "basic": { "locations": ["of:0000000000000022/1"], "ips": [ "10.0.0.27" ], "name": "BDE", "latitude": 50.8285252, "longitude": -4.546936 }},
+ "00:00:00:00:00:1a/-1": { "basic": { "locations": ["of:000000000000001a/1"], "ips": [ "10.0.0.28" ], "name": "MAR", "latitude": 43.374436, "longitude": 3.3699525 }},
+ "00:00:00:00:00:1b/-1": { "basic": { "locations": ["of:000000000000001b/1"], "ips": [ "10.0.0.27" ], "name": "HAM", "latitude": 52.6996415, "longitude": 11.6301627 }},
+ "00:00:00:00:00:1c/-1": { "basic": { "locations": ["of:000000000000001c/1"], "ips": [ "10.0.0.29" ], "name": "AMS", "latitude": 51.374436, "longitude": 7.3979956033677 }},
+ "00:00:00:00:00:1d/-1": { "basic": { "locations": ["of:000000000000001d/1"], "ips": [ "10.0.0.30" ], "name": "STO", "latitude": 61.3251172, "longitude": 16.0710935 }},
+ "00:00:00:00:00:1e/-1": { "basic": { "locations": ["of:000000000000001e/1"], "ips": [ "10.0.0.31" ], "name": "OSL", "latitude": 61.9132694, "longitude": 9.7391112 }},
+ "00:00:00:00:00:1f/-1": { "basic": { "locations": ["of:000000000000001f/1"], "ips": [ "10.0.0.32" ], "name": "HEL", "latitude": 62.1666277, "longitude": 24.9435079 }}
}
}
diff --git a/tools/test/topos/obeliskHostCheck.py b/tools/test/topos/obeliskHostCheck.py
index e928f89..988e2e5 100755
--- a/tools/test/topos/obeliskHostCheck.py
+++ b/tools/test/topos/obeliskHostCheck.py
@@ -60,7 +60,7 @@
mac = host.get( 'mac' )
assert mac, "mac field could not be found for this host object"
- location = host.get( 'location' )
+ location = host.get( 'locations' )[ 0 ] # Only looking for first interface
assert location, "location field could not be found for this host object"
# Trim the protocol identifier off deviceId
diff --git a/tools/test/topos/oe-linear-3.json b/tools/test/topos/oe-linear-3.json
index 44fccd9..8ea9899 100644
--- a/tools/test/topos/oe-linear-3.json
+++ b/tools/test/topos/oe-linear-3.json
@@ -42,7 +42,7 @@
],
"hosts" : [
- { "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000ffffffff0001/1", "ip": "10.0.0.1" },
- { "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000ffffffff0002/1", "ip": "10.0.0.2" }
+ { "mac": "00:00:00:00:00:01", "vlan": -1, "locations": ["of:0000ffffffff0001/1"], "ip": "10.0.0.1" },
+ { "mac": "00:00:00:00:00:02", "vlan": -1, "locations": ["of:0000ffffffff0002/1"], "ip": "10.0.0.2" }
]
-}
\ No newline at end of file
+}
diff --git a/tools/test/topos/sdn-ip.json b/tools/test/topos/sdn-ip.json
index 1eee4f3..d7f301b 100644
--- a/tools/test/topos/sdn-ip.json
+++ b/tools/test/topos/sdn-ip.json
@@ -13,14 +13,14 @@
},
"hosts": {
- "00:00:00:00:00:01/-1": { "basic": { "location": "of:0000000000000001/10", "uiType": "bgpSpeaker", "latitude": 42.292306, "longitude": -104.084378, "ips": [ "10.0.1.2", "10.0.2.2" ] }},
- "00:00:00:00:00:02/-1": { "basic": { "location": "of:0000000000000002/10", "uiType": "bgpSpeaker", "latitude": 41.019068, "longitude": -91.079570, "ips": [ "10.0.11.2", "10.0.22.2", "10.0.3.2", "10.0.4.2" ] }},
- "00:00:00:00:00:03/-1": { "basic": { "location": "of:0000000000000003/10", "uiType": "bgpSpeaker", "latitude": 32.043892, "longitude": -105.644437, "ips": [ "10.0.33.2", "10.0.44.2" ] }},
- "00:00:00:00:01:01/-1": { "basic": { "location": "of:0000000000000005/10", "uiType": "router", "latitude": 42.985256, "longitude": -127.074018, "ips": [ "10.0.1.1" ] }},
- "00:00:00:00:01:02/-1": { "basic": { "location": "of:0000000000000006/10", "uiType": "router", "latitude": 40.593824, "longitude": -127.074018, "ips": [ "10.0.11.1" ] }},
- "00:00:00:00:02:01/-1": { "basic": { "location": "of:0000000000000007/10", "uiType": "router", "latitude": 31.277098, "longitude": -121.354880, "ips": [ "10.0.2.1", "10.0.22.1" ] }},
- "00:00:00:00:03:01/-1": { "basic": { "location": "of:0000000000000008/10", "uiType": "router", "latitude": 39.368502, "longitude": -69.976271, "ips": [ "10.0.3.1", "10.0.33.1" ] }},
- "00:00:00:00:04:01/-1": { "basic": { "location": "of:0000000000000009/10", "uiType": "router", "latitude": 34.936264, "longitude": -75.526168, "ips": [ "10.0.4.1" ] }},
- "00:00:00:00:44:01/-1": { "basic": { "location": "of:000000000000000a/10", "uiType": "router", "latitude": 32.863420, "longitude": -77.505795, "ips": [ "10.0.44.1" ] }}
+ "00:00:00:00:00:01/-1": { "basic": { "locations": ["of:0000000000000001/10"], "uiType": "bgpSpeaker", "latitude": 42.292306, "longitude": -104.084378, "ips": [ "10.0.1.2", "10.0.2.2" ] }},
+ "00:00:00:00:00:02/-1": { "basic": { "locations": ["of:0000000000000002/10"], "uiType": "bgpSpeaker", "latitude": 41.019068, "longitude": -91.079570, "ips": [ "10.0.11.2", "10.0.22.2", "10.0.3.2", "10.0.4.2" ] }},
+ "00:00:00:00:00:03/-1": { "basic": { "locations": ["of:0000000000000003/10"], "uiType": "bgpSpeaker", "latitude": 32.043892, "longitude": -105.644437, "ips": [ "10.0.33.2", "10.0.44.2" ] }},
+ "00:00:00:00:01:01/-1": { "basic": { "locations": ["of:0000000000000005/10"], "uiType": "router", "latitude": 42.985256, "longitude": -127.074018, "ips": [ "10.0.1.1" ] }},
+ "00:00:00:00:01:02/-1": { "basic": { "locations": ["of:0000000000000006/10"], "uiType": "router", "latitude": 40.593824, "longitude": -127.074018, "ips": [ "10.0.11.1" ] }},
+ "00:00:00:00:02:01/-1": { "basic": { "locations": ["of:0000000000000007/10"], "uiType": "router", "latitude": 31.277098, "longitude": -121.354880, "ips": [ "10.0.2.1", "10.0.22.1" ] }},
+ "00:00:00:00:03:01/-1": { "basic": { "locations": ["of:0000000000000008/10"], "uiType": "router", "latitude": 39.368502, "longitude": -69.976271, "ips": [ "10.0.3.1", "10.0.33.1" ] }},
+ "00:00:00:00:04:01/-1": { "basic": { "locations": ["of:0000000000000009/10"], "uiType": "router", "latitude": 34.936264, "longitude": -75.526168, "ips": [ "10.0.4.1" ] }},
+ "00:00:00:00:44:01/-1": { "basic": { "locations": ["of:000000000000000a/10"], "uiType": "router", "latitude": 32.863420, "longitude": -77.505795, "ips": [ "10.0.44.1" ] }}
}
}
diff --git a/tools/test/topos/sdnip.json b/tools/test/topos/sdnip.json
index 912f54b..5c7c375 100644
--- a/tools/test/topos/sdnip.json
+++ b/tools/test/topos/sdnip.json
@@ -74,7 +74,7 @@
"hosts":{
"00:00:00:00:00:01/-1":{
"basic":{
- "location":"of:0000000000000001/7",
+ "locations":["of:0000000000000001/7"],
"uiType":"bgpSpeaker",
"latitude":42.8498743,
"longitude":-106.3598992,
@@ -87,7 +87,7 @@
},
"00:00:00:00:00:02/-1":{
"basic":{
- "location":"of:0000000000000001/8",
+ "locations":["of:0000000000000001/8"],
"uiType":"bgpSpeaker",
"latitude":42.8498743,
"longitude":-103.2984284,
@@ -99,7 +99,7 @@
},
"00:00:00:00:00:03/-1":{
"basic":{
- "location":"of:0000000000000001/9",
+ "locations":["of:0000000000000001/9"],
"uiType":"bgpSpeaker",
"latitude":41.1330594,
"longitude":-102.986907,
@@ -112,7 +112,7 @@
},
"00:00:01:00:01:01/-1":{
"basic":{
- "location":"of:0000000000000005/4",
+ "locations":["of:0000000000000005/4"],
"uiType":"router",
"latitude":42.512684,
"longitude":-126.4902853,
@@ -123,7 +123,7 @@
},
"00:00:01:00:01:02/-1":{
"basic":{
- "location":"of:0000000000000006/4",
+ "locations":["of:0000000000000006/4"],
"uiType":"router",
"latitude":41.3851357,
"longitude":-126.4902853,
@@ -134,7 +134,7 @@
},
"00:00:02:00:01:01/-1":{
"basic":{
- "location":"of:0000000000000007/4",
+ "locations":["of:0000000000000007/4"],
"uiType":"router",
"latitude":30.8457906,
"longitude":-121.354880,
@@ -146,7 +146,7 @@
},
"00:00:03:00:01:01/-1":{
"basic":{
- "location":"of:0000000000000008/4",
+ "locations":["of:0000000000000008/4"],
"uiType":"router",
"latitude":40.6976637,
"longitude":-69.976271,
@@ -158,7 +158,7 @@
},
"00:00:04:00:01:01/-1":{
"basic":{
- "location":"of:0000000000000009/4",
+ "locations":["of:0000000000000009/4"],
"uiType":"router",
"latitude":39.368502,
"longitude":-69.976271,
@@ -169,7 +169,7 @@
},
"00:00:04:00:02:01/-1":{
"basic":{
- "location":"of:000000000000000A/4",
+ "locations":["of:000000000000000A/4"],
"uiType":"router",
"latitude":30.8457906,
"longitude":-83.3532616,
@@ -293,4 +293,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/tools/test/topos/uk-region.json b/tools/test/topos/uk-region.json
index 2f52e7d..9412e0e 100644
--- a/tools/test/topos/uk-region.json
+++ b/tools/test/topos/uk-region.json
@@ -14,17 +14,17 @@
},
"hosts": {
- "00:00:00:00:00:10/-1": { "basic": { "location": "of:0000000000000010/1", "ips": [ "10.0.1.0" ], "name": "DOVER", "latitude": 51.6295, "longitude": 1.9089 }},
+ "00:00:00:00:00:10/-1": { "basic": { "locations": ["of:0000000000000010/1"], "ips": [ "10.0.1.0" ], "name": "DOVER", "latitude": 51.6295, "longitude": 1.9089 }},
- "00:00:00:00:00:21/-1": { "basic": { "location": "of:0000000000000021/1", "ips": [ "10.0.2.1" ], "name": "BRGHTN-A", "latitude": 51.4000, "longitude": -0.6313 }},
- "00:00:00:00:00:22/-1": { "basic": { "location": "of:0000000000000022/1", "ips": [ "10.0.2.2" ], "name": "BRGHTN-B", "latitude": 52.3429, "longitude": -0.6413 }},
- "00:00:00:00:00:23/-1": { "basic": { "location": "of:0000000000000023/1", "ips": [ "10.0.2.3" ], "name": "BRGHTN-C", "latitude": 52.3429, "longitude": -0.6213 }},
+ "00:00:00:00:00:21/-1": { "basic": { "locations": ["of:0000000000000021/1"], "ips": [ "10.0.2.1" ], "name": "BRGHTN-A", "latitude": 51.4000, "longitude": -0.6313 }},
+ "00:00:00:00:00:22/-1": { "basic": { "locations": ["of:0000000000000022/1"], "ips": [ "10.0.2.2" ], "name": "BRGHTN-B", "latitude": 52.3429, "longitude": -0.6413 }},
+ "00:00:00:00:00:23/-1": { "basic": { "locations": ["of:0000000000000023/1"], "ips": [ "10.0.2.3" ], "name": "BRGHTN-C", "latitude": 52.3429, "longitude": -0.6213 }},
- "00:00:00:00:00:31/-1": { "basic": { "location": "of:0000000000000031/1", "ips": [ "10.0.3.1" ], "name": "LONDON-A", "latitude": 52.0091, "longitude": -0.7704 }},
- "00:00:00:00:00:32/-1": { "basic": { "location": "of:0000000000000032/1", "ips": [ "10.0.3.2" ], "name": "LONDON-B", "latitude": 52.0091, "longitude": 0.0432 }},
- "00:00:00:00:00:33/-1": { "basic": { "location": "of:0000000000000033/1", "ips": [ "10.0.3.3" ], "name": "LONDON-C", "latitude": 51.9513, "longitude": -0.6058 }},
- "00:00:00:00:00:34/-1": { "basic": { "location": "of:0000000000000034/1", "ips": [ "10.0.3.4" ], "name": "LONDON-D", "latitude": 52.0418, "longitude": -0.6931 }},
- "00:00:00:00:00:35/-1": { "basic": { "location": "of:0000000000000035/1", "ips": [ "10.0.3.5" ], "name": "LONDON-E", "latitude": 52.0072, "longitude": -0.6175 }}
+ "00:00:00:00:00:31/-1": { "basic": { "locations": ["of:0000000000000031/1"], "ips": [ "10.0.3.1" ], "name": "LONDON-A", "latitude": 52.0091, "longitude": -0.7704 }},
+ "00:00:00:00:00:32/-1": { "basic": { "locations": ["of:0000000000000032/1"], "ips": [ "10.0.3.2" ], "name": "LONDON-B", "latitude": 52.0091, "longitude": 0.0432 }},
+ "00:00:00:00:00:33/-1": { "basic": { "locations": ["of:0000000000000033/1"], "ips": [ "10.0.3.3" ], "name": "LONDON-C", "latitude": 51.9513, "longitude": -0.6058 }},
+ "00:00:00:00:00:34/-1": { "basic": { "locations": ["of:0000000000000034/1"], "ips": [ "10.0.3.4" ], "name": "LONDON-D", "latitude": 52.0418, "longitude": -0.6931 }},
+ "00:00:00:00:00:35/-1": { "basic": { "locations": ["of:0000000000000035/1"], "ips": [ "10.0.3.5" ], "name": "LONDON-E", "latitude": 52.0072, "longitude": -0.6175 }}
},
"regions": {
diff --git a/tools/test/topos/uk.json b/tools/test/topos/uk.json
index e7f5f98..89c0b1f 100644
--- a/tools/test/topos/uk.json
+++ b/tools/test/topos/uk.json
@@ -15,17 +15,17 @@
},
"hosts": {
- "00:00:00:00:00:01/-1": { "basic": { "location": "of:0000000000000001/1", "ips": [ "10.0.0.1" ], "name": "LONDON", "latitude": 51.9798, "longitude": 0.0671 }},
- "00:00:00:00:00:02/-1": { "basic": { "location": "of:0000000000000002/1", "ips": [ "10.0.0.2" ], "name": "BRISTL", "latitude": 51.1693, "longitude": -2.5234 }},
- "00:00:00:00:00:03/-1": { "basic": { "location": "of:0000000000000003/1", "ips": [ "10.0.0.3" ], "name": "BIRMHM", "latitude": 52.2088, "longitude": -1.7738 }},
- "00:00:00:00:00:04/-1": { "basic": { "location": "of:0000000000000004/1", "ips": [ "10.0.0.4" ], "name": "PLYMTH", "latitude": 50.7991, "longitude": -4.1871 }},
- "00:00:00:00:00:05/-1": { "basic": { "location": "of:0000000000000005/1", "ips": [ "10.0.0.5" ], "name": "DOVER", "latitude": 51.4570, "longitude": 1.6981 }},
- "00:00:00:00:00:06/-1": { "basic": { "location": "of:0000000000000006/1", "ips": [ "10.0.0.6" ], "name": "BRGHTN", "latitude": 50.5870, "longitude": 0.2429 }},
- "00:00:00:00:00:07/-1": { "basic": { "location": "of:0000000000000007/1", "ips": [ "10.0.0.7" ], "name": "LIVRPL", "latitude": 53.1044, "longitude": -3.0899 }},
- "00:00:00:00:00:08/-1": { "basic": { "location": "of:0000000000000008/1", "ips": [ "10.0.0.8" ], "name": "YORK", "latitude": 54.2567, "longitude": -0.7510 }},
- "00:00:00:00:00:09/-1": { "basic": { "location": "of:0000000000000009/1", "ips": [ "10.0.0.9" ], "name": "NWCSTL", "latitude": 55.3089, "longitude": -1.4952 }},
- "00:00:00:00:00:0a/-1": { "basic": { "location": "of:000000000000000a/1", "ips": [ "10.0.0.10" ], "name": "NRWICH", "latitude": 52.9722, "longitude": 1.4613 }},
- "00:00:00:00:00:0b/-1": { "basic": { "location": "of:000000000000000b/1", "ips": [ "10.0.0.11" ], "name": "EDBUGH", "latitude": 55.7009, "longitude": -3.6230 }},
- "00:00:00:00:00:0c/-1": { "basic": { "location": "of:000000000000000c/1", "ips": [ "10.0.0.12" ], "name": "ABYSTW", "latitude": 52.0745, "longitude": -4.1444 }}
+ "00:00:00:00:00:01/-1": { "basic": { "locations": ["of:0000000000000001/1"], "ips": [ "10.0.0.1" ], "name": "LONDON", "latitude": 51.9798, "longitude": 0.0671 }},
+ "00:00:00:00:00:02/-1": { "basic": { "locations": ["of:0000000000000002/1"], "ips": [ "10.0.0.2" ], "name": "BRISTL", "latitude": 51.1693, "longitude": -2.5234 }},
+ "00:00:00:00:00:03/-1": { "basic": { "locations": ["of:0000000000000003/1"], "ips": [ "10.0.0.3" ], "name": "BIRMHM", "latitude": 52.2088, "longitude": -1.7738 }},
+ "00:00:00:00:00:04/-1": { "basic": { "locations": ["of:0000000000000004/1"], "ips": [ "10.0.0.4" ], "name": "PLYMTH", "latitude": 50.7991, "longitude": -4.1871 }},
+ "00:00:00:00:00:05/-1": { "basic": { "locations": ["of:0000000000000005/1"], "ips": [ "10.0.0.5" ], "name": "DOVER", "latitude": 51.4570, "longitude": 1.6981 }},
+ "00:00:00:00:00:06/-1": { "basic": { "locations": ["of:0000000000000006/1"], "ips": [ "10.0.0.6" ], "name": "BRGHTN", "latitude": 50.5870, "longitude": 0.2429 }},
+ "00:00:00:00:00:07/-1": { "basic": { "locations": ["of:0000000000000007/1"], "ips": [ "10.0.0.7" ], "name": "LIVRPL", "latitude": 53.1044, "longitude": -3.0899 }},
+ "00:00:00:00:00:08/-1": { "basic": { "locations": ["of:0000000000000008/1"], "ips": [ "10.0.0.8" ], "name": "YORK", "latitude": 54.2567, "longitude": -0.7510 }},
+ "00:00:00:00:00:09/-1": { "basic": { "locations": ["of:0000000000000009/1"], "ips": [ "10.0.0.9" ], "name": "NWCSTL", "latitude": 55.3089, "longitude": -1.4952 }},
+ "00:00:00:00:00:0a/-1": { "basic": { "locations": ["of:000000000000000a/1"], "ips": [ "10.0.0.10" ], "name": "NRWICH", "latitude": 52.9722, "longitude": 1.4613 }},
+ "00:00:00:00:00:0b/-1": { "basic": { "locations": ["of:000000000000000b/1"], "ips": [ "10.0.0.11" ], "name": "EDBUGH", "latitude": 55.7009, "longitude": -3.6230 }},
+ "00:00:00:00:00:0c/-1": { "basic": { "locations": ["of:000000000000000c/1"], "ips": [ "10.0.0.12" ], "name": "ABYSTW", "latitude": 52.0745, "longitude": -4.1444 }}
}
}
diff --git a/tools/test/topos/vpls.json b/tools/test/topos/vpls.json
index ea3654a..41d9511 100644
--- a/tools/test/topos/vpls.json
+++ b/tools/test/topos/vpls.json
@@ -8,12 +8,12 @@
"of:0000000000000006": { "basic": { "name": "s6", "latitude": 40.728270, "longitude": -73.994483 }}
},
"hosts": {
- "00:00:00:00:00:01/100": { "basic": { "location": "of:0000000000000001/1", "ips": [ "10.0.0.1" ], "name": "h1", "latitude": 40.888148, "longitude": -103.459878 }},
- "00:00:00:00:00:02/200": { "basic": { "location": "of:0000000000000002/1", "ips": [ "10.0.0.2" ], "name": "h2", "latitude": 42.756945, "longitude": -79.831317 }},
- "00:00:00:00:00:03/300": { "basic": { "location": "of:0000000000000003/1", "ips": [ "10.0.0.3" ], "name": "h3", "latitude": 35.427493, "longitude": -83.885831 }},
- "00:00:00:00:00:04/400": { "basic": { "location": "of:0000000000000004/1", "ips": [ "10.0.0.4" ], "name": "h4", "latitude": 34.662290, "longitude": -110.946662 }},
- "00:00:00:00:00:05/-1": { "basic": { "location": "of:0000000000000005/1", "ips": [ "10.0.0.5" ], "name": "h5", "latitude": 33.224634, "longitude": -121.532943 }},
- "00:00:00:00:00:06/-1": { "basic": { "location": "of:0000000000000006/1", "ips": [ "10.0.0.6" ], "name": "h6", "latitude": 42.395459, "longitude": -75.293563 }}
+ "00:00:00:00:00:01/100": { "basic": { "locations": ["of:0000000000000001/1"], "ips": [ "10.0.0.1" ], "name": "h1", "latitude": 40.888148, "longitude": -103.459878 }},
+ "00:00:00:00:00:02/200": { "basic": { "locations": ["of:0000000000000002/1"], "ips": [ "10.0.0.2" ], "name": "h2", "latitude": 42.756945, "longitude": -79.831317 }},
+ "00:00:00:00:00:03/300": { "basic": { "locations": ["of:0000000000000003/1"], "ips": [ "10.0.0.3" ], "name": "h3", "latitude": 35.427493, "longitude": -83.885831 }},
+ "00:00:00:00:00:04/400": { "basic": { "locations": ["of:0000000000000004/1"], "ips": [ "10.0.0.4" ], "name": "h4", "latitude": 34.662290, "longitude": -110.946662 }},
+ "00:00:00:00:00:05/-1": { "basic": { "locations": ["of:0000000000000005/1"], "ips": [ "10.0.0.5" ], "name": "h5", "latitude": 33.224634, "longitude": -121.532943 }},
+ "00:00:00:00:00:06/-1": { "basic": { "locations": ["of:0000000000000006/1"], "ips": [ "10.0.0.6" ], "name": "h6", "latitude": 42.395459, "longitude": -75.293563 }}
},
"ports": {
"of:0000000000000001/1": {