From 8ea6f29af28bd9a324aa4d84576f1291f8e954c6 Mon Sep 17 00:00:00 2001 From: Igor Plesser Date: Thu, 5 Mar 2026 14:16:58 +0200 Subject: [PATCH] cram: set vap type per configurated vap Closes: PPM-3589 Signed-off-by: Igor Plesser --- .../cram/arcadyan-mozart/110-prplmesh-dataelements.t | 8 ++++---- .../tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t | 8 ++++---- .gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t | 2 +- .../cram/mxl25641-hdk-6/120-prplmesh-static-puncturing.t | 2 +- .../tests/cram/wnc-freedom/110-prplmesh-dataelements.t | 8 ++++---- .gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t | 2 +- .../cram/wnc-freedom/120-prplmesh-static-puncturing.t | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab/tests/cram/arcadyan-mozart/110-prplmesh-dataelements.t b/.gitlab/tests/cram/arcadyan-mozart/110-prplmesh-dataelements.t index d6114305f6..daa5aa308a 100644 --- a/.gitlab/tests/cram/arcadyan-mozart/110-prplmesh-dataelements.t +++ b/.gitlab/tests/cram/arcadyan-mozart/110-prplmesh-dataelements.t @@ -81,8 +81,8 @@ Since no persistent storage of NbAPI Network subsection, always index:1 after co {} {"amxd-error-code":0} - $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul+Backhaul\"}}'" - {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"MultiApMode":"Fronthaul+Backhaul"}} + $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul+Backhaul\",\"X_PRPLWARE_VapType\":\"home\"}}'" + {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"X_PRPLWARE_VapType":"home","MultiApMode":"Fronthaul+Backhaul"}} {} {"amxd-error-code":0} @@ -113,8 +113,8 @@ Create second instance of Network.AccessPoint for guest VAPs: {} {"amxd-error-code":0} - $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul\"}}'" - {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"MultiApMode":"Fronthaul"}} + $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul\",\"X_PRPLWARE_VapType\":\"guest\"}}'" + {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"X_PRPLWARE_VapType":"guest","MultiApMode":"Fronthaul"}} {} {"amxd-error-code":0} 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 c55ef38b46..20ff53dd75 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t @@ -90,8 +90,8 @@ Since no persistent storage of NbAPI Network subsection, always index:1 after co {} {"amxd-error-code":0} - $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul+Backhaul\"}}'" - {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"MultiApMode":"Fronthaul+Backhaul"}} + $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul+Backhaul\",\"X_PRPLWARE_VapType\":\"home\"}}'" + {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"X_PRPLWARE_VapType":"home","MultiApMode":"Fronthaul+Backhaul"}} {} {"amxd-error-code":0} @@ -122,8 +122,8 @@ Create second instance of Network.AccessPoint for guest VAPs: {} {"amxd-error-code":0} - $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul\"}}'" - {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"MultiApMode":"Fronthaul"}} + $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul\",\"X_PRPLWARE_VapType\":\"guest\"}}'" + {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"X_PRPLWARE_VapType":"guest","MultiApMode":"Fronthaul"}} {} {"amxd-error-code":0} diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t b/.gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t index b717946bb5..53e55c4ee3 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/113-prplmesh-wpa3-cm.t @@ -104,7 +104,7 @@ Create one instances of Network.AccessPoint with WPA3-Personal enabled and push $ R logger -t cram "Create instances of Network.AccessPoint and push them to the agent" - $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPoint+(Band2_4G=1,Band5GH=1,Band5GL=1,Band6G=1,MultiApMode=\"Fronthaul+Backhaul\",SSID=\"SSID_WPA3CM\",Security.ModeEnabled=\"WPA3-Personal\",Security.KeyPassphrase=\"password\",Enable=1)\"" | tail -n +2 | sed '/^$/d' + $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPoint+(Band2_4G=1,Band5GH=1,Band5GL=1,Band6G=1,MultiApMode=\"Fronthaul+Backhaul\",X_PRPLWARE_VapType=\"home\",SSID=\"SSID_WPA3CM\",Security.ModeEnabled=\"WPA3-Personal\",Security.KeyPassphrase=\"password\",Enable=1)\"" | tail -n +2 | sed '/^$/d' X_PRPLWARE-COM_WiFiController.Network.AccessPoint.* (re) $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPointCommit()\"" | tail -n +2 | sed '/^$/d' diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/120-prplmesh-static-puncturing.t b/.gitlab/tests/cram/mxl25641-hdk-6/120-prplmesh-static-puncturing.t index ff09956f9d..b4b0fde8f9 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/120-prplmesh-static-puncturing.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/120-prplmesh-static-puncturing.t @@ -82,7 +82,7 @@ Create one instances of Network.AccessPoint and push it to the agent: $ R logger -t cram "create instances of Network.AccessPoint and push them to the agent" - $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPoint+(Band5GH=1,Band5GL=1,MultiApMode=\"Fronthaul+Backhaul\",SSID=\"SSIDforStaticPunct\",Security.ModeEnabled=\"WPA3-Personal\",Security.KeyPassphrase=\"password\",Enable=1)\"" | tail -n +2 | sed '/^$/d' + $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPoint+(Band5GH=1,Band5GL=1,MultiApMode=\"Fronthaul+Backhaul\",X_PRPLWARE_VapType=\"home\",SSID=\"SSIDforStaticPunct\",Security.ModeEnabled=\"WPA3-Personal\",Security.KeyPassphrase=\"password\",Enable=1)\"" | tail -n +2 | sed '/^$/d' X_PRPLWARE-COM_WiFiController.Network.AccessPoint.* (re) $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPointCommit()\"" | tail -n +2 | sed '/^$/d' diff --git a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t index aef43bc68e..d0ea5d94a1 100644 --- a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t +++ b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t @@ -87,8 +87,8 @@ Since no persistent storage of NbAPI Network subsection, always index:1 after co {} {"amxd-error-code":0} - $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul+Backhaul\"}}'" - {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"MultiApMode":"Fronthaul+Backhaul"}} + $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul+Backhaul\",\"X_PRPLWARE_VapType\":\"home\"}}'" + {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"X_PRPLWARE_VapType":"home","MultiApMode":"Fronthaul+Backhaul"}} {} {"amxd-error-code":0} @@ -119,8 +119,8 @@ Create second instance of Network.AccessPoint for guest VAPs: {} {"amxd-error-code":0} - $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul\"}}'" - {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"MultiApMode":"Fronthaul"}} + $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"MultiApMode\":\"Fronthaul\",\"X_PRPLWARE_VapType\":\"guest\"}}'" + {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"X_PRPLWARE_VapType":"guest","MultiApMode":"Fronthaul"}} {} {"amxd-error-code":0} diff --git a/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t b/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t index 69fd9dbf37..b318a5a554 100644 --- a/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t +++ b/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t @@ -98,7 +98,7 @@ Create one instances of Network.AccessPoint with WPA3-Personal enabled and push $ R logger -t cram "Create instances of Network.AccessPoint and push them to the agent" - $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPoint+(Band2_4G=1,Band5GH=1,Band5GL=1,Band6G=1,MultiApMode=\"Fronthaul+Backhaul\",SSID=\"SSID_WPA3CM\",Security.ModeEnabled=\"WPA3-Personal\",Security.KeyPassphrase=\"password\",Enable=1)\"" | tail -n +2 | sed '/^$/d' + $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPoint+(Band2_4G=1,Band5GH=1,Band5GL=1,Band6G=1,MultiApMode=\"Fronthaul+Backhaul\",X_PRPLWARE_VapType=\"home\",SSID=\"SSID_WPA3CM\",Security.ModeEnabled=\"WPA3-Personal\",Security.KeyPassphrase=\"password\",Enable=1)\"" | tail -n +2 | sed '/^$/d' X_PRPLWARE-COM_WiFiController.Network.AccessPoint.* (re) $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPointCommit()\"" | tail -n +2 | sed '/^$/d' diff --git a/.gitlab/tests/cram/wnc-freedom/120-prplmesh-static-puncturing.t b/.gitlab/tests/cram/wnc-freedom/120-prplmesh-static-puncturing.t index dc2bce2554..881cfa789c 100644 --- a/.gitlab/tests/cram/wnc-freedom/120-prplmesh-static-puncturing.t +++ b/.gitlab/tests/cram/wnc-freedom/120-prplmesh-static-puncturing.t @@ -83,7 +83,7 @@ Create one instances of Network.AccessPoint and push it to the agent: $ R logger -t cram "create instances of Network.AccessPoint and push them to the agent" - $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPoint+(Band5GH=1,Band5GL=1,MultiApMode=\"Fronthaul+Backhaul\",SSID=\"SSIDforStaticPunct\",Security.ModeEnabled=\"WPA3-Personal\",Security.KeyPassphrase=\"password\",Enable=1)\"" | tail -n +2 | sed '/^$/d' + $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPoint+(Band5GH=1,Band5GL=1,MultiApMode=\"Fronthaul+Backhaul\",X_PRPLWARE_VapType=\"home\",SSID=\"SSIDforStaticPunct\",Security.ModeEnabled=\"WPA3-Personal\",Security.KeyPassphrase=\"password\",Enable=1)\"" | tail -n +2 | sed '/^$/d' X_PRPLWARE-COM_WiFiController.Network.AccessPoint.* (re) $ R "ba-cli \"X_PRPLWARE-COM_WiFiController.Network.AccessPointCommit()\"" | tail -n +2 | sed '/^$/d'