From 8bc63723e0667e7ca7a6df0d2f4aba3877eafa0a Mon Sep 17 00:00:00 2001
From: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
Date: Wed, 22 Jan 2025 16:42:38 +0100
Subject: [PATCH] Align with latest changes

---
 gitlab-ci/install-dependencies.sh             |  2 +
 gitlab-ci/shared.sh                           | 41 +------------------
 libbbfdm-ubus/bbfdm-ubus.c                    |  2 +-
 test/files/etc/bbfdm/services/netmngr.json    |  4 ++
 .../bbfdm/services/wifidmd.dataelements.json  | 16 ++++++++
 test/files/var/reset_reason                   |  2 +
 6 files changed, 26 insertions(+), 41 deletions(-)
 create mode 100644 test/files/etc/bbfdm/services/wifidmd.dataelements.json
 create mode 100644 test/files/var/reset_reason

diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh
index 69c0369b..73306677 100755
--- a/gitlab-ci/install-dependencies.sh
+++ b/gitlab-ci/install-dependencies.sh
@@ -39,5 +39,7 @@ else
 	echo "Installing Network Data Model (netmngr) as a micro-service"
 	install_netmngr_as_micro_service
 
+	#install Ethernet Data Model as a micro-service
+	echo "Installing Ethernet Data Model (ethmngr) as a micro-service"
 	install_ethmngr_as_micro_service
 fi
diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh
index 899fa8b4..cf9ae917 100755
--- a/gitlab-ci/shared.sh
+++ b/gitlab-ci/shared.sh
@@ -43,40 +43,6 @@ function exec_cmd_verbose()
 	fi
 }
 
-generate_input_schema()
-{
-	service_name="$1"
-	schema='{
-  "daemon": {
-    "enable": "1",
-    "service_name": "'"$service_name"'",
-    "config": {
-      "loglevel": "4"
-    }
-  }
-}'
-	echo "$schema"
-}
-
-generate_input_schema_with_output_name()
-{
-	service_name="$1"
-	output_name="$2"
-	schema='{
-  "daemon": {
-    "enable": "1",
-    "service_name": "'"$service_name"'",
-    "config": {
-      "loglevel": "4"
-    },
-    "output": {
-      "name": "'"$output_name"'"
-    }
-  }
-}'
-	echo "$schema"
-}
-
 function install_plugin()
 {
 	exec_cmd cp -f "${1}" ${BBFDM_PLUGIN_DIR}/
@@ -128,10 +94,7 @@ function install_wifidmd_as_micro_service()
 
 	exec_cmd make -C /opt/dev/wifidmd/src/ clean && make -C /opt/dev/wifidmd/src/ CFLAGS="-D'BBF_VENDOR_PREFIX=\"X_IOPSYS_EU_\"'"
 	exec_cmd cp -f /opt/dev/wifidmd/src/libwifi.so /usr/share/bbfdm/micro_services/wifidmd.so
-	exec_cmd mkdir -p /usr/share/bbfdm/micro_services/wifidmd
-	exec_cmd cp -f /opt/dev/wifidmd/src/libdataelements.so /usr/share/bbfdm/micro_services/wifidmd
-
-	generate_input_schema_with_output_name "wifidmd" "WiFi" > /etc/bbfdm/services/wifidmd.json
+	exec_cmd cp -f /opt/dev/wifidmd/src/libdataelements.so /usr/share/bbfdm/micro_services/wifidmd.dataelements.so
 }
 
 function install_libeasy()
@@ -187,8 +150,6 @@ function install_netmngr_as_micro_service()
 	exec_cmd cp -f /opt/dev/netmngr/src/libinterface_stack.so /usr/share/bbfdm/plugins
 	exec_cmd mkdir -p /usr/share/bbfdm/micro_services/netmngr
 
-	generate_input_schema_with_output_name "netmngr" "Network" > /etc/bbfdm/services/netmngr.json
-
 	exec_cmd git clone https://dev.iopsys.eu/bbf/tr143d.git /opt/dev/tr143d
 	exec_cmd make -C /opt/dev/tr143d/src/ clean && make -C /opt/dev/tr143d/src/
 	exec_cmd cp -f /opt/dev/tr143d/src/libtr143d.so /usr/share/bbfdm/micro_services/netmngr
diff --git a/libbbfdm-ubus/bbfdm-ubus.c b/libbbfdm-ubus/bbfdm-ubus.c
index 626f1d76..fe414b99 100644
--- a/libbbfdm-ubus/bbfdm-ubus.c
+++ b/libbbfdm-ubus/bbfdm-ubus.c
@@ -683,7 +683,7 @@ static int bbfdm_service_handler(struct ubus_context *ctx, struct ubus_object *o
 	memset(&bb, 0, sizeof(struct blob_buf));
 	blob_buf_init(&bb, 0);
 
-	array = blobmsg_open_array(&bb, "registered_service");
+	array = blobmsg_open_array(&bb, "registered_services");
 	get_list_of_registered_service(&head_registered_service, &bb);
 	blobmsg_close_array(&bb, array);
 
diff --git a/test/files/etc/bbfdm/services/netmngr.json b/test/files/etc/bbfdm/services/netmngr.json
index b41b6d2f..100fd8d5 100644
--- a/test/files/etc/bbfdm/services/netmngr.json
+++ b/test/files/etc/bbfdm/services/netmngr.json
@@ -23,6 +23,10 @@
       {
         "parent_dm": "Device.",
         "object": "RouterAdvertisement"
+      },
+      {
+        "parent_dm": "Device.",
+        "object": "IPv6rd"
       }
     ],
     "config": {
diff --git a/test/files/etc/bbfdm/services/wifidmd.dataelements.json b/test/files/etc/bbfdm/services/wifidmd.dataelements.json
new file mode 100644
index 00000000..be254700
--- /dev/null
+++ b/test/files/etc/bbfdm/services/wifidmd.dataelements.json
@@ -0,0 +1,16 @@
+{
+  "daemon": {
+    "enable": "1",
+    "service_name": "wifidmd.dataelements",
+    "unified_daemon": false,
+    "services": [
+      {
+        "parent_dm": "Device.",
+        "object": "WiFi"
+      }
+    ],
+    "config": {
+      "loglevel": "3"
+    }
+  }
+}
diff --git a/test/files/var/reset_reason b/test/files/var/reset_reason
new file mode 100644
index 00000000..6f9e63ec
--- /dev/null
+++ b/test/files/var/reset_reason
@@ -0,0 +1,2 @@
+reset reason: REBOOT
+reset triggered: upgrade