From 8df0ad8e4619827c0ac9efd0cbf046ee0d15a780 Mon Sep 17 00:00:00 2001
From: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
Date: Wed, 22 Oct 2025 10:14:40 +0200
Subject: [PATCH] decollector: 6.2.2.1: introduce WiFi.DataElements. tree

---
 decollector/Config.in                        | 12 +++++
 decollector/Makefile                         | 18 ++++++-
 decollector/bbfdm_service.json               | 26 ++++++++++
 wifi-services/files/QoERating_Extension.json | 54 --------------------
 4 files changed, 54 insertions(+), 56 deletions(-)
 create mode 100644 decollector/bbfdm_service.json

diff --git a/decollector/Config.in b/decollector/Config.in
index e89644b7a..03d857464 100644
--- a/decollector/Config.in
+++ b/decollector/Config.in
@@ -4,4 +4,16 @@ config DECOLLECTOR_EASYMESH_VERSION
 	int "Support Easymesh version"
 	default 6
 
+config DECOLLECTOR_BUILD_TR181_PLUGIN
+	bool "Build TR-181 mapping module (responsible for Device.WiFi.DataElements.)"
+	default y
+
+config DECOLLECTOR_VENDOR_EXTENSIONS
+	bool "Iopsys vendor extensions for Device.WiFi.DataElements."
+	default y
+
+config DECOLLECTOR_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+
 endmenu
diff --git a/decollector/Makefile b/decollector/Makefile
index 26f7bcc11..58d242847 100644
--- a/decollector/Makefile
+++ b/decollector/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.2.1.13
+PKG_VERSION:=6.2.2.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=269aa271c2f8048dad9846be786620339a67bcaa
+PKG_SOURCE_VERSION:=b0552163d66ea18116d3d441268688428b5c508a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -24,6 +24,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/decollector
   SECTION:=utils
@@ -66,6 +67,18 @@ MAKE_PATH:=src
 
 TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
 
+ifeq ($(CONFIG_DECOLLECTOR_BUILD_TR181_PLUGIN),y)
+MAKE_FLAGS += DECOLLECTOR_BUILD_TR181_PLUGIN=y
+ifeq ($(CONFIG_DECOLLECTOR_VENDOR_EXTENSIONS),y)
+TARGET_CFLAGS += -DDECOLLECTOR_VENDOR_EXTENSIONS
+ifeq ($(CONFIG_DECOLLECTOR_VENDOR_PREFIX),"")
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+else
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_DECOLLECTOR_VENDOR_PREFIX)\\\"
+endif
+endif
+endif
+
 EXECS := \
 	$(if $(CONFIG_PACKAGE_decollector),decollector)
 
@@ -76,6 +89,7 @@ define Package/decollector/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/decollector $(1)/usr/sbin/
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,decollector))
diff --git a/decollector/bbfdm_service.json b/decollector/bbfdm_service.json
new file mode 100644
index 000000000..bbdeacca4
--- /dev/null
+++ b/decollector/bbfdm_service.json
@@ -0,0 +1,26 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "decollector",
+    "unified_daemon": true,
+    "services": [
+      {
+        "parent_dm": "Device.WiFi.",
+        "object": "DataElements"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    },
+    "apply_handler": {
+      "uci": [
+        {
+          "file": [
+            "mapcontroller"
+          ],
+          "external_handler": "/etc/wifidmd/bbf_config_reload.sh"
+        }
+      ]
+    }
+  }
+}
diff --git a/wifi-services/files/QoERating_Extension.json b/wifi-services/files/QoERating_Extension.json
index 0701788d9..6e6238b4f 100644
--- a/wifi-services/files/QoERating_Extension.json
+++ b/wifi-services/files/QoERating_Extension.json
@@ -26,60 +26,6 @@
 				}
 			]
 		}
-	},
-	"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.": {
-		"type": "object",
-		"protocols": [
-			"cwmp",
-			"usp"
-		],
-		"access": false,
-		"array": true,
-		"{BBF_VENDOR_PREFIX}QoERating": {
-			"type": "string",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"default": "-1.0",
-			"datatype": "string",
-			"mapping": [
-				{
-					"data": "@Parent",
-					"type": "json",
-					"key": "Rating"
-				}
-			]
-		}
-	},
-	"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.": {
-		"type": "object",
-		"protocols": [
-			"cwmp",
-			"usp"
-		],
-		"access": false,
-		"array": true,
-		"{BBF_VENDOR_PREFIX}QoERating": {
-			"type": "string",
-			"read": true,
-			"write": false,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"default": "-1.0",
-			"datatype": "string",
-			"mapping": [
-				{
-					"data": "@Parent",
-					"type": "json",
-					"key": "Rating"
-				}
-			]
-		}
 	}
 }