commit 6e920c89dde634c10deaf81f85be39fe7584be2b
author Jeremy Ronquillo <jeremyr@onlab.us> Mon Jul 10 16:44:09 2017 -0700
committer Simon Hunt <simon@onlab.us> Tue Jul 11 16:06:36 2017 +0000
tree 8b359f6fb08bdd84eccb7200512373894805d45b
parent 23f9c7b2a9e227c026ba3fdede93e83a2b0cd3b5

Changed location to locations in json files in topos

Change-Id: Iebe2ae9dfc7937e2199e4038488559c2fbc8014c

tools/test/topos/sdn-ip.json

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" ] }}
   }
 }