dm-framework: fix apply handler

bbfdm/Makefile

@@ -11,7 +11,7 @@ USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=8201f79d124fdd0887968778ce0804ec7f3b7daa
+PKG_SOURCE_VERSION:=678dea312a7fd0941a5bf5e884fffc11af1205e4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif

bridgemngr/Config.in

@@ -23,6 +23,6 @@ config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX
 
 config BRIDGEMNGR_USE_DM_FRAMEWORK
 	bool "Use new DM framework support"
-	default n
+	default y
 
 endif

bridgemngr/Makefile

@@ -11,7 +11,7 @@ LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr.git
-PKG_SOURCE_VERSION:=3c8b4bbc53cf89dc98a54fa1490c160a77e24c66
+PKG_SOURCE_VERSION:=c9370d04dd4784d1384458a7eb907431afef9099
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif

dm-framework/Makefile

@@ -12,7 +12,7 @@ USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/dm-framework.git
-PKG_SOURCE_VERSION:=3ac1679d08fd102cdb5365b41eb049c972e47b38
+PKG_SOURCE_VERSION:=9e92a5cdf74fd3754a76498ab2da23423843c22a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

dm-framework/dmf_service.json

@@ -12,21 +12,21 @@
     "config": {
       "loglevel": "3"
     },
-    "apply_handler": {
-      "dmmap": [
+    "pre_apply_handler": {
+      "uci": [
         {
           "file": [
-            "Bridging"
+            "network"
           ],
           "external_handler": "/etc/dm-framework/dmf_apply_handler.sh"
         }
       ]
     },
     "revert_handler": {
-      "dmmap": [
+      "uci": [
         {
           "file": [
-            "Bridging"
+            "network"
           ],
           "external_handler": "/etc/dm-framework/dmf_revert_handler.sh"
         }

dm-framework/files/etc/dm-framework/dmf_revert_handler.sh

@@ -4,7 +4,7 @@
 logger -t dmf.revert_handler "Inputs [$@]"
 
 json_init
-json_add_string "cmd" "revert"
+json_add_string "cmd" "abort"
 json_compact
 
 data="$(json_dump)"