Simon Hunt

GUI -- TopoView - Updated "traffic" test scenario.

Change-Id: Ic6fb17f069d87000cfd0f6c68b2f52daf9ef163f
Showing 26 changed files with 28 additions and 13 deletions
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 "links": [ 9 "links": [
10 "of:0000ffffffff0008/2-of:0000ffffffff0003/1" 10 "of:0000ffffffff0008/2-of:0000ffffffff0003/1"
11 ], 11 ],
12 - "labels": [""] 12 + "labels": ["primary"]
13 }, 13 },
14 { 14 {
15 "class": "secondary", 15 "class": "secondary",
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 "links": [ 17 "links": [
18 "of:0000ffffffff0003/9-of:0000ffffffff0007/2" 18 "of:0000ffffffff0003/9-of:0000ffffffff0007/2"
19 ], 19 ],
20 - "labels": [""] 20 + "labels": ["secondary"]
21 }, 21 },
22 { 22 {
23 "class": "animated", 23 "class": "animated",
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 "links": [ 25 "links": [
26 "of:0000ffffffff0008/4-of:0000ffffffff0007/1" 26 "of:0000ffffffff0008/4-of:0000ffffffff0007/1"
27 ], 27 ],
28 - "labels": [""] 28 + "labels": ["animated"]
29 }, 29 },
30 { 30 {
31 "class": "animated optical", 31 "class": "animated optical",
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 "links": [ 33 "links": [
34 "of:0000ffffffff0008/4-of:0000ffffffffff08/1" 34 "of:0000ffffffff0008/4-of:0000ffffffffff08/1"
35 ], 35 ],
36 - "labels": [""] 36 + "labels": ["animated optical"]
37 }, 37 },
38 { 38 {
39 "class": "secondary optical", 39 "class": "secondary optical",
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 "links": [ 41 "links": [
42 "of:0000ffffffff0003/4-of:0000ffffffffff03/1" 42 "of:0000ffffffff0003/4-of:0000ffffffffff03/1"
43 ], 43 ],
44 - "labels": [""] 44 + "labels": ["secondary optical"]
45 }, 45 },
46 { 46 {
47 "class": "primary optical", 47 "class": "primary optical",
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 "links": [ 49 "links": [
50 "of:0000ffffffffff08/4-of:0000ffffffffff03/1" 50 "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
51 ], 51 ],
52 - "labels": [""] 52 + "labels": ["primary optical"]
53 } 53 }
54 ] 54 ]
55 } 55 }
......
1 +{
2 + "event": "addInstance",
3 + "payload": {
4 + "id": "myInstA",
5 + "ip": "192.168.56.101",
6 + "online": true,
7 + "uiAttached": true,
8 + "switches": 4,
9 + "labels": [
10 + "myInstA",
11 + "192.168.56.101"
12 + ]
13 + }
14 +}
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 "id": "of:0000ffffffff0008", 4 "id": "of:0000ffffffff0008",
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 + "master": "myInstA",
7 "labels": [ 8 "labels": [
8 "", 9 "",
9 "sw-8", 10 "sw-8",
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 "id": "of:0000ffffffff0008", 4 "id": "of:0000ffffffff0008",
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 + "master": "myInstA",
7 "labels": [ 8 "labels": [
8 "", 9 "",
9 "sw-8", 10 "sw-8",
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 "id": "of:0000ffffffff0003", 4 "id": "of:0000ffffffff0003",
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 + "master": "myInstA",
7 "labels": [ 8 "labels": [
8 "", 9 "",
9 "sw-3", 10 "sw-3",
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 "id": "of:0000ffffffff0007", 4 "id": "of:0000ffffffff0007",
5 "type": "switch", 5 "type": "switch",
6 "online": true, 6 "online": true,
7 + "master": "myInstA",
7 "labels": [ 8 "labels": [
8 "", 9 "",
9 "sw-7", 10 "sw-7",
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 "id": "of:0000ffffffffff08", 4 "id": "of:0000ffffffffff08",
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 + "master": "myInstA",
7 "labels": [ 8 "labels": [
8 "", 9 "",
9 "opt-8", 10 "opt-8",
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 "id": "of:0000ffffffffff03", 4 "id": "of:0000ffffffffff03",
5 "type": "roadm", 5 "type": "roadm",
6 "online": true, 6 "online": true,
7 + "master": "myInstA",
7 "labels": [ 8 "labels": [
8 "", 9 "",
9 "opt-3", 10 "opt-3",
......
...@@ -4,14 +4,9 @@ ...@@ -4,14 +4,9 @@
4 ], 4 ],
5 "title": "Show Traffic Scenario", 5 "title": "Show Traffic Scenario",
6 "params": { 6 "params": {
7 - "lastAuto": 14 7 + "lastAuto": 15
8 }, 8 },
9 "description": [ 9 "description": [
10 - "Figure out primary, secondary and animated link visualizations.", 10 + "Primary, secondary and animated link visualizations."
11 - "",
12 - "Press 'H' to show hosts.",
13 - "",
14 - "Press '=' to load initial events.",
15 - "Press '-' to fire further events."
16 ] 11 ]
17 } 12 }
......