cli: rework printing of "connections" device details

18 files changed, 194 insertions, 108 deletions

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index cf9d4905ca..38c3916fc8 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -200,13 +200,133 @@ const NmcMetaGenericInfo *const metagen_device_detail_general[_NMC_GENERIC_INFO_
 
 /*****************************************************************************/
 
-const NmcMetaGenericInfo *const nmc_fields_dev_show_connections[] = {
-	NMC_META_GENERIC ("NAME"),                         /* 0 */
-	NMC_META_GENERIC ("AVAILABLE-CONNECTION-PATHS"),   /* 1 */
-	NMC_META_GENERIC ("AVAILABLE-CONNECTIONS"),        /* 2 */
-	NULL,
+static NMRemoteConnection **
+_device_get_available_connections (NMDevice *d, guint *out_len)
+{
+	NMRemoteConnection **avail_cons;
+	const GPtrArray *avail_cons_arr;
+
+	avail_cons_arr = nm_device_get_available_connections (d);
+	if (!avail_cons_arr || avail_cons_arr->len == 0) {
+		*out_len = 0;
+		return NULL;
+	}
+
+	avail_cons = (NMRemoteConnection **) nmc_objects_sort_by_path ((const NMObject *const*) avail_cons_arr->pdata,
+	                                                               avail_cons_arr->len);
+	nm_assert (avail_cons_arr->len == NM_PTRARRAY_LEN (avail_cons));
+	*out_len = avail_cons_arr->len;
+	return avail_cons;
+}
+
+static gconstpointer
+_metagen_device_detail_connections_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+{
+	NMDevice *d = target;
+	gs_free NMRemoteConnection **avail_cons = NULL;
+	guint avail_cons_len;
+	guint i, j;
+	char **arr = NULL;
+	GString *str;
+	gboolean had_prefix, has_prefix;
+
+	NMC_HANDLE_COLOR (NM_META_COLOR_NONE);
+
+	switch (info->info_type) {
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTIONS:
+		if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
+			return NULL;
+
+		avail_cons = _device_get_available_connections (d, &avail_cons_len);
+		if (avail_cons_len == 0)
+			goto arr_out;
+
+		arr = g_new (char *, avail_cons_len + 1);
+		j = 0;
+		for (i = 0; i < avail_cons_len; i++) {
+			NMRemoteConnection *ac = avail_cons[i];
+			const char *ac_id = nm_connection_get_id (NM_CONNECTION (ac));
+			const char *ac_uuid = nm_connection_get_uuid (NM_CONNECTION (ac));
+
+			if (!ac_id || !ac_uuid) {
+				const char *ac_path = nm_connection_get_path (NM_CONNECTION (ac));
+
+				if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) {
+					arr[j++] =   ac_path
+					           ? g_strdup_printf (_("<invisible> | %s"), ac_path)
+					           : g_strdup (_("<invisible>"));
+				} else {
+					arr[j++] =   ac_path
+					           ? g_strdup_printf ("<invisible> | %s", ac_path)
+					           : g_strdup ("<invisible>");
+				}
+			} else
+				arr[j++] = g_strdup_printf ("%s | %s", ac_uuid, ac_id);
+		}
+		arr[j] = NULL;
+		goto arr_out;
+
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTION_PATHS:
+
+		avail_cons = _device_get_available_connections (d, &avail_cons_len);
+		if (avail_cons_len == 0)
+			return NULL;
+
+		str = g_string_new (NULL);
+
+		had_prefix = FALSE;
+		for (i = 0; i < avail_cons_len; i++) {
+			NMRemoteConnection *ac = avail_cons[i];
+			const char *p = nm_connection_get_path (NM_CONNECTION (ac));
+
+			if (!p)
+				continue;
+
+			has_prefix =    g_str_has_prefix (p, NM_DBUS_PATH_SETTINGS_CONNECTION"/")
+			             && p[NM_STRLEN (NM_DBUS_PATH_SETTINGS_CONNECTION"/")];
+
+			if (str->len > 0) {
+				if (   had_prefix
+				    && !has_prefix)
+					g_string_append_c (str, '}');
+				g_string_append_c (str, ',');
+			}
+
+			if (!has_prefix)
+				g_string_append (str, p);
+			else {
+				if (!had_prefix)
+					g_string_printf (str, "%s/{", NM_DBUS_PATH_SETTINGS_CONNECTION);
+				g_string_append (str, &p[NM_STRLEN (NM_DBUS_PATH_SETTINGS_CONNECTION"/")]);
+			}
+			had_prefix = has_prefix;
+		}
+		if (had_prefix)
+			g_string_append_c (str, '}');
+
+		return (*out_to_free = g_string_free (str, FALSE));
+
+	default:
+		break;
+	}
+
+	g_return_val_if_reached (NULL);
+
+arr_out:
+	NM_SET_OUT (out_is_default, !arr || !arr[0]);
+	*out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV;
+	*out_to_free = arr;
+	return arr;
+}
+
+const NmcMetaGenericInfo *const metagen_device_detail_connections[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_NUM + 1] = {
+#define _METAGEN_DEVICE_DETAIL_CONNECTIONS(type, name) \
+	[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_connections_get_fcn)
+	_METAGEN_DEVICE_DETAIL_CONNECTIONS (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTION_PATHS, "AVAILABLE-CONNECTION-PATHS"),
+	_METAGEN_DEVICE_DETAIL_CONNECTIONS (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTIONS,      "AVAILABLE-CONNECTIONS"),
 };
-#define NMC_FIELDS_DEV_SHOW_CONNECTIONS_COMMON  "NAME,AVAILABLE-CONNECTION-PATHS,AVAILABLE-CONNECTIONS"
+
+/*****************************************************************************/
 
 const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[] = {
 	NMC_META_GENERIC ("NAME"),             /* 0 */
@@ -336,7 +456,7 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = {
 	NMC_META_GENERIC_WITH_NESTED ("BRIDGE",            nmc_fields_dev_show_master_prop + 1),  /* 13 */
 	NMC_META_GENERIC_WITH_NESTED ("VLAN",              nmc_fields_dev_show_vlan_prop + 1),    /* 14 */
 	NMC_META_GENERIC_WITH_NESTED ("BLUETOOTH",         nmc_fields_dev_show_bluetooth + 1),    /* 15 */
-	NMC_META_GENERIC_WITH_NESTED ("CONNECTIONS",       nmc_fields_dev_show_connections + 1),  /* 16 */
+	NMC_META_GENERIC_WITH_NESTED ("CONNECTIONS",       metagen_device_detail_connections),    /* 16 */
 	NULL,
 };
 #define NMC_FIELDS_DEV_SHOW_SECTIONS_COMMON  "GENERAL.DEVICE,GENERAL.TYPE,GENERAL.HWADDR,GENERAL.MTU,GENERAL.STATE,"\
@@ -1466,55 +1586,17 @@ show_device_info (NMDevice *device, NmCli *nmc)
 			}
 		}
 
