From 6c125a8da3e87730411e5e390258380af91f00d2 Mon Sep 17 00:00:00 2001
From: Michael Engel <mengel@redhat.com>
Date: Fri, 3 Jan 2025 14:58:47 +0100
Subject: [PATCH] Removed node name duplication in D-Bus API

Fixes: https://github.com/eclipse-bluechi/bluechi/issues/916

The structures returned by the ListUnits and ListUnitFiles API on
the Controller interface repeated the node name for each unit
(file) entry. This can be reduced by using a dictionary with the
node name as key and the unit (file) information in the array.

Signed-off-by: Michael Engel <mengel@redhat.com>
---
 data/org.eclipse.bluechi.Controller.xml       |  10 +-
 .../python/list-active-services.py            |  10 +-
 doc/docs/api/description.md                   |  16 +--
 src/bindings/python/bluechi/api.py            |  12 +-
 src/bindings/python/setup.py                  |   2 +-
 src/client/method-list-unit-files.c           | 111 +++++++++++-------
 src/client/method-list-units.c                | 101 ++++++++++------
 src/controller/controller.c                   | 101 ++++++++--------
 src/libbluechi/bus/utils.c                    |  65 ----------
 src/libbluechi/bus/utils.h                    |   4 +-
 src/libbluechi/common/protocol.h              |  12 +-
 11 files changed, 219 insertions(+), 225 deletions(-)

diff --git a/data/org.eclipse.bluechi.Controller.xml b/data/org.eclipse.bluechi.Controller.xml
index f2551fd43a..7322dff8c9 100644
--- a/data/org.eclipse.bluechi.Controller.xml
+++ b/data/org.eclipse.bluechi.Controller.xml
@@ -16,8 +16,7 @@
 
     <!--
       ListUnits:
-      @units: A list of all units on each node:
-        - The node name
+      @units: A dictionary for all nodes with the respective name and a list of all units on it:
         - The primary unit name as string
         - The human readable description string
         - The load state (i.e. whether the unit file has been loaded successfully)
@@ -32,19 +31,18 @@
       List all loaded systemd units on all nodes which are online.
     -->
     <method name="ListUnits">
-      <arg name="units" type="a(sssssssouso)" direction="out" />
+      <arg name="units" type="a{sa(ssssssouso)}" direction="out" />
     </method>
 
     <!--
       ListUnitFiles:
-      @unitfiles: A list of all unit files on each node:
-        - The node name
+      @unitfiles: A dictionary for all nodes with the respective name and a list of all unit files on it:
         - The unit file path as string
         - The enabled state (i.e. whether the unit is currently enabled or not)
       List all systemd unit files.
     -->
     <method name="ListUnitFiles">
-      <arg name="unitfiles" type="a(sss)" direction="out" />
+      <arg name="unitfiles" type="a{sa(ss)}" direction="out" />
     </method>
 
     <!--
