홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
58c6d6eb 1 parent a68be819

GUI -- Clean up local test events. 

Change-Id: I112ccb2db65a8190ff03c274717abf9735084e81
Inline Side-by-side
Showing 71 changed files with 228 additions and 127 deletions
1 +{
2 + "event": "updateInstance",
3 + "payload": {
4 + "id": "192.168.56.101",
5 + "ip": "192.168.56.101",
6 + "online": true,
7 + "uiAttached": true,
8 + "switches": 4,
9 + "labels": [
10 + "192.168.56.101",
11 + "192.168.56.101"
12 + ]
13 + }
14 +}
1 +{
2 + "event": "updateInstance",
3 + "payload": {
4 + "id": "onos-master",
5 + "ip": "192.168.0.7",
6 + "online": false,
7 + "uiAttached": false,
8 + "switches": 300,
9 + "labels": [
10 + "onos-master",
11 + "192.168.0.7"
12 + ]
13 + }
14 +}
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
7 "lastAuto": 29 7 "lastAuto": 29
8 }, 8 },
9 "description": [ 9 "description": [
10 - "Press 'S' to load initial events." 10 + "Press '=' to load initial events.",
11 + "Press '-' to fire further events."
11 ] 12 ]
12 } 13 }
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
2 "event": "updateInstance", 2 "event": "updateInstance",
3 "payload": { 3 "payload": {
4 "id": "onos-3", 4 "id": "onos-3",
5 + "ip": "192.168.3.3",
5 "online": true, 6 "online": true,
7 + "uiAttached": false,
8 + "switches": 2,
6 "labels": [ 9 "labels": [
7 "onos-3", 10 "onos-3",
8 "192.168.3.3" 11 "192.168.3.3"
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
2 "event": "updateInstance", 2 "event": "updateInstance",
3 "payload": { 3 "payload": {
4 "id": "onos-3", 4 "id": "onos-3",
5 + "ip": "192.168.3.3",
5 "online": false, 6 "online": false,
7 + "uiAttached": false,
8 + "switches": 2,
6 "labels": [ 9 "labels": [
7 "onos-3", 10 "onos-3",
8 "192.168.3.3" 11 "192.168.3.3"
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
2 "event": "addInstance", 2 "event": "addInstance",
3 "payload": { 3 "payload": {
4 "id": "192.168.56.101", 4 "id": "192.168.56.101",
5 + "ip": "192.168.56.101",
5 "online": true, 6 "online": true,
7 + "uiAttached": false,
8 + "switches": 2,
6 "labels": [ 9 "labels": [
7 "192.168.56.101", 10 "192.168.56.101",
8 "127.0.0.1" 11 "127.0.0.1"
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
2 "event": "addInstance", 2 "event": "addInstance",
3 "payload": { 3 "payload": {
4 "id": "onos-2", 4 "id": "onos-2",
5 + "ip": "192.168.2.2",
5 "online": true, 6 "online": true,
7 + "uiAttached": true,
8 + "switches": 1,
6 "labels": [ 9 "labels": [
7 "onos-2", 10 "onos-2",
8 "192.168.2.2" 11 "192.168.2.2"
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
2 "event": "addInstance", 2 "event": "addInstance",
3 "payload": { 3 "payload": {
4 "id": "onos-3", 4 "id": "onos-3",
5 + "ip": "192.168.3.3",
5 "online": false, 6 "online": false,
7 + "uiAttached": false,
8 + "switches": 2,
6 "labels": [ 9 "labels": [
7 "onos-3", 10 "onos-3",
8 "192.168.3.3" 11 "192.168.3.3"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 "id": "of:0000ffffffff0003", 4 "id": "of:0000ffffffff0003",
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 - "master": "local", 7 + "master": "192.168.56.101",
8 "labels": [ 8 "labels": [
9 "0000ffffffff0003", 9 "0000ffffffff0003",
10 "FF:FF:FF:FF:00:03", 10 "FF:FF:FF:FF:00:03",
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 "id": "of:0000ffffffffff03", 4 "id": "of:0000ffffffffff03",
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 - "master": "local", 7 + "master": "192.168.56.101",
8 "labels": [ 8 "labels": [
9 "0000ffffffffff03", 9 "0000ffffffffff03",
10 "FF:FF:FF:FF:FF:03", 10 "FF:FF:FF:FF:FF:03",
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
7 "lastAuto": 17 7 "lastAuto": 17
8 }, 8 },
9 "description": [ 9 "description": [
10 - "Visualizing ONOS instances.", 10 + "Press 'I' to show instance pane.",
11 + "Press 'H' to show hosts.",
11 "", 12 "",
12 - "Press 'S' to load initial events.", 13 + "Press '=' to load initial events.",
13 - "", 14 + "Press '-' to fire further events."
14 - "Press spacebar to complete the scenario..."
15 ] 15 ]
16 } 16 }
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
2 "event": "addInstance", 2 "event": "addInstance",
3 "payload": { 3 "payload": {
4 "id": "local", 4 "id": "local",
5 + "ip": "127.0.0.1",
5 "online": true, 6 "online": true,
7 + "uiAttached": true,
8 + "switches": 43,
6 "labels": [ 9 "labels": [
7 "local", 10 "local",
8 "127.0.0.1" 11 "127.0.0.1"
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
6 "online": true, 6 "online": true,
7 "master": "local", 7 "master": "local",
8 "labels": [ 8 "labels": [
9 - "0000ffffffff0003", 9 + "",
10 - "FF:FF:FF:FF:00:03", 10 + "sw-3",
11 - "sw-3" 11 + "0000ffffffff0003"
12 ], 12 ],
13 "metaUi": { 13 "metaUi": {
14 "x": 282, 14 "x": 282,
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
6 "online": true, 6 "online": true,
7 "master": "local", 7 "master": "local",
8 "labels": [ 8 "labels": [
9 - "0000ffffffff0007", 9 + "",
10 - "FF:FF:FF:FF:00:07", 10 + "sw-7",
11 - "sw-7" 11 + "0000ffffffff0007"
12 ], 12 ],
13 "metaUi": { 13 "metaUi": {
14 "x": 530, 14 "x": 530,
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
6 "online": true, 6 "online": true,
7 "master": "local", 7 "master": "local",
8 "labels": [ 8 "labels": [
9 - "0000ffffffff0008", 9 + "",
10 - "FF:FF:FF:FF:00:08", 10 + "sw-8",
11 - "sw-8" 11 + "0000ffffffff0008"
12 ], 12 ],
13 "metaUi": { 13 "metaUi": {
14 "x": 734, 14 "x": 734,
......
...@@ -7,10 +7,9 @@ ...@@ -7,10 +7,9 @@
7 "lastAuto": 13 7 "lastAuto": 13
8 }, 8 },
9 "description": [ 9 "description": [
10 - "Develop link event handling.", 10 + "Press 'H' to show hosts.",
11 "", 11 "",
12 - "Press 'S' to load initial events.", 12 + "Press '=' to load initial events.",
13 - "", 13 + "Press '-' to fire further events."
14 - "Press spacebar to complete the scenario..."
15 ] 14 ]
16 } 15 }
......
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
8 "lastAuto": 0 8 "lastAuto": 0
9 }, 9 },
10 "description": [ 10 "description": [
11 + "Press 'H' to show hosts.",
12 + "",
13 + "Press '-' to fire further events.",
14 + "",
11 "1. add device [8] (offline)", 15 "1. add device [8] (offline)",
12 "2. add device [3] (offline)", 16 "2. add device [3] (offline)",
13 "3. update device [8] (online, label3 change)", 17 "3. update device [8] (online, label3 change)",
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff04", 8 + "",
9 - "FF:FF:FF:FF:FF:04", 9 + "opt-4",
10 - "?" 10 + "0000ffffffffff04"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 322, 13 "x": 322,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff000A", 8 + "",
9 - "FF:FF:FF:FF:00:0A", 9 + "sw-A",
10 - "?" 10 + "0000ffffffff000A"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 832, 13 "x": 832,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff0001", 8 + "",
9 - "FF:FF:FF:FF:00:01", 9 + "sw-1",
10 - "?" 10 + "0000ffffffff0001"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 167, 13 "x": 167,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff01", 8 + "",
9 - "FF:FF:FF:FF:FF:01", 9 + "opt-1",
10 - "?" 10 + "0000ffffffffff01"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 227, 13 "x": 227,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff0004", 8 + "",
9 - "FF:FF:FF:FF:00:04", 9 + "sw-4",
10 - "?" 10 + "0000ffffffff0004"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 317, 13 "x": 317,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff0A", 8 + "",
9 - "FF:FF:FF:FF:FF:0A", 9 + "opt-A",
10 - "?" 10 + "0000ffffffffff0A"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 840, 13 "x": 840,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff09", 8 + "",
9 - "FF:FF:FF:FF:FF:09", 9 + "opt-9",
10 - "?" 10 + "0000ffffffffff09"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 1010, 13 "x": 1010,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff02/20-of:0000ffffffffff05/10", 4 "id": "of:0000ffffffffff02/20-of:0000ffffffffff05/10",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 4, 7 "linkWidth": 4,
7 "src": "of:0000ffffffffff02", 8 "src": "of:0000ffffffffff02",
8 "srcPort": "20", 9 "srcPort": "20",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffff000A/2-of:0000ffffffffff0A/1", 4 "id": "of:0000ffffffff000A/2-of:0000ffffffffff0A/1",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffff000A", 8 "src": "of:0000ffffffff000A",
8 "srcPort": "2", 9 "srcPort": "2",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff03/10-of:0000ffffffffff02/10", 4 "id": "of:0000ffffffffff03/10-of:0000ffffffffff02/10",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff03", 8 "src": "of:0000ffffffffff03",
8 "srcPort": "10", 9 "srcPort": "10",
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff08", 8 + "",
9 - "FF:FF:FF:FF:FF:08", 9 + "opt-B",
10 - "?" 10 + "0000ffffffffff08"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 539, 13 "x": 539,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff07/21-of:0000ffffffffff05/20", 4 "id": "of:0000ffffffffff07/21-of:0000ffffffffff05/20",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff07", 8 "src": "of:0000ffffffffff07",
8 "srcPort": "21", 9 "srcPort": "21",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffff0001/2-of:0000ffffffffff01/1", 4 "id": "of:0000ffffffff0001/2-of:0000ffffffffff01/1",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffff0001", 8 "src": "of:0000ffffffff0001",
8 "srcPort": "2", 9 "srcPort": "2",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff09/20-of:0000ffffffffff0A/20", 4 "id": "of:0000ffffffffff09/20-of:0000ffffffffff0A/20",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff09", 8 "src": "of:0000ffffffffff09",
8 "srcPort": "20", 9 "srcPort": "20",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20", 4 "id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 4, 7 "linkWidth": 4,
7 "src": "of:0000ffffffffff07", 8 "src": "of:0000ffffffffff07",
8 "srcPort": "30", 9 "srcPort": "30",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff02/10-of:0000ffffffffff01/10", 4 "id": "of:0000ffffffffff02/10-of:0000ffffffffff01/10",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff02", 8 "src": "of:0000ffffffffff02",
8 "srcPort": "10", 9 "srcPort": "10",
......
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
2 "event": "addLink", 2 "event": "addLink",
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10", 4 "id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10",
5 + "type": "optical",
6 + "online": true,
7 + "linkWidth": 2,
5 "src": "of:0000ffffffffff04", 8 "src": "of:0000ffffffffff04",
6 "srcPort": "27", 9 "srcPort": "27",
7 "dst": "of:0000ffffffffff08", 10 "dst": "of:0000ffffffffff08",
8 "dstPort": "10", 11 "dstPort": "10",
9 - "type": "optical",
10 - "linkWidth": 2,
11 "props" : { 12 "props" : {
12 "BW": "30 G" 13 "BW": "30 G"
13 } 14 }
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffff0003/2-of:0000ffffffffff03/1", 4 "id": "of:0000ffffffff0003/2-of:0000ffffffffff03/1",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffff0003", 8 "src": "of:0000ffffffff0003",
8 "srcPort": "2", 9 "srcPort": "2",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff09/1-of:0000ffffffff0009/2", 4 "id": "of:0000ffffffffff09/1-of:0000ffffffff0009/2",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff09", 8 "src": "of:0000ffffffffff09",
8 "srcPort": "1", 9 "srcPort": "1",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff03/30-of:0000ffffffffff04/10", 4 "id": "of:0000ffffffffff03/30-of:0000ffffffffff04/10",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff03", 8 "src": "of:0000ffffffffff03",
8 "srcPort": "30", 9 "srcPort": "30",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff07/20-of:0000ffffffffff09/10", 4 "id": "of:0000ffffffffff07/20-of:0000ffffffffff09/10",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff07", 8 "src": "of:0000ffffffffff07",
8 "srcPort": "20", 9 "srcPort": "20",
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff03", 8 + "",
9 - "FF:FF:FF:FF:FF:03", 9 + "opt-3",
10 - "?" 10 + "0000ffffffffff03"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 95, 13 "x": 95,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30", 4 "id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 4, 7 "linkWidth": 4,
7 "src": "of:0000ffffffffff0A", 8 "src": "of:0000ffffffffff0A",
8 "srcPort": "10", 9 "srcPort": "10",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffff0004/2-of:0000ffffffffff04/1", 4 "id": "of:0000ffffffff0004/2-of:0000ffffffffff04/1",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffff0004", 8 "src": "of:0000ffffffff0004",
8 "srcPort": "2", 9 "srcPort": "2",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff07/1-of:0000ffffffff0007/2", 4 "id": "of:0000ffffffffff07/1-of:0000ffffffff0007/2",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff07", 8 "src": "of:0000ffffffffff07",
8 "srcPort": "1", 9 "srcPort": "1",
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff06", 8 + "",
9 - "FF:FF:FF:FF:FF:06", 9 + "opt-6",
10 - "?" 10 + "0000ffffffffff06"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 336, 13 "x": 336,
......
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
2 "event": "addLink", 2 "event": "addLink",
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff06/20-of:0000ffffffffff05/30", 4 "id": "of:0000ffffffffff06/20-of:0000ffffffffff05/30",
5 + "type": "optical",
6 + "online": true,
7 + "linkWidth": 4,
5 "src": "of:0000ffffffffff06", 8 "src": "of:0000ffffffffff06",
6 "srcPort": "20", 9 "srcPort": "20",
7 "dst": "of:0000ffffffffff05", 10 "dst": "of:0000ffffffffff05",
8 "dstPort": "30", 11 "dstPort": "30",
9 - "type": "optical",
10 - "linkWidth": 4,
11 "props" : { 12 "props" : {
12 "BW": "70 G" 13 "BW": "70 G"
13 } 14 }
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff03/20-of:0000ffffffffff06/10", 4 "id": "of:0000ffffffffff03/20-of:0000ffffffffff06/10",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 2, 7 "linkWidth": 2,
7 "src": "of:0000ffffffffff03", 8 "src": "of:0000ffffffffff03",
8 "srcPort": "20", 9 "srcPort": "20",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10", 4 "id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10",
5 "type": "optical", 5 "type": "optical",
6 + "online": true,
6 "linkWidth": 4, 7 "linkWidth": 4,
7 "src": "of:0000ffffffffff06", 8 "src": "of:0000ffffffffff06",
8 "srcPort": "30", 9 "srcPort": "30",
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": false, 6 "online": false,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff08", 8 + "",
9 - "FF:FF:FF:FF:FF:08", 9 + "opt-8",
10 - "?" 10 + "0000ffffffffff08"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 539, 13 "x": 539,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20", 4 "id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20",
5 "type": "optical", 5 "type": "optical",
6 + "online": false,
6 "linkWidth": 4, 7 "linkWidth": 4,
7 "src": "of:0000ffffffffff07", 8 "src": "of:0000ffffffffff07",
8 "srcPort": "30", 9 "srcPort": "30",
......
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
2 "event": "removeLink", 2 "event": "removeLink",
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10", 4 "id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10",
5 + "type": "optical",
6 + "online": false,
7 + "linkWidth": 2,
5 "src": "of:0000ffffffffff04", 8 "src": "of:0000ffffffffff04",
6 "srcPort": "27", 9 "srcPort": "27",
7 "dst": "of:0000ffffffffff08", 10 "dst": "of:0000ffffffffff08",
8 "dstPort": "10", 11 "dstPort": "10",
9 - "type": "optical",
10 - "linkWidth": 2,
11 "props" : { 12 "props" : {
12 "BW": "30 G" 13 "BW": "30 G"
13 } 14 }
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff0007", 8 + "",
9 - "FF:FF:FF:FF:00:07", 9 + "sw-7",
10 - "?" 10 + "0000ffffffff0007"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 890, 13 "x": 890,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30", 4 "id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30",
5 "type": "optical", 5 "type": "optical",
6 + "online": false,
6 "linkWidth": 4, 7 "linkWidth": 4,
7 "src": "of:0000ffffffffff0A", 8 "src": "of:0000ffffffffff0A",
8 "srcPort": "10", 9 "srcPort": "10",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10", 4 "id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10",
5 "type": "optical", 5 "type": "optical",
6 + "online": false,
6 "linkWidth": 4, 7 "linkWidth": 4,
7 "src": "of:0000ffffffffff06", 8 "src": "of:0000ffffffffff06",
8 "srcPort": "30", 9 "srcPort": "30",
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff0009", 8 + "",
9 - "FF:FF:FF:FF:00:09", 9 + "sw-9",
10 - "?" 10 + "0000ffffffff0009"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 1004, 13 "x": 1004,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff02", 8 + "",
9 - "FF:FF:FF:FF:FF:02", 9 + "opt-2",
10 - "?" 10 + "0000ffffffffff02"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 211, 13 "x": 211,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff0003", 8 + "",
9 - "FF:FF:FF:FF:00:03", 9 + "sw-3",
10 - "?" 10 + "0000ffffffff0003"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 114, 13 "x": 114,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff07", 8 + "",
9 - "FF:FF:FF:FF:FF:07", 9 + "opt-7",
10 - "?" 10 + "0000ffffffffff07"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 925, 13 "x": 925,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": false, 6 "online": false,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff06", 8 + "",
9 - "FF:FF:FF:FF:FF:06", 9 + "opt-6",
10 - "?" 10 + "0000ffffffffff06"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 336, 13 "x": 336,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff05", 8 + "",
9 - "FF:FF:FF:FF:FF:05", 9 + "opt-5",
10 - "?" 10 + "0000ffffffffff05"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 539, 13 "x": 539,
......
...@@ -11,9 +11,8 @@ ...@@ -11,9 +11,8 @@
11 "Loads 16 devices (10 optical, 6 packet)", 11 "Loads 16 devices (10 optical, 6 packet)",
12 " and their associated links.", 12 " and their associated links.",
13 "", 13 "",
14 - "Press 'S' to load initial events.", 14 + "Press '=' to load initial events.",
15 - "", 15 + "Press '-' to fire further events...",
16 - "Press spacebar to complete the scenario...",
17 " * 4 events - device online, add 3 links", 16 " * 4 events - device online, add 3 links",
18 " * 5 events - device offline, remove 4 links" 17 " * 5 events - device offline, remove 4 links"
19 ] 18 ]
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 "event": "addLink", 2 "event": "addLink",
3 "payload": { 3 "payload": {
4 "id": "of:0000ffffffffff08/4-of:0000ffffffffff03/1", 4 "id": "of:0000ffffffffff08/4-of:0000ffffffffff03/1",
5 - "type": "direct", 5 + "type": "optical",
6 "online": true, 6 "online": true,
7 "linkWidth": 2, 7 "linkWidth": 2,
8 "src": "of:0000ffffffffff08", 8 "src": "of:0000ffffffffff08",
......
...@@ -4,21 +4,28 @@ ...@@ -4,21 +4,28 @@
4 "payload": { 4 "payload": {
5 "paths": [ 5 "paths": [
6 { 6 {
7 - "intentId": "0x4321", 7 + "class": "primary",
8 "links": [ 8 "links": [
9 "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101", 9 "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
10 "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101" 10 "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
11 ], 11 ],
12 - "class": "primary" 12 + "labels": [
13 + "20 bytes",
14 + "20 bytes"
15 + ]
13 }, 16 },
14 { 17 {
15 - "intentId": "0xbab3", 18 + "class": "primary optical",
16 "links": [ 19 "links": [
17 "of:0000ffffffff0003/4-of:0000ffffffffff03/1", 20 "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
18 "of:0000ffffffff0008/4-of:0000ffffffffff08/1", 21 "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
19 "of:0000ffffffffff08/4-of:0000ffffffffff03/1" 22 "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
20 ], 23 ],
21 - "class": "primary optical" 24 + "labels": [
25 + "24 bytes",
26 + "some bits",
27 + "foo bars"
28 + ]
22 } 29 }
23 ] 30 ]
24 } 31 }
......
...@@ -4,21 +4,28 @@ ...@@ -4,21 +4,28 @@
4 "payload": { 4 "payload": {
5 "paths": [ 5 "paths": [
6 { 6 {
7 - "intentId": "0x4321", 7 + "class": "secondary",
8 "links": [ 8 "links": [
9 "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101", 9 "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
10 "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101" 10 "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
11 ], 11 ],
12 - "class": "secondary" 12 + "labels": [
13 + "35 bytes",
14 + "35 bytes"
15 + ]
13 }, 16 },
14 { 17 {
15 - "intentId": "0xbab3", 18 + "class": "secondary optical",
16 "links": [ 19 "links": [
17 "of:0000ffffffff0003/4-of:0000ffffffffff03/1", 20 "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
18 "of:0000ffffffff0008/4-of:0000ffffffffff08/1", 21 "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
19 "of:0000ffffffffff08/4-of:0000ffffffffff03/1" 22 "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
20 ], 23 ],
21 - "class": "secondary optical" 24 + "labels": [
25 + "24 bytes",
26 + "some bits",
27 + "foo bars"
28 + ]
22 } 29 }
23 ] 30 ]
24 } 31 }
......
...@@ -4,21 +4,30 @@ ...@@ -4,21 +4,30 @@
4 "payload": { 4 "payload": {
5 "paths": [ 5 "paths": [
6 { 6 {
7 - "intentId": "0x4321", 7 + "class": "animated",
8 + "traffic": true,
8 "links": [ 9 "links": [
9 "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101", 10 "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
10 "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101" 11 "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
11 ], 12 ],
12 - "class": "animated" 13 + "labels": [
14 + "47 bytes",
15 + "47 bytes"
16 + ]
13 }, 17 },
14 { 18 {
15 - "intentId": "0xbab3", 19 + "class": "animated optical",
20 + "traffic": true,
16 "links": [ 21 "links": [
17 "of:0000ffffffff0003/4-of:0000ffffffffff03/1", 22 "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
18 "of:0000ffffffff0008/4-of:0000ffffffffff08/1", 23 "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
19 "of:0000ffffffffff08/4-of:0000ffffffffff03/1" 24 "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
20 ], 25 ],
21 - "class": "animated optical" 26 + "labels": [
27 + "24 bytes",
28 + "some bits",
29 + "foo bars"
30 + ]
22 } 31 }
23 ] 32 ]
24 } 33 }
......
...@@ -4,46 +4,52 @@ ...@@ -4,46 +4,52 @@
4 "payload": { 4 "payload": {
5 "paths": [ 5 "paths": [
6 { 6 {
7 - "intentId": "0x1234", 7 + "class": "primary",
8 + "traffic": false,
8 "links": [ 9 "links": [
9 "of:0000ffffffff0008/2-of:0000ffffffff0003/1" 10 "of:0000ffffffff0008/2-of:0000ffffffff0003/1"
10 ], 11 ],
11 - "class": "primary" 12 + "labels": [""]
12 }, 13 },
13 { 14 {
14 - "intentId": "0x4321", 15 + "class": "secondary",
16 + "traffic": false,
15 "links": [ 17 "links": [
16 "of:0000ffffffff0003/9-of:0000ffffffff0007/2" 18 "of:0000ffffffff0003/9-of:0000ffffffff0007/2"
17 ], 19 ],
18 - "class": "secondary" 20 + "labels": [""]
19 }, 21 },
20 { 22 {
21 - "intentId": "0xbabe", 23 + "class": "animated",
24 + "traffic": true,
22 "links": [ 25 "links": [
23 "of:0000ffffffff0008/4-of:0000ffffffff0007/1" 26 "of:0000ffffffff0008/4-of:0000ffffffff0007/1"
24 ], 27 ],
25 - "class": "animated" 28 + "labels": [""]
26 }, 29 },
27 { 30 {
28 - "intentId": "0xbab1", 31 + "class": "primary optical",
32 + "traffic": false,
29 "links": [ 33 "links": [
30 "of:0000ffffffff0008/4-of:0000ffffffffff08/1" 34 "of:0000ffffffff0008/4-of:0000ffffffffff08/1"
31 ], 35 ],
32 - "class": "primary optical" 36 + "labels": [""]
33 }, 37 },
34 { 38 {
35 - "intentId": "0xbab2", 39 + "class": "secondary optical",
40 + "traffic": false,
36 "links": [ 41 "links": [
37 "of:0000ffffffff0003/4-of:0000ffffffffff03/1" 42 "of:0000ffffffff0003/4-of:0000ffffffffff03/1"
38 ], 43 ],
39 - "class": "secondary optical" 44 + "labels": [""]
40 }, 45 },
41 { 46 {
42 - "intentId": "0xbab3", 47 + "class": "animated optical",
48 + "traffic": true,
43 "links": [ 49 "links": [
44 "of:0000ffffffffff08/4-of:0000ffffffffff03/1" 50 "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
45 ], 51 ],
46 - "class": "animated optical" 52 + "labels": [""]
47 } 53 }
48 ] 54 ]
49 } 55 }
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
2 "event": "showTraffic", 2 "event": "showTraffic",
3 "sid": 1, 3 "sid": 1,
4 "payload": { 4 "payload": {
5 - "paths": [ 5 + "paths": []
6 - ]
7 } 6 }
8 } 7 }
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff0008", 8 + "",
9 - "FF:FF:FF:FF:00:08", 9 + "sw-8",
10 - "sw-8" 10 + "0000ffffffff0008"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 734, 13 "x": 734,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff0003", 8 + "",
9 - "FF:FF:FF:FF:00:03", 9 + "sw-3",
10 - "sw-3" 10 + "0000ffffffff0003"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 282, 13 "x": 282,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffff0007", 8 + "",
9 - "FF:FF:FF:FF:00:07", 9 + "sw-7",
10 - "sw-7" 10 + "0000ffffffff0007"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 530, 13 "x": 530,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff08", 8 + "",
9 - "FF:FF:FF:FF:FF:08", 9 + "opt-8",
10 - "opt-8" 10 + "0000ffffffffff08"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 734, 13 "x": 734,
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 "labels": [ 7 "labels": [
8 - "0000ffffffffff03", 8 + "",
9 - "FF:FF:FF:FF:FF:03", 9 + "opt-3",
10 - "opt-3" 10 + "0000ffffffffff03"
11 ], 11 ],
12 "metaUi": { 12 "metaUi": {
13 "x": 282, 13 "x": 282,
......
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
9 "description": [ 9 "description": [
10 "Figure out primary, secondary and animated link visualizations.", 10 "Figure out primary, secondary and animated link visualizations.",
11 "", 11 "",
12 - "Press 'S' to load initial events.", 12 + "Press 'H' to show hosts.",
13 "", 13 "",
14 - "Press spacebar to complete the scenario..." 14 + "Press '=' to load initial events.",
15 + "Press '-' to fire further events."
15 ] 16 ]
16 } 17 }
......