GUI -- Clean up local test events.
Change-Id: I112ccb2db65a8190ff03c274717abf9735084e81
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_11_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_11_onos.json
index 2866f3f..6c08070 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_11_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_11_onos.json
@@ -2,7 +2,7 @@
"event": "addLink",
"payload": {
"id": "of:0000ffffffffff08/4-of:0000ffffffffff03/1",
- "type": "direct",
+ "type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff08",
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_15_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_15_onos.json
index 657900c..3b76e53 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_15_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_15_onos.json
@@ -4,21 +4,28 @@
"payload": {
"paths": [
{
- "intentId": "0x4321",
+ "class": "primary",
"links": [
"0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
"0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
],
- "class": "primary"
+ "labels": [
+ "20 bytes",
+ "20 bytes"
+ ]
},
{
- "intentId": "0xbab3",
+ "class": "primary optical",
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1",
"of:0000ffffffff0008/4-of:0000ffffffffff08/1",
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
- "class": "primary optical"
+ "labels": [
+ "24 bytes",
+ "some bits",
+ "foo bars"
+ ]
}
]
}
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_16_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_16_onos.json
index 5198454..4f42d41 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_16_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_16_onos.json
@@ -4,21 +4,28 @@
"payload": {
"paths": [
{
- "intentId": "0x4321",
+ "class": "secondary",
"links": [
"0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
"0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
],
- "class": "secondary"
+ "labels": [
+ "35 bytes",
+ "35 bytes"
+ ]
},
{
- "intentId": "0xbab3",
+ "class": "secondary optical",
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1",
"of:0000ffffffff0008/4-of:0000ffffffffff08/1",
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
- "class": "secondary optical"
+ "labels": [
+ "24 bytes",
+ "some bits",
+ "foo bars"
+ ]
}
]
}
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_17_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_17_onos.json
index 0a1fd74..f53b3e4 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_17_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_17_onos.json
@@ -4,21 +4,30 @@
"payload": {
"paths": [
{
- "intentId": "0x4321",
+ "class": "animated",
+ "traffic": true,
"links": [
"0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
"0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
],
- "class": "animated"
+ "labels": [
+ "47 bytes",
+ "47 bytes"
+ ]
},
{
- "intentId": "0xbab3",
+ "class": "animated optical",
+ "traffic": true,
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1",
"of:0000ffffffff0008/4-of:0000ffffffffff08/1",
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
- "class": "animated optical"
+ "labels": [
+ "24 bytes",
+ "some bits",
+ "foo bars"
+ ]
}
]
}
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_18_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_18_onos.json
index 571ba99..7ecaa88 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_18_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_18_onos.json
@@ -4,46 +4,52 @@
"payload": {
"paths": [
{
- "intentId": "0x1234",
+ "class": "primary",
+ "traffic": false,
"links": [
"of:0000ffffffff0008/2-of:0000ffffffff0003/1"
],
- "class": "primary"
+ "labels": [""]
},
{
- "intentId": "0x4321",
+ "class": "secondary",
+ "traffic": false,
"links": [
"of:0000ffffffff0003/9-of:0000ffffffff0007/2"
],
- "class": "secondary"
+ "labels": [""]
},
{
- "intentId": "0xbabe",
+ "class": "animated",
+ "traffic": true,
"links": [
"of:0000ffffffff0008/4-of:0000ffffffff0007/1"
],
- "class": "animated"
+ "labels": [""]
},
{
- "intentId": "0xbab1",
+ "class": "primary optical",
+ "traffic": false,
"links": [
"of:0000ffffffff0008/4-of:0000ffffffffff08/1"
],
- "class": "primary optical"
+ "labels": [""]
},
{
- "intentId": "0xbab2",
+ "class": "secondary optical",
+ "traffic": false,
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1"
],
- "class": "secondary optical"
+ "labels": [""]
},
{
- "intentId": "0xbab3",
+ "class": "animated optical",
+ "traffic": true,
"links": [
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
- "class": "animated optical"
+ "labels": [""]
}
]
}
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_19_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_19_onos.json
index 6d3c08a..5f8aae0 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_19_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_19_onos.json
@@ -2,7 +2,6 @@
"event": "showTraffic",
"sid": 1,
"payload": {
- "paths": [
- ]
+ "paths": []
}
}
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_1_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_1_onos.json
index 1357cef..0a4c853 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_1_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_1_onos.json
@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
- "0000ffffffff0008",
- "FF:FF:FF:FF:00:08",
- "sw-8"
+ "",
+ "sw-8",
+ "0000ffffffff0008"
],
"metaUi": {
"x": 734,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_2_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_2_onos.json
index df9b623..bdc52fa 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_2_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_2_onos.json
@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
- "0000ffffffff0003",
- "FF:FF:FF:FF:00:03",
- "sw-3"
+ "",
+ "sw-3",
+ "0000ffffffff0003"
],
"metaUi": {
"x": 282,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_3_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_3_onos.json
index d49d597..0a064b2 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_3_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_3_onos.json
@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
- "0000ffffffff0007",
- "FF:FF:FF:FF:00:07",
- "sw-7"
+ "",
+ "sw-7",
+ "0000ffffffff0007"
],
"metaUi": {
"x": 530,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_4_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_4_onos.json
index 631ed27..5326092 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_4_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_4_onos.json
@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
- "0000ffffffffff08",
- "FF:FF:FF:FF:FF:08",
- "opt-8"
+ "",
+ "opt-8",
+ "0000ffffffffff08"
],
"metaUi": {
"x": 734,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_5_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_5_onos.json
index 4c8cc7c..266d22a 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_5_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_5_onos.json
@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
- "0000ffffffffff03",
- "FF:FF:FF:FF:FF:03",
- "opt-3"
+ "",
+ "opt-3",
+ "0000ffffffffff03"
],
"metaUi": {
"x": 282,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/scenario.json b/web/gui/src/main/webapp/json/ev/traffic/scenario.json
index 06f9bf8..9eb9a69 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/scenario.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/scenario.json
@@ -9,8 +9,9 @@
"description": [
"Figure out primary, secondary and animated link visualizations.",
"",
- "Press 'S' to load initial events.",
+ "Press 'H' to show hosts.",
"",
- "Press spacebar to complete the scenario..."
+ "Press '=' to load initial events.",
+ "Press '-' to fire further events."
]
}