Revert "decollector: introduce data model"

This reverts commit 20a28db536.

decollector/Config.in

@@ -4,16 +4,4 @@ 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

decollector/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.2.2.1
+PKG_VERSION:=6.2.1.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b0552163d66ea18116d3d441268688428b5c508a
+PKG_SOURCE_VERSION:=269aa271c2f8048dad9846be786620339a67bcaa
 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,7 +24,6 @@ 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
@@ -67,18 +66,6 @@ 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)
 
@@ -89,7 +76,6 @@ 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))

decollector/bbfdm_service.json

@@ -1,26 +0,0 @@
-{
-  "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"
-        }
-      ]
-    }
-  }
-}

wifi-services/files/QoERating_Extension.json

@@ -26,6 +26,60 @@
 				}
 			]
 		}
+	},
+	"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"
+				}
+			]
+		}
 	}
 }
 

wifidmd/Config.in

@@ -1,5 +1,13 @@
 if PACKAGE_wifidmd
 
+config WIFIDMD_DISABLE_LEGACY_WIFI
+	bool "Disable legacy Wireless Objects like WiFi.Radio., WiFi.SSID., WiFi.AccessPoint. etc"
+	default n
+
+config WIFIDMD_ENABLE_WIFI_DATAELEMENTS
+	bool "Enable Device.WiFi.DataElements. Object"
+	default y
+
 config WIFIDMD_VENDOR_PREFIX
 	string "Package specific datamodel Vendor Prefix for TR181 extensions"
 	default ""

wifidmd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.4.1
+PKG_VERSION:=1.3.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=006359c351be70a45f5bc1ef3d78e14e270aa7cf
+PKG_SOURCE_VERSION:=882278e2783e37ffd65af261ed3ec404119a3ce8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -53,6 +53,14 @@ endif
 
 TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
+ifeq ($(CONFIG_WIFIDMD_DISABLE_LEGACY_WIFI),y)
+MAKE_FLAGS += WIFIDMD_DISABLE_LEGACY_WIFI=y
+endif
+
+ifeq ($(CONFIG_WIFIDMD_ENABLE_WIFI_DATAELEMENTS),y)
+MAKE_FLAGS += WIFIDMD_ENABLE_WIFI_DATAELEMENTS=y
+endif
+
 define Package/wifidmd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wifidmd $(1)/usr/sbin/wifidmd

wifidmd/bbfdm_service.json

@@ -5,28 +5,8 @@
     "unified_daemon": true,
     "services": [
       {
-        "parent_dm": "Device.WiFi.",
+        "parent_dm": "Device.",
-        "object": "Radio"
+        "object": "WiFi"
-      },
-      {
-        "parent_dm": "Device.WiFi.",
-        "object": "SSID"
-      },
-      {
-        "parent_dm": "Device.WiFi.",
-        "object": "AccessPoint"
-      },
-      {
-        "parent_dm": "Device.WiFi.",
-        "object": "NeighboringWiFiDiagnostic"
-      },
-      {
-        "parent_dm": "Device.WiFi.",
-        "object": "EndPoint"
-      },
-      {
-        "parent_dm": "Device.WiFi.",
-        "object": "Reset()"
       }
     ],
     "config": {