Thomas Vachuska

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

...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 }, 20 },
21 21
22 { 22 {
23 - "uri": "of:0000ffffffff0001", "mac": "ffffffffff0003", "type": "SWITCH", 23 + "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
24 "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1", 24 "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1",
25 "annotations": { "latitude": 37.6, "longitude": 122.3 }, 25 "annotations": { "latitude": 37.6, "longitude": 122.3 },
26 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 26 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
...@@ -41,10 +41,8 @@ ...@@ -41,10 +41,8 @@
41 { "src": "of:0000ffffffff0002/2", "dst": "of:0000ffffffffff02/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect" } } 41 { "src": "of:0000ffffffff0002/2", "dst": "of:0000ffffffffff02/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect" } }
42 ], 42 ],
43 43
44 - "Xhosts" : [ 44 + "hosts" : [
45 - { "mac": "a0:00:00:00:00:11", "vlan": -1, "location": "of:0000ffffffff0001/11", "ip": "1.2.3.4" }, 45 + { "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000ffffffff0001/1", "ip": "10.0.0.1" },
46 - { "mac": "a0:00:00:00:00:12", "vlan": -1, "location": "of:0000ffffffff0001/12", "ip": "1.2.3.5" }, 46 + { "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000ffffffff0002/1", "ip": "10.0.0.2" }
47 - { "mac": "a0:00:00:00:00:21", "vlan": -1, "location": "of:0000ffffffff0002/11", "ip": "2.2.3.4" },
48 - { "mac": "a0:00:00:00:00:22", "vlan": -1, "location": "of:0000ffffffff0002/12", "ip": "2.2.3.5" }
49 ] 47 ]
50 } 48 }
...\ No newline at end of file ...\ No newline at end of file
......
This diff is collapsed. Click to expand it.