Ticket#460: Update get and operate command in uspd

Description:
 - First draft of the changes

Test Done:
 - Below ubus call tested
   ubus call usp get '{"path":"Device.WiFi.SSID.[BSSID==\"00:22:07:6D:5E:DD\"].SSID"}'
   ubus call usp get '{"path":"Device.IP.Interface.*.IPv4Address.*.IPAddress"}'
   ubus call usp get '{"path":"Device.WiFi.AccessPoint.[SSIDReference+BSSID==\"00:22:07:6D:5E:DD\"].SSID"}'
   ubus call usp set '{"path":"Device.WiFi.AccessPoint.[SSIDReference+BSSID==\"00:22:07:6D:5E:D\"].SSID", "value":"Test-2G"}'

Not Covered:
 - Operate command
 - Alias based addressing
 - Searching with List of References

dectmngr2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.2.0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=637aa9ef231f81d195f7a1b67c70af445ade7fee
+PKG_SOURCE_VERSION:=0c029ed2486342e7e7687631b702d5c743f3c41a
 PKG_NAME:=dectmngr2
 
 

easy-soc-libs/Makefile

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f6deba973cba01d630fdc40c6e97c384b07e3df5
+PKG_SOURCE_VERSION:=6bd703870262eca9ccbd8c4937c41fe842828ae3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

endptmngr/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=fb453f8c89463c8cd323f15e369c5d69f73bd1e8
+PKG_SOURCE_VERSION:=44e2472e8c08bef01fab27e8e908d5672f7af136
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)

gryphon-led-module/src/main.c

@@ -192,9 +192,9 @@ static int canyon_led_probe(struct platform_device *pdev)
 	sk9822_set_color_str(leds, "00FF00");
 	sk9822_update(leds);
 	msleep(200);
+#endif
 	sk9822_set_color_str(leds, "000000");
 	sk9822_update(leds);
-#endif
 
 	printk(KERN_INFO "canyon led successfully probed\n");
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-05-06
+PKG_VERSION:=4.0-2019-04-05
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d3aea85146d21db0fc2bd0bcca58dd80d08908b6
+PKG_SOURCE_VERSION:=f7e8cee5bcc578cc9bb9307e31d0c057676a377c
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -51,13 +51,6 @@ define Package/icwmp_xmpp
 	DEPENDS:=+libuci +libubox +libexpat +libstrophe
 endef
 
-define Package/icwmp_twamp
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 twamp feature
-	DEPENDS:=+libuci
-endef
-
 define Package/icwmp_udpechoserver
 	SECTION:=utils
 	CATEGORY:=Utilities
@@ -226,15 +219,6 @@ define Package/icwmp_udpechoserver/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
 endef
 
-define Package/icwmp_twamp/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_twampd $(1)/usr/sbin/icwmp_twampd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_twampd $(1)/etc/init.d/icwmp_twampd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
@@ -271,5 +255,4 @@ $(eval $(call BuildPackage,libdatamodel))
 $(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp_udpechoserver))
-$(eval $(call BuildPackage,icwmp_twamp))
 $(eval $(call BuildPackage,icwmp-zstream))

iop/config

@@ -44,6 +44,7 @@ CONFIG_PACKAGE_juci-minidlna=y
 CONFIG_PACKAGE_juci-mod-status=y
 CONFIG_PACKAGE_juci-mod-system=y
 CONFIG_PACKAGE_juci-mwan3=y
+CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-device=y
 CONFIG_PACKAGE_juci-network-dsl=y

iop/scripts/genconfig.sh

@@ -171,8 +171,8 @@ function genconfig {
 		echo -e "  -a|--list-all\t\tList all Customers and their board types"
 		echo -e "  -b|--boards\t\tList all board types"
 		echo
-		echo "Example ./iop genconfig dg200 TELIA"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
+		echo "Example ./iop genconfig vg50 TELIA"
+		echo "(if no customerconfig is chosen the Inteno Config will be used)"
 		echo
 		exit 0
 	}
