From 09d6fd7e02369fc6ce6f0e1716fb8eaaa874a6ce Mon Sep 17 00:00:00 2001 From: Igor Plesser Date: Wed, 29 Oct 2025 19:25:18 +0200 Subject: [PATCH] ci: cram: adapt cram tests - Adapt CRAM test for taking backhaul interfaces into account Closes: PPM-3517 Signed-off-by: Igor Plesser --- .../tests/cram/mxl25641-hdk-6/010-network.t | 3 ++ .gitlab/tests/cram/mxl25641-hdk-6/030-wifi.t | 3 ++ .gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t | 45 ++++++++++++++++ .../110-prplmesh-dataelements.t | 18 +++++++ .gitlab/tests/cram/wnc-freedom/010-network.t | 5 +- .gitlab/tests/cram/wnc-freedom/030-wifi.t | 3 ++ .gitlab/tests/cram/wnc-freedom/100-pwhm.t | 45 ++++++++++++++++ .gitlab/tests/cram/wnc-freedom/101-mlo.t | 51 +++++++++++++++++++ .../wnc-freedom/110-prplmesh-dataelements.t | 18 +++++++ 9 files changed, 190 insertions(+), 1 deletion(-) diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/010-network.t b/.gitlab/tests/cram/mxl25641-hdk-6/010-network.t index 78ed52e0f7..04d443b23e 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/010-network.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/010-network.t @@ -34,13 +34,16 @@ Check correct interface setup: tunl0@NONE: mtu 1480 qdisc noop state DOWN mode DEFAULT group default qlen 1000 wlan0.1: mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000 wlan0.2: mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000 + wlan0.3: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 wlan0: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 wlan1: mtu 1500 qdisc noqueue master br-lan state DOWN mode DORMANT group default qlen 1000 wlan2.1: mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000 wlan2.2: mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000 + wlan2.3: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 wlan2: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 wlan3: mtu 1500 qdisc noqueue master br-lan state DOWN mode DORMANT group default qlen 1000 wlan4.1: mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000 wlan4.2: mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000 + wlan4.3: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 wlan4: mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000 wlan5: mtu 1500 qdisc noqueue master br-lan state DOWN mode DORMANT group default qlen 1000 diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/030-wifi.t b/.gitlab/tests/cram/mxl25641-hdk-6/030-wifi.t index eb4199f3c7..f35ebe9572 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/030-wifi.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/030-wifi.t @@ -8,12 +8,15 @@ Check for correct SSID setup: \tInterface wlan0 (esc) \tInterface wlan0.1 (esc) \tInterface wlan0.2 (esc) + \tInterface wlan0.3 (esc) \tInterface wlan1 (esc) \tInterface wlan2 (esc) \tInterface wlan2.1 (esc) \tInterface wlan2.2 (esc) + \tInterface wlan2.3 (esc) \tInterface wlan3 (esc) \tInterface wlan4 (esc) \tInterface wlan4.1 (esc) \tInterface wlan4.2 (esc) + \tInterface wlan4.3 (esc) \tInterface wlan5 (esc) diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t b/.gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t index 6fb993b30f..4f85bdd320 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/100-pwhm.t @@ -43,10 +43,16 @@ Check default SSID status: Down Down Down + Down + Down + Down Check default SSID configuration of access points: $ R "ba-cli -j -l WiFi.SSID.?0 | jsonfilter -e @[0]'[@.Alias != \"ep2g0\" && @.Alias != \"ep5g0\" && @.Alias != \"ep6g0\"].SSID'" | LC_ALL=C sort + backhaul_4C:BA:7D:*:*:* (glob) + backhaul_4C:BA:7D:*:*:* (glob) + backhaul_4C:BA:7D:*:*:* (glob) prplOS prplOS prplOS @@ -77,6 +83,9 @@ Test activation of access point 1: Down Down Down + Down + Down + Down Up Test activation of access point 2: @@ -96,6 +105,9 @@ Test activation of access point 2: Down Down Down + Down + Down + Down Up Up @@ -115,6 +127,9 @@ Test activation of access point 3: Down Down Down + Down + Down + Down Up Up Up @@ -134,6 +149,9 @@ Test activation of access point 4: $ get_ssid_status Down Down + Down + Down + Down Up Up Up @@ -153,6 +171,9 @@ Test activation of access point 5: $ get_ssid_status Down + Down + Down + Down Up Up Up @@ -172,6 +193,9 @@ Test activation of access point 6: $ sleep 5 $ get_ssid_status + Down + Down + Down Up Up Up @@ -192,14 +216,17 @@ Check iw interfaces and beaconing: Interface wlan0 Interface wlan0.1 Interface wlan0.2 + Interface wlan0.3 Interface wlan1 Interface wlan2 Interface wlan2.1 Interface wlan2.2 + Interface wlan2.3 Interface wlan3 Interface wlan4 Interface wlan4.1 Interface wlan4.2 + Interface wlan4.3 Interface wlan5 ssid dummy_ssid_2.4GHz ssid dummy_ssid_5GHz @@ -225,6 +252,9 @@ Test deactivation of access point 6: $ get_ssid_status Down + Down + Down + Down Up Up Up @@ -246,6 +276,9 @@ Test deactivation of access point 5: $ get_ssid_status Down Down + Down + Down + Down Up Up Up @@ -267,6 +300,9 @@ Test deactivation of access point 4: Down Down Down + Down + Down + Down Up Up Up @@ -288,6 +324,9 @@ Test deactivation of access point 3: Down Down Down + Down + Down + Down Up Up @@ -309,6 +348,9 @@ Test deactivation of access point 2: Down Down Down + Down + Down + Down Up Test deactivation of access point 1: @@ -330,6 +372,9 @@ Test deactivation of access point 1: Down Down Down + Down + Down + Down Check if hostapd process is stopped: diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t index 090015f6bf..10a9fcc56e 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t @@ -56,8 +56,14 @@ Check all AccessPoint.SSIDReference+ instances are disabled Down Down Down + Down + Down + Down $ get_ssid_ssid + backhaul_4C:BA:7D:*:*:* (glob) + backhaul_4C:BA:7D:*:*:* (glob) + backhaul_4C:BA:7D:*:*:* (glob) prplOS prplOS prplOS @@ -146,6 +152,9 @@ In case the controller does not yet have this parameter, catch error here isof l Check that wireless is operating: $ get_ssid_status + Down + Down + Down Up Up Up @@ -154,6 +163,9 @@ Check that wireless is operating: Up $ get_ssid_ssid + backhaul_4C:BA:7D:*:*:* (glob) + backhaul_4C:BA:7D:*:*:* (glob) + backhaul_4C:BA:7D:*:*:* (glob) prplOSguest prplOSguest prplOSguest @@ -224,10 +236,16 @@ Check that wireless is disabled: Down Down Down + Down + Down + Down Check that SSIDs did not change: $ get_ssid_ssid + backhaul_4C:BA:7D:*:*:* (glob) + backhaul_4C:BA:7D:*:*:* (glob) + backhaul_4C:BA:7D:*:*:* (glob) prplOSguest prplOSguest prplOSguest diff --git a/.gitlab/tests/cram/wnc-freedom/010-network.t b/.gitlab/tests/cram/wnc-freedom/010-network.t index 680faff043..bc4a774995 100644 --- a/.gitlab/tests/cram/wnc-freedom/010-network.t +++ b/.gitlab/tests/cram/wnc-freedom/010-network.t @@ -31,10 +31,13 @@ Check correct interface setup: wan: mtu 1500 qdisc noqueue state UP mode DEFAULT group default qlen 1000 wlan0.1: mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000 wlan0.2: mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000 + wlan0.3: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 wlan0: <(NO-CARRIER,)?BROADCAST,MULTICAST(,UP)?> mtu 1500 qdisc noqueue master br-lan state DOWN mode (DORMANT|DEFAULT) group default qlen 1000 (re) wlan1.1: mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000 wlan1.2: mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000 + wlan1.3: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 wlan1: <(NO-CARRIER,)?BROADCAST,MULTICAST(,UP)?> mtu 1500 qdisc noqueue master br-lan state DOWN mode (DORMANT|DEFAULT) group default qlen 1000 (re) wlan2.1: mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000 wlan2.2: mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000 - wlan2: <(NO-CARRIER,)?BROADCAST,MULTICAST(,UP)?> mtu 1500 qdisc noqueue master br-lan state DOWN mode (DORMANT|DEFAULT) group default qlen 1000 (re) + wlan2.3: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 + wlan2: <(NO-CARRIER,)?BROADCAST,MULTICAST(,UP)?> mtu 1500 qdisc noqueue master br-lan state DOWN mode (DORMANT|DEFAULT) group default qlen 1000 (re) \ No newline at end of file diff --git a/.gitlab/tests/cram/wnc-freedom/030-wifi.t b/.gitlab/tests/cram/wnc-freedom/030-wifi.t index 866f9d23bc..690c308dfd 100644 --- a/.gitlab/tests/cram/wnc-freedom/030-wifi.t +++ b/.gitlab/tests/cram/wnc-freedom/030-wifi.t @@ -8,9 +8,12 @@ Check for correct SSID setup: \tInterface wlan0 (esc) \tInterface wlan0.1 (esc) \tInterface wlan0.2 (esc) + \tInterface wlan0.3 (esc) \tInterface wlan1 (esc) \tInterface wlan1.1 (esc) \tInterface wlan1.2 (esc) + \tInterface wlan1.3 (esc) \tInterface wlan2 (esc) \tInterface wlan2.1 (esc) \tInterface wlan2.2 (esc) + \tInterface wlan2.3 (esc) diff --git a/.gitlab/tests/cram/wnc-freedom/100-pwhm.t b/.gitlab/tests/cram/wnc-freedom/100-pwhm.t index fec90f822c..38fbc8219e 100644 --- a/.gitlab/tests/cram/wnc-freedom/100-pwhm.t +++ b/.gitlab/tests/cram/wnc-freedom/100-pwhm.t @@ -43,10 +43,16 @@ Check default SSID status: Down Down Down + Down + Down + Down Check default SSID configuration of access points: $ R "ba-cli -j -l WiFi.SSID.?0 | jsonfilter -e @[0]'[@.Alias != \"ep2g0\" && @.Alias != \"ep5g0\" && @.Alias != \"ep6g0\"].SSID'" | LC_ALL=C sort + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) prplOS prplOS prplOS @@ -77,6 +83,9 @@ Test activation of access point 1: Down Down Down + Down + Down + Down Up Test activation of access point 2: @@ -96,6 +105,9 @@ Test activation of access point 2: Down Down Down + Down + Down + Down Up Up @@ -115,6 +127,9 @@ Test activation of access point 3: Down Down Down + Down + Down + Down Up Up Up @@ -134,6 +149,9 @@ Test activation of access point 4: $ get_ssid_status Down Down + Down + Down + Down Up Up Up @@ -153,6 +171,9 @@ Test activation of access point 5: $ get_ssid_status Down + Down + Down + Down Up Up Up @@ -172,6 +193,9 @@ Test activation of access point 6: $ sleep 10 $ get_ssid_status + Down + Down + Down Up Up Up @@ -200,12 +224,15 @@ Check iw interfaces and beaconing: Interface wlan0 Interface wlan0.1 Interface wlan0.2 + Interface wlan0.3 Interface wlan1 Interface wlan1.1 Interface wlan1.2 + Interface wlan1.3 Interface wlan2 Interface wlan2.1 Interface wlan2.2 + Interface wlan2.3 ssid prplOS ssid prplOS-guest @@ -239,6 +266,9 @@ Test deactivation of access point 6: $ get_ssid_status Down + Down + Down + Down Up Up Up @@ -260,6 +290,9 @@ Test deactivation of access point 5: $ get_ssid_status Down Down + Down + Down + Down Up Up Up @@ -281,6 +314,9 @@ Test deactivation of access point 4: Down Down Down + Down + Down + Down Up Up Up @@ -302,6 +338,9 @@ Test deactivation of access point 3: Down Down Down + Down + Down + Down Up Up @@ -323,6 +362,9 @@ Test deactivation of access point 2: Down Down Down + Down + Down + Down Up Test deactivation of access point 1: @@ -344,6 +386,9 @@ Test deactivation of access point 1: Down Down Down + Down + Down + Down Check if hostapd process is stopped: diff --git a/.gitlab/tests/cram/wnc-freedom/101-mlo.t b/.gitlab/tests/cram/wnc-freedom/101-mlo.t index 46c100ee68..b03944db00 100644 --- a/.gitlab/tests/cram/wnc-freedom/101-mlo.t +++ b/.gitlab/tests/cram/wnc-freedom/101-mlo.t @@ -43,10 +43,16 @@ Check default SSID status: Down Down Down + Down + Down + Down Check default SSID configuration of access points: $ R "ba-cli -j -l WiFi.SSID.?0 | jsonfilter -e @[0]'[@.Alias != \"ep2g0\" && @.Alias != \"ep5g0\" && @.Alias != \"ep6g0\"].SSID'" | LC_ALL=C sort + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) prplOS prplOS prplOS @@ -65,6 +71,9 @@ Check default MLDUnit configuration: -1 -1 -1 + -1 + -1 + -1 0 0 0 @@ -86,6 +95,9 @@ Disable MLO on private and guest vaps: -1 -1 -1 + -1 + -1 + -1 Test activation of access point 1: @@ -105,6 +117,9 @@ Test activation of access point 1: Down Down Down + Down + Down + Down Up Test activation of access point 2: @@ -124,6 +139,9 @@ Test activation of access point 2: Down Down Down + Down + Down + Down Up Up @@ -143,6 +161,9 @@ Test activation of access point 3: Down Down Down + Down + Down + Down Up Up Up @@ -162,6 +183,9 @@ Test activation of access point 4: $ get_ssid_status Down Down + Down + Down + Down Up Up Up @@ -181,6 +205,9 @@ Test activation of access point 5: $ get_ssid_status Down + Down + Down + Down Up Up Up @@ -200,6 +227,9 @@ Test activation of access point 6: $ sleep 10 $ get_ssid_status + Down + Down + Down Up Up Up @@ -232,12 +262,15 @@ Check iw interfaces and beaconing: Interface wlan0 Interface wlan0.1 Interface wlan0.2 + Interface wlan0.3 Interface wlan1 Interface wlan1.1 Interface wlan1.2 + Interface wlan1.3 Interface wlan2 Interface wlan2.1 Interface wlan2.2 + Interface wlan2.3 ssid prplOS ssid prplOS ssid prplOS @@ -259,6 +292,9 @@ Test deactivation of access point 6: $ get_ssid_status Down + Down + Down + Down Up Up Up @@ -280,6 +316,9 @@ Test deactivation of access point 5: $ get_ssid_status Down Down + Down + Down + Down Up Up Up @@ -301,6 +340,9 @@ Test deactivation of access point 4: Down Down Down + Down + Down + Down Up Up Up @@ -322,6 +364,9 @@ Test deactivation of access point 3: Down Down Down + Down + Down + Down Up Up @@ -343,6 +388,9 @@ Test deactivation of access point 2: Down Down Down + Down + Down + Down Up Test deactivation of access point 1: @@ -364,6 +412,9 @@ Test deactivation of access point 1: Down Down Down + Down + Down + Down Check if hostapd process is stopped: diff --git a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t index b63935c1eb..33f5fca39e 100644 --- a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t +++ b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t @@ -56,8 +56,14 @@ Check all AccessPoint.SSIDReference+ instances are disabled Down Down Down + Down + Down + Down $ get_ssid_ssid + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) prplOS prplOS prplOS @@ -146,6 +152,9 @@ In case the controller does not yet have this parameter, catch error here isof l Check that wireless is operating: $ get_ssid_status + Down + Down + Down Up Up Up @@ -154,6 +163,9 @@ Check that wireless is operating: Up $ get_ssid_ssid + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) prplOSguest prplOSguest prplOSguest @@ -224,10 +236,16 @@ Check that wireless is disabled: Down Down Down + Down + Down + Down Check that SSIDs did not change: $ get_ssid_ssid + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) + backhaul_AC:91:9B:*:*:* (glob) prplOSguest prplOSguest prplOSguest