From 9941ead32347b1bdf61b4e107a7bc51726a07cc5 Mon Sep 17 00:00:00 2001 From: Sergio Panseri Date: Mon, 1 Dec 2025 14:28:38 +0100 Subject: [PATCH] profiles: extender_full, mgmt: obuspa: enable WebSocket MTP support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBUSPA supports websockets as MTP together with Stomp and MQTT, but it is disabled at compilation time. As part of FEAT-63, websocket support in OBUSPA is now enabled by default. ci: cdrouter: add USP cdrouter tests over MQTT and websockets and update the controller's server and ca certificate locations. References: PCF-1323 Signed-off-by: Sergio Panseri Signed-off-by: Petr Štetiar [rebased] --- .../tests/cram/generic/fixtures/obuspa.expected | 14 ++++++++++++++ .../tests/cram/mxl25641-hdk-6/005-build-config.t | 1 + .gitlab/tests/cram/wnc-freedom/005-build-config.t | 1 + profiles/extender_full.yml | 1 - profiles/mgmt.yml | 1 + 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitlab/tests/cram/generic/fixtures/obuspa.expected b/.gitlab/tests/cram/generic/fixtures/obuspa.expected index 4dc4836b3c..4fef5b383b 100644 --- a/.gitlab/tests/cram/generic/fixtures/obuspa.expected +++ b/.gitlab/tests/cram/generic/fixtures/obuspa.expected @@ -1900,6 +1900,15 @@ Device.LocalAgent.Controller.{i}.MTP.{i}.STOMP.Reference Device.LocalAgent.Controller.{i}.MTP.{i}.UDS. Device.LocalAgent.Controller.{i}.MTP.{i}.UDS.USPServiceRef Device.LocalAgent.Controller.{i}.MTP.{i}.UDS.UnixDomainSocketRef +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket. +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket.CurrentRetryCount +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket.EnableEncryption +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket.Host +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket.KeepAliveInterval +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket.Path +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket.Port +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket.SessionRetryIntervalMultiplier +Device.LocalAgent.Controller.{i}.MTP.{i}.WebSocket.SessionRetryMinimumWaitInterval Device.LocalAgent.Controller.{i}.MTPNumberOfEntries Device.LocalAgent.Controller.{i}.PeriodicNotifInterval Device.LocalAgent.Controller.{i}.PeriodicNotifTime @@ -1971,6 +1980,11 @@ Device.LocalAgent.MTP.{i}.STOMP.Reference Device.LocalAgent.MTP.{i}.Status Device.LocalAgent.MTP.{i}.UDS. Device.LocalAgent.MTP.{i}.UDS.UnixDomainSocketRef +Device.LocalAgent.MTP.{i}.WebSocket. +Device.LocalAgent.MTP.{i}.WebSocket.EnableEncryption +Device.LocalAgent.MTP.{i}.WebSocket.KeepAliveInterval +Device.LocalAgent.MTP.{i}.WebSocket.Path +Device.LocalAgent.MTP.{i}.WebSocket.Port Device.LocalAgent.MTPNumberOfEntries Device.LocalAgent.Periodic! Device.LocalAgent.Request.{i}. diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t index 94bc08d443..998dc952a3 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t @@ -173,6 +173,7 @@ Assure expected build configuration (PCF-1413): CONFIG_MOSQUITTO_LWS=y CONFIG_MOSQUITTO_PASSWD=y CONFIG_MXL_WLAN_OSS_BUILD=y + CONFIG_OBUSPA_WEBSOCKET_MTP_SUPPORT=y CONFIG_ODHCP6C_ENABLE_UBUS=y CONFIG_PACKAGE_acl=y CONFIG_PACKAGE_acl-manager=y diff --git a/.gitlab/tests/cram/wnc-freedom/005-build-config.t b/.gitlab/tests/cram/wnc-freedom/005-build-config.t index 400a165df4..df757e9bb5 100644 --- a/.gitlab/tests/cram/wnc-freedom/005-build-config.t +++ b/.gitlab/tests/cram/wnc-freedom/005-build-config.t @@ -77,6 +77,7 @@ Assure expected build configuration (PCF-1413): CONFIG_MOSQUITTO_DYNAMIC_SECURITY=y CONFIG_MOSQUITTO_LWS=y CONFIG_MOSQUITTO_PASSWD=y + CONFIG_OBUSPA_WEBSOCKET_MTP_SUPPORT=y CONFIG_ODHCP6C_ENABLE_UBUS=y CONFIG_PACKAGE_ATH_DEBUG=y CONFIG_PACKAGE_MAC80211_SFE_SUPPORT=y diff --git a/profiles/extender_full.yml b/profiles/extender_full.yml index 121eb8d898..226021ef7a 100644 --- a/profiles/extender_full.yml +++ b/profiles/extender_full.yml @@ -18,6 +18,5 @@ diffconfig: | CONFIG_BUSYBOX_CONFIG_FEATURE_GETOPT_LONG=y CONFIG_SAH_AMX_TR181_BRIDGING_MSTPD=n CONFIG_PRPL_CPE_OPMODE_EXTENDER=y - CONFIG_OBUSPA_WEBSOCKET_MTP_SUPPORT=y CONFIG_USP_DISCOVERY_SUPPORT_MQTT_MTP=y CONFIG_USP_DISCOVERY_SUPPORT_STOMP_MTP=y diff --git a/profiles/mgmt.yml b/profiles/mgmt.yml index ebee51fd40..a606f49194 100644 --- a/profiles/mgmt.yml +++ b/profiles/mgmt.yml @@ -14,3 +14,4 @@ diffconfig: | CONFIG_SAH_AMX_TR069_MANAGER_USE_GSDM=y CONFIG_SAH_AMX_TR181_DEVICE_OBUSPA_SUPPORT=y CONFIG_SAH_MOD_AMXB_USP_REQUIRES_DEVICE_PREFIX=y + CONFIG_OBUSPA_WEBSOCKET_MTP_SUPPORT=y