maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: cram: prplmesh_ap_mld.sh: fix wrong default MLDUnits

Browse Source 
Correct the default MLDUnit values restored by
prplmesh_revert_mlo_to_defaults to avoid creating an
unsupported MLD configuration mixing BH and Guest VAPs
across four links, which may lead to a hostapd crash.

Closes: PPW-1997
References: FEAT-144,PPM-3930
Signed-off-by: Houssem Dafdouf <houssem.dafdouf_ext@softathome.com>
(cherry picked from commit 49137e8bb0bf2d6f60e6241c2f4599b1cc01c90f)
Signed-off-by: Cihangir Odabas <cihangir.odabas@prplfoundation.org>
This commit is contained in:
Houssem Dafdouf 2026-05-21 23:23:40 +02:00 committed by FAOUZI YAHYA
parent e8d94a0b05
commit 201b56bea0
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab/tests/cram/scripts/prplmesh_ap_mld.sh
View File

@ -114,21 +114,21 @@ get_dataelements_apmld_normalized() {
done | LC_ALL=C sort
}
# Restore default MLD/config after MLO test: WiFi MLDUnit for AP 1..9 (0,1,0,1,0,1,0,1,0),
# Restore default MLD/config after MLO test: WiFi MLDUnit for AP 1..9 (0,1,0,1,0,1,2,2,2),
# use_dataelements_vap_configs=0, Network.AccessPoint.1 SSID=prplOS, KeyPassphrase=password,
# commit, prplmesh restart.
# Out: echoes "MLO_DEFAULTS_RESTORED" when done.
prplmesh_revert_mlo_to_defaults() {
R logger -t cram "Restore default MLD configuration"
R "ba-cli -j -l WiFi.AccessPoint.1.SSIDReference+.MLDUnit=-1" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.1.SSIDReference+.MLDUnit=0" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.2.SSIDReference+.MLDUnit=1" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.3.SSIDReference+.MLDUnit=-1" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.3.SSIDReference+.MLDUnit=0" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.4.SSIDReference+.MLDUnit=1" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.5.SSIDReference+.MLDUnit=-1" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.5.SSIDReference+.MLDUnit=0" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.6.SSIDReference+.MLDUnit=1" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.7.SSIDReference+.MLDUnit=0" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.8.SSIDReference+.MLDUnit=1" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.9.SSIDReference+.MLDUnit=0" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.7.SSIDReference+.MLDUnit=2" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.8.SSIDReference+.MLDUnit=2" | sed '/^$/d'
R "ba-cli -j -l WiFi.AccessPoint.9.SSIDReference+.MLDUnit=2" | sed '/^$/d'
R "sed -i 's/^use_dataelements_vap_configs=.*/use_dataelements_vap_configs=0/' /opt/prplmesh/config/beerocks_controller.conf"
sleep 10
R "ba-cli -l X_PRPLWARE-COM_ProcessManager.PrplMesh.Enable=0" | tr -d '\n'

12
.gitlab/tests/cram/wnc-freedom/126-wifi-radio-capability.t
View File

@ -114,15 +114,15 @@ Compare: same => OK, else MISMATCH and show both:
OK
$ prplmesh_revert_mlo_to_defaults
[{"Device.WiFi.SSID.1.":{"MLDUnit":-1}}]
[{"Device.WiFi.SSID.1.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.3.":{"MLDUnit":1}}]
[{"Device.WiFi.SSID.4.":{"MLDUnit":-1}}]
[{"Device.WiFi.SSID.4.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.6.":{"MLDUnit":1}}]
[{"Device.WiFi.SSID.7.":{"MLDUnit":-1}}]
[{"Device.WiFi.SSID.7.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.9.":{"MLDUnit":1}}]
[{"Device.WiFi.SSID.16.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.17.":{"MLDUnit":1}}]
[{"Device.WiFi.SSID.18.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.16.":{"MLDUnit":2}}]
[{"Device.WiFi.SSID.17.":{"MLDUnit":2}}]
[{"Device.WiFi.SSID.18.":{"MLDUnit":2}}]
01/opt/prplmesh/bin/beerocks_agent
/opt/prplmesh/bin/beerocks_controller
/opt/prplmesh/bin/beerocks_fronthaul -i wlan0

12
.gitlab/tests/cram/wnc-freedom/127-wifi-mlo-over-mesh.t
View File

@ -130,15 +130,15 @@ Second MLO group (Guest):
Restore defautlt MLDUnit and config values:
$ prplmesh_revert_mlo_to_defaults
[{"Device.WiFi.SSID.1.":{"MLDUnit":-1}}]
[{"Device.WiFi.SSID.1.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.3.":{"MLDUnit":1}}]
[{"Device.WiFi.SSID.4.":{"MLDUnit":-1}}]
[{"Device.WiFi.SSID.4.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.6.":{"MLDUnit":1}}]
[{"Device.WiFi.SSID.7.":{"MLDUnit":-1}}]
[{"Device.WiFi.SSID.7.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.9.":{"MLDUnit":1}}]
[{"Device.WiFi.SSID.16.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.17.":{"MLDUnit":1}}]
[{"Device.WiFi.SSID.18.":{"MLDUnit":0}}]
[{"Device.WiFi.SSID.16.":{"MLDUnit":2}}]
[{"Device.WiFi.SSID.17.":{"MLDUnit":2}}]
[{"Device.WiFi.SSID.18.":{"MLDUnit":2}}]
01/opt/prplmesh/bin/beerocks_agent
/opt/prplmesh/bin/beerocks_controller
/opt/prplmesh/bin/beerocks_fronthaul -i wlan0