From c24a0ccd669cec954e1e890447f1c0a213b4a35f Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 12 Mar 2024 18:57:15 +0530
Subject: [PATCH] tr104: align with datamodel microservice

---
 tr104/Makefile                                         | 10 +++++-----
 .../etc/uci-defaults/50_add_tr104_dm_microservice      |  8 --------
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 tr104/files/etc/uci-defaults/50_add_tr104_dm_microservice

diff --git a/tr104/Makefile b/tr104/Makefile
index 7d7681cb4..ce4fd4dc6 100644
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.22
+PKG_VERSION:=1.0.23
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
@@ -72,14 +72,14 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/tr104/plugins/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1)/etc/tr104/
+	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/tr104,$(PKG_BUILD_DIR)/libdm/tr104/libtr104.so)
 ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1)/etc/tr104/plugins/
+	$(call BbfdmInstallPluginInMicroservice,$(1)/etc/tr104/plugins,$(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so)
 endif
 ifeq ($(CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE),y)
-	$(INSTALL_BIN) ./files/etc/uci-defaults/50_add_tr104_dm_microservice $(1)/etc/uci-defaults/
+	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/tr104/input.json)
 else
+	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/ubus/tr104d $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/tr104d $(1)/etc/init.d/tr104d
diff --git a/tr104/files/etc/uci-defaults/50_add_tr104_dm_microservice b/tr104/files/etc/uci-defaults/50_add_tr104_dm_microservice
deleted file mode 100644
index 2a25f1c6f..000000000
--- a/tr104/files/etc/uci-defaults/50_add_tr104_dm_microservice
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if ! uci -q get bbfdm.tr104 >/dev/null; then
-	uci set bbfdm.tr104=micro_service
-	uci set bbfdm.tr104.enable=1
-	uci set bbfdm.tr104.input_json="/etc/tr104/input.json"
-	uci set bbfdm.tr104.loglevel=1
-fi