From e9d0a81e8ea5a71a85a79a34ef2a0030c5ddae57 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amit.kumar@iopsys.eu>
Date: Thu, 15 Feb 2024 15:12:33 +0530
Subject: [PATCH] dslmngr: Added dsl,fst,atm,ptm bbf microservice

 DSL, ATM,FAST and PTM added as mlti object bbf microservice handling
 updated commit ID in Makefile
 incremented minor version
---
 dslmngr/Makefile                        |  9 ++++++---
 dslmngr/files/common/etc/dsl/input.json | 16 ++++++++++++++++
 dslmngr/files/common/etc/init.d/dsl     |  2 ++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 dslmngr/files/common/etc/dsl/input.json

diff --git a/dslmngr/Makefile b/dslmngr/Makefile
index 322ff92e6..9db89b15f 100644
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cb8b8fd2549751bcd38808391b76a1a9a908c4de
+PKG_SOURCE_VERSION:=6009d4cdabc2fb6827a1dd6096a96e720e97750b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
@@ -26,6 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
@@ -39,7 +40,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
 endef
 
 define Package/dslmngr/description
@@ -69,12 +70,14 @@ define Build/Compile
 endef
 
 define Package/dslmngr/install
+	$(INSTALL_DIR) $(1)/etc/dsl
 	$(CP) ./files/common/* $(1)/
 ifeq ($(CONFIG_TARGET_brcmbca),y)
 	$(CP) ./files/broadcom/* $(1)/
 endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdsl.so $(1)/etc/dsl/
 endef
 
 $(eval $(call BuildPackage,dslmngr))
diff --git a/dslmngr/files/common/etc/dsl/input.json b/dslmngr/files/common/etc/dsl/input.json
new file mode 100644
index 000000000..692a0785d
--- /dev/null
+++ b/dslmngr/files/common/etc/dsl/input.json
@@ -0,0 +1,16 @@
+{
+	"daemon": {
+		"input": {
+			"type": "DotSo",
+			"name": "/etc/dsl/libbbfdsl.so"
+		},
+		"output": {
+			"type": "UBUS",
+			"name": "bbfdm.DSL.",
+			"parent_dm": "Device.",
+			"object": "DSL",
+			"root_obj": "bbfdm",
+			"multiple_objects": ["DSL","PTM","ATM","FAST"]
+		}
+	}
+}
diff --git a/dslmngr/files/common/etc/init.d/dsl b/dslmngr/files/common/etc/init.d/dsl
index 4454c051c..64035d235 100755
--- a/dslmngr/files/common/etc/init.d/dsl
+++ b/dslmngr/files/common/etc/init.d/dsl
@@ -2,6 +2,7 @@
 
 . /lib/functions.sh
 include /lib/dsl
+. /etc/bbfdm/bbfdm_services.sh
 
 START=20
 USE_PROCD=1
@@ -9,6 +10,7 @@ USE_PROCD=1
 DSLMNGR=$(which dslmngr)
 
 start_service() {
+	bbfdm_add_service "bbfdm.DSL" "/etc/dsl/input.json"
 	[ -n "$DSLMNGR" ] && {
 		procd_open_instance
 		procd_set_param command "$DSLMNGR"