GUI -- TopoView - Updated "traffic" test scenario.
Change-Id: Ic6fb17f069d87000cfd0f6c68b2f52daf9ef163f
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_9_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_10_addLink_s8-r8.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_9_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_10_addLink_s8-r8.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_10_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_11_addLink_s3-r3.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_10_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_11_addLink_s3-r3.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_11_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_12_addLink_r8-r3.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_11_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_12_addLink_r8-r3.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_12_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_13_addHost_h3.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_12_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_13_addHost_h3.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_13_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_14_addHost_h7.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_13_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_14_addHost_h7.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_14_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_15_addHost_h8.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_14_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_15_addHost_h8.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_15_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_16_showTraffic_primary.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_15_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_16_showTraffic_primary.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_16_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_17_showTraffic_secondary.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_16_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_17_showTraffic_secondary.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_17_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_18_showTraffic_animated.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_17_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_18_showTraffic_animated.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_18_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_19_showTraffic_allMix.json
similarity index 83%
rename from web/gui/src/test/_karma/ev/traffic/ev_18_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_19_showTraffic_allMix.json
index 3b3e921..941fda9 100644
--- a/web/gui/src/test/_karma/ev/traffic/ev_18_onos.json
+++ b/web/gui/src/test/_karma/ev/traffic/ev_19_showTraffic_allMix.json
@@ -9,7 +9,7 @@
"links": [
"of:0000ffffffff0008/2-of:0000ffffffff0003/1"
],
- "labels": [""]
+ "labels": ["primary"]
},
{
"class": "secondary",
@@ -17,7 +17,7 @@
"links": [
"of:0000ffffffff0003/9-of:0000ffffffff0007/2"
],
- "labels": [""]
+ "labels": ["secondary"]
},
{
"class": "animated",
@@ -25,7 +25,7 @@
"links": [
"of:0000ffffffff0008/4-of:0000ffffffff0007/1"
],
- "labels": [""]
+ "labels": ["animated"]
},
{
"class": "animated optical",
@@ -33,7 +33,7 @@
"links": [
"of:0000ffffffff0008/4-of:0000ffffffffff08/1"
],
- "labels": [""]
+ "labels": ["animated optical"]
},
{
"class": "secondary optical",
@@ -41,7 +41,7 @@
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1"
],
- "labels": [""]
+ "labels": ["secondary optical"]
},
{
"class": "primary optical",
@@ -49,7 +49,7 @@
"links": [
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
- "labels": [""]
+ "labels": ["primary optical"]
}
]
}
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_1_addInstance.json b/web/gui/src/test/_karma/ev/traffic/ev_1_addInstance.json
new file mode 100644
index 0000000..c2eda41
--- /dev/null
+++ b/web/gui/src/test/_karma/ev/traffic/ev_1_addInstance.json
@@ -0,0 +1,14 @@
+{
+ "event": "addInstance",
+ "payload": {
+ "id": "myInstA",
+ "ip": "192.168.56.101",
+ "online": true,
+ "uiAttached": true,
+ "switches": 4,
+ "labels": [
+ "myInstA",
+ "192.168.56.101"
+ ]
+ }
+}
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_19_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_20_showTraffic_none.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_19_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_20_showTraffic_none.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_20_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_21_updateDevice_s7offline.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_20_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_21_updateDevice_s7offline.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_21_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_22_updateDevice_s7online.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_21_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_22_updateDevice_s7online.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_23_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_23_onos.json
deleted file mode 100644
index 0a4c853..0000000
--- a/web/gui/src/test/_karma/ev/traffic/ev_23_onos.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "event": "addDevice",
- "payload": {
- "id": "of:0000ffffffff0008",
- "type": "switch",
- "online": true,
- "labels": [
- "",
- "sw-8",
- "0000ffffffff0008"
- ],
- "metaUi": {
- "x": 734,
- "y": 477
- }
- }
-}
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_22_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_23_removeDevice_s8.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_22_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_23_removeDevice_s8.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_1_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_24_addDevice_s8.json
similarity index 90%
rename from web/gui/src/test/_karma/ev/traffic/ev_1_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_24_addDevice_s8.json
index 0a4c853..16f530f 100644
--- a/web/gui/src/test/_karma/ev/traffic/ev_1_onos.json
+++ b/web/gui/src/test/_karma/ev/traffic/ev_24_addDevice_s8.json
@@ -4,6 +4,7 @@
"id": "of:0000ffffffff0008",
"type": "switch",
"online": true,
+ "master": "myInstA",
"labels": [
"",
"sw-8",
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_24_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_25_removeHost_h7.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_24_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_25_removeHost_h7.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_1_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_2_addDevice_s8.json
similarity index 90%
copy from web/gui/src/test/_karma/ev/traffic/ev_1_onos.json
copy to web/gui/src/test/_karma/ev/traffic/ev_2_addDevice_s8.json
index 0a4c853..16f530f 100644
--- a/web/gui/src/test/_karma/ev/traffic/ev_1_onos.json
+++ b/web/gui/src/test/_karma/ev/traffic/ev_2_addDevice_s8.json
@@ -4,6 +4,7 @@
"id": "of:0000ffffffff0008",
"type": "switch",
"online": true,
+ "master": "myInstA",
"labels": [
"",
"sw-8",
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_2_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_3_addDevice_s3.json
similarity index 90%
rename from web/gui/src/test/_karma/ev/traffic/ev_2_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_3_addDevice_s3.json
index bdc52fa..60f687e 100644
--- a/web/gui/src/test/_karma/ev/traffic/ev_2_onos.json
+++ b/web/gui/src/test/_karma/ev/traffic/ev_3_addDevice_s3.json
@@ -4,6 +4,7 @@
"id": "of:0000ffffffff0003",
"type": "switch",
"online": true,
+ "master": "myInstA",
"labels": [
"",
"sw-3",
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_3_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_4_addDevice_s7.json
similarity index 90%
rename from web/gui/src/test/_karma/ev/traffic/ev_3_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_4_addDevice_s7.json
index 0a064b2..e468118 100644
--- a/web/gui/src/test/_karma/ev/traffic/ev_3_onos.json
+++ b/web/gui/src/test/_karma/ev/traffic/ev_4_addDevice_s7.json
@@ -4,6 +4,7 @@
"id": "of:0000ffffffff0007",
"type": "switch",
"online": true,
+ "master": "myInstA",
"labels": [
"",
"sw-7",
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_4_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_5_addDevice_r8.json
similarity index 90%
rename from web/gui/src/test/_karma/ev/traffic/ev_4_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_5_addDevice_r8.json
index 5326092..6fa87b1 100644
--- a/web/gui/src/test/_karma/ev/traffic/ev_4_onos.json
+++ b/web/gui/src/test/_karma/ev/traffic/ev_5_addDevice_r8.json
@@ -4,6 +4,7 @@
"id": "of:0000ffffffffff08",
"type": "roadm",
"online": true,
+ "master": "myInstA",
"labels": [
"",
"opt-8",
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_5_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_6_addDevice_r3.json
similarity index 90%
rename from web/gui/src/test/_karma/ev/traffic/ev_5_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_6_addDevice_r3.json
index 266d22a..ed1b1cb 100644
--- a/web/gui/src/test/_karma/ev/traffic/ev_5_onos.json
+++ b/web/gui/src/test/_karma/ev/traffic/ev_6_addDevice_r3.json
@@ -4,6 +4,7 @@
"id": "of:0000ffffffffff03",
"type": "roadm",
"online": true,
+ "master": "myInstA",
"labels": [
"",
"opt-3",
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_6_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_7_addLink_s3-s7.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_6_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_7_addLink_s3-s7.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_7_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_8_addLink_s8-s3.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_7_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_8_addLink_s8-s3.json
diff --git a/web/gui/src/test/_karma/ev/traffic/ev_8_onos.json b/web/gui/src/test/_karma/ev/traffic/ev_9_addLink_s8-s7.json
similarity index 100%
rename from web/gui/src/test/_karma/ev/traffic/ev_8_onos.json
rename to web/gui/src/test/_karma/ev/traffic/ev_9_addLink_s8-s7.json
diff --git a/web/gui/src/test/_karma/ev/traffic/scenario.json b/web/gui/src/test/_karma/ev/traffic/scenario.json
index 9eb9a69..57c0373 100644
--- a/web/gui/src/test/_karma/ev/traffic/scenario.json
+++ b/web/gui/src/test/_karma/ev/traffic/scenario.json
@@ -4,14 +4,9 @@
],
"title": "Show Traffic Scenario",
"params": {
- "lastAuto": 14
+ "lastAuto": 15
},
"description": [
- "Figure out primary, secondary and animated link visualizations.",
- "",
- "Press 'H' to show hosts.",
- "",
- "Press '=' to load initial events.",
- "Press '-' to fire further events."
+ "Primary, secondary and animated link visualizations."
]
}