diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_10_removeHost.json b/web/gui/src/test/_karma/ev/dualHomed/ev_10_removeHost.json new file mode 100644 index 0000000000..9f7d6f52df --- /dev/null +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_10_removeHost.json @@ -0,0 +1,35 @@ +{ + "event": "removeHost", + "payload": { + "id": "3C:FD:FE:9E:6E:D0/None", + "type": "endstation", + "cp": { + "device": "of:0000000000000206", + "port": 54 + }, + "allCps": [ + { + "device": "of:0000000000000206", + "port": 54 + }, + { + "device": "of:0000000000000205", + "port": 77 + } + ], + "labels": [ + "fe80::3efd:feff:fe9e:6ed0", + "fe80::3efd:feff:fe9e:6ed0", + "3C:FD:FE:9E:6E:D0" + ], + "props": {}, + "metaUi": { + "x": 771.2614872361207, + "y": 870.9614439514203, + "equivLoc": { + "lng": -86.82423167773878, + "lat": 27.650078076056364 + } + } + } +} diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_11_updateDevice.json b/web/gui/src/test/_karma/ev/dualHomed/ev_11_updateDevice.json new file mode 100644 index 0000000000..d5dd11b40a --- /dev/null +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_11_updateDevice.json @@ -0,0 +1,36 @@ +{ + "event": "updateDevice", + "payload": { + "id": "of:0000000000000206", + "type": "switch", + "online": true, + "master": "10.128.0.217", + "labels": [ + "", + "of:0000000000000206", + "of:0000000000000206" + ], + "props": { + "managementAddress": "10.128.0.206", + "protocol": "OF_13", + "latitude": "34.2403", + "name": "of:0000000000000206", + "locType": "geo", + "channelId": "10.128.0.206:52972", + "longitude": "-87.0413" + }, + "location": { + "locType": "geo", + "latOrY": 34.2403, + "longOrX": -87.0413 + }, + "metaUi": { + "x": 764.7366062749779, + "y": 639.7691957045747, + "equivLoc": { + "lng": -87.0413, + "lat": 34.2403 + } + } + } +} diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_12_addHost.json b/web/gui/src/test/_karma/ev/dualHomed/ev_12_addHost.json new file mode 100644 index 0000000000..4359989d78 --- /dev/null +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_12_addHost.json @@ -0,0 +1,31 @@ +{ + "event": "addHost", + "payload": { + "id": "3C:FD:FE:9E:6E:D0/None", + "type": "endstation", + "cp": { + "device": "of:0000000000000206", + "port": 54 + }, + "allCps": [ + { + "device": "of:0000000000000206", + "port": 54 + } + ], + "labels": [ + "10.0.5.55", + "10.0.5.55", + "3C:FD:FE:9E:6E:D0" + ], + "props": {}, + "metaUi": { + "x": 771.2614872361207, + "y": 870.9614439514203, + "equivLoc": { + "lng": -86.82423167773878, + "lat": 27.650078076056364 + } + } + } +} diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_13_updateHost.json b/web/gui/src/test/_karma/ev/dualHomed/ev_13_updateHost.json new file mode 100644 index 0000000000..c6357d2b87 --- /dev/null +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_13_updateHost.json @@ -0,0 +1,35 @@ +{ + "event": "updateHost", + "payload": { + "id": "3C:FD:FE:9E:6E:D0/None", + "type": "endstation", + "cp": { + "device": "of:0000000000000206", + "port": 54 + }, + "prevCp": { + "device": "of:0000000000000206", + "port": 54 + }, + "allCps": [ + { + "device": "of:0000000000000206", + "port": 54 + } + ], + "labels": [ + "fe80::3efd:feff:fe9e:6ed0", + "fe80::3efd:feff:fe9e:6ed0", + "3C:FD:FE:9E:6E:D0" + ], + "props": {}, + "metaUi": { + "x": 771.2614872361207, + "y": 870.9614439514203, + "equivLoc": { + "lng": -86.82423167773878, + "lat": 27.650078076056364 + } + } + } +} diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_2_addDevice_01.json b/web/gui/src/test/_karma/ev/dualHomed/ev_2_addDevice_01.json index c30ea6bbeb..e1aeffcb03 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/ev_2_addDevice_01.json +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_2_addDevice_01.json @@ -1,19 +1,36 @@ { "event": "addDevice", "payload": { - "id": "of:0000000000000001", + "id": "of:0000000000000205", "type": "switch", "online": true, - "master": "127.0.0.1", + "master": "10.128.0.218", "labels": [ "", - "of:0000000000000001", - "of:0000000000000001" + "of:0000000000000205", + "of:0000000000000205" ], "props": { - "managementAddress": "192.168.36.101", + "managementAddress": "10.128.0.205", "protocol": "OF_13", - "channelId": "192.168.36.101:55710" + "latitude": "34.1202", + "name": "of:0000000000000205", + "locType": "geo", + "channelId": "10.128.0.205:46174", + "longitude": "-90.4754" + }, + "location": { + "locType": "geo", + "latOrY": 34.1202, + "longOrX": -90.4754 + }, + "metaUi": { + "x": 661.5106105366713, + "y": 644.1330453927671, + "equivLoc": { + "lng": -90.4754, + "lat": 34.12019999999999 + } } } } diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_3_addDevice_02.json b/web/gui/src/test/_karma/ev/dualHomed/ev_3_addDevice_02.json index 2fde4a65fd..3163d74c27 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/ev_3_addDevice_02.json +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_3_addDevice_02.json @@ -1,14 +1,14 @@ { "event": "addDevice", "payload": { - "id": "of:0000000000000002", + "id": "of:0000000000000206", "type": "switch", "online": true, - "master": "127.0.0.1", + "master": "10.128.0.217", "labels": [ "", - "of:0000000000000002", - "of:0000000000000002" + "of:0000000000000206", + "of:0000000000000206" ], "props": { "managementAddress": "192.168.36.101", diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_4_addLink_1to2.json b/web/gui/src/test/_karma/ev/dualHomed/ev_4_addLink_1to2.json index 3ce5e3a519..e306ce142c 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/ev_4_addLink_1to2.json +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_4_addLink_1to2.json @@ -1,14 +1,14 @@ { "event": "addLink", "payload": { - "id": "of:0000000000000001/2-of:0000000000000002/2", + "id": "of:0000000000000205/2-of:0000000000000206/2", "type": "direct", "expected": false, "online": true, "linkWidth": 1.2, - "src": "of:0000000000000001", + "src": "of:0000000000000205", "srcPort": "2", - "dst": "of:0000000000000002", + "dst": "of:0000000000000206", "dstPort": "2" } } diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_5_addLink_2to1.json b/web/gui/src/test/_karma/ev/dualHomed/ev_5_addLink_2to1.json index ad4562ec54..69b8dc28ca 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/ev_5_addLink_2to1.json +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_5_addLink_2to1.json @@ -1,14 +1,14 @@ { "event": "addLink", "payload": { - "id": "of:0000000000000002/2-of:0000000000000001/2", + "id": "of:0000000000000206/2-of:0000000000000205/2", "type": "direct", "expected": false, "online": true, "linkWidth": 1.2, - "src": "of:0000000000000002", + "src": "of:0000000000000206", "srcPort": "2", - "dst": "of:0000000000000001", + "dst": "of:0000000000000205", "dstPort": "2" } } diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_6_addHost_to1.json b/web/gui/src/test/_karma/ev/dualHomed/ev_6_addHost_to1.json index 6a234a6df1..2e9a33d4d8 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/ev_6_addHost_to1.json +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_6_addHost_to1.json @@ -1,23 +1,35 @@ { "event": "addHost", "payload": { - "id": "00:00:00:00:00:01/None", + "id": "3C:FD:FE:9E:6E:D0/None", "type": "endstation", "cp": { - "device": "of:0000000000000001", - "port": 1 + "device": "of:0000000000000206", + "port": 54 + }, + "prevCp": { + "device": "of:0000000000000205", + "port": 54 }, "allCps": [ { - "device": "of:0000000000000001", - "port": 1 + "device": "of:0000000000000206", + "port": 54 } ], "labels": [ - "10.0.0.1", - "10.0.0.1", - "00:00:00:00:00:01" + "fe80::3efd:feff:fe9e:6ed0", + "fe80::3efd:feff:fe9e:6ed0", + "3C:FD:FE:9E:6E:D0" ], - "props": {} + "props": {}, + "metaUi": { + "x": 771.2614872361207, + "y": 870.9614439514203, + "equivLoc": { + "lng": -86.82423167773878, + "lat": 27.650078076056364 + } + } } } diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_7_updateDevice_01.json b/web/gui/src/test/_karma/ev/dualHomed/ev_7_updateDevice_01.json index 214d10be39..6c61921609 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/ev_7_updateDevice_01.json +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_7_updateDevice_01.json @@ -1,10 +1,10 @@ { "event": "updateDevice", "payload": { - "id": "of:0000000000000001", + "id": "of:0000000000000205", "type": "switch", "online": true, - "master": "127.0.0.1", + "master": "10.128.0.218", "labels": [ "", "SW-A", diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_8_updateDevice_02.json b/web/gui/src/test/_karma/ev/dualHomed/ev_8_updateDevice_02.json index 3fbb1d4481..2801fe8545 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/ev_8_updateDevice_02.json +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_8_updateDevice_02.json @@ -1,28 +1,36 @@ { "event": "updateDevice", "payload": { - "id": "of:0000000000000002", + "id": "of:0000000000000206", "type": "switch", "online": true, - "master": "127.0.0.1", + "master": "10.128.0.217", "labels": [ "", "SW-B", - "of:0000000000000002" + "of:0000000000000206" ], "props": { - "managementAddress": "192.168.36.101", + "managementAddress": "10.128.0.206", "protocol": "OF_13", - "latitude": "38.5189", - "name": "SW-B", + "latitude": "34.2403", + "name": "of:0000000000000206", "locType": "geo", - "channelId": "192.168.36.101:55712", - "longitude": "-109.2781" + "channelId": "10.128.0.206:52972", + "longitude": "-87.0413" }, "location": { "locType": "geo", - "latOrY": 38.5189, - "longOrX": -109.2781 + "latOrY": 34.2403, + "longOrX": -87.0413 + }, + "metaUi": { + "x": 764.7366062749779, + "y": 639.7691957045747, + "equivLoc": { + "lng": -87.0413, + "lat": 34.2403 + } } } } diff --git a/web/gui/src/test/_karma/ev/dualHomed/ev_9_moveHost.json b/web/gui/src/test/_karma/ev/dualHomed/ev_9_moveHost.json index 195208c666..b70c0ff63c 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/ev_9_moveHost.json +++ b/web/gui/src/test/_karma/ev/dualHomed/ev_9_moveHost.json @@ -1,41 +1,39 @@ { "event": "moveHost", "payload": { - "id": "00:00:00:00:00:01/None", + "id": "3C:FD:FE:9E:6E:D0/None", "type": "endstation", "cp": { - "device": "of:0000000000000001", - "port": 1 + "device": "of:0000000000000206", + "port": 54 }, "prevCp": { - "device": "of:0000000000000001", - "port": 1 + "device": "of:0000000000000205", + "port": 54 }, "allCps": [ { - "device": "of:0000000000000001", - "port": 1 + "device": "of:0000000000000206", + "port": 54 }, { - "device": "of:0000000000000002", - "port": 1 + "device": "of:0000000000000205", + "port": 77 } ], "labels": [ - "Host-X", - "10.0.0.1", - "00:00:00:00:00:01" + "fe80::3efd:feff:fe9e:6ed0", + "fe80::3efd:feff:fe9e:6ed0", + "3C:FD:FE:9E:6E:D0" ], - "props": { - "name": "Host-X", - "locType": "geo", - "latitude": "39.9444", - "longitude": "-91.7822" - }, - "location": { - "locType": "geo", - "latOrY": 39.9444, - "longOrX": -91.7822 + "props": {}, + "metaUi": { + "x": 771.2614872361207, + "y": 870.9614439514203, + "equivLoc": { + "lng": -86.82423167773878, + "lat": 27.650078076056364 + } } } } diff --git a/web/gui/src/test/_karma/ev/dualHomed/scenario.json b/web/gui/src/test/_karma/ev/dualHomed/scenario.json index a640d381ae..4f86c5b94b 100644 --- a/web/gui/src/test/_karma/ev/dualHomed/scenario.json +++ b/web/gui/src/test/_karma/ev/dualHomed/scenario.json @@ -10,13 +10,17 @@ "Simple sequence of events...", "", "1. add instance", - "2. add device [1]", - "3. add device [2]", - "4. add link [1] --> [2]", - "5. add link [2] --> [1]", - "6. add host (to [1])", - "7. update device [1]", - "8. update device [2]", - "9. move host (to include [2])" + "2. add device [205]", + "3. add device [206]", + "4. add link [205] --> [206]", + "5. add link [206] --> [205]", + "6. add host (to [206])", + "7. update device [205]", + "8. update device [206]", + "9. move host (to include [205])", + "10. remove host", + "11. update device [206", + "12. add host (to [206])", + "13. update host" ] }