commit 8ec96ecfd8e8556463295608376c0a6016ecd7f0
author Thomas Vachuska <tom@onlab.us> Wed Oct 29 22:40:52 2014 -0700
committer Thomas Vachuska <tom@onlab.us> Wed Oct 29 22:40:52 2014 -0700
tree 14adb69d5cffda67dc433875de9df07b6ad845de
parent e3784c9c0928ba3e09be8b562650bebb4886e0d2

Added ONOS topology config JSON for 10-node non-linear optical topology.

tools/test/topos/oe-linear-3.json

diff --git a/tools/test/topos/oe-linear-3.json b/tools/test/topos/oe-linear-3.json
index f361f10..91c4f34 100644
--- a/tools/test/topos/oe-linear-3.json
+++ b/tools/test/topos/oe-linear-3.json
@@ -20,7 +20,7 @@
         },
 
         {
-            "uri": "of:0000ffffffff0001", "mac": "ffffffffff0003", "type": "SWITCH",
+            "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1",
             "annotations": { "latitude": 37.6, "longitude": 122.3 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
@@ -41,10 +41,8 @@
         { "src": "of:0000ffffffff0002/2", "dst": "of:0000ffffffffff02/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect" } }
     ],
 
-    "Xhosts" : [
-        { "mac": "a0:00:00:00:00:11", "vlan": -1, "location": "of:0000ffffffff0001/11", "ip": "1.2.3.4" },
-        { "mac": "a0:00:00:00:00:12", "vlan": -1, "location": "of:0000ffffffff0001/12", "ip": "1.2.3.5" },
-        { "mac": "a0:00:00:00:00:21", "vlan": -1, "location": "of:0000ffffffff0002/11", "ip": "2.2.3.4" },
-        { "mac": "a0:00:00:00:00:22", "vlan": -1, "location": "of:0000ffffffff0002/12", "ip": "2.2.3.5" }
+    "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" }
     ]
 }
\ No newline at end of file