-		/* section CONNECTIONS */
-		if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[16]->name)) {
-			const GPtrArray *avail_cons;
-			GString *ac_paths_str;
-			char **ac_arr = NULL;
-			int i;
-			NMC_OUTPUT_DATA_DEFINE_SCOPED (out);
-
-			tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_connections;
-			out_indices = parse_output_fields (section_fld,
-			                                   tmpl, FALSE, NULL, NULL);
-			arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES);
-			g_ptr_array_add (out.output_data, arr);
-
-			/* available-connections */
-			avail_cons = nm_device_get_available_connections (device);
-			ac_paths_str = g_string_new (NULL);
-			if (avail_cons->len) {
-				ac_arr = g_new (char *, avail_cons->len + 1);
-				ac_arr[avail_cons->len] = NULL;
-			}
-			for (i = 0; i < avail_cons->len; i++) {
-				NMRemoteConnection *avail_con = g_ptr_array_index (avail_cons, i);
-				const char *ac_path = nm_connection_get_path (NM_CONNECTION (avail_con));
-				const char *ac_id = nm_connection_get_id (NM_CONNECTION (avail_con));
-				const char *ac_uuid = nm_connection_get_uuid (NM_CONNECTION (avail_con));
-
-				ac_arr[i] = g_strdup_printf ("%s | %s", ac_uuid, ac_id);
-
-				if (i == 0)
-					g_string_printf (ac_paths_str, "%s/{", NM_DBUS_PATH_SETTINGS);
-				else
-					g_string_append_c (ac_paths_str, ',');
-				g_string_append (ac_paths_str, strrchr (ac_path, '/') + 1);
-			}
-			if (ac_paths_str->len > 0)
-				g_string_append_c (ac_paths_str, '}');
+		if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_connections) {
+			gs_free char *f = section_fld ? g_strdup_printf ("CONNECTIONS.%s", section_fld) : NULL;
 
-			arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX);
-			set_val_strc (arr, 0, nmc_fields_dev_show_sections[16]->name);  /* "CONNECTIONS" */
-			set_val_str  (arr, 1, ac_paths_str->str);
-			set_val_arr  (arr, 2, (ac_arr));
-			g_ptr_array_add (out.output_data, arr);
-
-			print_data_prepare_width (out.output_data);
-			print_data (&nmc->nmc_config, out_indices, NULL, 0, &out);
-
-			g_string_free (ac_paths_str, FALSE);
+			nmc_print (&nmc->nmc_config,
+			           (gpointer[]) { device, NULL },
+			           NULL,
+			           NMC_META_GENERIC_GROUP ("CONNECTIONS", metagen_device_detail_connections, N_("GROUP")),
+			           f,
+			           NULL);
 			was_output = TRUE;
+			continue;
 		}
 	}
 