@@ -439,7 +439,7 @@ function genconfig {
 			shift;
 		done
 
-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
+		CUSTREPO="${CUSTREPO:-git@private.inteno.se:customerconfigs}"
 
 		setup_dirs
 		create_and_copy_files "$@"

iopupgrade/files/sbin/iopu

@@ -21,6 +21,7 @@ upd_ubi_id=""		# num,	UBI volume number for the volume name
 run_cleanup=0		# if set the cleanup should be run otherwise we skip it.
 run_mount_cleanup=0	# set if we should run umount in cleanup
 upd_kernel=0		# set to 1 if system has the kernel in own mtd partition
+upd_cfe=0		# set to 1 if system is using cfe as bootloader.
 log_stdout=1		# set to 0 to prevent the log to also print to stdout
 upd_noreboot=0		# set to 1 if we should not reboot after programming
 upd_forceimage=0	# set this to force upgrade even if image is for wrong board.

obuspa/Makefile

@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2019 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=obuspa
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e16b48cbebb1b19d2989833b03cc1aeea5ff4171
-PKG_SOURCE_URL:=git@dev.iopsys.eu:fork/obuspa.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/obuspa
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=USP agent
-  DEPENDS:=+libcoap +libopenssl +libcurl +libsqlite3 +libcares +libubox +libubus +libblobmsg-json
-endef
-
-define Package/obuspa/description
- OB-USP-AGENT is a system daemon providing a User Services Platform (USP) Agent.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
-
-ifneq ($(CONFIG_USE_MUSL),)
-TARGET_CFLAGS += -DUSE_MUSL
-endif
-
-#define Build/Prepare
-#        $(CP) -rf ./obuspa/* $(PKG_BUILD_DIR)/
-#endef
-
-define Package/obuspa/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,14 +0,0 @@
-config controller
-	option endpointid 'self::usp-controller.com'
-
-config mtp
-	option enable 'true'
-	option protocol 'STOMP'
-	option destination 'uspq'
-
-config connection
-	option host 'usp-controller.com'
-	option username 'username'
-	option password 'password'
-	option encryption 'false'
-

obuspa/files/etc/init.d/obuspa

@@ -1,105 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-PROG=/usr/sbin/obuspa
-
-CTRL_PATH="Device.LocalAgent.Controller.1."
-MTP_PATH="Device.LocalAgent.MTP.1."
-CONN_PATH="Device.STOMP.Connection.1."
-
-log() {
-	echo "${@}"|logger -t obuspa -p debug
-}
-
-db_set() {
-	log "DBSET param|${1}| value|${2}|"
-	${PROG} -c dbset ${1} ${2}
-}
-
-validate_controller_section()
-{
-	uci_validate_section obuspa controller "${1}" \
-		'endpointid:string:"self:usp-controller.com"'
-}
-
-validate_mtp_section()
-{
-	uci_validate_section obuspa mtp "${1}" \
-		'enable:bool:true' \
-		'protocol:string:"STOMP"' \
-		'destination:string:'
-}
-
-validate_connection_section()
-{
-	uci_validate_section obuspa connection "${1}" \
-		'host:string:"usp-controller.com"' \
-		'username:string:username' \
-		'password:string:password' \
-		'encryption:bool:true'
-}
-
-configure_controller() {
-	local endpointid
-
-	validate_controller_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-	db_set "${CTRL_PATH}EndpointID" ${endpointid}
-}
-
-configure_mtp() {
-	local protocol enable destination
-
-	validate_mtp_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-	db_set "${MTP_PATH}Enable" ${enable}
-	db_set "${MTP_PATH}Protocol" ${protocol}
-	db_set "${MTP_PATH}STOMP.Destination" ${destination}
-}
-
-configure_connection() {
-	local host username password encryption
-
-	validate_connection_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-	db_set "${CONN_PATH}Host" ${host}
-	db_set "${CONN_PATH}Username" ${username}
-	db_set "${CONN_PATH}Password" ${password}
-	db_set "${CONN_PATH}X_ARRIS-COM_EnableEncryption" ${encryption}
-}
-
-db_init() {
-	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db
-
-	config_load obuspa
-	config_foreach configure_controller controller
-	config_foreach configure_mtp mtp
-	config_foreach configure_connection connection
-}
-start_service() {
-	db_init
-
-	procd_open_instance
-	procd_set_param command ${PROG}
-	procd_append_param command -p -v 4
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
-}
-

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=769430115b6dd984313574c3fa2a6d99c65cd223
+PKG_SOURCE_VERSION:=c1598f9dc8f2d67fbfcfd831052f40b3cde3d19c
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 

uboot/Makefile

@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 
 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=15e223e20e5680bc446e84b4d8b5bce06b45fb1b
+PKG_SOURCE_VERSION:=0ef53f269c27f8e736fd30fd1a874159f70c76bf
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85
@@ -74,7 +74,7 @@ define uboot/grx500_norrland
   TITLE:=U-Boot for Norrland Board
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=11
+  PKG_RELEASE:=10
 endef
 
 UBOOTS := \

usp/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=uspd
 PKG_VERSION:=1.0.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e9aa8a42f1da90b44fbd6bca3f4131a24fe79efb
+PKG_SOURCE_VERSION:=64f39a5041da3d6c0a45cbc901dea3bd062d96fe
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/uspd
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=USP ubus backend
+  TITLE:=TR069 extention for USP
   DEPENDS:=+libubox +ubus +icwmp-curl
 endef
 

voice-client/files/etc/asterisk_templates/extensions_macro.conf.TEMPLATE

@@ -130,7 +130,7 @@ exten => s,1,			Goto(s-${DIALSTATUS},1)
 exten => s,n,			Hangup()
 
 ;handle busy (with CBBS support)
-exten => s-BUSY,1,		Read(DIGIT,Busy,1,i,30)
+exten => s-BUSY,1,		Read(DIGIT,Busy,1,in,30)
 exten => s-BUSY,n,		GotoIf($["${DIGIT}" = "${ARG8}"]?ccbs)
 exten => s-BUSY,n,		Hangup()
 exten => s-BUSY,n(ccbs),	Set(result=${SHELL(/usr/lib/asterisk/cbbs.sh ${ARG1} ${ARG2} ${ARG3} ${ARG4} ${ARG5} ${ARG6} ${ARG7})})

voice-client/files/etc/uci-defaults/99-voice_client

@@ -5,7 +5,6 @@
 # Adapt to config section name changes
 grep -q brcm_line /etc/config/voice_client && sed -i 's/brcm_line/tel_line/g' /etc/config/voice_client
 grep -q brcm_advanced /etc/config/voice_client && sed -i 's/brcm_advanced/tel_advanced/g' /etc/config/voice_client
-grep -q BRCM /etc/config/voice_client && sed -i 's/BRCM/TEL/g' /etc/config/voice_client
 
 # Add call filter section
 uci -q get voice_client.call_filter0 >/dev/null || {
@@ -71,9 +70,9 @@ EOT
 # If dtmfmode is set to the obsolete compatability change to auto
 sed -i 's/dtmfmode\s*=\s*compatibility/dtmfmode=auto/' /etc/asterisk/sip.conf
 
-if [ "$(uci get voice_client.SIP.dtmfmode)" == "compatibility" ]; then
-	uci set voice_client.SIP.dtmfmode="auto"
-	uci commit voice_client
+if [ $(uci get voice_client.SIP.dtmfmode) == 'compatibility' ]; then
+    uci set voice_client.SIP.dtmfmode='auto'
+    uci commit
 fi
 
 exit 0

wifilife/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifilife
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=837631d44eafa3827a1c1c1603540658744f4a9a
+PKG_SOURCE_VERSION:=de6183cda406fbd1a98779bda2ea1b2ffb8f2e04
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 ifeq ($(CONFIG_WIFILIFE_OPEN),y)

wifilife/files/wifilife.init

@@ -9,8 +9,6 @@ EXTRA_COMMANDS="enable_check"
 
 
 start_service() {
-	[ "$(uci -q get wifilife.@wifilife[0].enabled)" == "0" ] && return
-
 	procd_open_instance
 	procd_set_param command ${PROG} -d -l -f -o /tmp/wifiagent.log
 	procd_set_param respawn

wifimngr/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=wifimngr
 PKG_VERSION:=1.0.2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=659602bc62a244d5b53e452b7ee10ff846f03d01
+PKG_SOURCE_VERSION:=66a7e957f5e3e83ab60da68f7fb05cdda7f474d5
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>