From 064611a15d49f48b09a289350b46b6f93664b8b8 Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Thu, 14 Aug 2025 21:58:58 +0530 Subject: [PATCH] obuspa: removed test controller definition --- obuspa/Config.in | 9 +-- obuspa/Makefile | 29 +++---- obuspa/files/etc/init.d/usptest | 75 ------------------- .../files/etc/uci-defaults/54-test-usp-remote | 20 ----- .../55-obuspa-local-mqtt-usp-connection | 21 ++++++ .../etc/uci-defaults/55-test-usp-controller | 57 -------------- 6 files changed, 35 insertions(+), 176 deletions(-) delete mode 100755 obuspa/files/etc/init.d/usptest delete mode 100644 obuspa/files/etc/uci-defaults/54-test-usp-remote create mode 100644 obuspa/files/etc/uci-defaults/55-obuspa-local-mqtt-usp-connection delete mode 100644 obuspa/files/etc/uci-defaults/55-test-usp-controller diff --git a/obuspa/Config.in b/obuspa/Config.in index 607202344..13f6caa9c 100644 --- a/obuspa/Config.in +++ b/obuspa/Config.in @@ -19,13 +19,8 @@ config OBUSPA_CONTROLLER_MTP_VERIFY bool "Enable verification of controller MTP before processing the message" default n -config OBUSPA_ENABLE_TEST_CONTROLLER - bool "Adds a test controller by default" - default n - select OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL - -config OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL - bool "Adds a test controller by default (local access only)" +config OBUSPA_LOCAL_MQTT_LISTENER + bool "Configures local mqtt broker for local usp connections" default n config OBUSPA_MAX_CONTROLLERS_NUM diff --git a/obuspa/Makefile b/obuspa/Makefile index 1bdb7cdf7..5e6473191 100644 --- a/obuspa/Makefile +++ b/obuspa/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=obuspa -PKG_VERSION:=10.0.6.1 +PKG_VERSION:=10.0.6.2 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -33,8 +33,7 @@ define Package/obuspa TITLE:=USP agent MENU:=1 DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl +ca-certificates \ - +OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL:mosquitto-ssl +OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL:mosquitto-client-ssl \ - +OBUSPA_ENABLE_TEST_CONTROLLER:mosquitto-auth-shadow +libjson-c + +OBUSPA_LOCAL_MQTT_LISTENER:mosquitto-ssl +libjson-c DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service endef @@ -132,27 +131,23 @@ define Package/obuspa/install $(INSTALL_DATA) ./files/etc/users/roles/*.json $(1)/etc/users/roles/ $(INSTALL_DATA) ./files/etc/obuspa/usp_utils.sh $(1)/etc/obuspa/ echo "$(VENDOR_PREFIX)" > $(1)/etc/obuspa/vendor_prefix - $(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/ - $(INSTALL_BIN) ./files/etc/uci-defaults/60-generate-ctrust-defaults $(1)/etc/uci-defaults/ - $(INSTALL_BIN) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/ - $(INSTALL_BIN) ./files/etc/uci-defaults/92-obuspa_firewall $(1)/etc/uci-defaults/ - $(INSTALL_BIN) ./files/etc/uci-defaults/93-obuspa_mdns_adv $(1)/etc/uci-defaults/ - $(INSTALL_BIN) ./files/etc/uci-defaults/94-obuspa_set_credential $(1)/etc/uci-defaults/ + $(INSTALL_DATA) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/ + $(INSTALL_DATA) ./files/etc/uci-defaults/60-generate-ctrust-defaults $(1)/etc/uci-defaults/ + $(INSTALL_DATA) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/ + $(INSTALL_DATA) ./files/etc/uci-defaults/92-obuspa_firewall $(1)/etc/uci-defaults/ + $(INSTALL_DATA) ./files/etc/uci-defaults/93-obuspa_mdns_adv $(1)/etc/uci-defaults/ + $(INSTALL_DATA) ./files/etc/uci-defaults/94-obuspa_set_credential $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/firewall.usp $(1)/etc/ - $(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user + $(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/ ifeq ($(CONFIG_OBUSPA_CWMP_DATAMODEL_SUPPORT),y) $(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME) $(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libuspagentdm.so $(1) $(PKG_NAME) endif -ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y) - $(INSTALL_BIN) ./files/etc/uci-defaults/54-test-usp-remote $(1)/etc/uci-defaults/ -endif -ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL),y) - $(INSTALL_BIN) ./files/etc/init.d/usptest $(1)/etc/init.d/ - $(INSTALL_BIN) ./files/etc/uci-defaults/55-test-usp-controller $(1)/etc/uci-defaults/ +ifeq ($(CONFIG_OBUSPA_LOCAL_MQTT_LISTENER),y) + $(INSTALL_DATA) ./files/etc/uci-defaults/55-obuspa-local-mqtt-usp-connection $(1)/etc/uci-defaults/ endif ifeq ($(CONFIG_OBUSPA_OVERRIDE_CT_ROLE),y) - $(INSTALL_BIN) ./files/etc/uci-defaults/61-override-ct-roles $(1)/etc/uci-defaults/ + $(INSTALL_DATA) ./files/etc/uci-defaults/61-override-ct-roles $(1)/etc/uci-defaults/ endif endef diff --git a/obuspa/files/etc/init.d/usptest b/obuspa/files/etc/init.d/usptest deleted file mode 100755 index 104bccd42..000000000 --- a/obuspa/files/etc/init.d/usptest +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -STOP=01 -USE_PROCD=1 - -log() -{ - echo "$*"|logger -t usptest -p debug -} - -get_oui_from_db() -{ - db -q get device.deviceinfo.ManufacturerOUI -} - -get_serial_from_db() -{ - db -q get device.deviceinfo.SerialNumber -} - -publish_endpoint() -{ - local AgentEndpointID serial oui user pass - - if ! uci -q get obuspa.testmqtt; then - return 0; - fi - - # return if mosquitto_pub is not present - if [ ! "$(command -v mosquitto_pub)" ]; then - log "mosquitto_pub not present can't publish EndpointID" - return 0; - fi - - sleep 2 - # Get endpoint id from obuspa config first - config_load obuspa - config_get AgentEndpointID localagent EndpointID "" - if [ -z "${AgentEndpointID}" ]; then - serial=$(get_serial_from_db) - oui=$(get_oui_from_db) - AgentEndpointID="os::${oui}-${serial//+/%2B}" - fi - - config_get user testmqtt Username "" - config_get pass testmqtt Password "" - - # publish Agent's EndpointID in mosquito broker for discovery by usp-js - # This is a work around till obuspa adds supports for mDNS discovery - if [ -n "${user}" ] && [ -n "${pass}" ]; then - log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker with username, password" - mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" -u "${user}" -P "${pass}" - elif [ -n "${user}" ]; then - log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker with username only" - mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" -u "${user}" - else - log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker" - mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" - fi -} - -start_service() { - procd_open_instance usptest - publish_endpoint - procd_close_instance -} - -reload_service() { - publish_endpoint -} - -service_triggers() { - procd_add_reload_trigger "mosquitto" "obuspa" -} diff --git a/obuspa/files/etc/uci-defaults/54-test-usp-remote b/obuspa/files/etc/uci-defaults/54-test-usp-remote deleted file mode 100644 index c50e52309..000000000 --- a/obuspa/files/etc/uci-defaults/54-test-usp-remote +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh - -if [ ! -f "/etc/config/mosquitto" ]; then - echo "Local mosquitto broker not available" - return 0 -fi - -add_usp_test() -{ - uci_add mosquitto listener usptest - uci_set mosquitto usptest enabled 1 - uci_set mosquitto usptest port '9004' - uci_set mosquitto usptest protocol 'websockets' - uci_set mosquitto usptest auth_plugin '/usr/lib/mosquitto_auth_shadow.so' -} - -# Install test MQTT over WS listener -add_usp_test diff --git a/obuspa/files/etc/uci-defaults/55-obuspa-local-mqtt-usp-connection b/obuspa/files/etc/uci-defaults/55-obuspa-local-mqtt-usp-connection new file mode 100644 index 000000000..ec7c32bf5 --- /dev/null +++ b/obuspa/files/etc/uci-defaults/55-obuspa-local-mqtt-usp-connection @@ -0,0 +1,21 @@ +#!/bin/sh + +. /lib/functions.sh + +if [ ! -f "/etc/config/mosquitto" ]; then + echo "Local mosquitto broker not available" + return 0 +fi + +add_mqtt_obuspa_listener() +{ + uci_add mosquitto listener obuspa + uci_set mosquitto obuspa enabled 1 + uci_set mosquitto obuspa port '1883' + uci_set mosquitto obuspa no_remote_access '1' + uci_set mosquitto obuspa allow_anonymous '1' +} + +# Add mosquitto listener for obuspa connection +# apps/controller should add controller definitions separately +add_mqtt_obuspa_listener diff --git a/obuspa/files/etc/uci-defaults/55-test-usp-controller b/obuspa/files/etc/uci-defaults/55-test-usp-controller deleted file mode 100644 index 8b0233106..000000000 --- a/obuspa/files/etc/uci-defaults/55-test-usp-controller +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh - -if [ ! -f "/etc/config/obuspa" ]; then - echo "Local obuspa not available" - return 0 -fi - -if [ ! -f "/etc/config/mosquitto" ]; then - echo "Local mosquitto broker not available" - return 0 -fi - -add_obuspa_test_mtp() -{ - uci_add obuspa mtp test_mtp - uci_set obuspa test_mtp Protocol 'MQTT' - uci_set obuspa test_mtp ResponseTopicConfigured '/usp/endpoint' - uci_set obuspa test_mtp mqtt 'testmqtt' -} - -add_obuspa_test_mqtt() -{ - # Adds Device.MQTT.Client. - uci_add obuspa mqtt testmqtt - uci_set obuspa testmqtt BrokerAddress '127.0.0.1' - uci_set obuspa testmqtt BrokerPort '1883' - uci_set obuspa testmqtt TransportProtocol 'TCP/IP' -} - -add_obuspa_test_controller() -{ - # Adds Device.LocalAgent.Controller. - uci_add obuspa controller testcontroller - uci_set obuspa testcontroller EndpointID 'proto::interop-usp-controller' - uci_set obuspa testcontroller Protocol 'MQTT' - uci_set obuspa testcontroller Topic '/usp/controller' - uci_set obuspa testcontroller mqtt 'testmqtt' - uci_set obuspa testcontroller assigned_role_name 'full_access' -} - -add_obuspa_config() -{ - uci_add mosquitto listener obuspa - uci_set mosquitto obuspa enabled 1 - uci_set mosquitto obuspa port '1883' - uci_set mosquitto obuspa no_remote_access '1' - uci_set mosquitto obuspa allow_anonymous '1' -} - -# Install test usp controller config -add_obuspa_config - -add_obuspa_test_mtp -add_obuspa_test_mqtt -add_obuspa_test_controller