Sketching out request/showTraffic interactions between GUI server/client.
Change-Id: I78dfe0da6a7b4e03972a8ef11190101614d81a63
diff --git a/web/gui/src/main/webapp/json/ev/intentSketch/ev_2_onos.json b/web/gui/src/main/webapp/json/ev/intentSketch/ev_2_onos.json
index 2b3bbe5..4fdeaa1 100644
--- a/web/gui/src/main/webapp/json/ev/intentSketch/ev_2_onos.json
+++ b/web/gui/src/main/webapp/json/ev/intentSketch/ev_2_onos.json
@@ -1,11 +1,18 @@
{
- "event": "showPath",
+ "event": "showTraffic",
"sid": 1,
"payload": {
- "intentId": "0x1234",
- "path": {
- "links": [ "1-2", "2-3" ],
- "traffic": false
- }
+ "paths": [
+ {
+ "intentId": "0x1234",
+ "links": [ "1-2", "2-3" ],
+ "class": "primary"
+ },
+ {
+ "intentId": "0x4321",
+ "links": [ "5-6", "6-7" ],
+ "class": "secondary"
+ }
+ ]
}
}
diff --git a/web/gui/src/main/webapp/json/ev/intentSketch/ev_3_ui.json b/web/gui/src/main/webapp/json/ev/intentSketch/ev_3_ui.json
index 3151c8d..e15f211 100644
--- a/web/gui/src/main/webapp/json/ev/intentSketch/ev_3_ui.json
+++ b/web/gui/src/main/webapp/json/ev/intentSketch/ev_3_ui.json
@@ -1,7 +1,7 @@
{
- "event": "monitorIntent",
+ "event": "requestTraffic",
"sid": 2,
"payload": {
- "intentId": "0x1234"
+ "ids": [ "00:00:00:00:00:01/-1", "00:00:00:00:00:02/-1" ]
}
}
diff --git a/web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json b/web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json
index 1a6632e..bbb2001 100644
--- a/web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json
+++ b/web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json
@@ -2,12 +2,19 @@
"event": "showPath",
"sid": 2,
"payload": {
- "intentId": "0x1234",
- "path": {
- "links": [ "1-2", "2-3" ],
- "traffic": true,
- "srcLabel": "567 Mb",
- "dstLabel": "6 Mb"
- }
+ "paths": [
+ {
+ "intentId": "0x1234",
+ "links": [ "1-2", "2-3" ],
+ "class": "animated",
+ "labels": [ "9Gb", "9Gb" ]
+ },
+ {
+ "intentId": "0x4321",
+ "links": [ "5-6", "6-7" ],
+ "class": "animated",
+ "traffic": [ "4GB", "4GB" ]
+ }
+ ]
}
}
diff --git a/web/gui/src/main/webapp/json/ev/intentSketch/ev_5_onos.json b/web/gui/src/main/webapp/json/ev/intentSketch/ev_5_onos.json
index 7fd0ee4..2afb785 100644
--- a/web/gui/src/main/webapp/json/ev/intentSketch/ev_5_onos.json
+++ b/web/gui/src/main/webapp/json/ev/intentSketch/ev_5_onos.json
@@ -1,13 +1,20 @@
{
- "event": "showPath",
+ "event": "showTraffic",
"sid": 2,
"payload": {
- "intentId": "0x1234",
- "path": {
- "links": [ "1-2", "2-3" ],
- "traffic": true,
- "srcLabel": "967 Mb",
- "dstLabel": "65 Mb"
- }
+ "paths": [
+ {
+ "intentId": "0x1234",
+ "links": [ "1-2", "2-3" ],
+ "class": "animated",
+ "labels": [ "17Gb", "16Gb" ]
+ },
+ {
+ "intentId": "0x4321",
+ "links": [ "5-6", "6-7" ],
+ "class": "animated",
+ "labels": [ "9Gb", "5Gb" ]
+ }
+ ]
}
}
diff --git a/web/gui/src/main/webapp/json/ev/intentSketch/ev_6_onos.json b/web/gui/src/main/webapp/json/ev/intentSketch/ev_6_onos.json
index be3925e..5f55415 100644
--- a/web/gui/src/main/webapp/json/ev/intentSketch/ev_6_onos.json
+++ b/web/gui/src/main/webapp/json/ev/intentSketch/ev_6_onos.json
@@ -1,11 +1,20 @@
{
- "event": "showPath",
+ "event": "showTraffic",
"sid": 2,
"payload": {
- "intentId": "0x1234",
- "path": {
- "links": [ "1-2", "2-3" ],
- "traffic": false
- }
+ "paths": [
+ {
+ "intentId": "0x1234",
+ "links": [ "1-2", "2-3" ],
+ "class": "primary",
+ "labels": [ "17Gb", "16Gb" ]
+ },
+ {
+ "intentId": "0x4321",
+ "links": [ "5-6", "6-7" ],
+ "class": "secondary",
+ "labels": [ "9Gb", "5Gb" ]
+ }
+ ]
}
}
diff --git a/web/gui/src/main/webapp/json/ev/intentSketch/ev_7_ui.json b/web/gui/src/main/webapp/json/ev/intentSketch/ev_7_ui.json
index 158476e..89da44e 100644
--- a/web/gui/src/main/webapp/json/ev/intentSketch/ev_7_ui.json
+++ b/web/gui/src/main/webapp/json/ev/intentSketch/ev_7_ui.json
@@ -1,7 +1,6 @@
{
- "event": "cancelMonitorIntent",
+ "event": "cancelTraffic",
"sid": 3,
"payload": {
- "intentId": "0x1234"
}
}
diff --git a/web/gui/src/main/webapp/json/ev/intentSketch/ev_8_onos.json b/web/gui/src/main/webapp/json/ev/intentSketch/ev_8_onos.json
new file mode 100644
index 0000000..8d5a50e
--- /dev/null
+++ b/web/gui/src/main/webapp/json/ev/intentSketch/ev_8_onos.json
@@ -0,0 +1,7 @@
+{
+ "event": "showTraffic",
+ "sid": 3,
+ "payload": {
+ "paths": []
+ }
+}