From c06016bc5b40d084c2ecf484e88714fe68a9a15a Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Wed, 13 Mar 2024 11:14:55 +0530
Subject: [PATCH] dslmngr: align with bbfdm microservices

---
 dslmngr/Makefile                                             | 2 +-
 .../etc/{dsl/input.json => bbfdm/micro_services/dsl.json}    | 5 +++--
 dslmngr/files/common/etc/init.d/dsl                          | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename dslmngr/files/common/etc/{dsl/input.json => bbfdm/micro_services/dsl.json} (83%)

diff --git a/dslmngr/Makefile b/dslmngr/Makefile
index 9db89b15f..a611f738c 100644
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
diff --git a/dslmngr/files/common/etc/dsl/input.json b/dslmngr/files/common/etc/bbfdm/micro_services/dsl.json
similarity index 83%
rename from dslmngr/files/common/etc/dsl/input.json
rename to dslmngr/files/common/etc/bbfdm/micro_services/dsl.json
index 692a0785d..911d60ecf 100644
--- a/dslmngr/files/common/etc/dsl/input.json
+++ b/dslmngr/files/common/etc/bbfdm/micro_services/dsl.json
@@ -1,14 +1,15 @@
 {
 	"daemon": {
+		"config": {
+			"loglevel": "1"
+		},
 		"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 64035d235..4454c051c 100755
--- a/dslmngr/files/common/etc/init.d/dsl
+++ b/dslmngr/files/common/etc/init.d/dsl
@@ -2,7 +2,6 @@
 
 . /lib/functions.sh
 include /lib/dsl
-. /etc/bbfdm/bbfdm_services.sh
 
 START=20
 USE_PROCD=1
@@ -10,7 +9,6 @@ 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"