diff --git a/clients/cli/devices.h b/clients/cli/devices.h
index 08b3ea8fd2..ba2f2fb1ca 100644
--- a/clients/cli/devices.h
+++ b/clients/cli/devices.h
@@ -36,7 +36,7 @@ NMMetaColor nmc_device_state_to_color (NMDeviceState state);
 
 extern const NmcMetaGenericInfo *const metagen_device_status[];
 extern const NmcMetaGenericInfo *const metagen_device_detail_general[];
-extern const NmcMetaGenericInfo *const nmc_fields_dev_show_connections[];
+extern const NmcMetaGenericInfo *const metagen_device_detail_connections[];
 extern const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[];
 extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[];
 extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wifi_prop[];
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 83486968a4..e83e72f6f8 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -194,7 +194,7 @@ complete_fields (const char *option, const char *prefix)
 	complete_field (h, nmc_fields_con_active_details_groups);
 	complete_field (h, metagen_device_status);
 	complete_field (h, metagen_device_detail_general);
-	complete_field (h, nmc_fields_dev_show_connections);
+	complete_field (h, metagen_device_detail_connections);
 	complete_field (h, nmc_fields_dev_show_cap);
 	complete_field (h, nmc_fields_dev_show_wired_prop);
 	complete_field (h, nmc_fields_dev_show_wifi_prop);
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index 1e9df1aa7e..01dce2da04 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -198,6 +198,10 @@ typedef enum {
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_METERED,
 	_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NUM,
 
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTION_PATHS = 0,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTIONS,
+	_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_NUM,
+
 } NmcGenericInfoType;
 
 #define NMC_HANDLE_COLOR(color) \
diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected
index 831ef252a7..92a393c7dd 100644
--- a/clients/tests/test-client.check-on-disk/test_003-030.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-030.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:854:test_003()/30
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
-stdout: 3239 bytes
+stdout: 3250 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected
index 4baa8b8217..d4a8f3b710 100644
--- a/clients/tests/test-client.check-on-disk/test_003-031.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-031.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:854:test_003()/31
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3262 bytes
+stdout: 3273 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected
index db7379e022..9d956782a7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-032.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-032.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:857:test_003()/32
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
-stdout: 2011 bytes
+stdout: 2022 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected
index 3613c8a0d9..4ae8d0cf67 100644
--- a/clients/tests/test-client.check-on-disk/test_003-033.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-033.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:857:test_003()/33
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2024 bytes
+stdout: 2035 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected
index 8d83959f91..a128981d85 100644
--- a/clients/tests/test-client.check-on-disk/test_003-053.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-053.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:854:test_003()/53
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
-stdout: 3239 bytes
+stdout: 3250 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected
index 665e1bd193..b7c7828c98 100644
--- a/clients/tests/test-client.check-on-disk/test_003-054.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-054.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:854:test_003()/54
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3262 bytes
+stdout: 3273 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected
index a231575a65..727a991c67 100644
--- a/clients/tests/test-client.check-on-disk/test_003-055.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-055.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:857:test_003()/55
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
-stdout: 2011 bytes
+stdout: 2022 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected
index 7dd84226ac..8073cef275 100644
--- a/clients/tests/test-client.check-on-disk/test_003-056.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-056.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:857:test_003()/56
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2024 bytes
+stdout: 2035 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected
index a0cf3f02b6..797deb64fc 100644
--- a/clients/tests/test-client.check-on-disk/test_003-077.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-077.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:901:test_003()/77
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3239 bytes
+stdout: 3250 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected
index c8c85afb6d..2f5ed6ac7b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-078.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-078.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:901:test_003()/78
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3262 bytes
+stdout: 3273 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-099.expected b/clients/tests/test-client.check-on-disk/test_003-099.expected
index 3c58542769..31d3a21288 100644
--- a/clients/tests/test-client.check-on-disk/test_003-099.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-099.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:901:test_003()/99
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3207 bytes
+stdout: 3270 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   (null) | (null)
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/3
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-100.expected b/clients/tests/test-client.check-on-disk/test_003-100.expected
index 11c3d16084..032bf382d9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-100.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-100.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:901:test_003()/100
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3230 bytes
+stdout: 3293 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   (null) | (null)
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/3
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected
index be2917f33e..c469cd0e0a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-035.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-035.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:971:test_004()/35
 cmd: $NMCLI -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4600 bytes
+stdout: 4611 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -91,7 +91,7 @@ DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
 DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
 DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
 DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected
index 7b58b747a0..9650dcf65f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-036.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-036.expected
@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:971:test_004()/36
 cmd: $NMCLI -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4643 bytes
+stdout: 4654 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -91,7 +91,7 @@ DHCP6.OPTION[2]:                        dhcp-6-opt-2 = val-2
 DHCP6.OPTION[3]:                        dhcp-6-opt-3 = val-3
 DHCP6.OPTION[4]:                        dhcp-6-opt-4 = val-4
 DHCP6.OPTION[5]:                        dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/Connection/{2}
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<