diff --git a/doc/api-examples/python/list-active-services.py b/doc/api-examples/python/list-active-services.py
index 81a47c6c98..676cf47e97 100644
--- a/doc/api-examples/python/list-active-services.py
+++ b/doc/api-examples/python/list-active-services.py
@@ -13,7 +13,6 @@
 NodeUnitInfo = namedtuple(
     "NodeUnitInfo",
     [
-        "node",
         "name",
         "description",
         "load_state",
@@ -29,7 +28,8 @@
 
 controller = bus.get_proxy("org.eclipse.bluechi", "/org/eclipse/bluechi")
 units = controller.ListUnits()
-for u in units:
-    info = NodeUnitInfo(*u)
-    if info.active_state == "active" and info.name.endswith(".service"):
-        print(f"Node: {info.node}, Unit: {info.name}")
+for node, units in units.items():
+    for u in units:
+        info = NodeUnitInfo(*u)
+        if info.active_state == "active" and info.name.endswith(".service"):
+            print(f"Node: {node}, Unit: {info.name}")
diff --git a/doc/docs/api/description.md b/doc/docs/api/description.md
index f7e90a916b..10d73fbc4a 100644
--- a/doc/docs/api/description.md
+++ b/doc/docs/api/description.md
@@ -16,17 +16,17 @@ Note that some properties also come with change events, so you can easily track
 
 #### Methods
 
-  * `ListUnits(out a(sssssssouso) units)`
+  * `ListUnits(out a{sa(ssssssouso)} units)`
 
-    Returns an array with all currently loaded systemd units on all online nodes. This is equivalent to calling
-    `Node.ListUnits()` on all the online nodes and adding the name of the node as the first element of each returned
-    element struct.
+    Returns a dictionary with all online nodes and all currently loaded systemd units on them. This is equivalent to calling
+    `Node.ListUnits()` on all the online nodes and adding the name of the node as the key element of the returned
+    dictionary.
   
-  * `ListUnitFiles(out a(sss) unit_files)`
+  * `ListUnitFiles(out a{sa(ss)} unit_files)`
 
-    Returns an array with all systemd unit files on all online nodes. This is equivalent to calling
-    `Node.ListUnitFiles()` on all the online nodes and adding the name of the node as the first element of each returned
-    element struct.
+    Returns a dictionary with all online nodes and all systemd unit files on them. This is equivalent to calling
+    `Node.ListUnitFiles()` on all the online nodes and adding the name of the node as the key element of the returned
+    dictionary.
 
   * `CreateMonitor(out o monitor)`
 
diff --git a/src/bindings/python/bluechi/api.py b/src/bindings/python/bluechi/api.py
index 5abd44649f..d4dc316d07 100644
--- a/src/bindings/python/bluechi/api.py
+++ b/src/bindings/python/bluechi/api.py
@@ -325,11 +325,10 @@ def list_nodes(self) -> List[Tuple[str, ObjPath, str, str]]:
         """
         return self.get_proxy().ListNodes()
 
-    def list_unit_files(self) -> List[Tuple[str, str, str]]:
+    def list_unit_files(self) -> Dict[str, List[Tuple[str, str]]]:
         """
           ListUnitFiles:
-        @unitfiles: A list of all unit files on each node:
-          - The node name
+        @unitfiles: A dictionary for all nodes with the respective name and a list of all unit files on it:
           - The unit file path as string
           - The enabled state (i.e. whether the unit is currently enabled or not)
         List all systemd unit files.
@@ -338,11 +337,12 @@ def list_unit_files(self) -> List[Tuple[str, str, str]]:
 
     def list_units(
         self,
-    ) -> List[Tuple[str, str, str, str, str, str, str, ObjPath, UInt32, str, ObjPath]]:
+    ) -> Dict[
+        str, List[Tuple[str, str, str, str, str, str, ObjPath, UInt32, str, ObjPath]]
+    ]:
         """
           ListUnits:
-        @units: A list of all units on each node:
-          - The node name
+        @units: A dictionary for all nodes with the respective name and a list of all units on it:
           - The primary unit name as string
           - The human readable description string
           - The load state (i.e. whether the unit file has been loaded successfully)
diff --git a/src/bindings/python/setup.py b/src/bindings/python/setup.py
index f228aabea2..99de06c0a9 100644
--- a/src/bindings/python/setup.py
+++ b/src/bindings/python/setup.py
@@ -12,7 +12,7 @@ def readme():
 
 setup(
     name="bluechi",
-    version="0.9.0",
+    version="0.10.0",
     description="Python bindings for BlueChi's D-Bus API",
     long_description=readme(),
     long_description_content_type="text/markdown",
diff --git a/src/client/method-list-unit-files.c b/src/client/method-list-unit-files.c
index 35bdac37f0..14ef4de089 100644
--- a/src/client/method-list-unit-files.c
+++ b/src/client/method-list-unit-files.c
@@ -31,74 +31,96 @@ void unit_file_list_unref(UnitFileList *unit_file_list);
 DEFINE_CLEANUP_FUNC(UnitFileList, unit_file_list_unref)
 #define _cleanup_unit_file_list_ _cleanup_(unit_file_list_unrefp)
 
-static int fetch_unit_file_list(
-                sd_bus *api_bus,
-                const char *node_name,
-                const char *object_path,
-                const char *interface,
-                const char *typestring,
-                int (*parse_unit_file_info)(sd_bus_message *, UnitFileInfo *),
-                UnitFileList *unit_file_list) {
-        int r = 0;
-        _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
-        _cleanup_sd_bus_message_ sd_bus_message *message = NULL;
 
-        r = sd_bus_call_method(
-                        api_bus,
-                        BC_INTERFACE_BASE_NAME,
-                        object_path,
-                        interface,
-                        "ListUnitFiles",
-                        &error,
-                        &message,
-                        "");
-        if (r < 0) {
-                fprintf(stderr, "Failed to issue method call: %s\n", error.message);
-                return r;
-        }
+static int parse_unit_file_list(sd_bus_message *message, const char *node_name, UnitFileList *unit_file_list) {
 
-        r = sd_bus_message_enter_container(message, SD_BUS_TYPE_ARRAY, typestring);
+        int r = 0;
+        r = sd_bus_message_enter_container(message, SD_BUS_TYPE_ARRAY, UNIT_FILE_INFO_STRUCT_TYPESTRING);
         if (r < 0) {
-                fprintf(stderr, "Failed to read sd-bus message: %s\n", strerror(-r));
+                fprintf(stderr, "Failed to enter sd-bus message container: %s\n", strerror(-r));
                 return r;
         }
 
         for (;;) {
                 _cleanup_unit_file_ UnitFileInfo *info = new_unit_file();
 
-                r = (*parse_unit_file_info)(message, info);
+                r = bus_parse_unit_file_info(message, info);
                 if (r < 0) {
-                        fprintf(stderr, "Failed to parse unit file info: %s\n", strerror(-r));
+                        fprintf(stderr, "Failed to parse unit info: %s\n", strerror(-r));
                         return r;
                 }
                 if (r == 0) {
                         break;
                 }
-                if (node_name != NULL) {
-                        info->node = strdup(node_name);
+                info->node = strdup(node_name);
+                if (info->node == NULL) {
+                        return -ENOMEM;
                 }
 
                 LIST_APPEND(unit_files, unit_file_list->unit_files, unit_file_ref(info));
         }
 
+        r = sd_bus_message_exit_container(message);
+        if (r < 0) {
+                fprintf(stderr, "Failed to exit sd-bus message container: %s\n", strerror(-r));
+                return r;
+        }
+
         return r;
 }
 
 static int method_list_unit_files_on_all(sd_bus *api_bus, print_unit_file_list_fn print, const char *glob_filter) {
+        int r = 0;
         _cleanup_unit_file_list_ UnitFileList *unit_file_list = new_unit_file_list();
 
-        int r = fetch_unit_file_list(
+        _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_sd_bus_message_ sd_bus_message *message = NULL;
+        r = sd_bus_call_method(
                         api_bus,
-                        NULL,
+                        BC_INTERFACE_BASE_NAME,
                         BC_OBJECT_PATH,
                         CONTROLLER_INTERFACE,
-                        NODE_AND_UNIT_FILE_INFO_STRUCT_TYPESTRING,
-                        &bus_parse_unit_file_on_node_info,
-                        unit_file_list);
+                        "ListUnitFiles",
+                        &error,
+                        &message,
+                        "");
+        if (r < 0) {
+                fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+                return r;
+        }
+
+        r = sd_bus_message_enter_container(message, SD_BUS_TYPE_ARRAY, NODE_AND_UNIT_FILE_INFO_DICT_TYPESTRING);
         if (r < 0) {
+                fprintf(stderr, "Failed to read sd-bus message: %s\n", strerror(-r));
                 return r;
         }
 
+        for (;;) {
+                r = sd_bus_message_enter_container(
+                                message, SD_BUS_TYPE_DICT_ENTRY, NODE_AND_UNIT_FILE_INFO_TYPESTRING);
+                if (r < 0) {
+                        fprintf(stderr, "Failed to enter sd-bus message dictionary: %s\n", strerror(-r));
+                        return r;
+                }
+                if (r == 0) {
+                        break;
+                }
+
+                char *node_name = NULL;
+                r = sd_bus_message_read(message, "s", &node_name);
+                if (r < 0) {
+                        fprintf(stderr, "Failed to read node name: %s\n", strerror(-r));
+                        return r;
+                }
+                parse_unit_file_list(message, node_name, unit_file_list);
+
+                r = sd_bus_message_exit_container(message);
+                if (r < 0) {
+                        fprintf(stderr, "Failed to exit sd-bus message dictionary: %s\n", strerror(-r));
+                        return r;
+                }
+        }
+
         print(unit_file_list, glob_filter);
 
         return 0;
@@ -115,14 +137,23 @@ static int method_list_unit_files_on(
                 return r;
         }
 
-        r = fetch_unit_file_list(
+        _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_sd_bus_message_ sd_bus_message *message = NULL;
+        r = sd_bus_call_method(
                         api_bus,
-                        node_name,
+                        BC_INTERFACE_BASE_NAME,
                         object_path,
                         NODE_INTERFACE,
-                        UNIT_FILE_INFO_STRUCT_TYPESTRING,
-                        &bus_parse_unit_file_info,
-                        unit_file_list);
+                        "ListUnitFiles",
+                        &error,
+                        &message,
+                        "");
+        if (r < 0) {
+                fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+                return r;
+        }
+
+        r = parse_unit_file_list(message, node_name, unit_file_list);
         if (r < 0) {
                 return r;
         }
diff --git a/src/client/method-list-units.c b/src/client/method-list-units.c
index 6dfd4edc01..101e076de4 100644
--- a/src/client/method-list-units.c
+++ b/src/client/method-list-units.c
@@ -31,36 +31,19 @@ void unit_list_unref(UnitList *unit_list);
 DEFINE_CLEANUP_FUNC(UnitList, unit_list_unref)
 #define _cleanup_unit_list_ _cleanup_(unit_list_unrefp)
 
-static int
-                fetch_unit_list(sd_bus *api_bus,
-                                const char *node_name,
-                                const char *object_path,
-                                const char *interface,
-                                const char *typestring,
-                                int (*parse_unit_info)(sd_bus_message *, UnitInfo *),
-                                UnitList *unit_list) {
+static int parse_unit_list(sd_bus_message *message, const char *node_name, UnitList *unit_list) {
 
         int r = 0;
-        _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
-        _cleanup_sd_bus_message_ sd_bus_message *message = NULL;
-
-        r = sd_bus_call_method(
-                        api_bus, BC_INTERFACE_BASE_NAME, object_path, interface, "ListUnits", &error, &message, "");
+        r = sd_bus_message_enter_container(message, SD_BUS_TYPE_ARRAY, UNIT_INFO_STRUCT_TYPESTRING);
         if (r < 0) {
-                fprintf(stderr, "Failed to issue method call: %s\n", error.message);
-                return r;
-        }
-
-        r = sd_bus_message_enter_container(message, SD_BUS_TYPE_ARRAY, typestring);
-        if (r < 0) {
-                fprintf(stderr, "Failed to read sd-bus message: %s\n", strerror(-r));
+                fprintf(stderr, "Failed to enter sd-bus message container: %s\n", strerror(-r));
                 return r;
         }
 
         for (;;) {
                 _cleanup_unit_ UnitInfo *info = new_unit();
 
-                r = (*parse_unit_info)(message, info);
+                r = bus_parse_unit_info(message, info);
                 if (r < 0) {
                         fprintf(stderr, "Failed to parse unit info: %s\n", strerror(-r));
                         return r;
@@ -68,31 +51,72 @@ static int
                 if (r == 0) {
                         break;
                 }
-                if (node_name != NULL) {
-                        info->node = strdup(node_name);
-                }
+                info->node = strdup(node_name);
 
                 LIST_APPEND(units, unit_list->units, unit_ref(info));
         }
 
+        r = sd_bus_message_exit_container(message);
+        if (r < 0) {
+                fprintf(stderr, "Failed to exit sd-bus message container: %s\n", strerror(-r));
+                return r;
+        }
+
         return r;
 }
 
 static int method_list_units_on_all(sd_bus *api_bus, print_unit_list_fn print, const char *glob_filter) {
+        int r = 0;
         _cleanup_unit_list_ UnitList *unit_list = new_unit_list();
 
-        int r = fetch_unit_list(
+        _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_sd_bus_message_ sd_bus_message *message = NULL;
+        r = sd_bus_call_method(
                         api_bus,
-                        NULL,
+                        BC_INTERFACE_BASE_NAME,
                         BC_OBJECT_PATH,
                         CONTROLLER_INTERFACE,
-                        NODE_AND_UNIT_INFO_STRUCT_TYPESTRING,
-                        &bus_parse_unit_on_node_info,
-                        unit_list);
+                        "ListUnits",
+                        &error,
+                        &message,
+                        "");
         if (r < 0) {
+                fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+                return r;
+        }
+
+        r = sd_bus_message_enter_container(message, SD_BUS_TYPE_ARRAY, NODE_AND_UNIT_INFO_DICT_TYPESTRING);
+        if (r < 0) {
+                fprintf(stderr, "Failed to read sd-bus message: %s\n", strerror(-r));
                 return r;
         }
 
+        for (;;) {
+                r = sd_bus_message_enter_container(
+                                message, SD_BUS_TYPE_DICT_ENTRY, NODE_AND_UNIT_INFO_TYPESTRING);
+                if (r < 0) {
+                        fprintf(stderr, "Failed to enter sd-bus message dictionary: %s\n", strerror(-r));
+                        return r;
+                }
+                if (r == 0) {
+                        break;
+                }
+
+                char *node_name = NULL;
+                r = sd_bus_message_read(message, "s", &node_name);
+                if (r < 0) {
+                        fprintf(stderr, "Failed to read node name: %s\n", strerror(-r));
+                        return r;
+                }
+                parse_unit_list(message, node_name, unit_list);
+
+                r = sd_bus_message_exit_container(message);
+                if (r < 0) {
+                        fprintf(stderr, "Failed to exit sd-bus message dictionary: %s\n", strerror(-r));
+                        return r;
+                }
+        }
+
         print(unit_list, glob_filter);
 
         return 0;
@@ -109,14 +133,23 @@ static int method_list_units_on(
                 return r;
         }
 
-        r = fetch_unit_list(
+        _cleanup_sd_bus_error_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_sd_bus_message_ sd_bus_message *message = NULL;
+        r = sd_bus_call_method(
                         api_bus,
-                        node_name,
+                        BC_INTERFACE_BASE_NAME,
                         object_path,
                         NODE_INTERFACE,
-                        UNIT_INFO_STRUCT_TYPESTRING,
-                        &bus_parse_unit_info,
-                        unit_list);
+                        "ListUnits",
+                        &error,
+                        &message,
+                        "");
+        if (r < 0) {
+                fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+                return r;
+        }
+
+        r = parse_unit_list(message, node_name, unit_list);
         if (r < 0) {
                 return r;
         }
diff --git a/src/controller/controller.c b/src/controller/controller.c
index fc70e8f321..75925165bf 100644
--- a/src/controller/controller.c
+++ b/src/controller/controller.c
@@ -922,7 +922,7 @@ static int agent_fleet_request_start(
  ************************************************************************/
 
 static int controller_method_list_units_encode_reply(AgentFleetRequest *req, sd_bus_message *reply) {
-        int r = sd_bus_message_open_container(reply, SD_BUS_TYPE_ARRAY, NODE_AND_UNIT_INFO_STRUCT_TYPESTRING);
+        int r = sd_bus_message_open_container(reply, SD_BUS_TYPE_ARRAY, NODE_AND_UNIT_INFO_DICT_TYPESTRING);
         if (r < 0) {
                 return r;
         }
@@ -936,45 +936,44 @@ static int controller_method_list_units_encode_reply(AgentFleetRequest *req, sd_
 
                 const sd_bus_error *err = sd_bus_message_get_error(m);
                 if (err != NULL) {
-                        bc_log_errorf("Failed to list units for node '%s': %s", node_name, err->message);
                         return -sd_bus_message_get_errno(m);
                 }
 
-                r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, UNIT_INFO_STRUCT_TYPESTRING);
+                r = sd_bus_message_open_container(reply, SD_BUS_TYPE_DICT_ENTRY, NODE_AND_UNIT_INFO_TYPESTRING);
                 if (r < 0) {
                         return r;
                 }
 
-                while (sd_bus_message_at_end(m, false) == 0) {
-                        r = sd_bus_message_open_container(
-                                        reply, SD_BUS_TYPE_STRUCT, NODE_AND_UNIT_INFO_TYPESTRING);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_append(reply, "s", node_name);
+                if (r < 0) {
+                        return r;
+                }
 
-                        r = sd_bus_message_append(reply, "s", node_name);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_open_container(reply, SD_BUS_TYPE_ARRAY, UNIT_INFO_STRUCT_TYPESTRING);
+                if (r < 0) {
+                        return r;
+                }
 
-                        r = sd_bus_message_enter_container(m, SD_BUS_TYPE_STRUCT, UNIT_INFO_TYPESTRING);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, UNIT_INFO_STRUCT_TYPESTRING);
+                if (r < 0) {
+                        return r;
+                }
 
+                while (sd_bus_message_at_end(m, false) == 0) {
                         r = sd_bus_message_copy(reply, m, true);
                         if (r < 0) {
                                 return r;
                         }
+                }
 
-                        r = sd_bus_message_close_container(reply);
-                        if (r < 0) {
-                                return r;
-                        }
-                        r = sd_bus_message_exit_container(m);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_close_container(reply);
+                if (r < 0) {
+                        return r;
+                }
+
+                r = sd_bus_message_close_container(reply);
+                if (r < 0) {
+                        return r;
                 }
 
                 r = sd_bus_message_exit_container(m);
@@ -1003,7 +1002,7 @@ static int controller_method_list_units(sd_bus_message *m, void *userdata, UNUSE
 
 static int controller_method_list_unit_files_encode_reply(AgentFleetRequest *req, sd_bus_message *reply) {
         int r = sd_bus_message_open_container(
-                        reply, SD_BUS_TYPE_ARRAY, NODE_AND_UNIT_FILE_INFO_STRUCT_TYPESTRING);
+                        reply, SD_BUS_TYPE_ARRAY, NODE_AND_UNIT_FILE_INFO_DICT_TYPESTRING);
         if (r < 0) {
                 return r;
         }
@@ -1021,42 +1020,42 @@ static int controller_method_list_unit_files_encode_reply(AgentFleetRequest *req
                         return -sd_bus_message_get_errno(m);
                 }
 
-                r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, UNIT_FILE_INFO_STRUCT_TYPESTRING);
+                r = sd_bus_message_open_container(
+                                reply, SD_BUS_TYPE_DICT_ENTRY, NODE_AND_UNIT_FILE_INFO_TYPESTRING);
                 if (r < 0) {
                         return r;
                 }
 
-                while (sd_bus_message_at_end(m, false) == 0) {
-                        r = sd_bus_message_open_container(
-                                        reply, SD_BUS_TYPE_STRUCT, NODE_AND_UNIT_FILE_INFO_TYPESTRING);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_append(reply, "s", node_name);
+                if (r < 0) {
+                        return r;
+                }
 
-                        r = sd_bus_message_append(reply, "s", node_name);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_open_container(reply, SD_BUS_TYPE_ARRAY, UNIT_FILE_INFO_STRUCT_TYPESTRING);
+                if (r < 0) {
+                        return r;
+                }
 
-                        r = sd_bus_message_enter_container(m, SD_BUS_TYPE_STRUCT, UNIT_FILE_INFO_TYPESTRING);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, UNIT_FILE_INFO_STRUCT_TYPESTRING);
+                if (r < 0) {
+                        return r;
+                }
 
+                while (sd_bus_message_at_end(m, false) == 0) {
                         r = sd_bus_message_copy(reply, m, true);
                         if (r < 0) {
                                 return r;
                         }
+                }
 
-                        r = sd_bus_message_close_container(reply);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_close_container(reply);
+                if (r < 0) {
+                        return r;
+                }
 
-                        r = sd_bus_message_exit_container(m);
-                        if (r < 0) {
-                                return r;
-                        }
+                r = sd_bus_message_close_container(reply);
+                if (r < 0) {
+                        return r;
                 }
 
                 r = sd_bus_message_exit_container(m);
@@ -1366,10 +1365,10 @@ static int controller_property_get_log_target(
 
 static const sd_bus_vtable controller_vtable[] = {
         SD_BUS_VTABLE_START(0),
-        SD_BUS_METHOD("ListUnits", "", NODE_AND_UNIT_INFO_STRUCT_ARRAY_TYPESTRING, controller_method_list_units, 0),
+        SD_BUS_METHOD("ListUnits", "", NODE_AND_UNIT_INFO_DICT_ARRAY_TYPESTRING, controller_method_list_units, 0),
         SD_BUS_METHOD("ListUnitFiles",
                       "",
-                      NODE_AND_UNIT_FILE_INFO_STRUCT_ARRAY_TYPESTRING,
+                      NODE_AND_UNIT_FILE_INFO_DICT_ARRAY_TYPESTRING,
                       controller_method_list_unit_files,
                       0),
         SD_BUS_METHOD("ListNodes", "", "a(soss)", controller_method_list_nodes, 0),
diff --git a/src/libbluechi/bus/utils.c b/src/libbluechi/bus/utils.c
index e36fe7db70..e432869b1e 100644
--- a/src/libbluechi/bus/utils.c
+++ b/src/libbluechi/bus/utils.c
@@ -192,49 +192,6 @@ int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
         return r;
 }
 
-int bus_parse_unit_on_node_info(sd_bus_message *message, UnitInfo *u) {
-        int r = 0;
-        char *node = NULL, *id = NULL, *description = NULL, *load_state = NULL;
-        char *active_state = NULL, *sub_state = NULL, *following = NULL, *unit_path = NULL;
-        int job_id = 0;
-        char *job_type = NULL, *job_path = NULL;
-        assert(message);
-        assert(u);
-
-        r = sd_bus_message_read(
-                        message,
-                        NODE_AND_UNIT_INFO_STRUCT_TYPESTRING,
-                        &node,
-                        &id,
-                        &description,
-                        &load_state,
-                        &active_state,
-                        &sub_state,
-                        &following,
-                        &unit_path,
-                        &job_id,
-                        &job_type,
-                        &job_path);
-
-        if (r <= 0) {
-                return r;
-        }
-
-        u->node = strdup(node);
-        u->id = strdup(id);
-        u->description = strdup(description);
-        u->load_state = strdup(load_state);
-        u->active_state = strdup(active_state);
-        u->sub_state = strdup(sub_state);
-        u->following = strdup(following);
-        u->unit_path = strdup(unit_path);
-        u->job_id = job_id;
-        u->job_type = strdup(job_type);
-        u->job_path = strdup(job_path);
-
-        return r;
-}
-
 UnitFileInfo *new_unit_file() {
         _cleanup_unit_file_ UnitFileInfo *unit_file = malloc0(sizeof(UnitFileInfo));
         if (unit_file == NULL) {
@@ -285,28 +242,6 @@ int bus_parse_unit_file_info(sd_bus_message *m, UnitFileInfo *unit_file) {
         return r;
 }
 
-int bus_parse_unit_file_on_node_info(sd_bus_message *m, UnitFileInfo *unit_file) {
-        int r = 0;
-        char *node = NULL;
-        char *unit_path = NULL;
-        char *enablement_status = NULL;
-
-        assert(m);
-        assert(unit_file);
-
-        r = sd_bus_message_read(
-                        m, NODE_AND_UNIT_FILE_INFO_STRUCT_TYPESTRING, &node, &unit_path, &enablement_status);
-        if (r <= 0) {
-                return r;
-        }
-
-        unit_file->node = strdup(node);
-        unit_file->unit_path = strdup(unit_path);
-        unit_file->enablement_status = strdup(enablement_status);
-
-        return r;
-}
-
 int assemble_object_path_string(const char *prefix, const char *name, char **res) {
         _cleanup_free_ char *escaped = bus_path_escape(name);
         if (escaped == NULL) {
diff --git a/src/libbluechi/bus/utils.h b/src/libbluechi/bus/utils.h
index c889b96d6f..2ecb057c5d 100644
--- a/src/libbluechi/bus/utils.h
+++ b/src/libbluechi/bus/utils.h
@@ -43,7 +43,6 @@ UnitInfo *unit_ref(UnitInfo *unit);
 void unit_unref(UnitInfo *unit);
 
 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u);
-int bus_parse_unit_on_node_info(sd_bus_message *message, UnitInfo *u);
 
 int bus_socket_set_options(sd_bus *bus, SocketOptions *opts);
 
@@ -70,7 +69,6 @@ UnitFileInfo *unit_file_ref(UnitFileInfo *unit_file);
 void unit_file_unref(UnitFileInfo *unit_file);
 
 int bus_parse_unit_file_info(sd_bus_message *m, UnitFileInfo *unit_file);
-int bus_parse_unit_file_on_node_info(sd_bus_message *m, UnitFileInfo *u);
 
 DEFINE_CLEANUP_FUNC(UnitFileInfo, unit_file_unref)
-#define _cleanup_unit_file_ _cleanup_(unit_file_unrefp)
\ No newline at end of file
+#define _cleanup_unit_file_ _cleanup_(unit_file_unrefp)
diff --git a/src/libbluechi/common/protocol.h b/src/libbluechi/common/protocol.h
index af039f54a0..8ac8704d7e 100644
--- a/src/libbluechi/common/protocol.h
+++ b/src/libbluechi/common/protocol.h
@@ -92,17 +92,17 @@
 #define UNIT_INFO_STRUCT_TYPESTRING "(" UNIT_INFO_TYPESTRING ")"
 #define UNIT_INFO_STRUCT_ARRAY_TYPESTRING "a" UNIT_INFO_STRUCT_TYPESTRING
 
-#define NODE_AND_UNIT_INFO_TYPESTRING "s" UNIT_INFO_TYPESTRING
-#define NODE_AND_UNIT_INFO_STRUCT_TYPESTRING "(" NODE_AND_UNIT_INFO_TYPESTRING ")"
-#define NODE_AND_UNIT_INFO_STRUCT_ARRAY_TYPESTRING "a" NODE_AND_UNIT_INFO_STRUCT_TYPESTRING
+#define NODE_AND_UNIT_INFO_TYPESTRING "s" UNIT_INFO_STRUCT_ARRAY_TYPESTRING
+#define NODE_AND_UNIT_INFO_DICT_TYPESTRING "{" NODE_AND_UNIT_INFO_TYPESTRING "}"
+#define NODE_AND_UNIT_INFO_DICT_ARRAY_TYPESTRING "a" NODE_AND_UNIT_INFO_DICT_TYPESTRING
 
 #define UNIT_FILE_INFO_TYPESTRING "ss"
 #define UNIT_FILE_INFO_STRUCT_TYPESTRING "(" UNIT_FILE_INFO_TYPESTRING ")"
 #define UNIT_FILE_INFO_STRUCT_ARRAY_TYPESTRING "a" UNIT_FILE_INFO_STRUCT_TYPESTRING
 
-#define NODE_AND_UNIT_FILE_INFO_TYPESTRING "s" UNIT_FILE_INFO_TYPESTRING
-#define NODE_AND_UNIT_FILE_INFO_STRUCT_TYPESTRING "(" NODE_AND_UNIT_FILE_INFO_TYPESTRING ")"
-#define NODE_AND_UNIT_FILE_INFO_STRUCT_ARRAY_TYPESTRING "a" NODE_AND_UNIT_FILE_INFO_STRUCT_TYPESTRING
+#define NODE_AND_UNIT_FILE_INFO_TYPESTRING "s" UNIT_FILE_INFO_STRUCT_ARRAY_TYPESTRING
+#define NODE_AND_UNIT_FILE_INFO_DICT_TYPESTRING "{" NODE_AND_UNIT_FILE_INFO_TYPESTRING "}"
+#define NODE_AND_UNIT_FILE_INFO_DICT_ARRAY_TYPESTRING "a" NODE_AND_UNIT_FILE_INFO_DICT_TYPESTRING
 
 typedef enum JobState {
         JOB_WAITING,