From 59ea03cc0825997a58c2f65f4f9170b0dadd6578 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Apr 2018 14:41:13 +0200 Subject: [PATCH 01/14] cli: rework printing of vpn active-connection properties use nmc_print() for the job. --- clients/cli/connections.c | 254 ++++++++++-------- clients/cli/connections.h | 2 +- clients/cli/nmcli.c | 2 +- clients/cli/utils.h | 38 ++- .../test_004-026.expected | 4 +- 5 files changed, 176 insertions(+), 124 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index a38ad3c406..66468fdbc5 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -185,17 +185,24 @@ get_ac_device_string (NMActiveConnection *active) /* FIXME: The same or similar code for VPN info appears also in nm-applet (applet-dialogs.c), * and in gnome-control-center as well. It could probably be shared somehow. */ -static char * +static const char * get_vpn_connection_type (NMConnection *connection) { + NMSettingVpn *s_vpn; const char *type, *p; + s_vpn = nm_connection_get_setting_vpn (connection); + if (!s_vpn) + return NULL; + /* The service type is in form of "org.freedesktop.NetworkManager.vpnc". * Extract end part after last dot, e.g. "vpnc" */ type = nm_setting_vpn_get_service_type (nm_connection_get_setting_vpn (connection)); + if (!type) + return NULL; p = strrchr (type, '.'); - return g_strdup (p ? p + 1 : type); + return p ? p + 1 : type; } /* VPN parameters can be found at: @@ -206,31 +213,35 @@ get_vpn_connection_type (NMConnection *connection) * http://git.gnome.org/browse/network-manager-openswan/tree/src/nm-openswan-service.h * See also 'properties' directory in these plugins. */ -static const gchar * +static const char * find_vpn_gateway_key (const char *vpn_type) { - if (g_strcmp0 (vpn_type, "openvpn") == 0) return "remote"; - if (g_strcmp0 (vpn_type, "vpnc") == 0) return "IPSec gateway"; - if (g_strcmp0 (vpn_type, "pptp") == 0) return "gateway"; - if (g_strcmp0 (vpn_type, "openconnect") == 0) return "gateway"; - if (g_strcmp0 (vpn_type, "openswan") == 0) return "right"; - if (g_strcmp0 (vpn_type, "libreswan") == 0) return "right"; - if (g_strcmp0 (vpn_type, "ssh") == 0) return "remote"; - if (g_strcmp0 (vpn_type, "l2tp") == 0) return "gateway"; - return ""; + if (vpn_type) { + if (nm_streq (vpn_type, "openvpn")) return "remote"; + if (nm_streq (vpn_type, "vpnc")) return "IPSec gateway"; + if (nm_streq (vpn_type, "pptp")) return "gateway"; + if (nm_streq (vpn_type, "openconnect")) return "gateway"; + if (nm_streq (vpn_type, "openswan")) return "right"; + if (nm_streq (vpn_type, "libreswan")) return "right"; + if (nm_streq (vpn_type, "ssh")) return "remote"; + if (nm_streq (vpn_type, "l2tp")) return "gateway"; + } + return NULL; } -static const gchar * +static const char * find_vpn_username_key (const char *vpn_type) { - if (g_strcmp0 (vpn_type, "openvpn") == 0) return "username"; - if (g_strcmp0 (vpn_type, "vpnc") == 0) return "Xauth username"; - if (g_strcmp0 (vpn_type, "pptp") == 0) return "user"; - if (g_strcmp0 (vpn_type, "openconnect") == 0) return "username"; - if (g_strcmp0 (vpn_type, "openswan") == 0) return "leftxauthusername"; - if (g_strcmp0 (vpn_type, "libreswan") == 0) return "leftxauthusername"; - if (g_strcmp0 (vpn_type, "l2tp") == 0) return "user"; - return ""; + if (vpn_type) { + if (nm_streq (vpn_type, "openvpn")) return "username"; + if (nm_streq (vpn_type, "vpnc")) return "Xauth username"; + if (nm_streq (vpn_type, "pptp")) return "user"; + if (nm_streq (vpn_type, "openconnect")) return "username"; + if (nm_streq (vpn_type, "openswan")) return "leftxauthusername"; + if (nm_streq (vpn_type, "libreswan")) return "leftxauthusername"; + if (nm_streq (vpn_type, "l2tp")) return "user"; + } + return NULL; } enum VpnDataItem { @@ -241,8 +252,8 @@ enum VpnDataItem { static const gchar * get_vpn_data_item (NMConnection *connection, enum VpnDataItem vpn_data_item) { - const char *key; - gs_free char *type = NULL; + const char *type; + const char *key = NULL; type = get_vpn_connection_type (connection); @@ -254,10 +265,11 @@ get_vpn_data_item (NMConnection *connection, enum VpnDataItem vpn_data_item) key = find_vpn_username_key (type); break; default: - key = ""; break; } + if (!key) + return NULL; return nm_setting_vpn_get_data_item (nm_connection_get_setting_vpn (connection), key); } @@ -627,6 +639,100 @@ const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYP /*****************************************************************************/ +static gconstpointer +_metagen_con_active_vpn_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMActiveConnection *ac = target; + NMConnection *c; + NMSettingVpn *s_vpn = NULL; + NMVpnConnectionState vpn_state; + guint i; + const char *s; + char **arr = NULL; + + nm_assert (NM_IS_VPN_CONNECTION (ac)); + + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + + nm_assert (NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE)); + + c = NM_CONNECTION (nm_active_connection_get_connection (ac)); + if (c) + s_vpn = nm_connection_get_setting_vpn (c); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_CON_VPN_TYPE: + return c ? get_vpn_connection_type (c) : NULL; + case NMC_GENERIC_INFO_TYPE_CON_VPN_USERNAME: + if ( s_vpn + && (s = nm_setting_vpn_get_user_name (s_vpn))) + return s; + return c ? get_vpn_data_item (c, VPN_DATA_ITEM_USERNAME) : NULL; + case NMC_GENERIC_INFO_TYPE_CON_VPN_GATEWAY: + return c ? get_vpn_data_item (c, VPN_DATA_ITEM_GATEWAY) : NULL; + case NMC_GENERIC_INFO_TYPE_CON_VPN_BANNER: + s = nm_vpn_connection_get_banner (NM_VPN_CONNECTION (ac)); + if (s) + return (*out_to_free = g_strescape (s, "")); + return NULL; + case NMC_GENERIC_INFO_TYPE_CON_VPN_VPN_STATE: + vpn_state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (ac)); + return (*out_to_free = nmc_meta_generic_get_enum_with_detail (NMC_META_GENERIC_GET_ENUM_TYPE_DASH, + vpn_state, + vpn_connection_state_to_string (vpn_state), + get_type)); + case NMC_GENERIC_INFO_TYPE_CON_VPN_CFG: + if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV)) + return NULL; + if (s_vpn) { + gs_free char **arr2 = NULL; + guint n; + + arr2 = (char **) nm_setting_vpn_get_data_keys (s_vpn, &n); + if (!n) + goto arr_out; + + nm_assert (arr2 && !arr2[n]); + for (i = 0; i < n; i++) { + const char *k = arr2[i]; + const char *v; + + nm_assert (k); + v = nm_setting_vpn_get_data_item (s_vpn, k); + /* update the arr array in-place. Previously it contained + * the constant keys, now it contains the strdup'ed output text. */ + arr2[i] = g_strdup_printf ("%s = %s", k, v); + } + + arr = g_steal_pointer (&arr2); + } + goto arr_out; + 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_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CON_ACTIVE_VPN_NUM + 1] = { +#define _METAGEN_CON_ACTIVE_VPN(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_con_active_vpn_get_fcn) + _METAGEN_CON_ACTIVE_VPN (NMC_GENERIC_INFO_TYPE_CON_VPN_TYPE, "TYPE"), + _METAGEN_CON_ACTIVE_VPN (NMC_GENERIC_INFO_TYPE_CON_VPN_USERNAME, "USERNAME"), + _METAGEN_CON_ACTIVE_VPN (NMC_GENERIC_INFO_TYPE_CON_VPN_GATEWAY, "GATEWAY"), + _METAGEN_CON_ACTIVE_VPN (NMC_GENERIC_INFO_TYPE_CON_VPN_BANNER, "BANNER"), + _METAGEN_CON_ACTIVE_VPN (NMC_GENERIC_INFO_TYPE_CON_VPN_VPN_STATE, "VPN-STATE"), + _METAGEN_CON_ACTIVE_VPN (NMC_GENERIC_INFO_TYPE_CON_VPN_CFG, "CFG"), +}; + +/*****************************************************************************/ + #define NMC_FIELDS_SETTINGS_NAMES_ALL NM_SETTING_CONNECTION_SETTING_NAME","\ NM_SETTING_WIRED_SETTING_NAME","\ NM_SETTING_802_1X_SETTING_NAME","\ @@ -667,24 +773,13 @@ const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYP // NM_SETTING_DUMMY_SETTING_NAME // NM_SETTING_WIMAX_SETTING_NAME -const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[] = { - NMC_META_GENERIC ("GROUP"), /* 0 */ - NMC_META_GENERIC ("TYPE"), /* 1 */ - NMC_META_GENERIC ("USERNAME"), /* 2 */ - NMC_META_GENERIC ("GATEWAY"), /* 3 */ - NMC_META_GENERIC ("BANNER"), /* 4 */ - NMC_META_GENERIC ("VPN-STATE"), /* 5 */ - NMC_META_GENERIC ("CFG"), /* 6 */ - NULL, -}; - const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[] = { NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_con_active_general), /* 0 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 1 */ NMC_META_GENERIC_WITH_NESTED ("DHCP4", nmc_fields_dhcp_config + 1), /* 2 */ NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 3 */ NMC_META_GENERIC_WITH_NESTED ("DHCP6", nmc_fields_dhcp_config + 1), /* 4 */ - NMC_META_GENERIC_WITH_NESTED ("VPN", nmc_fields_con_active_details_vpn + 1), /* 5 */ + NMC_META_GENERIC_WITH_NESTED ("VPN", metagen_con_active_vpn), /* 5 */ NULL, }; @@ -1219,19 +1314,6 @@ nmc_active_connection_state_to_color (NMActiveConnectionState state) return NM_META_COLOR_CONNECTION_UNKNOWN; } -typedef struct { - char **array; - guint32 idx; -} FillVPNDataInfo; - -static void -fill_vpn_data_item (const char *key, const char *value, gpointer user_data) -{ - FillVPNDataInfo *info = (FillVPNDataInfo *) user_data; - - info->array[info->idx++] = g_strdup_printf ("%s = %s", key, value); -} - static gboolean nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) { @@ -1240,8 +1322,6 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) GPtrArray *group_fields = NULL; int i; const char *fields_str = NULL; - const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; const char *base_hdr = _("Activate connection details"); gboolean was_output = FALSE; @@ -1343,69 +1423,17 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) was_output = was_output || b1; } - /* VPN */ - if (NM_IS_VPN_CONNECTION (acon) && - strcasecmp (nmc_fields_con_active_details_groups[group_idx]->name, nmc_fields_con_active_details_groups[5]->name) == 0) { - NMConnection *con; - NMSettingConnection *s_con; - NMSettingVpn *s_vpn; - NMVpnConnectionState vpn_state; - char *type_str, *banner_str = NULL, *vpn_state_str; - const char *banner; - const char *username = NULL; - char **vpn_data_array = NULL; - guint32 items_num; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - - con = NM_CONNECTION (nm_active_connection_get_connection (acon)); - - s_con = nm_connection_get_setting_connection (con); - g_assert (s_con); - - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_vpn; - out_indices = parse_output_fields (group_fld, - tmpl, FALSE, NULL, NULL); - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - s_vpn = nm_connection_get_setting_vpn (con); - if (s_vpn) { - items_num = nm_setting_vpn_get_num_data_items (s_vpn); - if (items_num > 0) { - FillVPNDataInfo info; - - vpn_data_array = g_new (char *, items_num + 1); - info.array = vpn_data_array; - info.idx = 0; - nm_setting_vpn_foreach_data_item (s_vpn, &fill_vpn_data_item, &info); - vpn_data_array[items_num] = NULL; - } - username = nm_setting_vpn_get_user_name (s_vpn); + if (nmc_fields_con_active_details_groups[group_idx]->nested == metagen_con_active_vpn) { + if (NM_IS_VPN_CONNECTION (acon)) { + nmc_print (&nmc->nmc_config, + (gpointer[]) { acon, NULL }, + NULL, + NMC_META_GENERIC_GROUP ("VPN", metagen_con_active_vpn, N_("NAME")), + group_fld, + NULL); + was_output = TRUE; } - - type_str = get_vpn_connection_type (con); - banner = nm_vpn_connection_get_banner (NM_VPN_CONNECTION (acon)); - if (banner) - banner_str = g_strescape (banner, ""); - vpn_state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (acon)); - vpn_state_str = g_strdup_printf ("%d - %s", - vpn_state, - gettext (vpn_connection_state_to_string (vpn_state))); - - /* Add values */ - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX); - set_val_strc (arr, 0, nmc_fields_con_active_details_groups[5]->name); - set_val_str (arr, 1, type_str); - set_val_strc (arr, 2, username ?: get_vpn_data_item (con, VPN_DATA_ITEM_USERNAME)); - set_val_strc (arr, 3, get_vpn_data_item (con, VPN_DATA_ITEM_GATEWAY)); - set_val_str (arr, 4, banner_str); - set_val_str (arr, 5, vpn_state_str); - set_val_arr (arr, 6, vpn_data_array); - 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); - was_output = TRUE; + continue; } } diff --git a/clients/cli/connections.h b/clients/cli/connections.h index 43cd97f697..22bfa8ec2a 100644 --- a/clients/cli/connections.h +++ b/clients/cli/connections.h @@ -37,7 +37,7 @@ NMMetaColor nmc_active_connection_state_to_color (NMActiveConnectionState state) extern const NmcMetaGenericInfo *const metagen_con_show[]; extern const NmcMetaGenericInfo *const metagen_con_active_general[]; -extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[]; +extern const NmcMetaGenericInfo *const metagen_con_active_vpn[]; extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[]; #endif /* NMC_CONNECTIONS_H */ diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index c5e0a03fbd..63d0959953 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -193,7 +193,7 @@ complete_fields (const char *option, const char *prefix) complete_field (h, nmc_fields_ip6_config); complete_field (h, metagen_con_show); complete_field (h, metagen_con_active_general); - complete_field (h, nmc_fields_con_active_details_vpn); + complete_field (h, metagen_con_active_vpn); complete_field (h, nmc_fields_con_active_details_groups); complete_field (h, nmc_fields_dev_status); complete_field (h, nmc_fields_dev_show_general); diff --git a/clients/cli/utils.h b/clients/cli/utils.h index 19694d111c..a80b88979b 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -152,6 +152,14 @@ typedef enum { NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH, _NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NUM, + NMC_GENERIC_INFO_TYPE_CON_VPN_TYPE = 0, + NMC_GENERIC_INFO_TYPE_CON_VPN_USERNAME, + NMC_GENERIC_INFO_TYPE_CON_VPN_GATEWAY, + NMC_GENERIC_INFO_TYPE_CON_VPN_BANNER, + NMC_GENERIC_INFO_TYPE_CON_VPN_VPN_STATE, + NMC_GENERIC_INFO_TYPE_CON_VPN_CFG, + _NMC_GENERIC_INFO_TYPE_CON_ACTIVE_VPN_NUM, + } NmcGenericInfoType; #define NMC_HANDLE_COLOR(color) \ @@ -220,8 +228,13 @@ nmc_meta_generic_get_bool (gboolean val, NMMetaAccessorGetType get_type) return nmc_meta_generic_get_str_i18n (val ? N_("yes") : N_("no"), get_type); } +typedef enum { + NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES, + NMC_META_GENERIC_GET_ENUM_TYPE_DASH, +} NmcMetaGenericGetEnumType; + static inline char * -nmc_meta_generic_get_enum_with_detail (gint64 enum_val, const char *str_val, NMMetaAccessorGetType get_type) +nmc_meta_generic_get_enum_with_detail (NmcMetaGenericGetEnumType get_enum_type, gint64 enum_val, const char *str_val, NMMetaAccessorGetType get_type) { if (!NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE)) @@ -232,12 +245,23 @@ nmc_meta_generic_get_enum_with_detail (gint64 enum_val, const char *str_val, NMM return g_strdup_printf ("%lld", (long long) enum_val); } - /* note that this function will always print "$NUM ($NICK)", also in PARSABLE - * mode. That might not be desired, but it's done for certain properties to preserve - * previous behavior. */ - if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) - return g_strdup_printf (_("%lld (%s)"), (long long) enum_val, gettext (str_val)); - return g_strdup_printf ("%lld (%s)", (long long) enum_val, str_val); + switch (get_enum_type) { + case NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES: + /* note that this function will always print "$NUM ($NICK)", also in PARSABLE + * mode. That might not be desired, but it's done for certain properties to preserve + * previous behavior. */ + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) + return g_strdup_printf (_("%lld (%s)"), (long long) enum_val, gettext (str_val)); + return g_strdup_printf ("%lld (%s)", (long long) enum_val, str_val); + case NMC_META_GENERIC_GET_ENUM_TYPE_DASH: + /* note that this function will always print "$NUM ($NICK)", also in PARSABLE + * mode. That might not be desired, but it's done for certain properties to preserve + * previous behavior. */ + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) + return g_strdup_printf (_("%lld - %s"), (long long) enum_val, gettext (str_val)); + return g_strdup_printf ("%lld - %s", (long long) enum_val, str_val); + } + g_return_val_if_reached (NULL); } /*****************************************************************************/ diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected index e80c54cfbc..a79a8c406b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-026.expected +++ b/clients/tests/test-client.check-on-disk/test_004-026.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:939:test_004()/26 cmd: $NMCLI -t con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2136 bytes +stdout: 2131 bytes >>> connection.id:con-vpn-1 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -91,7 +91,7 @@ VPN.TYPE:openvpn VPN.USERNAME: VPN.GATEWAY: VPN.BANNER:*** VPN connection con-vpn-1 *** -VPN.VPN-STATE:5 - Połączono z VPN +VPN.VPN-STATE:5 - VPN connected VPN.CFG[1]:key1 = val1 VPN.CFG[2]:key2 = val2 VPN.CFG[3]:key3 = val3 From 096ac93f8aeeac8feb15859c8d9ba147b245e2bc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Apr 2018 17:43:13 +0200 Subject: [PATCH 02/14] cli: rework printing of dhcp options --- clients/cli/common.c | 110 +++++++++++++++++++++++++------------- clients/cli/common.h | 2 +- clients/cli/connections.c | 4 +- clients/cli/devices.c | 4 +- clients/cli/nmcli.c | 2 +- clients/cli/utils.h | 3 ++ 6 files changed, 81 insertions(+), 44 deletions(-) diff --git a/clients/cli/common.c b/clients/cli/common.c index 09c86334ab..39ee2c0b52 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -270,12 +270,67 @@ const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CO /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_dhcp_config[] = { - NMC_META_GENERIC ("GROUP"), /* 0 */ - NMC_META_GENERIC ("OPTION"), /* 1 */ - NULL, +static gconstpointer +_metagen_dhcp_config_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMDhcpConfig *dhcp = target; + guint i; + char **arr = NULL; + + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_DHCP_CONFIG_OPTION: + { + GHashTable *table; + gs_free char **arr2 = NULL; + guint n; + + if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV)) + return NULL; + + table = nm_dhcp_config_get_options (dhcp); + if (!table) + goto arr_out; + + arr2 = (char **) nm_utils_strdict_get_keys (table, TRUE, &n); + if (!n) + goto arr_out; + + nm_assert (arr2 && !arr2[n] && n == NM_PTRARRAY_LEN (arr2)); + for (i = 0; i < n; i++) { + const char *k = arr2[i]; + const char *v; + + nm_assert (k); + v = g_hash_table_lookup (table, k); + arr2[i] = g_strdup_printf ("%s = %s", k, v); + } + + arr = g_steal_pointer (&arr2); + goto arr_out; + } + 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_dhcp_config[_NMC_GENERIC_INFO_TYPE_DHCP_CONFIG_NUM + 1] = { +#define _METAGEN_DHCP_CONFIG(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_dhcp_config_get_fcn) + _METAGEN_DHCP_CONFIG (NMC_GENERIC_INFO_TYPE_DHCP_CONFIG_OPTION, "OPTION"), }; +/*****************************************************************************/ + const NmcMetaGenericInfo *const nmc_fields_ip6_config[] = { NMC_META_GENERIC ("GROUP"), /* 0 */ NMC_META_GENERIC ("ADDRESS"), /* 1 */ @@ -343,45 +398,24 @@ print_dhcp_config (NMDhcpConfig *dhcp, const char *group_prefix, const char *one_field) { - GHashTable *table; - const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; + gs_free_error GError *error = NULL; + gs_free char *field_str = NULL; - if (dhcp == NULL) + if (!dhcp) return FALSE; - table = nm_dhcp_config_get_options (dhcp); - if (table) { - char **options_arr = NULL; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - gs_free const char **keys = NULL; - guint i, nkeys; + if (one_field) + field_str = g_strdup_printf ("%s.%s", group_prefix, one_field); - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dhcp_config; - out_indices = parse_output_fields (one_field, - tmpl, FALSE, NULL, NULL); - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - keys = (const char **) g_hash_table_get_keys_as_array (table, &nkeys); - nm_utils_strv_sort (keys, nkeys); - - options_arr = g_new (char *, nkeys + 1); - for (i = 0; i < nkeys; i++) - options_arr[i] = g_strdup_printf ("%s = %s", keys[i], (const char *) g_hash_table_lookup (table, keys[i])); - options_arr[i] = NULL; - - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX); - set_val_strc (arr, 0, group_prefix); - set_val_arr (arr, 1, options_arr); - g_ptr_array_add (out.output_data, arr); - - print_data_prepare_width (out.output_data); - print_data (nmc_config, out_indices, NULL, 0, &out); - - return TRUE; + if (!nmc_print (nmc_config, + (gpointer[]) { dhcp, NULL }, + NULL, + NMC_META_GENERIC_GROUP (group_prefix, metagen_dhcp_config, N_("GROUP")), + field_str, + &error)) { + return FALSE; } - return FALSE; + return TRUE; } /* diff --git a/clients/cli/common.h b/clients/cli/common.h index 8f4e47c28b..2a5e3ffbed 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -84,6 +84,6 @@ const char *nmc_error_get_simple_message (GError *error); extern const NmcMetaGenericInfo *const metagen_ip4_config[]; extern const NmcMetaGenericInfo *const nmc_fields_ip6_config[]; -extern const NmcMetaGenericInfo *const nmc_fields_dhcp_config[]; +extern const NmcMetaGenericInfo *const metagen_dhcp_config[]; #endif /* NMC_COMMON_H */ diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 66468fdbc5..4d1ce9e0ee 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -776,9 +776,9 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[] = { NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_con_active_general), /* 0 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 1 */ - NMC_META_GENERIC_WITH_NESTED ("DHCP4", nmc_fields_dhcp_config + 1), /* 2 */ + NMC_META_GENERIC_WITH_NESTED ("DHCP4", metagen_dhcp_config), /* 2 */ NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 3 */ - NMC_META_GENERIC_WITH_NESTED ("DHCP6", nmc_fields_dhcp_config + 1), /* 4 */ + NMC_META_GENERIC_WITH_NESTED ("DHCP6", metagen_dhcp_config), /* 4 */ NMC_META_GENERIC_WITH_NESTED ("VPN", metagen_con_active_vpn), /* 5 */ NULL, }; diff --git a/clients/cli/devices.c b/clients/cli/devices.c index aa28678ff5..ec0ae94c8c 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -209,9 +209,9 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = { NMC_META_GENERIC_WITH_NESTED ("WIMAX-PROPERTIES", nmc_fields_dev_show_wimax_prop + 1), /* 5 */ NMC_META_GENERIC_WITH_NESTED ("NSP", nmc_fields_dev_wimax_list + 1), /* 6 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 7 */ - NMC_META_GENERIC_WITH_NESTED ("DHCP4", nmc_fields_dhcp_config + 1), /* 8 */ + NMC_META_GENERIC_WITH_NESTED ("DHCP4", metagen_dhcp_config), /* 8 */ NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 9 */ - NMC_META_GENERIC_WITH_NESTED ("DHCP6", nmc_fields_dhcp_config + 1), /* 10 */ + NMC_META_GENERIC_WITH_NESTED ("DHCP6", metagen_dhcp_config), /* 10 */ NMC_META_GENERIC_WITH_NESTED ("BOND", nmc_fields_dev_show_master_prop + 1), /* 11 */ NMC_META_GENERIC_WITH_NESTED ("TEAM", nmc_fields_dev_show_team_prop + 1), /* 12 */ NMC_META_GENERIC_WITH_NESTED ("BRIDGE", nmc_fields_dev_show_master_prop + 1), /* 13 */ diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 63d0959953..cecd5f3fbf 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -189,7 +189,7 @@ complete_fields (const char *option, const char *prefix) h = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, NULL); complete_field (h, metagen_ip4_config); - complete_field (h, nmc_fields_dhcp_config); + complete_field (h, metagen_dhcp_config); complete_field (h, nmc_fields_ip6_config); complete_field (h, metagen_con_show); complete_field (h, metagen_con_active_general); diff --git a/clients/cli/utils.h b/clients/cli/utils.h index a80b88979b..acb5d63775 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -121,6 +121,9 @@ typedef enum { NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN, _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM, + NMC_GENERIC_INFO_TYPE_DHCP_CONFIG_OPTION = 0, + _NMC_GENERIC_INFO_TYPE_DHCP_CONFIG_NUM, + NMC_GENERIC_INFO_TYPE_CON_SHOW_NAME = 0, NMC_GENERIC_INFO_TYPE_CON_SHOW_UUID, NMC_GENERIC_INFO_TYPE_CON_SHOW_TYPE, From ff273b82214e9678c5e1c8cc1ff58de20f31853f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Apr 2018 17:55:27 +0200 Subject: [PATCH 03/14] cli: drop duplicate IPv6 property metadata --- clients/cli/common.c | 10 ---------- clients/cli/common.h | 2 +- clients/cli/connections.c | 2 +- clients/cli/devices.c | 2 +- clients/cli/nmcli.c | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/clients/cli/common.c b/clients/cli/common.c index 39ee2c0b52..585ea71192 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -331,16 +331,6 @@ const NmcMetaGenericInfo *const metagen_dhcp_config[_NMC_GENERIC_INFO_TYPE_DHCP_ /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_ip6_config[] = { - NMC_META_GENERIC ("GROUP"), /* 0 */ - NMC_META_GENERIC ("ADDRESS"), /* 1 */ - NMC_META_GENERIC ("GATEWAY"), /* 2 */ - NMC_META_GENERIC ("ROUTE"), /* 3 */ - NMC_META_GENERIC ("DNS"), /* 4 */ - NMC_META_GENERIC ("DOMAIN"), /* 5 */ - NULL, -}; - gboolean print_ip4_config (NMIPConfig *cfg4, const NmcConfig *nmc_config, diff --git a/clients/cli/common.h b/clients/cli/common.h index 2a5e3ffbed..d695d5c333 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -83,7 +83,7 @@ void nmc_complete_bool (const char *prefix); const char *nmc_error_get_simple_message (GError *error); extern const NmcMetaGenericInfo *const metagen_ip4_config[]; -extern const NmcMetaGenericInfo *const nmc_fields_ip6_config[]; +extern const NmcMetaGenericInfo *const metagen_ip6_config[]; extern const NmcMetaGenericInfo *const metagen_dhcp_config[]; #endif /* NMC_COMMON_H */ diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 4d1ce9e0ee..46c736259c 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -777,7 +777,7 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[] = { NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_con_active_general), /* 0 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 1 */ NMC_META_GENERIC_WITH_NESTED ("DHCP4", metagen_dhcp_config), /* 2 */ - NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 3 */ + NMC_META_GENERIC_WITH_NESTED ("IP6", metagen_ip6_config), /* 3 */ NMC_META_GENERIC_WITH_NESTED ("DHCP6", metagen_dhcp_config), /* 4 */ NMC_META_GENERIC_WITH_NESTED ("VPN", metagen_con_active_vpn), /* 5 */ NULL, diff --git a/clients/cli/devices.c b/clients/cli/devices.c index ec0ae94c8c..98ccf97383 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -210,7 +210,7 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = { NMC_META_GENERIC_WITH_NESTED ("NSP", nmc_fields_dev_wimax_list + 1), /* 6 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 7 */ NMC_META_GENERIC_WITH_NESTED ("DHCP4", metagen_dhcp_config), /* 8 */ - NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 9 */ + NMC_META_GENERIC_WITH_NESTED ("IP6", metagen_ip6_config), /* 9 */ NMC_META_GENERIC_WITH_NESTED ("DHCP6", metagen_dhcp_config), /* 10 */ NMC_META_GENERIC_WITH_NESTED ("BOND", nmc_fields_dev_show_master_prop + 1), /* 11 */ NMC_META_GENERIC_WITH_NESTED ("TEAM", nmc_fields_dev_show_team_prop + 1), /* 12 */ diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index cecd5f3fbf..361cc3d3a9 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -190,7 +190,7 @@ complete_fields (const char *option, const char *prefix) complete_field (h, metagen_ip4_config); complete_field (h, metagen_dhcp_config); - complete_field (h, nmc_fields_ip6_config); + complete_field (h, metagen_ip6_config); complete_field (h, metagen_con_show); complete_field (h, metagen_con_active_general); complete_field (h, metagen_con_active_vpn); From bddf482fa121904c36742417c4d18fcb866461f2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Apr 2018 19:56:46 +0200 Subject: [PATCH 04/14] cli/trivial: move code --- clients/cli/common.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/clients/cli/common.c b/clients/cli/common.c index 585ea71192..3137cb8814 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -102,6 +102,8 @@ _ip_config_get_routes (NMIPConfig *cfg) return arr; } +/*****************************************************************************/ + static gconstpointer _metagen_ip4_config_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) { @@ -177,6 +179,19 @@ arr_out: return arr; } +const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM + 1] = { +#define _METAGEN_IP4_CONFIG(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_ip4_config_get_fcn) + _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ADDRESS, "ADDRESS"), + _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_GATEWAY, "GATEWAY"), + _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ROUTE, "ROUTE"), + _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DNS, "DNS"), + _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DOMAIN, "DOMAIN"), + _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_WINS, "WINS"), +}; + +/*****************************************************************************/ + static gconstpointer _metagen_ip6_config_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) { @@ -247,17 +262,6 @@ arr_out: return arr; } -const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM + 1] = { -#define _METAGEN_IP4_CONFIG(type, name) \ - [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_ip4_config_get_fcn) - _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ADDRESS, "ADDRESS"), - _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_GATEWAY, "GATEWAY"), - _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ROUTE, "ROUTE"), - _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DNS, "DNS"), - _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DOMAIN, "DOMAIN"), - _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_WINS, "WINS"), -}; - const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM + 1] = { #define _METAGEN_IP6_CONFIG(type, name) \ [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_ip6_config_get_fcn) From 940979a5a6a2fc1e2d56afcdeeaf2a423ca8c657 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Apr 2018 20:09:53 +0200 Subject: [PATCH 05/14] cli: merge IPv4 and IPv6 versions of ip/dhcp config print --- clients/cli/common.c | 59 +++++++++++++++------------------------ clients/cli/common.h | 13 +++++++-- clients/cli/connections.c | 8 +++--- clients/cli/devices.c | 8 +++--- 4 files changed, 40 insertions(+), 48 deletions(-) diff --git a/clients/cli/common.c b/clients/cli/common.c index 3137cb8814..de55a49141 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -336,49 +336,29 @@ const NmcMetaGenericInfo *const metagen_dhcp_config[_NMC_GENERIC_INFO_TYPE_DHCP_ /*****************************************************************************/ gboolean -print_ip4_config (NMIPConfig *cfg4, - const NmcConfig *nmc_config, - const char *one_field) +print_ip_config (NMIPConfig *cfg, + int addr_family, + const NmcConfig *nmc_config, + const char *one_field) { gs_free_error GError *error = NULL; gs_free char *field_str = NULL; - if (cfg4 == NULL) + if (!cfg) return FALSE; - if (one_field) - field_str = g_strdup_printf ("IP4.%s", one_field); - - if (!nmc_print (nmc_config, - (gpointer[]) { cfg4, NULL }, - NULL, - NMC_META_GENERIC_GROUP ("IP4", metagen_ip4_config, N_("GROUP")), - field_str, - &error)) { - return FALSE; + if (one_field) { + field_str = g_strdup_printf ("IP%c.%s", + nm_utils_addr_family_to_char (addr_family), + one_field); } - return TRUE; -} - -gboolean -print_ip6_config (NMIPConfig *cfg6, - const NmcConfig *nmc_config, - const char *group_prefix, - const char *one_field) -{ - gs_free_error GError *error = NULL; - gs_free char *field_str = NULL; - - if (cfg6 == NULL) - return FALSE; - - if (one_field) - field_str = g_strdup_printf ("IP6.%s", one_field); if (!nmc_print (nmc_config, - (gpointer[]) { cfg6, NULL }, + (gpointer[]) { cfg, NULL }, NULL, - NMC_META_GENERIC_GROUP ("IP6", metagen_ip6_config, N_("GROUP")), + addr_family == AF_INET + ? NMC_META_GENERIC_GROUP ("IP4", metagen_ip4_config, N_("GROUP")) + : NMC_META_GENERIC_GROUP ("IP6", metagen_ip6_config, N_("GROUP")), field_str, &error)) { return FALSE; @@ -388,8 +368,8 @@ print_ip6_config (NMIPConfig *cfg6, gboolean print_dhcp_config (NMDhcpConfig *dhcp, + int addr_family, const NmcConfig *nmc_config, - const char *group_prefix, const char *one_field) { gs_free_error GError *error = NULL; @@ -398,13 +378,18 @@ print_dhcp_config (NMDhcpConfig *dhcp, if (!dhcp) return FALSE; - if (one_field) - field_str = g_strdup_printf ("%s.%s", group_prefix, one_field); + if (one_field) { + field_str = g_strdup_printf ("DHCP%c.%s", + nm_utils_addr_family_to_char (addr_family), + one_field); + } if (!nmc_print (nmc_config, (gpointer[]) { dhcp, NULL }, NULL, - NMC_META_GENERIC_GROUP (group_prefix, metagen_dhcp_config, N_("GROUP")), + addr_family == AF_INET + ? NMC_META_GENERIC_GROUP ("DHCP4", metagen_dhcp_config, N_("GROUP")) + : NMC_META_GENERIC_GROUP ("DHCP6", metagen_dhcp_config, N_("GROUP")), field_str, &error)) { return FALSE; diff --git a/clients/cli/common.h b/clients/cli/common.h index d695d5c333..c180dfb73d 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -25,9 +25,16 @@ #include "nmcli.h" #include "nm-secret-agent-simple.h" -gboolean print_ip4_config (NMIPConfig *cfg4, const NmcConfig *nmc_config, const char *one_field); -gboolean print_ip6_config (NMIPConfig *cfg6, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field); -gboolean print_dhcp_config (NMDhcpConfig *dhcp, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field); + +gboolean print_ip_config (NMIPConfig *cfg, + int addr_family, + const NmcConfig *nmc_config, + const char *one_field); + +gboolean print_dhcp_config (NMDhcpConfig *dhcp, + int addr_family, + const NmcConfig *nmc_config, + const char *one_field); NMConnection *nmc_find_connection (const GPtrArray *connections, const char *filter_type, diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 46c736259c..8395b7d0fe 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1392,7 +1392,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) gboolean b1 = FALSE; NMIPConfig *cfg4 = nm_active_connection_get_ip4_config (acon); - b1 = print_ip4_config (cfg4, &nmc->nmc_config, group_fld); + b1 = print_ip_config (cfg4, AF_INET, &nmc->nmc_config, group_fld); was_output = was_output || b1; } @@ -1401,7 +1401,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) gboolean b1 = FALSE; NMDhcpConfig *dhcp4 = nm_active_connection_get_dhcp4_config (acon); - b1 = print_dhcp_config (dhcp4, &nmc->nmc_config, "DHCP4", group_fld); + b1 = print_dhcp_config (dhcp4, AF_INET, &nmc->nmc_config, group_fld); was_output = was_output || b1; } @@ -1410,7 +1410,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) gboolean b1 = FALSE; NMIPConfig *cfg6 = nm_active_connection_get_ip6_config (acon); - b1 = print_ip6_config (cfg6, &nmc->nmc_config, "IP6", group_fld); + b1 = print_ip_config (cfg6, AF_INET6, &nmc->nmc_config, group_fld); was_output = was_output || b1; } @@ -1419,7 +1419,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) gboolean b1 = FALSE; NMDhcpConfig *dhcp6 = nm_active_connection_get_dhcp6_config (acon); - b1 = print_dhcp_config (dhcp6, &nmc->nmc_config, "DHCP6", group_fld); + b1 = print_dhcp_config (dhcp6, AF_INET6, &nmc->nmc_config, group_fld); was_output = was_output || b1; } diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 98ccf97383..e0d1748670 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1319,19 +1319,19 @@ show_device_info (NMDevice *device, NmCli *nmc) /* IP4 */ if (cfg4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[7]->name)) - was_output = print_ip4_config (cfg4, &nmc->nmc_config, section_fld); + was_output = print_ip_config (cfg4, AF_INET, &nmc->nmc_config, section_fld); /* DHCP4 */ if (dhcp4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[8]->name)) - was_output = print_dhcp_config (dhcp4, &nmc->nmc_config, nmc_fields_dev_show_sections[8]->name, section_fld); + was_output = print_dhcp_config (dhcp4, AF_INET, &nmc->nmc_config, section_fld); /* IP6 */ if (cfg6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[9]->name)) - was_output = print_ip6_config (cfg6, &nmc->nmc_config, nmc_fields_dev_show_sections[9]->name, section_fld); + was_output = print_ip_config (cfg6, AF_INET6, &nmc->nmc_config, section_fld); /* DHCP6 */ if (dhcp6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[10]->name)) - was_output = print_dhcp_config (dhcp6, &nmc->nmc_config, nmc_fields_dev_show_sections[10]->name, section_fld); + was_output = print_dhcp_config (dhcp6, AF_INET6, &nmc->nmc_config, section_fld); /* Bond specific information */ if (NM_IS_DEVICE_BOND (device)) { From 283b1d18b74f4ee99d6317996a91a35c5aaffe66 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Apr 2018 20:28:02 +0200 Subject: [PATCH 06/14] cli: rework printing of device status --- clients/cli/devices.c | 116 ++++++++++++++++++++---------------------- clients/cli/devices.h | 2 +- clients/cli/nmcli.c | 2 +- clients/cli/utils.h | 9 ++++ 4 files changed, 67 insertions(+), 62 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index e0d1748670..7ba2a7f798 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -39,17 +39,54 @@ #define PROMPT_INTERFACE _("Interface: ") #define PROMPT_INTERFACES _("Interface(s): ") -const NmcMetaGenericInfo *const nmc_fields_dev_status[] = { - NMC_META_GENERIC ("DEVICE"), /* 0 */ - NMC_META_GENERIC ("TYPE"), /* 1 */ - NMC_META_GENERIC ("STATE"), /* 2 */ - NMC_META_GENERIC ("DBUS-PATH"), /* 3 */ - NMC_META_GENERIC ("CONNECTION"), /* 4 */ - NMC_META_GENERIC ("CON-UUID"), /* 5 */ - NMC_META_GENERIC ("CON-PATH"), /* 6 */ - NULL, +/*****************************************************************************/ + +static gconstpointer +_metagen_device_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMDevice *d = target; + NMActiveConnection *ac; + + NMC_HANDLE_COLOR (nmc_device_state_to_color (nm_device_get_state (d))); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DEVICE: + return nm_device_get_iface (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_TYPE: + return nm_device_get_type_description (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE: + return nmc_device_state_to_string (nm_device_get_state (d)); + case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH: + return nm_object_get_path (NM_OBJECT (d)); + case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION: + ac = nm_device_get_active_connection (d); + return ac ? nm_active_connection_get_id (ac) : NULL; + case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_UUID: + ac = nm_device_get_active_connection (d); + return ac ? nm_active_connection_get_uuid (ac) : NULL; + case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_PATH: + ac = nm_device_get_active_connection (d); + return ac ? nm_object_get_path (NM_OBJECT (ac)) : NULL; + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_device_status[_NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_NUM + 1] = { +#define _METAGEN_DEVICE_STATUS(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_status_get_fcn) + _METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DEVICE, "DEVICE"), + _METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_TYPE, "TYPE"), + _METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE, "STATE"), + _METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH, "DBUS-PATH"), + _METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION, "CONNECTION"), + _METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_UUID, "CON-UUID"), + _METAGEN_DEVICE_STATUS (NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_PATH, "CON-PATH"), }; -#define NMC_FIELDS_DEV_STATUS_COMMON "DEVICE,TYPE,STATE,CONNECTION" + +/*****************************************************************************/ const NmcMetaGenericInfo *const nmc_fields_dev_show_general[] = { NMC_META_GENERIC ("NAME"), /* 0 */ @@ -1473,47 +1510,15 @@ nmc_device_state_to_color (NMDeviceState state) g_return_val_if_reached (NM_META_COLOR_DEVICE_UNKNOWN); } -static void -fill_output_device_status (NMDevice *device, GPtrArray *output_data) -{ - NMActiveConnection *ac; - NMDeviceState state; - NMMetaColor color; - NmcOutputField *arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_dev_status, - 0); - - state = nm_device_get_state (device); - ac = nm_device_get_active_connection (device); - - /* Show devices in color */ - color = nmc_device_state_to_color (state); - set_val_color_all (arr, color); - - set_val_strc (arr, 0, nm_device_get_iface (device)); - set_val_strc (arr, 1, nm_device_get_type_description (device)); - set_val_strc (arr, 2, nmc_device_state_to_string (state)); - set_val_strc (arr, 3, nm_object_get_path (NM_OBJECT (device))); - set_val_strc (arr, 4, get_active_connection_id (device)); - set_val_strc (arr, 5, ac ? nm_active_connection_get_uuid (ac) : NULL); - set_val_strc (arr, 6, ac ? nm_object_get_path (NM_OBJECT (ac)) : NULL); - - g_ptr_array_add (output_data, arr); -} - static NMCResultCode do_devices_status (NmCli *nmc, int argc, char **argv) { GError *error = NULL; - NMDevice **devices; - int i; + gs_free NMDevice **devices = NULL; const char *fields_str = NULL; - const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); next_arg (nmc, &argc, &argv, NULL); - /* Nothing to complete */ if (nmc->complete) return nmc->return_value; @@ -1523,33 +1528,24 @@ do_devices_status (NmCli *nmc, int argc, char **argv) } if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) - fields_str = NMC_FIELDS_DEV_STATUS_COMMON; + fields_str = "DEVICE,TYPE,STATE,CONNECTION"; else if (!nmc->required_fields || strcasecmp (nmc->required_fields, "all") == 0) { } else fields_str = nmc->required_fields; - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_status; - out_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &error); + devices = nmc_get_devices_sorted (nmc->client); - if (error) { + if (!nmc_print (&nmc->nmc_config, + (gpointer *) devices, + N_("Status of devices"), + (const NMMetaAbstractInfo *const*) metagen_device_status, + fields_str, + &error)) { g_string_printf (nmc->return_text, _("Error: 'device status': %s"), error->message); g_error_free (error); return NMC_RESULT_ERROR_USER_INPUT; } - /* Add headers */ - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - devices = nmc_get_devices_sorted (nmc->client); - for (i = 0; devices[i]; i++) - fill_output_device_status (devices[i], out.output_data); - - print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, out_indices, _("Status of devices"), 0, &out); - - g_free (devices); - return NMC_RESULT_SUCCESS; } diff --git a/clients/cli/devices.h b/clients/cli/devices.h index c78680da34..f85e3fdc41 100644 --- a/clients/cli/devices.h +++ b/clients/cli/devices.h @@ -34,7 +34,7 @@ NMDevice ** nmc_get_devices_sorted (NMClient *client); NMMetaColor nmc_device_state_to_color (NMDeviceState state); -extern const NmcMetaGenericInfo *const nmc_fields_dev_status[]; +extern const NmcMetaGenericInfo *const metagen_device_status[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_general[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_connections[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[]; diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 361cc3d3a9..92efd7e854 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -195,7 +195,7 @@ complete_fields (const char *option, const char *prefix) complete_field (h, metagen_con_active_general); complete_field (h, metagen_con_active_vpn); complete_field (h, nmc_fields_con_active_details_groups); - complete_field (h, nmc_fields_dev_status); + complete_field (h, metagen_device_status); complete_field (h, nmc_fields_dev_show_general); complete_field (h, nmc_fields_dev_show_connections); complete_field (h, nmc_fields_dev_show_cap); diff --git a/clients/cli/utils.h b/clients/cli/utils.h index acb5d63775..a716cc3ab7 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -163,6 +163,15 @@ typedef enum { NMC_GENERIC_INFO_TYPE_CON_VPN_CFG, _NMC_GENERIC_INFO_TYPE_CON_ACTIVE_VPN_NUM, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DEVICE = 0, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_TYPE, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_UUID, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_PATH, + _NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_NUM, + } NmcGenericInfoType; #define NMC_HANDLE_COLOR(color) \ From fede017001e1e47c3e38e726d9a8c065c7ded3d7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Apr 2018 21:28:14 +0200 Subject: [PATCH 07/14] cli: rework printing of "general" device details --- clients/cli/devices.c | 217 ++++++++++-------- clients/cli/devices.h | 2 +- clients/cli/nmcli.c | 2 +- clients/cli/utils.h | 26 +++ .../test_003-033.expected | 12 +- .../test_003-056.expected | 12 +- .../test_003-106.expected | 12 +- .../test_003-116.expected | 12 +- .../test_003-166.expected | 4 +- .../test_003-176.expected | 4 +- .../test_003-226.expected | 12 +- .../test_003-236.expected | 12 +- .../test_003-286.expected | 12 +- .../test_003-296.expected | 12 +- .../test_003-346.expected | 4 +- .../test_003-356.expected | 4 +- .../test_003-406.expected | 12 +- .../test_003-416.expected | 12 +- .../test_004-040.expected | 12 +- .../test_004-128.expected | 12 +- .../test_004-132.expected | 12 +- .../test_004-146.expected | 12 +- .../test_004-150.expected | 12 +- .../test_004-236.expected | 4 +- .../test_004-240.expected | 4 +- .../test_004-254.expected | 4 +- .../test_004-258.expected | 4 +- .../test_004-344.expected | 12 +- .../test_004-348.expected | 12 +- .../test_004-362.expected | 12 +- .../test_004-366.expected | 12 +- 31 files changed, 280 insertions(+), 227 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 7ba2a7f798..6e005044a0 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -88,35 +88,113 @@ const NmcMetaGenericInfo *const metagen_device_status[_NMC_GENERIC_INFO_TYPE_DEV /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_dev_show_general[] = { - NMC_META_GENERIC ("NAME"), /* 0 */ - NMC_META_GENERIC ("DEVICE"), /* 1 */ - NMC_META_GENERIC ("TYPE"), /* 2 */ - NMC_META_GENERIC ("NM-TYPE"), /* 3 */ - NMC_META_GENERIC ("VENDOR"), /* 4 */ - NMC_META_GENERIC ("PRODUCT"), /* 5 */ - NMC_META_GENERIC ("DRIVER"), /* 6 */ - NMC_META_GENERIC ("DRIVER-VERSION"), /* 7 */ - NMC_META_GENERIC ("FIRMWARE-VERSION"), /* 8 */ - NMC_META_GENERIC ("HWADDR"), /* 9 */ - NMC_META_GENERIC ("MTU"), /* 10 */ - NMC_META_GENERIC ("STATE"), /* 11 */ - NMC_META_GENERIC ("REASON"), /* 12 */ - NMC_META_GENERIC ("UDI"), /* 13 */ - NMC_META_GENERIC ("IP-IFACE"), /* 14 */ - NMC_META_GENERIC ("IS-SOFTWARE"), /* 15 */ - NMC_META_GENERIC ("NM-MANAGED"), /* 16 */ - NMC_META_GENERIC ("AUTOCONNECT"), /* 17 */ - NMC_META_GENERIC ("FIRMWARE-MISSING"), /* 18 */ - NMC_META_GENERIC ("NM-PLUGIN-MISSING"), /* 19 */ - NMC_META_GENERIC ("PHYS-PORT-ID"), /* 20 */ - NMC_META_GENERIC ("CONNECTION"), /* 21 */ - NMC_META_GENERIC ("CON-UUID"), /* 22 */ - NMC_META_GENERIC ("CON-PATH"), /* 23 */ - NMC_META_GENERIC ("METERED"), /* 24 */ - NULL, +static gconstpointer +_metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMDevice *d = target; + NMActiveConnection *ac; + NMDeviceState state; + NMDeviceStateReason state_reason; + const char *s; + + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DEVICE: + return nm_device_get_iface (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_TYPE: + return nm_device_get_type_description (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE: + return G_OBJECT_TYPE_NAME (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR: + return nm_device_get_vendor (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT: + return nm_device_get_product (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER: + s = nm_device_get_driver (d); + return s ?: nmc_meta_generic_get_str_i18n (N_("(unknown)"), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER_VERSION: + return nm_device_get_driver_version (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_FIRMWARE_VERSION: + return nm_device_get_firmware_version (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_HWADDR: + s = nm_device_get_hw_address (d); + return s ?: nmc_meta_generic_get_str_i18n (N_("(unknown)"), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_MTU: + return (*out_to_free = g_strdup_printf ("%u", (guint) nm_device_get_mtu (d))); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE: + state = nm_device_get_state (d); + // FIXME: wrong use of translation + return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state, nmc_device_state_to_string (state))); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON: + state_reason = nm_device_get_state_reason (d); + // FIXME: wrong use of translation + return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state_reason, nmc_device_reason_to_string (state_reason))); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI: + return nm_device_get_udi (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE: + return nm_device_get_ip_iface (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IS_SOFTWARE: + return nmc_meta_generic_get_bool (nm_device_is_software (d), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_MANAGED: + return nmc_meta_generic_get_bool (nm_device_get_managed (d), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_AUTOCONNECT: + return nmc_meta_generic_get_bool (nm_device_get_autoconnect (d), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_FIRMWARE_MISSING: + return nmc_meta_generic_get_bool (nm_device_get_firmware_missing (d), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_PLUGIN_MISSING: + return nmc_meta_generic_get_bool (nm_device_get_nm_plugin_missing (d), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PHYS_PORT_ID: + return nm_device_get_physical_port_id (d); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CONNECTION: + ac = nm_device_get_active_connection (d); + return ac ? nm_active_connection_get_id (ac) : NULL; + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CON_UUID: + ac = nm_device_get_active_connection (d); + return ac ? nm_active_connection_get_uuid (ac) : NULL; + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CON_PATH: + ac = nm_device_get_active_connection (d); + return ac ? nm_object_get_path (NM_OBJECT (ac)) : NULL; + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_METERED: + // FIXME: wrong use of translation + return nmc_device_metered_to_string (nm_device_get_metered (d)); + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_device_detail_general[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NUM + 1] = { +#define _METAGEN_DEVICE_DETAIL_GENERAL(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_general_get_fcn) + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DEVICE, "DEVICE"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_TYPE, "TYPE"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE, "NM-TYPE"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR, "VENDOR"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT, "PRODUCT"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER, "DRIVER"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER_VERSION, "DRIVER-VERSION"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_FIRMWARE_VERSION, "FIRMWARE-VERSION"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_HWADDR, "HWADDR"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_MTU, "MTU"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE, "STATE"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON, "REASON"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI, "UDI"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE, "IP-IFACE"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IS_SOFTWARE, "IS-SOFTWARE"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_MANAGED, "NM-MANAGED"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_AUTOCONNECT, "AUTOCONNECT"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_FIRMWARE_MISSING, "FIRMWARE-MISSING"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_PLUGIN_MISSING, "NM-PLUGIN-MISSING"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PHYS_PORT_ID, "PHYS-PORT-ID"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CONNECTION, "CONNECTION"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CON_UUID, "CON-UUID"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CON_PATH, "CON-PATH"), + _METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_METERED, "METERED"), }; -#define NMC_FIELDS_DEV_SHOW_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE" + +/*****************************************************************************/ const NmcMetaGenericInfo *const nmc_fields_dev_show_connections[] = { NMC_META_GENERIC ("NAME"), /* 0 */ @@ -238,7 +316,7 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_bluetooth[] = { /* Available sections for 'device show' */ const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = { - NMC_META_GENERIC_WITH_NESTED ("GENERAL", nmc_fields_dev_show_general + 1), /* 0 */ + NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_device_detail_general), /* 0 */ NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES", nmc_fields_dev_show_cap + 1), /* 1 */ NMC_META_GENERIC_WITH_NESTED ("WIFI-PROPERTIES", nmc_fields_dev_show_wifi_prop + 1), /* 2 */ NMC_META_GENERIC_WITH_NESTED ("AP", nmc_fields_dev_wifi_list + 1), /* 3 */ @@ -960,18 +1038,6 @@ construct_header_name (const char *base, const char *spec) return g_strdup_printf ("%s (%s)", base, spec); } -static const char * -get_active_connection_id (NMDevice *device) -{ - NMActiveConnection *ac; - - ac = nm_device_get_active_connection (device); - if (!ac) - return NULL; - - return nm_active_connection_get_id (ac); -} - static gboolean print_bond_bridge_info (NMDevice *device, NmCli *nmc, @@ -1098,13 +1164,10 @@ static gboolean show_device_info (NMDevice *device, NmCli *nmc) { GError *error = NULL; - const char *hwaddr = NULL; NMDeviceState state = NM_DEVICE_STATE_UNKNOWN; - NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE; NMDeviceCapabilities caps; - NMActiveConnection *acon; guint32 speed; - char *speed_str, *state_str, *reason_str, *mtu_str; + char *speed_str; GArray *sections_array; int k; const char *fields_str = NULL; @@ -1141,12 +1204,12 @@ show_device_info (NMDevice *device, NmCli *nmc) /* Lazy way to retrieve sorted array from 0 to the number of dev fields */ out_indices = parse_output_fields (NULL, - (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_general, + (const NMMetaAbstractInfo *const*) metagen_device_detail_general, FALSE, NULL, NULL); - row = g_new0 (NmcOutputField, G_N_ELEMENTS (nmc_fields_dev_show_general)); - for (i = 0; i < G_N_ELEMENTS (nmc_fields_dev_show_general); i++) - row[i].info = (const NMMetaAbstractInfo *) &nmc_fields_dev_show_general[i]; + row = g_new0 (NmcOutputField, G_N_ELEMENTS (metagen_device_detail_general)); + for (i = 0; i < G_N_ELEMENTS (metagen_device_detail_general); i++) + row[i].info = (const NMMetaAbstractInfo *) &metagen_device_detail_general[i]; print_required_fields (&nmc->nmc_config, NMC_OF_FLAG_MAIN_HEADER_ONLY, out_indices, header_name, @@ -1164,57 +1227,21 @@ show_device_info (NMDevice *device, NmCli *nmc) was_output = FALSE; state = nm_device_get_state (device); - reason = nm_device_get_state_reason (device); - /* section GENERAL */ - if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[0]->name)) { - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); + if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_general) { + gs_free char *f = section_fld ? g_strdup_printf ("GENERAL.%s", section_fld) : NULL; - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_general; - 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); - - state_str = g_strdup_printf ("%d (%s)", state, nmc_device_state_to_string (state)); - reason_str = g_strdup_printf ("%d (%s)", reason, nmc_device_reason_to_string (reason)); - hwaddr = nm_device_get_hw_address (device); - mtu_str = g_strdup_printf ("%u", nm_device_get_mtu (device)); - acon = nm_device_get_active_connection (device); - - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX); - set_val_strc (arr, 0, nmc_fields_dev_show_sections[0]->name); /* "GENERAL"*/ - set_val_strc (arr, 1, nm_device_get_iface (device)); - set_val_strc (arr, 2, nm_device_get_type_description (device)); - set_val_strc (arr, 3, G_OBJECT_TYPE_NAME (device)); - set_val_strc (arr, 4, nm_device_get_vendor (device)); - set_val_strc (arr, 5, nm_device_get_product (device)); - set_val_strc (arr, 6, nm_device_get_driver (device) ? nm_device_get_driver (device) : _("(unknown)")); - set_val_strc (arr, 7, nm_device_get_driver_version (device)); - set_val_strc (arr, 8, nm_device_get_firmware_version (device)); - set_val_strc (arr, 9, hwaddr ?: _("(unknown)")); - set_val_str (arr, 10, mtu_str); - set_val_str (arr, 11, state_str); - set_val_str (arr, 12, reason_str); - set_val_strc (arr, 13, nm_device_get_udi (device)); - set_val_strc (arr, 14, nm_device_get_ip_iface (device)); - set_val_strc (arr, 15, nm_device_is_software (device) ? _("yes") : _("no")); - set_val_strc (arr, 16, nm_device_get_managed (device) ? _("yes") : _("no")); - set_val_strc (arr, 17, nm_device_get_autoconnect (device) ? _("yes") : _("no")); - set_val_strc (arr, 18, nm_device_get_firmware_missing (device) ? _("yes") : _("no")); - set_val_strc (arr, 19, nm_device_get_nm_plugin_missing (device) ? _("yes") : _("no")); - set_val_strc (arr, 20, nm_device_get_physical_port_id (device)); - set_val_strc (arr, 21, get_active_connection_id (device)); - set_val_strc (arr, 22, acon ? nm_active_connection_get_uuid (acon) : NULL); - set_val_strc (arr, 23, acon ? nm_object_get_path (NM_OBJECT (acon)) : NULL); - set_val_strc (arr, 24, nmc_device_metered_to_string (nm_device_get_metered (device))); - 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); + nmc_print (&nmc->nmc_config, + (gpointer[]) { device, NULL }, + NULL, + NMC_META_GENERIC_GROUP ("GENERAL", metagen_device_detail_general, N_("NAME")), + f, + NULL); was_output = TRUE; + continue; } + /* section CAPABILITIES */ if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[1]->name)) { NMC_OUTPUT_DATA_DEFINE_SCOPED (out); diff --git a/clients/cli/devices.h b/clients/cli/devices.h index f85e3fdc41..08b3ea8fd2 100644 --- a/clients/cli/devices.h +++ b/clients/cli/devices.h @@ -35,7 +35,7 @@ NMDevice ** nmc_get_devices_sorted (NMClient *client); NMMetaColor nmc_device_state_to_color (NMDeviceState state); extern const NmcMetaGenericInfo *const metagen_device_status[]; -extern const NmcMetaGenericInfo *const nmc_fields_dev_show_general[]; +extern const NmcMetaGenericInfo *const metagen_device_detail_general[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_connections[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[]; diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 92efd7e854..be7af90362 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -196,7 +196,7 @@ complete_fields (const char *option, const char *prefix) complete_field (h, metagen_con_active_vpn); complete_field (h, nmc_fields_con_active_details_groups); complete_field (h, metagen_device_status); - complete_field (h, nmc_fields_dev_show_general); + complete_field (h, metagen_device_detail_general); complete_field (h, nmc_fields_dev_show_connections); complete_field (h, nmc_fields_dev_show_cap); complete_field (h, nmc_fields_dev_show_wired_prop); diff --git a/clients/cli/utils.h b/clients/cli/utils.h index a716cc3ab7..1e9df1aa7e 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -172,6 +172,32 @@ typedef enum { NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_PATH, _NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_NUM, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DEVICE = 0, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_TYPE, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER_VERSION, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_FIRMWARE_VERSION, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_HWADDR, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_MTU, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IS_SOFTWARE, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_MANAGED, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_AUTOCONNECT, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_FIRMWARE_MISSING, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_PLUGIN_MISSING, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PHYS_PORT_ID, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CONNECTION, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CON_UUID, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_CON_PATH, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_METERED, + _NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NUM, + } NmcGenericInfoType; #define NMC_HANDLE_COLOR(color) \ 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 9097c18898..9c5c973e28 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:860:test_003()/33 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2034 bytes +stdout: 2031 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL 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 6d761c8ad0..32847571b0 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:860:test_003()/56 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2034 bytes +stdout: 2031 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_003-106.expected b/clients/tests/test-client.check-on-disk/test_003-106.expected index 64c73ef297..bdfb514617 100644 --- a/clients/tests/test-client.check-on-disk/test_003-106.expected +++ b/clients/tests/test-client.check-on-disk/test_003-106.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/106 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2034 bytes +stdout: 2031 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_003-116.expected b/clients/tests/test-client.check-on-disk/test_003-116.expected index 0616d5e1e7..801199b530 100644 --- a/clients/tests/test-client.check-on-disk/test_003-116.expected +++ b/clients/tests/test-client.check-on-disk/test_003-116.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/116 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2034 bytes +stdout: 2031 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_003-166.expected b/clients/tests/test-client.check-on-disk/test_003-166.expected index d48062d5db..3d3d31c9cf 100644 --- a/clients/tests/test-client.check-on-disk/test_003-166.expected +++ b/clients/tests/test-client.check-on-disk/test_003-166.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:887:test_003()/166 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1199 bytes +stdout: 1196 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane CAPABILITIES:nie:100 Mb/s:nie:nie WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 diff --git a/clients/tests/test-client.check-on-disk/test_003-176.expected b/clients/tests/test-client.check-on-disk/test_003-176.expected index c15224d5ce..361c4b2f90 100644 --- a/clients/tests/test-client.check-on-disk/test_003-176.expected +++ b/clients/tests/test-client.check-on-disk/test_003-176.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:887:test_003()/176 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1199 bytes +stdout: 1196 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane CAPABILITIES:nie:100 Mb/s:nie:nie WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 diff --git a/clients/tests/test-client.check-on-disk/test_003-226.expected b/clients/tests/test-client.check-on-disk/test_003-226.expected index 2ac0c19f66..36b71525f7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-226.expected +++ b/clients/tests/test-client.check-on-disk/test_003-226.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/226 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2034 bytes +stdout: 2031 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_003-236.expected b/clients/tests/test-client.check-on-disk/test_003-236.expected index cbe7107064..7198c5d0d1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-236.expected +++ b/clients/tests/test-client.check-on-disk/test_003-236.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/236 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2034 bytes +stdout: 2031 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_003-286.expected b/clients/tests/test-client.check-on-disk/test_003-286.expected index 5a82b745dc..9a9722aa31 100644 --- a/clients/tests/test-client.check-on-disk/test_003-286.expected +++ b/clients/tests/test-client.check-on-disk/test_003-286.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/286 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2002 bytes +stdout: 1999 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_003-296.expected b/clients/tests/test-client.check-on-disk/test_003-296.expected index 92c01051ad..abea0ebed2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-296.expected +++ b/clients/tests/test-client.check-on-disk/test_003-296.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/296 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2002 bytes +stdout: 1999 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_003-346.expected b/clients/tests/test-client.check-on-disk/test_003-346.expected index 2917822846..0dea943f49 100644 --- a/clients/tests/test-client.check-on-disk/test_003-346.expected +++ b/clients/tests/test-client.check-on-disk/test_003-346.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:887:test_003()/346 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1167 bytes +stdout: 1164 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane CAPABILITIES:nie:100 Mb/s:nie:nie WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 diff --git a/clients/tests/test-client.check-on-disk/test_003-356.expected b/clients/tests/test-client.check-on-disk/test_003-356.expected index 261cb8706c..d81e583fc6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-356.expected +++ b/clients/tests/test-client.check-on-disk/test_003-356.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:887:test_003()/356 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1167 bytes +stdout: 1164 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane CAPABILITIES:nie:100 Mb/s:nie:nie WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 diff --git a/clients/tests/test-client.check-on-disk/test_003-406.expected b/clients/tests/test-client.check-on-disk/test_003-406.expected index 22ac9ce7c8..0632217b41 100644 --- a/clients/tests/test-client.check-on-disk/test_003-406.expected +++ b/clients/tests/test-client.check-on-disk/test_003-406.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/406 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2002 bytes +stdout: 1999 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_003-416.expected b/clients/tests/test-client.check-on-disk/test_003-416.expected index f7a0b5cf6d..e034b3cbbe 100644 --- a/clients/tests/test-client.check-on-disk/test_003-416.expected +++ b/clients/tests/test-client.check-on-disk/test_003-416.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/416 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2002 bytes +stdout: 1999 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected index bbaef46ff8..a40112a3d4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-040.expected +++ b/clients/tests/test-client.check-on-disk/test_004-040.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:963:test_004()/40 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 943 bytes +stdout: 940 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP diff --git a/clients/tests/test-client.check-on-disk/test_004-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected index 2317cd91ad..d9bbfc1a4a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-128.expected +++ b/clients/tests/test-client.check-on-disk/test_004-128.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/128 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2510 bytes +stdout: 2507 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP diff --git a/clients/tests/test-client.check-on-disk/test_004-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected index bae7620978..69a445e05d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-132.expected +++ b/clients/tests/test-client.check-on-disk/test_004-132.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/132 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2510 bytes +stdout: 2507 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP diff --git a/clients/tests/test-client.check-on-disk/test_004-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected index 4ea1fb9b36..c934addd05 100644 --- a/clients/tests/test-client.check-on-disk/test_004-146.expected +++ b/clients/tests/test-client.check-on-disk/test_004-146.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/146 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2726 bytes +stdout: 2723 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP diff --git a/clients/tests/test-client.check-on-disk/test_004-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected index aeb3f0588a..0fa20ed767 100644 --- a/clients/tests/test-client.check-on-disk/test_004-150.expected +++ b/clients/tests/test-client.check-on-disk/test_004-150.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/150 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2726 bytes +stdout: 2723 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP diff --git a/clients/tests/test-client.check-on-disk/test_004-236.expected b/clients/tests/test-client.check-on-disk/test_004-236.expected index b35e6f1e42..8f017e3b42 100644 --- a/clients/tests/test-client.check-on-disk/test_004-236.expected +++ b/clients/tests/test-client.check-on-disk/test_004-236.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:984:test_004()/236 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1207 bytes +stdout: 1204 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane +GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane CAPABILITIES:nie:nieznane:nie:nie WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-240.expected b/clients/tests/test-client.check-on-disk/test_004-240.expected index b246d9a043..d06a02a8b2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-240.expected +++ b/clients/tests/test-client.check-on-disk/test_004-240.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:988:test_004()/240 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1207 bytes +stdout: 1204 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane +GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane CAPABILITIES:nie:nieznane:nie:nie WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-254.expected b/clients/tests/test-client.check-on-disk/test_004-254.expected index 01a7767ece..2095db4ea9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-254.expected +++ b/clients/tests/test-client.check-on-disk/test_004-254.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:984:test_004()/254 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1450 bytes +stdout: 1447 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane +GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane CAPABILITIES:nie:nieznane:nie:nie WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-258.expected b/clients/tests/test-client.check-on-disk/test_004-258.expected index f56c1906be..7d3651d4a5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-258.expected +++ b/clients/tests/test-client.check-on-disk/test_004-258.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:988:test_004()/258 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1450 bytes +stdout: 1447 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane +GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane CAPABILITIES:nie:nieznane:nie:nie WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-344.expected b/clients/tests/test-client.check-on-disk/test_004-344.expected index cc4ac7be7c..dea67c7f93 100644 --- a/clients/tests/test-client.check-on-disk/test_004-344.expected +++ b/clients/tests/test-client.check-on-disk/test_004-344.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/344 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2510 bytes +stdout: 2507 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP diff --git a/clients/tests/test-client.check-on-disk/test_004-348.expected b/clients/tests/test-client.check-on-disk/test_004-348.expected index 370e51b90a..b4d1301c01 100644 --- a/clients/tests/test-client.check-on-disk/test_004-348.expected +++ b/clients/tests/test-client.check-on-disk/test_004-348.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/348 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2510 bytes +stdout: 2507 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP diff --git a/clients/tests/test-client.check-on-disk/test_004-362.expected b/clients/tests/test-client.check-on-disk/test_004-362.expected index a8096a9b23..5b18cfa09e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-362.expected +++ b/clients/tests/test-client.check-on-disk/test_004-362.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/362 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2726 bytes +stdout: 2723 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP diff --git a/clients/tests/test-client.check-on-disk/test_004-366.expected b/clients/tests/test-client.check-on-disk/test_004-366.expected index 311fd8e42c..c22fe4d46a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-366.expected +++ b/clients/tests/test-client.check-on-disk/test_004-366.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/366 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2726 bytes +stdout: 2723 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -18,11 +18,11 @@ GENERAL.STATE:20 (niedostępne) GENERAL.REASON:0 (Nie podano przyczyny) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: -GENERAL.IS-SOFTWARE:nie -GENERAL.NM-MANAGED:tak -GENERAL.AUTOCONNECT:tak -GENERAL.FIRMWARE-MISSING:nie -GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP From 6f8f7ad597e8b4785dde2a44a5776b43534249fd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 27 Apr 2018 12:05:29 +0200 Subject: [PATCH 08/14] cli: rework enum-to-string function to not return translated text There are cases, where we need the untranslated text. There is no change of behavior of this patch, because all callers now explicitly call gettext(). --- clients/cli/connections.c | 4 +- clients/cli/devices.c | 14 +- clients/cli/general.c | 2 +- clients/common/nm-client-utils.c | 347 ++++++++++--------------------- 4 files changed, 124 insertions(+), 243 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 8395b7d0fe..f947a45e34 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -2440,7 +2440,7 @@ progress_active_connection_cb (gpointer user_data) } str = device - ? nmc_device_state_to_string (nm_device_get_state (device)) + ? gettext (nmc_device_state_to_string (nm_device_get_state (device))) : active_connection_state_to_string (ac_state); nmc_terminal_show_progress (str); @@ -6560,7 +6560,7 @@ progress_activation_editor_cb (gpointer user_data) ac_state = nm_active_connection_get_state (ac); dev_state = nm_device_get_state (device); - nmc_terminal_show_progress (nmc_device_state_to_string (dev_state)); + nmc_terminal_show_progress (gettext (nmc_device_state_to_string (dev_state))); if ( ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED || dev_state == NM_DEVICE_STATE_ACTIVATED) { diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 6e005044a0..8e9fa15319 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -55,7 +55,7 @@ _metagen_device_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_TYPE: return nm_device_get_type_description (d); case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE: - return nmc_device_state_to_string (nm_device_get_state (d)); + return gettext (nmc_device_state_to_string (nm_device_get_state (d))); case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH: return nm_object_get_path (NM_OBJECT (d)); case NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION: @@ -125,11 +125,11 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE: state = nm_device_get_state (d); // FIXME: wrong use of translation - return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state, nmc_device_state_to_string (state))); + return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state, gettext (nmc_device_state_to_string (state)))); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON: state_reason = nm_device_get_state_reason (d); // FIXME: wrong use of translation - return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state_reason, nmc_device_reason_to_string (state_reason))); + return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state_reason, gettext (nmc_device_reason_to_string (state_reason)))); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI: return nm_device_get_udi (d); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE: @@ -157,7 +157,7 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) return ac ? nm_object_get_path (NM_OBJECT (ac)) : NULL; case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_METERED: // FIXME: wrong use of translation - return nmc_device_metered_to_string (nm_device_get_metered (d)); + return gettext (nmc_device_metered_to_string (nm_device_get_metered (d))); default: break; } @@ -1642,7 +1642,7 @@ progress_cb (gpointer user_data) { NMDevice *device = (NMDevice *) user_data; - nmc_terminal_show_progress (device ? nmc_device_state_to_string (nm_device_get_state (device)) : ""); + nmc_terminal_show_progress (device ? gettext (nmc_device_state_to_string (nm_device_get_state (device))) : ""); return TRUE; } @@ -1687,7 +1687,7 @@ connected_state_cb (NMDevice *device, NMActiveConnection *active) || state >= NM_DEVICE_STATE_DEACTIVATING) { reason = nm_device_get_state_reason (device); g_print (_("Error: Connection activation failed: (%d) %s.\n"), - reason, nmc_device_reason_to_string (reason)); + reason, gettext (nmc_device_reason_to_string (reason))); } else return; @@ -2427,7 +2427,7 @@ device_state (NMDevice *device, GParamSpec *pspec, NmCli *nmc) color = nmc_device_state_to_color (state); str = nmc_colorize (&nmc->nmc_config, color, "%s: %s\n", nm_device_get_iface (device), - nmc_device_state_to_string (state)); + gettext (nmc_device_state_to_string (state))); g_print ("%s", str); g_free (str); diff --git a/clients/cli/general.c b/clients/cli/general.c index de7439708b..2e030ec78a 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -1316,7 +1316,7 @@ do_overview (NmCli *nmc, int argc, char **argv) color = nmc_device_state_to_color (state); tmp = nmc_colorize (&nmc->nmc_config, color, "%s: %s%s%s", nm_device_get_iface (devices[i]), - nmc_device_state_to_string (state), + gettext (nmc_device_state_to_string (state)), ac ? " to " : "", ac ? nm_active_connection_get_id (ac) : ""); g_print ("%s\n", tmp); diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index fec6e33b8f..058ddae39a 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -256,241 +256,122 @@ nmc_bond_validate_mode (const char *mode, GError **error) return nmc_string_is_valid (mode, valid_modes, error); } -const char * -nmc_device_state_to_string (NMDeviceState state) -{ - switch (state) { - case NM_DEVICE_STATE_UNMANAGED: - return _("unmanaged"); - case NM_DEVICE_STATE_UNAVAILABLE: - return _("unavailable"); - case NM_DEVICE_STATE_DISCONNECTED: - return _("disconnected"); - case NM_DEVICE_STATE_PREPARE: - return _("connecting (prepare)"); - case NM_DEVICE_STATE_CONFIG: - return _("connecting (configuring)"); - case NM_DEVICE_STATE_NEED_AUTH: - return _("connecting (need authentication)"); - case NM_DEVICE_STATE_IP_CONFIG: - return _("connecting (getting IP configuration)"); - case NM_DEVICE_STATE_IP_CHECK: - return _("connecting (checking IP connectivity)"); - case NM_DEVICE_STATE_SECONDARIES: - return _("connecting (starting secondary connections)"); - case NM_DEVICE_STATE_ACTIVATED: - return _("connected"); - case NM_DEVICE_STATE_DEACTIVATING: - return _("deactivating"); - case NM_DEVICE_STATE_FAILED: - return _("connection failed"); - case NM_DEVICE_STATE_UNKNOWN: - return _("unknown"); - } +NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_state_to_string, NMDeviceState, + NM_UTILS_LOOKUP_DEFAULT (N_("unknown")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_UNMANAGED, N_("unmanaged")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_UNAVAILABLE, N_("unavailable")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_DISCONNECTED, N_("disconnected")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_PREPARE, N_("connecting (prepare)")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_CONFIG, N_("connecting (configuring)")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_NEED_AUTH, N_("connecting (need authentication)")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_IP_CONFIG, N_("connecting (getting IP configuration)")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_IP_CHECK, N_("connecting (checking IP connectivity)")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_SECONDARIES, N_("connecting (starting secondary connections)")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_ACTIVATED, N_("connected")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_DEACTIVATING, N_("deactivating")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_FAILED, N_("connection failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_UNKNOWN, N_("unknown")), +) - return _("unknown"); -} - -const char * -nmc_device_metered_to_string (NMMetered value) -{ - switch (value) { - case NM_METERED_YES: - return _("yes"); - case NM_METERED_NO: - return _("no"); - case NM_METERED_GUESS_YES: - return _("yes (guessed)"); - case NM_METERED_GUESS_NO: - return _("no (guessed)"); - case NM_METERED_UNKNOWN: - return _("unknown"); - } - - return _("unknown"); -} - -const char * -nmc_device_reason_to_string (NMDeviceStateReason reason) -{ - switch (reason) { - case NM_DEVICE_STATE_REASON_NONE: - return _("No reason given"); - case NM_DEVICE_STATE_REASON_UNKNOWN: - return _("Unknown error"); - case NM_DEVICE_STATE_REASON_NOW_MANAGED: - return _("Device is now managed"); - case NM_DEVICE_STATE_REASON_NOW_UNMANAGED: - return _("Device is now unmanaged"); - case NM_DEVICE_STATE_REASON_CONFIG_FAILED: - return _("The device could not be readied for configuration"); - case NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE: - return _("IP configuration could not be reserved (no available address, timeout, etc.)"); - case NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED: - return _("The IP configuration is no longer valid"); - case NM_DEVICE_STATE_REASON_NO_SECRETS: - return _("Secrets were required, but not provided"); - case NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT: - return _("802.1X supplicant disconnected"); - case NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED: - return _("802.1X supplicant configuration failed"); - case NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED: - return _("802.1X supplicant failed"); - case NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT: - return _("802.1X supplicant took too long to authenticate"); - case NM_DEVICE_STATE_REASON_PPP_START_FAILED: - return _("PPP service failed to start"); - case NM_DEVICE_STATE_REASON_PPP_DISCONNECT: - return _("PPP service disconnected"); - case NM_DEVICE_STATE_REASON_PPP_FAILED: - return _("PPP failed"); - case NM_DEVICE_STATE_REASON_DHCP_START_FAILED: - return _("DHCP client failed to start"); - case NM_DEVICE_STATE_REASON_DHCP_ERROR: - return _("DHCP client error"); - case NM_DEVICE_STATE_REASON_DHCP_FAILED: - return _("DHCP client failed"); - case NM_DEVICE_STATE_REASON_SHARED_START_FAILED: - return _("Shared connection service failed to start"); - case NM_DEVICE_STATE_REASON_SHARED_FAILED: - return _("Shared connection service failed"); - case NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED: - return _("AutoIP service failed to start"); - case NM_DEVICE_STATE_REASON_AUTOIP_ERROR: - return _("AutoIP service error"); - case NM_DEVICE_STATE_REASON_AUTOIP_FAILED: - return _("AutoIP service failed"); - case NM_DEVICE_STATE_REASON_MODEM_BUSY: - return _("The line is busy"); - case NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE: - return _("No dial tone"); - case NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER: - return _("No carrier could be established"); - case NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT: - return _("The dialing request timed out"); - case NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED: - return _("The dialing attempt failed"); - case NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED: - return _("Modem initialization failed"); - case NM_DEVICE_STATE_REASON_GSM_APN_FAILED: - return _("Failed to select the specified APN"); - case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING: - return _("Not searching for networks"); - case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED: - return _("Network registration denied"); - case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT: - return _("Network registration timed out"); - case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED: - return _("Failed to register with the requested network"); - case NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED: - return _("PIN check failed"); - case NM_DEVICE_STATE_REASON_FIRMWARE_MISSING: - return _("Necessary firmware for the device may be missing"); - case NM_DEVICE_STATE_REASON_REMOVED: - return _("The device was removed"); - case NM_DEVICE_STATE_REASON_SLEEPING: - return _("NetworkManager went to sleep"); - case NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: - return _("The device's active connection disappeared"); - case NM_DEVICE_STATE_REASON_USER_REQUESTED: - return _("Device disconnected by user or client"); - case NM_DEVICE_STATE_REASON_CARRIER: - return _("Carrier/link changed"); - case NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED: - return _("The device's existing connection was assumed"); - case NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE: - return _("The supplicant is now available"); - case NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND: - return _("The modem could not be found"); - case NM_DEVICE_STATE_REASON_BT_FAILED: - return _("The Bluetooth connection failed or timed out"); - case NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED: - return _("GSM Modem's SIM card not inserted"); - case NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED: - return _("GSM Modem's SIM PIN required"); - case NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED: - return _("GSM Modem's SIM PUK required"); - case NM_DEVICE_STATE_REASON_GSM_SIM_WRONG: - return _("GSM Modem's SIM wrong"); - case NM_DEVICE_STATE_REASON_INFINIBAND_MODE: - return _("InfiniBand device does not support connected mode"); - case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: - return _("A dependency of the connection failed"); - case NM_DEVICE_STATE_REASON_BR2684_FAILED: - return _("A problem with the RFC 2684 Ethernet over ADSL bridge"); - case NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: - return _("ModemManager is unavailable"); - case NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: - return _("The Wi-Fi network could not be found"); - case NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: - return _("A secondary connection of the base connection failed"); - case NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: - return _("DCB or FCoE setup failed"); - case NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: - return _("teamd control failed"); - case NM_DEVICE_STATE_REASON_MODEM_FAILED: - return _("Modem failed or no longer available"); - case NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: - return _("Modem now ready and available"); - case NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: - return _("SIM PIN was incorrect"); - case NM_DEVICE_STATE_REASON_NEW_ACTIVATION: - return _("New connection activation was enqueued"); - case NM_DEVICE_STATE_REASON_PARENT_CHANGED: - return _("The device's parent changed"); - case NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: - return _("The device parent's management changed"); - case NM_DEVICE_STATE_REASON_OVSDB_FAILED: - return _("OpenVSwitch database connection failed"); - case NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: - return _("A duplicate IP address was detected"); - case NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: - return _("The selected IP method is not supported"); - } +NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_metered_to_string, NMMetered, + NM_UTILS_LOOKUP_DEFAULT (N_("unknown")), + NM_UTILS_LOOKUP_ITEM (NM_METERED_YES, N_("yes")), + NM_UTILS_LOOKUP_ITEM (NM_METERED_NO, N_("no")), + NM_UTILS_LOOKUP_ITEM (NM_METERED_GUESS_YES, N_("yes (guessed)")), + NM_UTILS_LOOKUP_ITEM (NM_METERED_GUESS_NO, N_("no (guessed)")), + NM_UTILS_LOOKUP_ITEM (NM_METERED_UNKNOWN, N_("unknown")), +) +NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_reason_to_string, NMDeviceStateReason, /* TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) */ - return _("Unknown"); -} + NM_UTILS_LOOKUP_DEFAULT (N_("Unknown")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_NONE, N_("No reason given")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_UNKNOWN, N_("Unknown error")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_NOW_MANAGED, N_("Device is now managed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_NOW_UNMANAGED, N_("Device is now unmanaged")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_CONFIG_FAILED, N_("The device could not be readied for configuration")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE, N_("IP configuration could not be reserved (no available address, timeout, etc.)")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED, N_("The IP configuration is no longer valid")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_NO_SECRETS, N_("Secrets were required, but not provided")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT, N_("802.1X supplicant disconnected")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED, N_("802.1X supplicant configuration failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED, N_("802.1X supplicant failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT, N_("802.1X supplicant took too long to authenticate")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PPP_START_FAILED, N_("PPP service failed to start")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PPP_DISCONNECT, N_("PPP service disconnected")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PPP_FAILED, N_("PPP failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_DHCP_START_FAILED, N_("DHCP client failed to start")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_DHCP_ERROR, N_("DHCP client error")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_DHCP_FAILED, N_("DHCP client failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SHARED_START_FAILED, N_("Shared connection service failed to start")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SHARED_FAILED, N_("Shared connection service failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED, N_("AutoIP service failed to start")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_AUTOIP_ERROR, N_("AutoIP service error")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_AUTOIP_FAILED, N_("AutoIP service failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_BUSY, N_("The line is busy")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE, N_("No dial tone")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER, N_("No carrier could be established")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT, N_("The dialing request timed out")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED, N_("The dialing attempt failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED, N_("Modem initialization failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_APN_FAILED, N_("Failed to select the specified APN")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING, N_("Not searching for networks")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED, N_("Network registration denied")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT, N_("Network registration timed out")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED, N_("Failed to register with the requested network")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED, N_("PIN check failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_FIRMWARE_MISSING, N_("Necessary firmware for the device may be missing")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_REMOVED, N_("The device was removed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SLEEPING, N_("NetworkManager went to sleep")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_CONNECTION_REMOVED, N_("The device's active connection disappeared")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_USER_REQUESTED, N_("Device disconnected by user or client")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_CARRIER, N_("Carrier/link changed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED, N_("The device's existing connection was assumed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE, N_("The supplicant is now available")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND, N_("The modem could not be found")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_BT_FAILED, N_("The Bluetooth connection failed or timed out")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED, N_("GSM Modem's SIM card not inserted")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED, N_("GSM Modem's SIM PIN required")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED, N_("GSM Modem's SIM PUK required")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_GSM_SIM_WRONG, N_("GSM Modem's SIM wrong")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_INFINIBAND_MODE, N_("InfiniBand device does not support connected mode")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED, N_("A dependency of the connection failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_BR2684_FAILED, N_("A problem with the RFC 2684 Ethernet over ADSL bridge")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE, N_("ModemManager is unavailable")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SSID_NOT_FOUND, N_("The Wi-Fi network could not be found")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED, N_("A secondary connection of the base connection failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED, N_("DCB or FCoE setup failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED, N_("teamd control failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_FAILED, N_("Modem failed or no longer available")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_MODEM_AVAILABLE, N_("Modem now ready and available")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT, N_("SIM PIN was incorrect")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_NEW_ACTIVATION, N_("New connection activation was enqueued")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PARENT_CHANGED, N_("The device's parent changed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED, N_("The device parent's management changed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_OVSDB_FAILED, N_("OpenVSwitch database connection failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE, N_("A duplicate IP address was detected")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED, N_("The selected IP method is not supported")), +) -const char * -nm_active_connection_state_reason_to_string (NMActiveConnectionStateReason reason) -{ - switch (reason) { - case NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN: - return _("Unknown reason"); - case NM_ACTIVE_CONNECTION_STATE_REASON_NONE: - return _("The connection was disconnected"); - case NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED: - return _("Disconnected by user"); - case NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: - return _("The base network connection was interrupted"); - case NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED: - return _("The VPN service stopped unexpectedly"); - case NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: - return _("The VPN service returned invalid configuration"); - case NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: - return _("The connection attempt timed out"); - case NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: - return _("The VPN service did not start in time"); - case NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED: - return _("The VPN service failed to start"); - case NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS: - return _("No valid secrets"); - case NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED: - return _("Invalid secrets"); - case NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED: - return _("The connection was removed"); - case NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED: - return _("Master connection failed"); - case NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED: - return _("Could not create a software link"); - case NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED: - return _("The device disappeared"); - default: - /* TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason) */ - return _("Unknown"); - } -} +NM_UTILS_LOOKUP_STR_DEFINE (nm_active_connection_state_reason_to_string, NMActiveConnectionStateReason, + /* TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason) */ + NM_UTILS_LOOKUP_DEFAULT (N_("Unknown")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN, N_("Unknown reason")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_NONE, N_("The connection was disconnected")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED, N_("Disconnected by user")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED, N_("The base network connection was interrupted")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED, N_("The VPN service stopped unexpectedly")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID, N_("The VPN service returned invalid configuration")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT, N_("The connection attempt timed out")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT, N_("The VPN service did not start in time")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED, N_("The VPN service failed to start")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS, N_("No valid secrets")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED, N_("Invalid secrets")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED, N_("The connection was removed")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED, N_("Master connection failed")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED, N_("Could not create a software link")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED, N_("The device disappeared")), +) NMActiveConnectionState nmc_activation_get_effective_state (NMActiveConnection *active, @@ -524,14 +405,14 @@ nmc_activation_get_effective_state (NMActiveConnection *active, * - or, @ac_reason is specific * - or, @device no longer references the current @active * >> we complete with @ac_reason. */ - *reason = nm_active_connection_state_reason_to_string (ac_reason); + *reason = gettext (nm_active_connection_state_reason_to_string (ac_reason)); } else if ( dev_state <= NM_DEVICE_STATE_DISCONNECTED || dev_state >= NM_DEVICE_STATE_FAILED) { /* (2) * - not (1) * - and, the device is no longer in an activated state, * >> we complete with @dev_reason. */ - *reason = nmc_device_reason_to_string (dev_reason); + *reason = gettext (nmc_device_reason_to_string (dev_reason)); } else { /* (3) * we wait for the device go disconnect. We will get a better From e771153c0a7ef557c6b48cfb7ff4aa6814f88349 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 27 Apr 2018 12:28:23 +0200 Subject: [PATCH 09/14] cli: don't translate device details in terse mode https://bugzilla.gnome.org/show_bug.cgi?id=794329 --- clients/cli/devices.c | 16 ++++++++++------ .../test_003-033.expected | 8 ++++---- .../test_003-056.expected | 8 ++++---- .../test_003-106.expected | 8 ++++---- .../test_003-116.expected | 8 ++++---- .../test_003-166.expected | 4 ++-- .../test_003-176.expected | 4 ++-- .../test_003-226.expected | 8 ++++---- .../test_003-236.expected | 8 ++++---- .../test_003-286.expected | 8 ++++---- .../test_003-296.expected | 8 ++++---- .../test_003-346.expected | 4 ++-- .../test_003-356.expected | 4 ++-- .../test_003-406.expected | 8 ++++---- .../test_003-416.expected | 8 ++++---- .../test_004-040.expected | 8 ++++---- .../test_004-128.expected | 8 ++++---- .../test_004-130.expected | 4 ++-- .../test_004-132.expected | 8 ++++---- .../test_004-146.expected | 8 ++++---- .../test_004-148.expected | 4 ++-- .../test_004-150.expected | 8 ++++---- .../test_004-236.expected | 4 ++-- .../test_004-238.expected | 4 ++-- .../test_004-240.expected | 4 ++-- .../test_004-254.expected | 4 ++-- .../test_004-256.expected | 4 ++-- .../test_004-258.expected | 4 ++-- .../test_004-344.expected | 8 ++++---- .../test_004-346.expected | 4 ++-- .../test_004-348.expected | 8 ++++---- .../test_004-362.expected | 8 ++++---- .../test_004-364.expected | 4 ++-- .../test_004-366.expected | 8 ++++---- 34 files changed, 114 insertions(+), 110 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 8e9fa15319..3ca6e2bd9c 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -124,12 +124,16 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) return (*out_to_free = g_strdup_printf ("%u", (guint) nm_device_get_mtu (d))); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE: state = nm_device_get_state (d); - // FIXME: wrong use of translation - return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state, gettext (nmc_device_state_to_string (state)))); + return (*out_to_free = nmc_meta_generic_get_enum_with_detail (NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES, + state, + nmc_device_state_to_string (state), + get_type)); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON: state_reason = nm_device_get_state_reason (d); - // FIXME: wrong use of translation - return (*out_to_free = g_strdup_printf ("%d (%s)", (int) state_reason, gettext (nmc_device_reason_to_string (state_reason)))); + return (*out_to_free = nmc_meta_generic_get_enum_with_detail (NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES, + state_reason, + nmc_device_reason_to_string (state_reason), + get_type)); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI: return nm_device_get_udi (d); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE: @@ -156,8 +160,8 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) ac = nm_device_get_active_connection (d); return ac ? nm_object_get_path (NM_OBJECT (ac)) : NULL; case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_METERED: - // FIXME: wrong use of translation - return gettext (nmc_device_metered_to_string (nm_device_get_metered (d))); + return nmc_meta_generic_get_str_i18n (nmc_device_metered_to_string (nm_device_get_metered (d)), + get_type); default: break; } 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 9c5c973e28..eba78584a0 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:860:test_003()/33 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2031 bytes +stdout: 2024 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie 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 32847571b0..97e54473fe 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:860:test_003()/56 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2031 bytes +stdout: 2024 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_003-106.expected b/clients/tests/test-client.check-on-disk/test_003-106.expected index bdfb514617..e66fba072e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-106.expected +++ b/clients/tests/test-client.check-on-disk/test_003-106.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/106 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2031 bytes +stdout: 2024 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_003-116.expected b/clients/tests/test-client.check-on-disk/test_003-116.expected index 801199b530..4f6e635ae3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-116.expected +++ b/clients/tests/test-client.check-on-disk/test_003-116.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/116 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2031 bytes +stdout: 2024 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_003-166.expected b/clients/tests/test-client.check-on-disk/test_003-166.expected index 3d3d31c9cf..fe7aeadcaf 100644 --- a/clients/tests/test-client.check-on-disk/test_003-166.expected +++ b/clients/tests/test-client.check-on-disk/test_003-166.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:887:test_003()/166 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1196 bytes +stdout: 1189 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:nie:100 Mb/s:nie:nie WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 diff --git a/clients/tests/test-client.check-on-disk/test_003-176.expected b/clients/tests/test-client.check-on-disk/test_003-176.expected index 361c4b2f90..680fa73a9f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-176.expected +++ b/clients/tests/test-client.check-on-disk/test_003-176.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:887:test_003()/176 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1196 bytes +stdout: 1189 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:nie:100 Mb/s:nie:nie WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 diff --git a/clients/tests/test-client.check-on-disk/test_003-226.expected b/clients/tests/test-client.check-on-disk/test_003-226.expected index 36b71525f7..1805330259 100644 --- a/clients/tests/test-client.check-on-disk/test_003-226.expected +++ b/clients/tests/test-client.check-on-disk/test_003-226.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/226 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2031 bytes +stdout: 2024 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_003-236.expected b/clients/tests/test-client.check-on-disk/test_003-236.expected index 7198c5d0d1..61e1b1923c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-236.expected +++ b/clients/tests/test-client.check-on-disk/test_003-236.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/236 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2031 bytes +stdout: 2024 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_003-286.expected b/clients/tests/test-client.check-on-disk/test_003-286.expected index 9a9722aa31..7bec06ab29 100644 --- a/clients/tests/test-client.check-on-disk/test_003-286.expected +++ b/clients/tests/test-client.check-on-disk/test_003-286.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/286 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1999 bytes +stdout: 1992 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_003-296.expected b/clients/tests/test-client.check-on-disk/test_003-296.expected index abea0ebed2..ade04f397d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-296.expected +++ b/clients/tests/test-client.check-on-disk/test_003-296.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/296 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1999 bytes +stdout: 1992 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_003-346.expected b/clients/tests/test-client.check-on-disk/test_003-346.expected index 0dea943f49..059172f7e0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-346.expected +++ b/clients/tests/test-client.check-on-disk/test_003-346.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:887:test_003()/346 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1164 bytes +stdout: 1157 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:nie:100 Mb/s:nie:nie WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 diff --git a/clients/tests/test-client.check-on-disk/test_003-356.expected b/clients/tests/test-client.check-on-disk/test_003-356.expected index d81e583fc6..b318159056 100644 --- a/clients/tests/test-client.check-on-disk/test_003-356.expected +++ b/clients/tests/test-client.check-on-disk/test_003-356.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:887:test_003()/356 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1164 bytes +stdout: 1157 bytes >>> -GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:nie:100 Mb/s:nie:nie WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 diff --git a/clients/tests/test-client.check-on-disk/test_003-406.expected b/clients/tests/test-client.check-on-disk/test_003-406.expected index 0632217b41..7fca7218e7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-406.expected +++ b/clients/tests/test-client.check-on-disk/test_003-406.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/406 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1999 bytes +stdout: 1992 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_003-416.expected b/clients/tests/test-client.check-on-disk/test_003-416.expected index e034b3cbbe..5709c0d21b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-416.expected +++ b/clients/tests/test-client.check-on-disk/test_003-416.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/416 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1999 bytes +stdout: 1992 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:C0:61:AE:26:4D:D7 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/eth0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected index a40112a3d4..17560ee4d2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-040.expected +++ b/clients/tests/test-client.check-on-disk/test_004-040.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:963:test_004()/40 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 940 bytes +stdout: 933 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown GENERAL.HWADDR:13:E0:74:85:7C:D9 WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak diff --git a/clients/tests/test-client.check-on-disk/test_004-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected index d9bbfc1a4a..62dddf96ac 100644 --- a/clients/tests/test-client.check-on-disk/test_004-128.expected +++ b/clients/tests/test-client.check-on-disk/test_004-128.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/128 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2507 bytes +stdout: 2500 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:nieznane CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_004-130.expected b/clients/tests/test-client.check-on-disk/test_004-130.expected index a15eeb5fc1..722e99365a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-130.expected +++ b/clients/tests/test-client.check-on-disk/test_004-130.expected @@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/130 cmd: $NMCLI --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 740 bytes +stdout: 739 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) +GENERAL.STATE:20 (unavailable) GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 IP4.ADDRESS[1]:192.168.228.18/32 diff --git a/clients/tests/test-client.check-on-disk/test_004-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected index 69a445e05d..240bac22ad 100644 --- a/clients/tests/test-client.check-on-disk/test_004-132.expected +++ b/clients/tests/test-client.check-on-disk/test_004-132.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/132 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2507 bytes +stdout: 2500 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:nieznane CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_004-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected index c934addd05..fe875057c6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-146.expected +++ b/clients/tests/test-client.check-on-disk/test_004-146.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/146 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2723 bytes +stdout: 2716 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:nieznane CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_004-148.expected b/clients/tests/test-client.check-on-disk/test_004-148.expected index 6ae2ebaed7..aca6d84b03 100644 --- a/clients/tests/test-client.check-on-disk/test_004-148.expected +++ b/clients/tests/test-client.check-on-disk/test_004-148.expected @@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/148 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 740 bytes +stdout: 739 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) +GENERAL.STATE:20 (unavailable) GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 IP4.ADDRESS[1]:192.168.228.18/32 diff --git a/clients/tests/test-client.check-on-disk/test_004-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected index 0fa20ed767..272d5373a9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-150.expected +++ b/clients/tests/test-client.check-on-disk/test_004-150.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/150 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2723 bytes +stdout: 2716 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:nieznane CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_004-236.expected b/clients/tests/test-client.check-on-disk/test_004-236.expected index 8f017e3b42..12962d4464 100644 --- a/clients/tests/test-client.check-on-disk/test_004-236.expected +++ b/clients/tests/test-client.check-on-disk/test_004-236.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:984:test_004()/236 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1204 bytes +stdout: 1197 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane +GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:nie:nieznane:nie:nie WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-238.expected b/clients/tests/test-client.check-on-disk/test_004-238.expected index dd78d13094..9812c98e6f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-238.expected +++ b/clients/tests/test-client.check-on-disk/test_004-238.expected @@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/238 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 447 bytes +stdout: 446 bytes >>> wlan0 wifi 13\:E0\:74\:85\:7C\:D9 0 -20 (niedostępne) +20 (unavailable) con-vpn-1 /org/freedesktop/NetworkManager/ActiveConnection/2 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79 diff --git a/clients/tests/test-client.check-on-disk/test_004-240.expected b/clients/tests/test-client.check-on-disk/test_004-240.expected index d06a02a8b2..a59dee741a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-240.expected +++ b/clients/tests/test-client.check-on-disk/test_004-240.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:988:test_004()/240 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1204 bytes +stdout: 1197 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane +GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:nie:nieznane:nie:nie WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-254.expected b/clients/tests/test-client.check-on-disk/test_004-254.expected index 2095db4ea9..4a20e69bca 100644 --- a/clients/tests/test-client.check-on-disk/test_004-254.expected +++ b/clients/tests/test-client.check-on-disk/test_004-254.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:984:test_004()/254 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1447 bytes +stdout: 1440 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane +GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:nie:nieznane:nie:nie WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-256.expected b/clients/tests/test-client.check-on-disk/test_004-256.expected index c29a93b849..d8656df7e6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-256.expected +++ b/clients/tests/test-client.check-on-disk/test_004-256.expected @@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/256 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 447 bytes +stdout: 446 bytes >>> wlan0 wifi 13\:E0\:74\:85\:7C\:D9 0 -20 (niedostępne) +20 (unavailable) con-vpn-1 /org/freedesktop/NetworkManager/ActiveConnection/2 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79 diff --git a/clients/tests/test-client.check-on-disk/test_004-258.expected b/clients/tests/test-client.check-on-disk/test_004-258.expected index 7d3651d4a5..6cd013166e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-258.expected +++ b/clients/tests/test-client.check-on-disk/test_004-258.expected @@ -2,9 +2,9 @@ location: clients/tests/test-client.py:988:test_004()/258 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1447 bytes +stdout: 1440 bytes >>> -GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane +GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:nie:nieznane:nie:nie WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-344.expected b/clients/tests/test-client.check-on-disk/test_004-344.expected index dea67c7f93..4e34f933b5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-344.expected +++ b/clients/tests/test-client.check-on-disk/test_004-344.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/344 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2507 bytes +stdout: 2500 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:nieznane CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_004-346.expected b/clients/tests/test-client.check-on-disk/test_004-346.expected index b728a32e71..4ebd610a6a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-346.expected +++ b/clients/tests/test-client.check-on-disk/test_004-346.expected @@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/346 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 740 bytes +stdout: 739 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) +GENERAL.STATE:20 (unavailable) GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 IP4.ADDRESS[1]:192.168.228.18/32 diff --git a/clients/tests/test-client.check-on-disk/test_004-348.expected b/clients/tests/test-client.check-on-disk/test_004-348.expected index b4d1301c01..726ddabd6d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-348.expected +++ b/clients/tests/test-client.check-on-disk/test_004-348.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/348 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2507 bytes +stdout: 2500 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:nieznane CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_004-362.expected b/clients/tests/test-client.check-on-disk/test_004-362.expected index 5b18cfa09e..8458fc9ec9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-362.expected +++ b/clients/tests/test-client.check-on-disk/test_004-362.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/362 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2723 bytes +stdout: 2716 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:nieznane CAPABILITIES.IS-SOFTWARE:nie diff --git a/clients/tests/test-client.check-on-disk/test_004-364.expected b/clients/tests/test-client.check-on-disk/test_004-364.expected index 9e406882a3..39399a1854 100644 --- a/clients/tests/test-client.check-on-disk/test_004-364.expected +++ b/clients/tests/test-client.check-on-disk/test_004-364.expected @@ -2,13 +2,13 @@ location: clients/tests/test-client.py:986:test_004()/364 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 740 bytes +stdout: 739 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) +GENERAL.STATE:20 (unavailable) GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 IP4.ADDRESS[1]:192.168.228.18/32 diff --git a/clients/tests/test-client.check-on-disk/test_004-366.expected b/clients/tests/test-client.check-on-disk/test_004-366.expected index c22fe4d46a..4b32e98e59 100644 --- a/clients/tests/test-client.check-on-disk/test_004-366.expected +++ b/clients/tests/test-client.check-on-disk/test_004-366.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/366 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2723 bytes +stdout: 2716 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,8 +14,8 @@ GENERAL.DRIVER-VERSION: GENERAL.FIRMWARE-VERSION: GENERAL.HWADDR:13:E0:74:85:7C:D9 GENERAL.MTU:0 -GENERAL.STATE:20 (niedostępne) -GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) GENERAL.UDI:/sys/devices/virtual/wlan0 GENERAL.IP-IFACE: GENERAL.IS-SOFTWARE:no @@ -27,7 +27,7 @@ GENERAL.PHYS-PORT-ID: GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED:nieznane +GENERAL.METERED:unknown CAPABILITIES.CARRIER-DETECT:nie CAPABILITIES.SPEED:nieznane CAPABILITIES.IS-SOFTWARE:nie From 2fc475ccdf38f2e243c692c56163dd152ac71553 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 27 Apr 2018 17:28:43 +0200 Subject: [PATCH 10/14] cli: rework printing of "connections" device details --- clients/cli/devices.c | 190 +++++++++++++----- clients/cli/devices.h | 2 +- clients/cli/nmcli.c | 2 +- clients/cli/utils.h | 4 + .../test_003-030.expected | 8 +- .../test_003-031.expected | 8 +- .../test_003-032.expected | 8 +- .../test_003-033.expected | 8 +- .../test_003-053.expected | 8 +- .../test_003-054.expected | 8 +- .../test_003-055.expected | 8 +- .../test_003-056.expected | 8 +- .../test_003-065.expected | 8 +- .../test_003-066.expected | 8 +- .../test_003-075.expected | 8 +- .../test_003-076.expected | 8 +- .../test_003-085.expected | 8 +- .../test_003-086.expected | 8 +- .../test_003-095.expected | 8 +- .../test_003-096.expected | 8 +- .../test_003-105.expected | 8 +- .../test_003-106.expected | 8 +- .../test_003-115.expected | 8 +- .../test_003-116.expected | 8 +- .../test_003-125.expected | 6 +- .../test_003-126.expected | 6 +- .../test_003-135.expected | 6 +- .../test_003-136.expected | 6 +- .../test_003-145.expected | 8 +- .../test_003-146.expected | 8 +- .../test_003-155.expected | 8 +- .../test_003-156.expected | 8 +- .../test_003-165.expected | 4 +- .../test_003-166.expected | 4 +- .../test_003-175.expected | 4 +- .../test_003-176.expected | 4 +- .../test_003-185.expected | 8 +- .../test_003-186.expected | 8 +- .../test_003-195.expected | 8 +- .../test_003-196.expected | 8 +- .../test_003-205.expected | 8 +- .../test_003-206.expected | 8 +- .../test_003-215.expected | 8 +- .../test_003-216.expected | 8 +- .../test_003-225.expected | 8 +- .../test_003-226.expected | 8 +- .../test_003-235.expected | 8 +- .../test_003-236.expected | 8 +- .../test_003-245.expected | 10 +- .../test_003-246.expected | 10 +- .../test_003-255.expected | 10 +- .../test_003-256.expected | 10 +- .../test_003-265.expected | 10 +- .../test_003-266.expected | 10 +- .../test_003-275.expected | 10 +- .../test_003-276.expected | 10 +- .../test_003-285.expected | 10 +- .../test_003-286.expected | 10 +- .../test_003-295.expected | 10 +- .../test_003-296.expected | 10 +- .../test_003-305.expected | 6 +- .../test_003-306.expected | 6 +- .../test_003-315.expected | 6 +- .../test_003-316.expected | 6 +- .../test_003-325.expected | 8 +- .../test_003-326.expected | 8 +- .../test_003-335.expected | 8 +- .../test_003-336.expected | 8 +- .../test_003-345.expected | 4 +- .../test_003-346.expected | 4 +- .../test_003-355.expected | 4 +- .../test_003-356.expected | 4 +- .../test_003-365.expected | 10 +- .../test_003-366.expected | 10 +- .../test_003-375.expected | 10 +- .../test_003-376.expected | 10 +- .../test_003-385.expected | 10 +- .../test_003-386.expected | 10 +- .../test_003-395.expected | 10 +- .../test_003-396.expected | 10 +- .../test_003-405.expected | 10 +- .../test_003-406.expected | 10 +- .../test_003-415.expected | 10 +- .../test_003-416.expected | 10 +- .../test_004-035.expected | 4 +- .../test_004-036.expected | 4 +- .../test_004-055.expected | 4 +- .../test_004-056.expected | 4 +- .../test_004-059.expected | 4 +- .../test_004-060.expected | 4 +- .../test_004-073.expected | 4 +- .../test_004-074.expected | 4 +- .../test_004-077.expected | 4 +- .../test_004-078.expected | 4 +- .../test_004-091.expected | 4 +- .../test_004-092.expected | 4 +- .../test_004-095.expected | 4 +- .../test_004-096.expected | 4 +- .../test_004-109.expected | 4 +- .../test_004-110.expected | 4 +- .../test_004-113.expected | 4 +- .../test_004-114.expected | 4 +- .../test_004-127.expected | 4 +- .../test_004-128.expected | 4 +- .../test_004-131.expected | 4 +- .../test_004-132.expected | 4 +- .../test_004-145.expected | 4 +- .../test_004-146.expected | 4 +- .../test_004-149.expected | 4 +- .../test_004-150.expected | 4 +- .../test_004-163.expected | 6 +- .../test_004-164.expected | 6 +- .../test_004-167.expected | 6 +- .../test_004-168.expected | 6 +- .../test_004-181.expected | 6 +- .../test_004-182.expected | 6 +- .../test_004-185.expected | 6 +- .../test_004-186.expected | 6 +- .../test_004-199.expected | 8 +- .../test_004-200.expected | 8 +- .../test_004-203.expected | 8 +- .../test_004-204.expected | 8 +- .../test_004-217.expected | 8 +- .../test_004-218.expected | 8 +- .../test_004-221.expected | 8 +- .../test_004-222.expected | 8 +- .../test_004-235.expected | 4 +- .../test_004-236.expected | 4 +- .../test_004-239.expected | 4 +- .../test_004-240.expected | 4 +- .../test_004-253.expected | 4 +- .../test_004-254.expected | 4 +- .../test_004-257.expected | 4 +- .../test_004-258.expected | 4 +- .../test_004-271.expected | 4 +- .../test_004-272.expected | 4 +- .../test_004-275.expected | 4 +- .../test_004-276.expected | 4 +- .../test_004-289.expected | 4 +- .../test_004-290.expected | 4 +- .../test_004-293.expected | 4 +- .../test_004-294.expected | 4 +- .../test_004-307.expected | 4 +- .../test_004-308.expected | 4 +- .../test_004-311.expected | 4 +- .../test_004-312.expected | 4 +- .../test_004-325.expected | 4 +- .../test_004-326.expected | 4 +- .../test_004-329.expected | 4 +- .../test_004-330.expected | 4 +- .../test_004-343.expected | 4 +- .../test_004-344.expected | 4 +- .../test_004-347.expected | 4 +- .../test_004-348.expected | 4 +- .../test_004-361.expected | 4 +- .../test_004-362.expected | 4 +- .../test_004-365.expected | 4 +- .../test_004-366.expected | 4 +- 158 files changed, 634 insertions(+), 548 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 3ca6e2bd9c..0d86d3e5e1 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 (_(" | %s"), ac_path) + : g_strdup (_("")); + } else { + arr[j++] = ac_path + ? g_strdup_printf (" | %s", ac_path) + : g_strdup (""); + } + } 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); + 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; - 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, '}'); - - 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_("NAME")), + 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 be7af90362..61d4556163 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -197,7 +197,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 f1cbde6948..2e7d01ff29 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:857: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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< 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 1b72213135..71e6a64487 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:857: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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< 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 7d48972fc4..cdf450c672 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:860: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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< 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 eba78584a0..9d8a1c9f22 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:860: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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< 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 57563e1343..03967d0caf 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:857: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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< 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 219d57f719..49f28ef094 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:857: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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< 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 5518745d2e..405fe30302 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:860: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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< 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 97e54473fe..8fd71b3524 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:860: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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected index a796f5d27f..13b5b9c7cc 100644 --- a/clients/tests/test-client.check-on-disk/test_003-065.expected +++ b/clients/tests/test-client.check-on-disk/test_003-065.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/65 cmd: $NMCLI -f all dev show eth0 lang: C returncode: 0 -stdout: 3239 bytes +stdout: 3250 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected index ecd1d5b5c9..9caf4dd1ae 100644 --- a/clients/tests/test-client.check-on-disk/test_003-066.expected +++ b/clients/tests/test-client.check-on-disk/test_003-066.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/66 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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected index 716b49f5ae..9e57bae477 100644 --- a/clients/tests/test-client.check-on-disk/test_003-075.expected +++ b/clients/tests/test-client.check-on-disk/test_003-075.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/75 cmd: $NMCLI --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 3239 bytes +stdout: 3250 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected index e6d504e3ff..f65f483800 100644 --- a/clients/tests/test-client.check-on-disk/test_003-076.expected +++ b/clients/tests/test-client.check-on-disk/test_003-076.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/76 cmd: $NMCLI --color yes -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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-085.expected b/clients/tests/test-client.check-on-disk/test_003-085.expected index d1d072e91d..4fba9d41de 100644 --- a/clients/tests/test-client.check-on-disk/test_003-085.expected +++ b/clients/tests/test-client.check-on-disk/test_003-085.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/85 cmd: $NMCLI --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4090 bytes +stdout: 4101 bytes >>> =============================================================================== Device details (eth0) @@ -65,9 +65,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_003-086.expected b/clients/tests/test-client.check-on-disk/test_003-086.expected index 4bc2628ce1..e34edefc7f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-086.expected +++ b/clients/tests/test-client.check-on-disk/test_003-086.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/86 cmd: $NMCLI --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4119 bytes +stdout: 4130 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -65,9 +65,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_003-095.expected b/clients/tests/test-client.check-on-disk/test_003-095.expected index cb96535c53..2430b283c2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-095.expected +++ b/clients/tests/test-client.check-on-disk/test_003-095.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/95 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4090 bytes +stdout: 4101 bytes >>> =============================================================================== Device details (eth0) @@ -65,9 +65,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_003-096.expected b/clients/tests/test-client.check-on-disk/test_003-096.expected index ce71e0ee0b..0593c8b206 100644 --- a/clients/tests/test-client.check-on-disk/test_003-096.expected +++ b/clients/tests/test-client.check-on-disk/test_003-096.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/96 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4119 bytes +stdout: 4130 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -65,9 +65,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_003-105.expected b/clients/tests/test-client.check-on-disk/test_003-105.expected index 0584ee5bfd..9684fe701a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-105.expected +++ b/clients/tests/test-client.check-on-disk/test_003-105.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/105 cmd: $NMCLI --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 2011 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-106.expected b/clients/tests/test-client.check-on-disk/test_003-106.expected index e66fba072e..c91c52710e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-106.expected +++ b/clients/tests/test-client.check-on-disk/test_003-106.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/106 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2024 bytes +stdout: 2035 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-115.expected b/clients/tests/test-client.check-on-disk/test_003-115.expected index 6959b62a98..5264163c17 100644 --- a/clients/tests/test-client.check-on-disk/test_003-115.expected +++ b/clients/tests/test-client.check-on-disk/test_003-115.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/115 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2011 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-116.expected b/clients/tests/test-client.check-on-disk/test_003-116.expected index 4f6e635ae3..1e94d72cb0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-116.expected +++ b/clients/tests/test-client.check-on-disk/test_003-116.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/116 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2024 bytes +stdout: 2035 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-125.expected b/clients/tests/test-client.check-on-disk/test_003-125.expected index 37cf783f9b..fd2b101c48 100644 --- a/clients/tests/test-client.check-on-disk/test_003-125.expected +++ b/clients/tests/test-client.check-on-disk/test_003-125.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/125 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: C returncode: 0 -stdout: 2721 bytes +stdout: 2743 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown @@ -25,8 +25,8 @@ IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a: GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-126.expected b/clients/tests/test-client.check-on-disk/test_003-126.expected index 272334357e..3cf4c5ef01 100644 --- a/clients/tests/test-client.check-on-disk/test_003-126.expected +++ b/clients/tests/test-client.check-on-disk/test_003-126.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/126 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2742 bytes +stdout: 2764 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane @@ -25,8 +25,8 @@ IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a: GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-135.expected b/clients/tests/test-client.check-on-disk/test_003-135.expected index a38dc41882..59ecda5161 100644 --- a/clients/tests/test-client.check-on-disk/test_003-135.expected +++ b/clients/tests/test-client.check-on-disk/test_003-135.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/135 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2721 bytes +stdout: 2743 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown @@ -25,8 +25,8 @@ IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a: GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-136.expected b/clients/tests/test-client.check-on-disk/test_003-136.expected index ca80f4b2e2..8600c7db7c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-136.expected +++ b/clients/tests/test-client.check-on-disk/test_003-136.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/136 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2742 bytes +stdout: 2764 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane @@ -25,8 +25,8 @@ IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a: GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-145.expected b/clients/tests/test-client.check-on-disk/test_003-145.expected index 261b4e4291..deaf23a14f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-145.expected +++ b/clients/tests/test-client.check-on-disk/test_003-145.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/145 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4162 bytes +stdout: 4195 bytes >>> ========================= Device details (eth0) @@ -35,9 +35,9 @@ GROUP OPTION -------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-146.expected b/clients/tests/test-client.check-on-disk/test_003-146.expected index 907f56bd7f..b889127a98 100644 --- a/clients/tests/test-client.check-on-disk/test_003-146.expected +++ b/clients/tests/test-client.check-on-disk/test_003-146.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/146 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4220 bytes +stdout: 4253 bytes >>> ================================== Informacje o urządzeniu (eth0) @@ -35,9 +35,9 @@ GROUP OPTION -------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-155.expected b/clients/tests/test-client.check-on-disk/test_003-155.expected index 3d5acebafb..f5fffc3d26 100644 --- a/clients/tests/test-client.check-on-disk/test_003-155.expected +++ b/clients/tests/test-client.check-on-disk/test_003-155.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/155 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4162 bytes +stdout: 4195 bytes >>> ========================= Device details (eth0) @@ -35,9 +35,9 @@ GROUP OPTION -------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-156.expected b/clients/tests/test-client.check-on-disk/test_003-156.expected index a7008caee1..65bf8ec6f1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-156.expected +++ b/clients/tests/test-client.check-on-disk/test_003-156.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/156 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4220 bytes +stdout: 4253 bytes >>> ================================== Informacje o urządzeniu (eth0) @@ -35,9 +35,9 @@ GROUP OPTION -------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-165.expected b/clients/tests/test-client.check-on-disk/test_003-165.expected index dad2481920..8357a4362c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-165.expected +++ b/clients/tests/test-client.check-on-disk/test_003-165.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/165 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 1176 bytes +stdout: 1187 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no @@ -11,7 +11,7 @@ IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-166.expected b/clients/tests/test-client.check-on-disk/test_003-166.expected index fe7aeadcaf..8320d36637 100644 --- a/clients/tests/test-client.check-on-disk/test_003-166.expected +++ b/clients/tests/test-client.check-on-disk/test_003-166.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/166 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1189 bytes +stdout: 1200 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:nie:100 Mb/s:nie:nie @@ -11,7 +11,7 @@ IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-175.expected b/clients/tests/test-client.check-on-disk/test_003-175.expected index 2489ec8b44..369304187d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-175.expected +++ b/clients/tests/test-client.check-on-disk/test_003-175.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/175 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 1176 bytes +stdout: 1187 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no @@ -11,7 +11,7 @@ IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-176.expected b/clients/tests/test-client.check-on-disk/test_003-176.expected index 680fa73a9f..9d76bb5874 100644 --- a/clients/tests/test-client.check-on-disk/test_003-176.expected +++ b/clients/tests/test-client.check-on-disk/test_003-176.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/176 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1189 bytes +stdout: 1200 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:nie:100 Mb/s:nie:nie @@ -11,7 +11,7 @@ IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-185.expected b/clients/tests/test-client.check-on-disk/test_003-185.expected index fc9874f9ce..54ec199b16 100644 --- a/clients/tests/test-client.check-on-disk/test_003-185.expected +++ b/clients/tests/test-client.check-on-disk/test_003-185.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/185 cmd: $NMCLI --mode multiline -f all dev show eth0 lang: C returncode: 0 -stdout: 3239 bytes +stdout: 3250 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-186.expected b/clients/tests/test-client.check-on-disk/test_003-186.expected index 5a52f7ebb9..9714a12d7a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-186.expected +++ b/clients/tests/test-client.check-on-disk/test_003-186.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/186 cmd: $NMCLI --mode multiline -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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-195.expected b/clients/tests/test-client.check-on-disk/test_003-195.expected index 26ef687866..89a50fb5f9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-195.expected +++ b/clients/tests/test-client.check-on-disk/test_003-195.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/195 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 3239 bytes +stdout: 3250 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-196.expected b/clients/tests/test-client.check-on-disk/test_003-196.expected index ebc6f5750b..e874cf68af 100644 --- a/clients/tests/test-client.check-on-disk/test_003-196.expected +++ b/clients/tests/test-client.check-on-disk/test_003-196.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/196 cmd: $NMCLI --mode multiline --color yes -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,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-205.expected b/clients/tests/test-client.check-on-disk/test_003-205.expected index 1747f10795..ffb9295b3b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-205.expected +++ b/clients/tests/test-client.check-on-disk/test_003-205.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/205 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4090 bytes +stdout: 4101 bytes >>> =============================================================================== Device details (eth0) @@ -65,9 +65,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_003-206.expected b/clients/tests/test-client.check-on-disk/test_003-206.expected index 46588a495e..c47f141a7f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-206.expected +++ b/clients/tests/test-client.check-on-disk/test_003-206.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/206 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4119 bytes +stdout: 4130 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -65,9 +65,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_003-215.expected b/clients/tests/test-client.check-on-disk/test_003-215.expected index 5a469be289..656a5fdd47 100644 --- a/clients/tests/test-client.check-on-disk/test_003-215.expected +++ b/clients/tests/test-client.check-on-disk/test_003-215.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/215 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4090 bytes +stdout: 4101 bytes >>> =============================================================================== Device details (eth0) @@ -65,9 +65,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_003-216.expected b/clients/tests/test-client.check-on-disk/test_003-216.expected index f55025a65f..ca775cb12d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-216.expected +++ b/clients/tests/test-client.check-on-disk/test_003-216.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/216 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4119 bytes +stdout: 4130 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -65,9 +65,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_003-225.expected b/clients/tests/test-client.check-on-disk/test_003-225.expected index e06086509f..2824c61fdb 100644 --- a/clients/tests/test-client.check-on-disk/test_003-225.expected +++ b/clients/tests/test-client.check-on-disk/test_003-225.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/225 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 2011 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-226.expected b/clients/tests/test-client.check-on-disk/test_003-226.expected index 1805330259..3620a1552b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-226.expected +++ b/clients/tests/test-client.check-on-disk/test_003-226.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/226 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2024 bytes +stdout: 2035 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-235.expected b/clients/tests/test-client.check-on-disk/test_003-235.expected index 883d38021e..8e02fe7234 100644 --- a/clients/tests/test-client.check-on-disk/test_003-235.expected +++ b/clients/tests/test-client.check-on-disk/test_003-235.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/235 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2011 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-236.expected b/clients/tests/test-client.check-on-disk/test_003-236.expected index 61e1b1923c..6f258f9864 100644 --- a/clients/tests/test-client.check-on-disk/test_003-236.expected +++ b/clients/tests/test-client.check-on-disk/test_003-236.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/236 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2024 bytes +stdout: 2035 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -55,9 +55,9 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +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]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-245.expected b/clients/tests/test-client.check-on-disk/test_003-245.expected index 431da8d800..fc9d0d8bba 100644 --- a/clients/tests/test-client.check-on-disk/test_003-245.expected +++ b/clients/tests/test-client.check-on-disk/test_003-245.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/245 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-246.expected b/clients/tests/test-client.check-on-disk/test_003-246.expected index 869ac95e40..d807b132e1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-246.expected +++ b/clients/tests/test-client.check-on-disk/test_003-246.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/246 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-255.expected b/clients/tests/test-client.check-on-disk/test_003-255.expected index e0f60685ed..ac95522e64 100644 --- a/clients/tests/test-client.check-on-disk/test_003-255.expected +++ b/clients/tests/test-client.check-on-disk/test_003-255.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/255 cmd: $NMCLI --color yes -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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-256.expected b/clients/tests/test-client.check-on-disk/test_003-256.expected index edc0a18a19..29649ee34a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-256.expected +++ b/clients/tests/test-client.check-on-disk/test_003-256.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/256 cmd: $NMCLI --color yes -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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-265.expected b/clients/tests/test-client.check-on-disk/test_003-265.expected index 01a2b6681e..fb1e9a6df7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-265.expected +++ b/clients/tests/test-client.check-on-disk/test_003-265.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/265 cmd: $NMCLI --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4058 bytes +stdout: 4121 bytes >>> =============================================================================== Device details (eth0) @@ -65,10 +65,10 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 ------------------------------------------------------------------------------- <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-266.expected b/clients/tests/test-client.check-on-disk/test_003-266.expected index 1568ca81e2..a4c28e2e9d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-266.expected +++ b/clients/tests/test-client.check-on-disk/test_003-266.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/266 cmd: $NMCLI --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4087 bytes +stdout: 4150 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -65,10 +65,10 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 ------------------------------------------------------------------------------- <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-275.expected b/clients/tests/test-client.check-on-disk/test_003-275.expected index 519ade4c37..aa16c21b4d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-275.expected +++ b/clients/tests/test-client.check-on-disk/test_003-275.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/275 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4058 bytes +stdout: 4121 bytes >>> =============================================================================== Device details (eth0) @@ -65,10 +65,10 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 ------------------------------------------------------------------------------- <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-276.expected b/clients/tests/test-client.check-on-disk/test_003-276.expected index f86ede56d0..768f56521e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-276.expected +++ b/clients/tests/test-client.check-on-disk/test_003-276.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/276 cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4087 bytes +stdout: 4150 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -65,10 +65,10 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 ------------------------------------------------------------------------------- <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-285.expected b/clients/tests/test-client.check-on-disk/test_003-285.expected index 5ecbf8c785..7a5e36ebd4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-285.expected +++ b/clients/tests/test-client.check-on-disk/test_003-285.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/285 cmd: $NMCLI --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 1979 bytes +stdout: 2042 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-286.expected b/clients/tests/test-client.check-on-disk/test_003-286.expected index 7bec06ab29..3c508fe870 100644 --- a/clients/tests/test-client.check-on-disk/test_003-286.expected +++ b/clients/tests/test-client.check-on-disk/test_003-286.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/286 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1992 bytes +stdout: 2055 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-295.expected b/clients/tests/test-client.check-on-disk/test_003-295.expected index 0280d7bf08..b46ffa11ce 100644 --- a/clients/tests/test-client.check-on-disk/test_003-295.expected +++ b/clients/tests/test-client.check-on-disk/test_003-295.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/295 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 1979 bytes +stdout: 2042 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-296.expected b/clients/tests/test-client.check-on-disk/test_003-296.expected index ade04f397d..2b8ecd07ab 100644 --- a/clients/tests/test-client.check-on-disk/test_003-296.expected +++ b/clients/tests/test-client.check-on-disk/test_003-296.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/296 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1992 bytes +stdout: 2055 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-305.expected b/clients/tests/test-client.check-on-disk/test_003-305.expected index 58655007c9..8064eb0fe2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-305.expected +++ b/clients/tests/test-client.check-on-disk/test_003-305.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/305 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: C returncode: 0 -stdout: 2657 bytes +stdout: 2783 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown @@ -25,8 +25,8 @@ IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a: GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-306.expected b/clients/tests/test-client.check-on-disk/test_003-306.expected index 8019429636..0e2aa11b85 100644 --- a/clients/tests/test-client.check-on-disk/test_003-306.expected +++ b/clients/tests/test-client.check-on-disk/test_003-306.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/306 cmd: $NMCLI --mode tabular -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2678 bytes +stdout: 2804 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane @@ -25,8 +25,8 @@ IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a: GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-315.expected b/clients/tests/test-client.check-on-disk/test_003-315.expected index 4e9ba3a5d2..f2e9a27141 100644 --- a/clients/tests/test-client.check-on-disk/test_003-315.expected +++ b/clients/tests/test-client.check-on-disk/test_003-315.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/315 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 2657 bytes +stdout: 2783 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown @@ -25,8 +25,8 @@ IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a: GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-316.expected b/clients/tests/test-client.check-on-disk/test_003-316.expected index 4ae92c6ebc..cb67034e09 100644 --- a/clients/tests/test-client.check-on-disk/test_003-316.expected +++ b/clients/tests/test-client.check-on-disk/test_003-316.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/316 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2678 bytes +stdout: 2804 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane @@ -25,8 +25,8 @@ IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a: GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-325.expected b/clients/tests/test-client.check-on-disk/test_003-325.expected index 5863691c76..caafbf824b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-325.expected +++ b/clients/tests/test-client.check-on-disk/test_003-325.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/325 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4066 bytes +stdout: 4255 bytes >>> ========================= Device details (eth0) @@ -35,9 +35,9 @@ GROUP OPTION -------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-326.expected b/clients/tests/test-client.check-on-disk/test_003-326.expected index 110b7429d4..c3be9fdb01 100644 --- a/clients/tests/test-client.check-on-disk/test_003-326.expected +++ b/clients/tests/test-client.check-on-disk/test_003-326.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/326 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4124 bytes +stdout: 4313 bytes >>> ================================== Informacje o urządzeniu (eth0) @@ -35,9 +35,9 @@ GROUP OPTION -------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-335.expected b/clients/tests/test-client.check-on-disk/test_003-335.expected index 6abbde8435..e5ad4c7d4c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-335.expected +++ b/clients/tests/test-client.check-on-disk/test_003-335.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/335 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4066 bytes +stdout: 4255 bytes >>> ========================= Device details (eth0) @@ -35,9 +35,9 @@ GROUP OPTION -------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-336.expected b/clients/tests/test-client.check-on-disk/test_003-336.expected index b350f3f1be..99f0408cdf 100644 --- a/clients/tests/test-client.check-on-disk/test_003-336.expected +++ b/clients/tests/test-client.check-on-disk/test_003-336.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/336 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4124 bytes +stdout: 4313 bytes >>> ================================== Informacje o urządzeniu (eth0) @@ -35,9 +35,9 @@ GROUP OPTION -------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{1,2,3} 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-345.expected b/clients/tests/test-client.check-on-disk/test_003-345.expected index 3179e3c798..4bbb31838f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-345.expected +++ b/clients/tests/test-client.check-on-disk/test_003-345.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/345 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 1144 bytes +stdout: 1207 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no @@ -11,7 +11,7 @@ IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-346.expected b/clients/tests/test-client.check-on-disk/test_003-346.expected index 059172f7e0..08d103d88b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-346.expected +++ b/clients/tests/test-client.check-on-disk/test_003-346.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/346 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1157 bytes +stdout: 1220 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:nie:100 Mb/s:nie:nie @@ -11,7 +11,7 @@ IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-355.expected b/clients/tests/test-client.check-on-disk/test_003-355.expected index 7efc5263c8..e9c1540afc 100644 --- a/clients/tests/test-client.check-on-disk/test_003-355.expected +++ b/clients/tests/test-client.check-on-disk/test_003-355.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/355 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 1144 bytes +stdout: 1207 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no @@ -11,7 +11,7 @@ IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-356.expected b/clients/tests/test-client.check-on-disk/test_003-356.expected index b318159056..84e59c6a8c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-356.expected +++ b/clients/tests/test-client.check-on-disk/test_003-356.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/356 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1157 bytes +stdout: 1220 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:nie:100 Mb/s:nie:nie @@ -11,7 +11,7 @@ IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,3}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-365.expected b/clients/tests/test-client.check-on-disk/test_003-365.expected index 1da0887e2c..9d05b01589 100644 --- a/clients/tests/test-client.check-on-disk/test_003-365.expected +++ b/clients/tests/test-client.check-on-disk/test_003-365.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/365 cmd: $NMCLI --mode multiline -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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-366.expected b/clients/tests/test-client.check-on-disk/test_003-366.expected index be1f19bb7c..5f89d9c17b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-366.expected +++ b/clients/tests/test-client.check-on-disk/test_003-366.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/366 cmd: $NMCLI --mode multiline -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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-375.expected b/clients/tests/test-client.check-on-disk/test_003-375.expected index 016cebed4e..21089b127d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-375.expected +++ b/clients/tests/test-client.check-on-disk/test_003-375.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/375 cmd: $NMCLI --mode multiline --color yes -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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-376.expected b/clients/tests/test-client.check-on-disk/test_003-376.expected index 83e59a9346..c839d5b3a2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-376.expected +++ b/clients/tests/test-client.check-on-disk/test_003-376.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/376 cmd: $NMCLI --mode multiline --color yes -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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-385.expected b/clients/tests/test-client.check-on-disk/test_003-385.expected index 0377a0c65f..b44b9b329e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-385.expected +++ b/clients/tests/test-client.check-on-disk/test_003-385.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/385 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 4058 bytes +stdout: 4121 bytes >>> =============================================================================== Device details (eth0) @@ -65,10 +65,10 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 ------------------------------------------------------------------------------- <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-386.expected b/clients/tests/test-client.check-on-disk/test_003-386.expected index 5b4c432d7a..4333ffce78 100644 --- a/clients/tests/test-client.check-on-disk/test_003-386.expected +++ b/clients/tests/test-client.check-on-disk/test_003-386.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/386 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4087 bytes +stdout: 4150 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -65,10 +65,10 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 ------------------------------------------------------------------------------- <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-395.expected b/clients/tests/test-client.check-on-disk/test_003-395.expected index eb7dcad0c9..67e458a712 100644 --- a/clients/tests/test-client.check-on-disk/test_003-395.expected +++ b/clients/tests/test-client.check-on-disk/test_003-395.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/395 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4058 bytes +stdout: 4121 bytes >>> =============================================================================== Device details (eth0) @@ -65,10 +65,10 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 ------------------------------------------------------------------------------- <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-396.expected b/clients/tests/test-client.check-on-disk/test_003-396.expected index db99bda746..e0991d2fe9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-396.expected +++ b/clients/tests/test-client.check-on-disk/test_003-396.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/396 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4087 bytes +stdout: 4150 bytes >>> =============================================================================== Informacje o urządzeniu (eth0) @@ -65,10 +65,10 @@ 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 ------------------------------------------------------------------------------- <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-405.expected b/clients/tests/test-client.check-on-disk/test_003-405.expected index db889b0d6b..5b74a96cef 100644 --- a/clients/tests/test-client.check-on-disk/test_003-405.expected +++ b/clients/tests/test-client.check-on-disk/test_003-405.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/405 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: C returncode: 0 -stdout: 1979 bytes +stdout: 2042 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-406.expected b/clients/tests/test-client.check-on-disk/test_003-406.expected index 7fca7218e7..4306f3f9f4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-406.expected +++ b/clients/tests/test-client.check-on-disk/test_003-406.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/406 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1992 bytes +stdout: 2055 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-415.expected b/clients/tests/test-client.check-on-disk/test_003-415.expected index 737a2c0df9..f82c36c97e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-415.expected +++ b/clients/tests/test-client.check-on-disk/test_003-415.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/415 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 1979 bytes +stdout: 2042 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(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]: | /org/freedesktop/NetworkManager/Settings/Connection/3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-416.expected b/clients/tests/test-client.check-on-disk/test_003-416.expected index 5709c0d21b..fb0fa542ca 100644 --- a/clients/tests/test-client.check-on-disk/test_003-416.expected +++ b/clients/tests/test-client.check-on-disk/test_003-416.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/416 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1992 bytes +stdout: 2055 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/{2,1,3} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(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]: | /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 e593159708..aa92b626f4 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:957: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 1209fa2c07..c3398462f8 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:957: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 <<< diff --git a/clients/tests/test-client.check-on-disk/test_004-055.expected b/clients/tests/test-client.check-on-disk/test_004-055.expected index eddb0fb690..275da8ca39 100644 --- a/clients/tests/test-client.check-on-disk/test_004-055.expected +++ b/clients/tests/test-client.check-on-disk/test_004-055.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/55 cmd: $NMCLI -f ALL device 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-056.expected b/clients/tests/test-client.check-on-disk/test_004-056.expected index f0ba9e9ea1..8ee67b723b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-056.expected +++ b/clients/tests/test-client.check-on-disk/test_004-056.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/56 cmd: $NMCLI -f ALL device 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 <<< diff --git a/clients/tests/test-client.check-on-disk/test_004-059.expected b/clients/tests/test-client.check-on-disk/test_004-059.expected index f526639b6c..c32808c29e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-059.expected +++ b/clients/tests/test-client.check-on-disk/test_004-059.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/59 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device 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-060.expected b/clients/tests/test-client.check-on-disk/test_004-060.expected index c94837b5ec..07e247afc4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-060.expected +++ b/clients/tests/test-client.check-on-disk/test_004-060.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/60 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device 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 <<< diff --git a/clients/tests/test-client.check-on-disk/test_004-073.expected b/clients/tests/test-client.check-on-disk/test_004-073.expected index 9d753439b2..24bde41761 100644 --- a/clients/tests/test-client.check-on-disk/test_004-073.expected +++ b/clients/tests/test-client.check-on-disk/test_004-073.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/73 cmd: $NMCLI --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4816 bytes +stdout: 4827 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-074.expected b/clients/tests/test-client.check-on-disk/test_004-074.expected index 1a8fc281c1..3545319375 100644 --- a/clients/tests/test-client.check-on-disk/test_004-074.expected +++ b/clients/tests/test-client.check-on-disk/test_004-074.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/74 cmd: $NMCLI --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4859 bytes +stdout: 4870 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-077.expected b/clients/tests/test-client.check-on-disk/test_004-077.expected index 178e8631d5..bfd866f4d6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-077.expected +++ b/clients/tests/test-client.check-on-disk/test_004-077.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/77 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4816 bytes +stdout: 4827 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-078.expected b/clients/tests/test-client.check-on-disk/test_004-078.expected index 7c9ea637f1..d18a28deee 100644 --- a/clients/tests/test-client.check-on-disk/test_004-078.expected +++ b/clients/tests/test-client.check-on-disk/test_004-078.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/78 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4859 bytes +stdout: 4870 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-091.expected b/clients/tests/test-client.check-on-disk/test_004-091.expected index 06a213fc4f..2aaebbe137 100644 --- a/clients/tests/test-client.check-on-disk/test_004-091.expected +++ b/clients/tests/test-client.check-on-disk/test_004-091.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/91 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5691 bytes +stdout: 5702 bytes >>> =============================================================================== Device details (wlan0) @@ -104,7 +104,7 @@ 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-092.expected b/clients/tests/test-client.check-on-disk/test_004-092.expected index e76c6e0f66..a21d457ca6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-092.expected +++ b/clients/tests/test-client.check-on-disk/test_004-092.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/92 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5741 bytes +stdout: 5752 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -104,7 +104,7 @@ 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-095.expected b/clients/tests/test-client.check-on-disk/test_004-095.expected index 946d555579..9527e08815 100644 --- a/clients/tests/test-client.check-on-disk/test_004-095.expected +++ b/clients/tests/test-client.check-on-disk/test_004-095.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/95 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5691 bytes +stdout: 5702 bytes >>> =============================================================================== Device details (wlan0) @@ -104,7 +104,7 @@ 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-096.expected b/clients/tests/test-client.check-on-disk/test_004-096.expected index dae7174bd3..01c451cb1d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-096.expected +++ b/clients/tests/test-client.check-on-disk/test_004-096.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/96 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5741 bytes +stdout: 5752 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -104,7 +104,7 @@ 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-109.expected b/clients/tests/test-client.check-on-disk/test_004-109.expected index 0ab277a61d..0fab865f22 100644 --- a/clients/tests/test-client.check-on-disk/test_004-109.expected +++ b/clients/tests/test-client.check-on-disk/test_004-109.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/109 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5907 bytes +stdout: 5918 bytes >>> =============================================================================== Device details (wlan0) @@ -104,7 +104,7 @@ 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-110.expected b/clients/tests/test-client.check-on-disk/test_004-110.expected index 9a4e97e63f..2db85d63ac 100644 --- a/clients/tests/test-client.check-on-disk/test_004-110.expected +++ b/clients/tests/test-client.check-on-disk/test_004-110.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/110 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5957 bytes +stdout: 5968 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -104,7 +104,7 @@ 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-113.expected b/clients/tests/test-client.check-on-disk/test_004-113.expected index fdef3f97a3..d5ef082a5f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-113.expected +++ b/clients/tests/test-client.check-on-disk/test_004-113.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/113 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5907 bytes +stdout: 5918 bytes >>> =============================================================================== Device details (wlan0) @@ -104,7 +104,7 @@ 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-114.expected b/clients/tests/test-client.check-on-disk/test_004-114.expected index d179fca04c..7ce374c9f5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-114.expected +++ b/clients/tests/test-client.check-on-disk/test_004-114.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/114 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5957 bytes +stdout: 5968 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -104,7 +104,7 @@ 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-127.expected b/clients/tests/test-client.check-on-disk/test_004-127.expected index 968ce10477..acdde12176 100644 --- a/clients/tests/test-client.check-on-disk/test_004-127.expected +++ b/clients/tests/test-client.check-on-disk/test_004-127.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/127 cmd: $NMCLI --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2467 bytes +stdout: 2478 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-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected index 62dddf96ac..9b94b149cd 100644 --- a/clients/tests/test-client.check-on-disk/test_004-128.expected +++ b/clients/tests/test-client.check-on-disk/test_004-128.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/128 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2500 bytes +stdout: 2511 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-131.expected b/clients/tests/test-client.check-on-disk/test_004-131.expected index 27ceb9d5d6..6036a8c3c9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-131.expected +++ b/clients/tests/test-client.check-on-disk/test_004-131.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/131 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2467 bytes +stdout: 2478 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-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected index 240bac22ad..18abe753a7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-132.expected +++ b/clients/tests/test-client.check-on-disk/test_004-132.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/132 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2500 bytes +stdout: 2511 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-145.expected b/clients/tests/test-client.check-on-disk/test_004-145.expected index e6632d5bd4..8c6e04cbbb 100644 --- a/clients/tests/test-client.check-on-disk/test_004-145.expected +++ b/clients/tests/test-client.check-on-disk/test_004-145.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/145 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2683 bytes +stdout: 2694 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-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected index fe875057c6..535385ba92 100644 --- a/clients/tests/test-client.check-on-disk/test_004-146.expected +++ b/clients/tests/test-client.check-on-disk/test_004-146.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/146 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2716 bytes +stdout: 2727 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-149.expected b/clients/tests/test-client.check-on-disk/test_004-149.expected index f815ba4955..897acb40f7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-149.expected +++ b/clients/tests/test-client.check-on-disk/test_004-149.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/149 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2683 bytes +stdout: 2694 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-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected index 272d5373a9..84a6e98d60 100644 --- a/clients/tests/test-client.check-on-disk/test_004-150.expected +++ b/clients/tests/test-client.check-on-disk/test_004-150.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/150 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2716 bytes +stdout: 2727 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-163.expected b/clients/tests/test-client.check-on-disk/test_004-163.expected index fad3d76496..a190d15793 100644 --- a/clients/tests/test-client.check-on-disk/test_004-163.expected +++ b/clients/tests/test-client.check-on-disk/test_004-163.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/163 cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2760 bytes +stdout: 2782 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown @@ -30,8 +30,8 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-164.expected b/clients/tests/test-client.check-on-disk/test_004-164.expected index 975c433ea2..2f844c59d6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-164.expected +++ b/clients/tests/test-client.check-on-disk/test_004-164.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/164 cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2813 bytes +stdout: 2835 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane @@ -30,8 +30,8 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-167.expected b/clients/tests/test-client.check-on-disk/test_004-167.expected index cccf23a009..c48d5ff413 100644 --- a/clients/tests/test-client.check-on-disk/test_004-167.expected +++ b/clients/tests/test-client.check-on-disk/test_004-167.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/167 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2760 bytes +stdout: 2782 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown @@ -30,8 +30,8 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-168.expected b/clients/tests/test-client.check-on-disk/test_004-168.expected index cff1e0f555..a76841ea73 100644 --- a/clients/tests/test-client.check-on-disk/test_004-168.expected +++ b/clients/tests/test-client.check-on-disk/test_004-168.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/168 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2813 bytes +stdout: 2835 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane @@ -30,8 +30,8 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-181.expected b/clients/tests/test-client.check-on-disk/test_004-181.expected index d23e45ec8e..eb21b93c99 100644 --- a/clients/tests/test-client.check-on-disk/test_004-181.expected +++ b/clients/tests/test-client.check-on-disk/test_004-181.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/181 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 3003 bytes +stdout: 3025 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown @@ -30,8 +30,8 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-182.expected b/clients/tests/test-client.check-on-disk/test_004-182.expected index f2479a0e11..27aad6c5a2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-182.expected +++ b/clients/tests/test-client.check-on-disk/test_004-182.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/182 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3056 bytes +stdout: 3078 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane @@ -30,8 +30,8 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-185.expected b/clients/tests/test-client.check-on-disk/test_004-185.expected index 5388190a7d..3b2bd9e724 100644 --- a/clients/tests/test-client.check-on-disk/test_004-185.expected +++ b/clients/tests/test-client.check-on-disk/test_004-185.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/185 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 3003 bytes +stdout: 3025 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown @@ -30,8 +30,8 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-186.expected b/clients/tests/test-client.check-on-disk/test_004-186.expected index eedb660ff7..55d8154c0b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-186.expected +++ b/clients/tests/test-client.check-on-disk/test_004-186.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/186 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3056 bytes +stdout: 3078 bytes >>> NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane @@ -30,8 +30,8 @@ IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250 GROUP OPTION DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-199.expected b/clients/tests/test-client.check-on-disk/test_004-199.expected index ed7a8e5ac1..bdef72ed6c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-199.expected +++ b/clients/tests/test-client.check-on-disk/test_004-199.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/199 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4148 bytes +stdout: 4181 bytes >>> ========================== Device details (wlan0) @@ -41,9 +41,9 @@ GROUP OPTION ------------------------------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ------------------------------------------------------------------------------------------------------------ -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-200.expected b/clients/tests/test-client.check-on-disk/test_004-200.expected index ef7399f40e..4a936d5607 100644 --- a/clients/tests/test-client.check-on-disk/test_004-200.expected +++ b/clients/tests/test-client.check-on-disk/test_004-200.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/200 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4246 bytes +stdout: 4279 bytes >>> =================================== Informacje o urządzeniu (wlan0) @@ -41,9 +41,9 @@ GROUP OPTION ------------------------------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ------------------------------------------------------------------------------------------------------------ -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-203.expected b/clients/tests/test-client.check-on-disk/test_004-203.expected index 3eff1ecd85..f58fc88ff6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-203.expected +++ b/clients/tests/test-client.check-on-disk/test_004-203.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/203 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4148 bytes +stdout: 4181 bytes >>> ========================== Device details (wlan0) @@ -41,9 +41,9 @@ GROUP OPTION ------------------------------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ------------------------------------------------------------------------------------------------------------ -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-204.expected b/clients/tests/test-client.check-on-disk/test_004-204.expected index 780d2e1257..236cd56b12 100644 --- a/clients/tests/test-client.check-on-disk/test_004-204.expected +++ b/clients/tests/test-client.check-on-disk/test_004-204.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/204 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4246 bytes +stdout: 4279 bytes >>> =================================== Informacje o urządzeniu (wlan0) @@ -41,9 +41,9 @@ GROUP OPTION ------------------------------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ------------------------------------------------------------------------------------------------------------ -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-217.expected b/clients/tests/test-client.check-on-disk/test_004-217.expected index 59734df68e..88608c2199 100644 --- a/clients/tests/test-client.check-on-disk/test_004-217.expected +++ b/clients/tests/test-client.check-on-disk/test_004-217.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/217 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4391 bytes +stdout: 4424 bytes >>> ========================== Device details (wlan0) @@ -41,9 +41,9 @@ GROUP OPTION ------------------------------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ------------------------------------------------------------------------------------------------------------ -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-218.expected b/clients/tests/test-client.check-on-disk/test_004-218.expected index 16f08c99d4..1e91498a52 100644 --- a/clients/tests/test-client.check-on-disk/test_004-218.expected +++ b/clients/tests/test-client.check-on-disk/test_004-218.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/218 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4489 bytes +stdout: 4522 bytes >>> =================================== Informacje o urządzeniu (wlan0) @@ -41,9 +41,9 @@ GROUP OPTION ------------------------------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ------------------------------------------------------------------------------------------------------------ -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-221.expected b/clients/tests/test-client.check-on-disk/test_004-221.expected index 8f50cabe4e..1fbcb57279 100644 --- a/clients/tests/test-client.check-on-disk/test_004-221.expected +++ b/clients/tests/test-client.check-on-disk/test_004-221.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/221 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4391 bytes +stdout: 4424 bytes >>> ========================== Device details (wlan0) @@ -41,9 +41,9 @@ GROUP OPTION ------------------------------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ------------------------------------------------------------------------------------------------------------ -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-222.expected b/clients/tests/test-client.check-on-disk/test_004-222.expected index a577b116ad..fb29155c05 100644 --- a/clients/tests/test-client.check-on-disk/test_004-222.expected +++ b/clients/tests/test-client.check-on-disk/test_004-222.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/222 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4489 bytes +stdout: 4522 bytes >>> =================================== Informacje o urządzeniu (wlan0) @@ -41,9 +41,9 @@ GROUP OPTION ------------------------------------------------------------------------------------------------------------------------- DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS ------------------------------------------------------------------------------------------------------------ -CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-235.expected b/clients/tests/test-client.check-on-disk/test_004-235.expected index e13b008d0d..55559fbe82 100644 --- a/clients/tests/test-client.check-on-disk/test_004-235.expected +++ b/clients/tests/test-client.check-on-disk/test_004-235.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/235 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 1164 bytes +stdout: 1175 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no @@ -14,7 +14,7 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-236.expected b/clients/tests/test-client.check-on-disk/test_004-236.expected index 12962d4464..3ed0c94318 100644 --- a/clients/tests/test-client.check-on-disk/test_004-236.expected +++ b/clients/tests/test-client.check-on-disk/test_004-236.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/236 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1197 bytes +stdout: 1208 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:nie:nieznane:nie:nie @@ -14,7 +14,7 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-239.expected b/clients/tests/test-client.check-on-disk/test_004-239.expected index 714add3ef7..b66bb0307b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-239.expected +++ b/clients/tests/test-client.check-on-disk/test_004-239.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/239 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 1164 bytes +stdout: 1175 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no @@ -14,7 +14,7 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-240.expected b/clients/tests/test-client.check-on-disk/test_004-240.expected index a59dee741a..68d984bd80 100644 --- a/clients/tests/test-client.check-on-disk/test_004-240.expected +++ b/clients/tests/test-client.check-on-disk/test_004-240.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/240 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1197 bytes +stdout: 1208 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:nie:nieznane:nie:nie @@ -14,7 +14,7 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-253.expected b/clients/tests/test-client.check-on-disk/test_004-253.expected index 1615f87ada..258cd7b7c6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-253.expected +++ b/clients/tests/test-client.check-on-disk/test_004-253.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/253 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 1407 bytes +stdout: 1418 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no @@ -14,7 +14,7 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-254.expected b/clients/tests/test-client.check-on-disk/test_004-254.expected index 4a20e69bca..5c85e07d0c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-254.expected +++ b/clients/tests/test-client.check-on-disk/test_004-254.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/254 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1440 bytes +stdout: 1451 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:nie:nieznane:nie:nie @@ -14,7 +14,7 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-257.expected b/clients/tests/test-client.check-on-disk/test_004-257.expected index 8858c7ed49..66f6e72319 100644 --- a/clients/tests/test-client.check-on-disk/test_004-257.expected +++ b/clients/tests/test-client.check-on-disk/test_004-257.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/257 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 1407 bytes +stdout: 1418 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no @@ -14,7 +14,7 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-258.expected b/clients/tests/test-client.check-on-disk/test_004-258.expected index 6cd013166e..1482e165a9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-258.expected +++ b/clients/tests/test-client.check-on-disk/test_004-258.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/258 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1440 bytes +stdout: 1451 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:nie:nieznane:nie:nie @@ -14,7 +14,7 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 -CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-271.expected b/clients/tests/test-client.check-on-disk/test_004-271.expected index 1b29d1dcd6..5366a1f31a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-271.expected +++ b/clients/tests/test-client.check-on-disk/test_004-271.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/271 cmd: $NMCLI --mode multiline -f ALL device 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-272.expected b/clients/tests/test-client.check-on-disk/test_004-272.expected index 80a931a9d0..149748f76b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-272.expected +++ b/clients/tests/test-client.check-on-disk/test_004-272.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/272 cmd: $NMCLI --mode multiline -f ALL device 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 <<< diff --git a/clients/tests/test-client.check-on-disk/test_004-275.expected b/clients/tests/test-client.check-on-disk/test_004-275.expected index 8b52dd9334..60cb76c875 100644 --- a/clients/tests/test-client.check-on-disk/test_004-275.expected +++ b/clients/tests/test-client.check-on-disk/test_004-275.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/275 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device 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-276.expected b/clients/tests/test-client.check-on-disk/test_004-276.expected index 0a0cf672a7..95aacb0516 100644 --- a/clients/tests/test-client.check-on-disk/test_004-276.expected +++ b/clients/tests/test-client.check-on-disk/test_004-276.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/276 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device 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 <<< diff --git a/clients/tests/test-client.check-on-disk/test_004-289.expected b/clients/tests/test-client.check-on-disk/test_004-289.expected index f3ce7b56c9..556a28d901 100644 --- a/clients/tests/test-client.check-on-disk/test_004-289.expected +++ b/clients/tests/test-client.check-on-disk/test_004-289.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/289 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4816 bytes +stdout: 4827 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-290.expected b/clients/tests/test-client.check-on-disk/test_004-290.expected index 4fe20920f2..c5fe08a778 100644 --- a/clients/tests/test-client.check-on-disk/test_004-290.expected +++ b/clients/tests/test-client.check-on-disk/test_004-290.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/290 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4859 bytes +stdout: 4870 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-293.expected b/clients/tests/test-client.check-on-disk/test_004-293.expected index d447e3ca00..56e906c05d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-293.expected +++ b/clients/tests/test-client.check-on-disk/test_004-293.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/293 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4816 bytes +stdout: 4827 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-294.expected b/clients/tests/test-client.check-on-disk/test_004-294.expected index dd30287a5d..0063cad670 100644 --- a/clients/tests/test-client.check-on-disk/test_004-294.expected +++ b/clients/tests/test-client.check-on-disk/test_004-294.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/294 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4859 bytes +stdout: 4870 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-307.expected b/clients/tests/test-client.check-on-disk/test_004-307.expected index e0d952ae71..e537f3b899 100644 --- a/clients/tests/test-client.check-on-disk/test_004-307.expected +++ b/clients/tests/test-client.check-on-disk/test_004-307.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/307 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5691 bytes +stdout: 5702 bytes >>> =============================================================================== Device details (wlan0) @@ -104,7 +104,7 @@ 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-308.expected b/clients/tests/test-client.check-on-disk/test_004-308.expected index a9c0e91fdd..5f046c9219 100644 --- a/clients/tests/test-client.check-on-disk/test_004-308.expected +++ b/clients/tests/test-client.check-on-disk/test_004-308.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/308 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5741 bytes +stdout: 5752 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -104,7 +104,7 @@ 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-311.expected b/clients/tests/test-client.check-on-disk/test_004-311.expected index 9dcf1837ef..563f360e1f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-311.expected +++ b/clients/tests/test-client.check-on-disk/test_004-311.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/311 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5691 bytes +stdout: 5702 bytes >>> =============================================================================== Device details (wlan0) @@ -104,7 +104,7 @@ 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-312.expected b/clients/tests/test-client.check-on-disk/test_004-312.expected index 3d65693d6b..3d277ef3fd 100644 --- a/clients/tests/test-client.check-on-disk/test_004-312.expected +++ b/clients/tests/test-client.check-on-disk/test_004-312.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/312 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5741 bytes +stdout: 5752 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -104,7 +104,7 @@ 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-325.expected b/clients/tests/test-client.check-on-disk/test_004-325.expected index ce69bfbef4..25a0ae9a79 100644 --- a/clients/tests/test-client.check-on-disk/test_004-325.expected +++ b/clients/tests/test-client.check-on-disk/test_004-325.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/325 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5907 bytes +stdout: 5918 bytes >>> =============================================================================== Device details (wlan0) @@ -104,7 +104,7 @@ 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-326.expected b/clients/tests/test-client.check-on-disk/test_004-326.expected index 146e5f157d..18e2c50ff4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-326.expected +++ b/clients/tests/test-client.check-on-disk/test_004-326.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/326 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5957 bytes +stdout: 5968 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -104,7 +104,7 @@ 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-329.expected b/clients/tests/test-client.check-on-disk/test_004-329.expected index faed570e81..f98db0db84 100644 --- a/clients/tests/test-client.check-on-disk/test_004-329.expected +++ b/clients/tests/test-client.check-on-disk/test_004-329.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/329 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5907 bytes +stdout: 5918 bytes >>> =============================================================================== Device details (wlan0) @@ -104,7 +104,7 @@ 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-330.expected b/clients/tests/test-client.check-on-disk/test_004-330.expected index 2e887975f2..941424b957 100644 --- a/clients/tests/test-client.check-on-disk/test_004-330.expected +++ b/clients/tests/test-client.check-on-disk/test_004-330.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/330 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5957 bytes +stdout: 5968 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -104,7 +104,7 @@ 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-343.expected b/clients/tests/test-client.check-on-disk/test_004-343.expected index 7d054d88f0..0f63d3b209 100644 --- a/clients/tests/test-client.check-on-disk/test_004-343.expected +++ b/clients/tests/test-client.check-on-disk/test_004-343.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/343 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2467 bytes +stdout: 2478 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-344.expected b/clients/tests/test-client.check-on-disk/test_004-344.expected index 4e34f933b5..cd6204f677 100644 --- a/clients/tests/test-client.check-on-disk/test_004-344.expected +++ b/clients/tests/test-client.check-on-disk/test_004-344.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/344 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2500 bytes +stdout: 2511 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-347.expected b/clients/tests/test-client.check-on-disk/test_004-347.expected index 07b0c58671..a338275861 100644 --- a/clients/tests/test-client.check-on-disk/test_004-347.expected +++ b/clients/tests/test-client.check-on-disk/test_004-347.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/347 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2467 bytes +stdout: 2478 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-348.expected b/clients/tests/test-client.check-on-disk/test_004-348.expected index 726ddabd6d..97361dc35f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-348.expected +++ b/clients/tests/test-client.check-on-disk/test_004-348.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/348 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2500 bytes +stdout: 2511 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-361.expected b/clients/tests/test-client.check-on-disk/test_004-361.expected index 2e8fdb364a..27a53ffe79 100644 --- a/clients/tests/test-client.check-on-disk/test_004-361.expected +++ b/clients/tests/test-client.check-on-disk/test_004-361.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/361 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2683 bytes +stdout: 2694 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-362.expected b/clients/tests/test-client.check-on-disk/test_004-362.expected index 8458fc9ec9..60523c52ee 100644 --- a/clients/tests/test-client.check-on-disk/test_004-362.expected +++ b/clients/tests/test-client.check-on-disk/test_004-362.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/362 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2716 bytes +stdout: 2727 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-365.expected b/clients/tests/test-client.check-on-disk/test_004-365.expected index a554b0bff4..ea97999911 100644 --- a/clients/tests/test-client.check-on-disk/test_004-365.expected +++ b/clients/tests/test-client.check-on-disk/test_004-365.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/365 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2683 bytes +stdout: 2694 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-366.expected b/clients/tests/test-client.check-on-disk/test_004-366.expected index 4b32e98e59..4688beb010 100644 --- a/clients/tests/test-client.check-on-disk/test_004-366.expected +++ b/clients/tests/test-client.check-on-disk/test_004-366.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/366 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2716 bytes +stdout: 2727 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 <<< From d6949a2924f98cb01ff32aa23e41007b4ef52b62 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 29 Apr 2018 19:13:57 +0200 Subject: [PATCH 11/14] cli: rework printing of "capabilities" device details --- clients/cli/devices.c | 105 ++++++++++-------- clients/cli/devices.h | 2 +- clients/cli/nmcli.c | 2 +- clients/cli/utils.h | 6 + .../test_003-033.expected | 10 +- .../test_003-056.expected | 10 +- .../test_003-106.expected | 10 +- .../test_003-116.expected | 10 +- .../test_003-166.expected | 4 +- .../test_003-176.expected | 4 +- .../test_003-226.expected | 10 +- .../test_003-236.expected | 10 +- .../test_003-286.expected | 10 +- .../test_003-296.expected | 10 +- .../test_003-346.expected | 4 +- .../test_003-356.expected | 4 +- .../test_003-406.expected | 10 +- .../test_003-416.expected | 10 +- .../test_004-128.expected | 10 +- .../test_004-132.expected | 10 +- .../test_004-146.expected | 10 +- .../test_004-150.expected | 10 +- .../test_004-236.expected | 4 +- .../test_004-240.expected | 4 +- .../test_004-254.expected | 4 +- .../test_004-258.expected | 4 +- .../test_004-344.expected | 10 +- .../test_004-348.expected | 10 +- .../test_004-362.expected | 10 +- .../test_004-366.expected | 10 +- 30 files changed, 175 insertions(+), 152 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 0d86d3e5e1..931ad785d6 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -328,15 +328,58 @@ const NmcMetaGenericInfo *const metagen_device_detail_connections[_NMC_GENERIC_I /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[] = { - NMC_META_GENERIC ("NAME"), /* 0 */ - NMC_META_GENERIC ("CARRIER-DETECT"), /* 1 */ - NMC_META_GENERIC ("SPEED"), /* 2 */ - NMC_META_GENERIC ("IS-SOFTWARE"), /* 3 */ - NMC_META_GENERIC ("SRIOV"), /* 4 */ - NULL, +static gconstpointer +_metagen_device_detail_capabilities_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMDevice *d = target; + NMDeviceCapabilities caps; + guint32 speed; + + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + + caps = nm_device_get_capabilities (d); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_CARRIER_DETECT), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED: + speed = 0; + if (NM_IS_DEVICE_ETHERNET (d)) { + /* Speed in Mb/s */ + speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (d)); + } else if (NM_IS_DEVICE_WIFI (d)) { + /* Speed in b/s */ + speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (d)); + speed /= 1000; + } + + if (speed) { + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) + return (*out_to_free = g_strdup_printf (_("%u Mb/s"), (guint) speed)); + return (*out_to_free = g_strdup_printf ("%u Mb/s", (guint) speed)); + } + return nmc_meta_generic_get_str_i18n (N_("unknown"), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_IS_SOFTWARE), get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_SRIOV), get_type); + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_device_detail_capabilities[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_NUM + 1] = { +#define _METAGEN_DEVICE_DETAIL_CAPABILITIES(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_capabilities_get_fcn) + _METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT, "CARRIER-DETECT"), + _METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED, "SPEED"), + _METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE, "IS-SOFTWARE"), + _METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV, "SRIOV"), }; -#define NMC_FIELDS_DEV_SHOW_CAP_COMMON "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE" + +/*****************************************************************************/ const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[] = { NMC_META_GENERIC ("NAME"), /* 0 */ @@ -441,7 +484,7 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_bluetooth[] = { /* Available sections for 'device show' */ const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = { NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_device_detail_general), /* 0 */ - NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES", nmc_fields_dev_show_cap + 1), /* 1 */ + NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES", metagen_device_detail_capabilities), /* 1 */ NMC_META_GENERIC_WITH_NESTED ("WIFI-PROPERTIES", nmc_fields_dev_show_wifi_prop + 1), /* 2 */ NMC_META_GENERIC_WITH_NESTED ("AP", nmc_fields_dev_wifi_list + 1), /* 3 */ NMC_META_GENERIC_WITH_NESTED ("WIRED-PROPERTIES", nmc_fields_dev_show_wired_prop + 1), /* 4 */ @@ -1289,9 +1332,6 @@ show_device_info (NMDevice *device, NmCli *nmc) { GError *error = NULL; NMDeviceState state = NM_DEVICE_STATE_UNKNOWN; - NMDeviceCapabilities caps; - guint32 speed; - char *speed_str; GArray *sections_array; int k; const char *fields_str = NULL; @@ -1365,40 +1405,17 @@ show_device_info (NMDevice *device, NmCli *nmc) continue; } + if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_capabilities) { + gs_free char *f = section_fld ? g_strdup_printf ("CAPABILITIES.%s", section_fld) : NULL; - /* section CAPABILITIES */ - if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[1]->name)) { - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_cap; - 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); - - caps = nm_device_get_capabilities (device); - speed = 0; - if (NM_IS_DEVICE_ETHERNET (device)) { - /* Speed in Mb/s */ - speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (device)); - } else if (NM_IS_DEVICE_WIFI (device)) { - /* Speed in b/s */ - speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (device)); - speed /= 1000; - } - speed_str = speed ? g_strdup_printf (_("%u Mb/s"), speed) : g_strdup (_("unknown")); - - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX); - set_val_strc (arr, 0, nmc_fields_dev_show_sections[1]->name); /* "CAPABILITIES" */ - set_val_strc (arr, 1, (caps & NM_DEVICE_CAP_CARRIER_DETECT) ? _("yes") : _("no")); - set_val_str (arr, 2, speed_str); - set_val_strc (arr, 3, (caps & NM_DEVICE_CAP_IS_SOFTWARE) ? _("yes") : _("no")); - set_val_strc (arr, 4, (caps & NM_DEVICE_CAP_SRIOV) ? _("yes") : _("no")); - 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); + nmc_print (&nmc->nmc_config, + (gpointer[]) { device, NULL }, + NULL, + NMC_META_GENERIC_GROUP ("CAPABILITIES", metagen_device_detail_capabilities, N_("NAME")), + f, + NULL); was_output = TRUE; + continue; } /* Wireless specific information */ diff --git a/clients/cli/devices.h b/clients/cli/devices.h index ba2f2fb1ca..963f06b555 100644 --- a/clients/cli/devices.h +++ b/clients/cli/devices.h @@ -37,7 +37,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 metagen_device_detail_connections[]; -extern const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[]; +extern const NmcMetaGenericInfo *const metagen_device_detail_capabilities[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wifi_prop[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wimax_prop[]; diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 61d4556163..8dd214e31d 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -198,7 +198,7 @@ complete_fields (const char *option, const char *prefix) complete_field (h, metagen_device_status); complete_field (h, metagen_device_detail_general); complete_field (h, metagen_device_detail_connections); - complete_field (h, nmc_fields_dev_show_cap); + complete_field (h, metagen_device_detail_capabilities); complete_field (h, nmc_fields_dev_show_wired_prop); complete_field (h, nmc_fields_dev_show_wifi_prop); complete_field (h, nmc_fields_dev_show_wimax_prop); diff --git a/clients/cli/utils.h b/clients/cli/utils.h index 01dce2da04..23509d9825 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -202,6 +202,12 @@ typedef enum { NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTIONS, _NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_NUM, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT = 0, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV, + _NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_NUM, + } NmcGenericInfoType; #define NMC_HANDLE_COLOR(color) \ 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 9d8a1c9f22..43e602215c 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:860:test_003()/33 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2035 bytes +stdout: 2030 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: 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 8fd71b3524..69d8e0b76c 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:860:test_003()/56 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2035 bytes +stdout: 2030 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_003-106.expected b/clients/tests/test-client.check-on-disk/test_003-106.expected index c91c52710e..d077e24518 100644 --- a/clients/tests/test-client.check-on-disk/test_003-106.expected +++ b/clients/tests/test-client.check-on-disk/test_003-106.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/106 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2035 bytes +stdout: 2030 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_003-116.expected b/clients/tests/test-client.check-on-disk/test_003-116.expected index 1e94d72cb0..6d0ca206e3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-116.expected +++ b/clients/tests/test-client.check-on-disk/test_003-116.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/116 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2035 bytes +stdout: 2030 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_003-166.expected b/clients/tests/test-client.check-on-disk/test_003-166.expected index 8320d36637..93677ff833 100644 --- a/clients/tests/test-client.check-on-disk/test_003-166.expected +++ b/clients/tests/test-client.check-on-disk/test_003-166.expected @@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/166 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1200 bytes +stdout: 1195 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown -CAPABILITIES:nie:100 Mb/s:nie:nie +CAPABILITIES:no:100 Mb/s:no:no WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 DHCP4: diff --git a/clients/tests/test-client.check-on-disk/test_003-176.expected b/clients/tests/test-client.check-on-disk/test_003-176.expected index 9d76bb5874..22de4e7f8a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-176.expected +++ b/clients/tests/test-client.check-on-disk/test_003-176.expected @@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/176 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1200 bytes +stdout: 1195 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown -CAPABILITIES:nie:100 Mb/s:nie:nie +CAPABILITIES:no:100 Mb/s:no:no WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 DHCP4: diff --git a/clients/tests/test-client.check-on-disk/test_003-226.expected b/clients/tests/test-client.check-on-disk/test_003-226.expected index 3620a1552b..0bb90b02d9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-226.expected +++ b/clients/tests/test-client.check-on-disk/test_003-226.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/226 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2035 bytes +stdout: 2030 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_003-236.expected b/clients/tests/test-client.check-on-disk/test_003-236.expected index 6f258f9864..e1df214459 100644 --- a/clients/tests/test-client.check-on-disk/test_003-236.expected +++ b/clients/tests/test-client.check-on-disk/test_003-236.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/236 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2035 bytes +stdout: 2030 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_003-286.expected b/clients/tests/test-client.check-on-disk/test_003-286.expected index 3c508fe870..8f7d9ec237 100644 --- a/clients/tests/test-client.check-on-disk/test_003-286.expected +++ b/clients/tests/test-client.check-on-disk/test_003-286.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/286 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2055 bytes +stdout: 2050 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_003-296.expected b/clients/tests/test-client.check-on-disk/test_003-296.expected index 2b8ecd07ab..ec3211d084 100644 --- a/clients/tests/test-client.check-on-disk/test_003-296.expected +++ b/clients/tests/test-client.check-on-disk/test_003-296.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/296 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2055 bytes +stdout: 2050 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_003-346.expected b/clients/tests/test-client.check-on-disk/test_003-346.expected index 08d103d88b..75b91cbbf5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-346.expected +++ b/clients/tests/test-client.check-on-disk/test_003-346.expected @@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/346 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1220 bytes +stdout: 1215 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown -CAPABILITIES:nie:100 Mb/s:nie:nie +CAPABILITIES:no:100 Mb/s:no:no WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 DHCP4: diff --git a/clients/tests/test-client.check-on-disk/test_003-356.expected b/clients/tests/test-client.check-on-disk/test_003-356.expected index 84e59c6a8c..b3f2e0a49c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-356.expected +++ b/clients/tests/test-client.check-on-disk/test_003-356.expected @@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/356 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1220 bytes +stdout: 1215 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown -CAPABILITIES:nie:100 Mb/s:nie:nie +CAPABILITIES:no:100 Mb/s:no:no WIRED-PROPERTIES:wyłączone: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 DHCP4: diff --git a/clients/tests/test-client.check-on-disk/test_003-406.expected b/clients/tests/test-client.check-on-disk/test_003-406.expected index 4306f3f9f4..6b869b53ed 100644 --- a/clients/tests/test-client.check-on-disk/test_003-406.expected +++ b/clients/tests/test-client.check-on-disk/test_003-406.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/406 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2055 bytes +stdout: 2050 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_003-416.expected b/clients/tests/test-client.check-on-disk/test_003-416.expected index fb0fa542ca..ce4c7b0e9a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-416.expected +++ b/clients/tests/test-client.check-on-disk/test_003-416.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/416 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2055 bytes +stdout: 2050 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -28,10 +28,10 @@ GENERAL.CONNECTION:ethernet GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:100 Mb/s -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIRED-PROPERTIES.CARRIER:wyłączone IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: diff --git a/clients/tests/test-client.check-on-disk/test_004-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected index 9b94b149cd..e17fa0fecb 100644 --- a/clients/tests/test-client.check-on-disk/test_004-128.expected +++ b/clients/tests/test-client.check-on-disk/test_004-128.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/128 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2511 bytes +stdout: 2507 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:nieznane -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak WIFI-PROPERTIES.WPA2:tak diff --git a/clients/tests/test-client.check-on-disk/test_004-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected index 18abe753a7..ee250375a8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-132.expected +++ b/clients/tests/test-client.check-on-disk/test_004-132.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/132 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2511 bytes +stdout: 2507 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:nieznane -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak WIFI-PROPERTIES.WPA2:tak diff --git a/clients/tests/test-client.check-on-disk/test_004-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected index 535385ba92..4647f0b145 100644 --- a/clients/tests/test-client.check-on-disk/test_004-146.expected +++ b/clients/tests/test-client.check-on-disk/test_004-146.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/146 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2727 bytes +stdout: 2723 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:nieznane -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak WIFI-PROPERTIES.WPA2:tak diff --git a/clients/tests/test-client.check-on-disk/test_004-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected index 84a6e98d60..b806e27cf4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-150.expected +++ b/clients/tests/test-client.check-on-disk/test_004-150.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/150 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2727 bytes +stdout: 2723 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:nieznane -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak WIFI-PROPERTIES.WPA2:tak diff --git a/clients/tests/test-client.check-on-disk/test_004-236.expected b/clients/tests/test-client.check-on-disk/test_004-236.expected index 3ed0c94318..d88b65fbe4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-236.expected +++ b/clients/tests/test-client.check-on-disk/test_004-236.expected @@ -2,10 +2,10 @@ location: clients/tests/test-client.py:984:test_004()/236 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1208 bytes +stdout: 1204 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown -CAPABILITIES:nie:nieznane:nie:nie +CAPABILITIES:no:unknown:no:no WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-240.expected b/clients/tests/test-client.check-on-disk/test_004-240.expected index 68d984bd80..01d7e17b95 100644 --- a/clients/tests/test-client.check-on-disk/test_004-240.expected +++ b/clients/tests/test-client.check-on-disk/test_004-240.expected @@ -2,10 +2,10 @@ location: clients/tests/test-client.py:988:test_004()/240 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1208 bytes +stdout: 1204 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown -CAPABILITIES:nie:nieznane:nie:nie +CAPABILITIES:no:unknown:no:no WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-254.expected b/clients/tests/test-client.check-on-disk/test_004-254.expected index 5c85e07d0c..745ac37d39 100644 --- a/clients/tests/test-client.check-on-disk/test_004-254.expected +++ b/clients/tests/test-client.check-on-disk/test_004-254.expected @@ -2,10 +2,10 @@ location: clients/tests/test-client.py:984:test_004()/254 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1451 bytes +stdout: 1447 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown -CAPABILITIES:nie:nieznane:nie:nie +CAPABILITIES:no:unknown:no:no WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-258.expected b/clients/tests/test-client.check-on-disk/test_004-258.expected index 1482e165a9..55b9213b0c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-258.expected +++ b/clients/tests/test-client.check-on-disk/test_004-258.expected @@ -2,10 +2,10 @@ location: clients/tests/test-client.py:988:test_004()/258 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1451 bytes +stdout: 1447 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown -CAPABILITIES:nie:nieznane:nie:nie +CAPABILITIES:no:unknown:no:no WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-344.expected b/clients/tests/test-client.check-on-disk/test_004-344.expected index cd6204f677..716128b8db 100644 --- a/clients/tests/test-client.check-on-disk/test_004-344.expected +++ b/clients/tests/test-client.check-on-disk/test_004-344.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/344 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2511 bytes +stdout: 2507 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:nieznane -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak WIFI-PROPERTIES.WPA2:tak diff --git a/clients/tests/test-client.check-on-disk/test_004-348.expected b/clients/tests/test-client.check-on-disk/test_004-348.expected index 97361dc35f..ca91532302 100644 --- a/clients/tests/test-client.check-on-disk/test_004-348.expected +++ b/clients/tests/test-client.check-on-disk/test_004-348.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/348 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2511 bytes +stdout: 2507 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:nieznane -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak WIFI-PROPERTIES.WPA2:tak diff --git a/clients/tests/test-client.check-on-disk/test_004-362.expected b/clients/tests/test-client.check-on-disk/test_004-362.expected index 60523c52ee..022e8fbacb 100644 --- a/clients/tests/test-client.check-on-disk/test_004-362.expected +++ b/clients/tests/test-client.check-on-disk/test_004-362.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/362 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2727 bytes +stdout: 2723 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:nieznane -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak WIFI-PROPERTIES.WPA2:tak diff --git a/clients/tests/test-client.check-on-disk/test_004-366.expected b/clients/tests/test-client.check-on-disk/test_004-366.expected index 4688beb010..5ee35cc3e4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-366.expected +++ b/clients/tests/test-client.check-on-disk/test_004-366.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/366 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2727 bytes +stdout: 2723 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1 GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown -CAPABILITIES.CARRIER-DETECT:nie -CAPABILITIES.SPEED:nieznane -CAPABILITIES.IS-SOFTWARE:nie -CAPABILITIES.SRIOV:nie +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no WIFI-PROPERTIES.WEP:tak WIFI-PROPERTIES.WPA:tak WIFI-PROPERTIES.WPA2:tak From 918be83493f8f5d73092b43afcfeef94d4dc113e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Apr 2018 09:00:08 +0200 Subject: [PATCH 12/14] cli: rework printing of "wired" and "wifi" device details --- clients/cli/devices.c | 221 +++++++++++------- clients/cli/devices.h | 6 +- clients/cli/nmcli.c | 6 +- clients/cli/utils.h | 21 ++ .../test_003-033.expected | 4 +- .../test_003-056.expected | 4 +- .../test_003-106.expected | 4 +- .../test_003-116.expected | 4 +- .../test_003-166.expected | 4 +- .../test_003-176.expected | 4 +- .../test_003-226.expected | 4 +- .../test_003-236.expected | 4 +- .../test_003-286.expected | 4 +- .../test_003-296.expected | 4 +- .../test_003-346.expected | 4 +- .../test_003-356.expected | 4 +- .../test_003-406.expected | 4 +- .../test_003-416.expected | 4 +- .../test_004-040.expected | 20 +- .../test_004-128.expected | 20 +- .../test_004-132.expected | 20 +- .../test_004-146.expected | 20 +- .../test_004-150.expected | 20 +- .../test_004-236.expected | 4 +- .../test_004-240.expected | 4 +- .../test_004-254.expected | 4 +- .../test_004-258.expected | 4 +- .../test_004-344.expected | 20 +- .../test_004-348.expected | 20 +- .../test_004-362.expected | 20 +- .../test_004-366.expected | 20 +- 31 files changed, 289 insertions(+), 217 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 931ad785d6..4b2438b2bd 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -381,39 +381,116 @@ const NmcMetaGenericInfo *const metagen_device_detail_capabilities[_NMC_GENERIC_ /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[] = { - NMC_META_GENERIC ("NAME"), /* 0 */ - NMC_META_GENERIC ("CARRIER"), /* 1 */ - NMC_META_GENERIC ("S390-SUBCHANNELS"), /* 2 */ - NULL, -}; -#define NMC_FIELDS_DEV_SHOW_WIRED_PROP_COMMON "NAME,CARRIER,S390-SUBCHANNELS" +static gconstpointer +_metagen_device_detail_wired_properties_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMDevice *d = target; -const NmcMetaGenericInfo *const nmc_fields_dev_show_wifi_prop[] = { - NMC_META_GENERIC ("NAME"), /* 0 */ - NMC_META_GENERIC ("WEP"), /* 1 */ - NMC_META_GENERIC ("WPA"), /* 2 */ - NMC_META_GENERIC ("WPA2"), /* 3 */ - NMC_META_GENERIC ("TKIP"), /* 4 */ - NMC_META_GENERIC ("CCMP"), /* 5 */ - NMC_META_GENERIC ("AP"), /* 6 */ - NMC_META_GENERIC ("ADHOC"), /* 7 */ - NMC_META_GENERIC ("2GHZ"), /* 8 */ - NMC_META_GENERIC ("5GHZ"), /* 9 */ - NULL, -}; -#define NMC_FIELDS_DEV_SHOW_WIFI_PROP_COMMON "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC" + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); -const NmcMetaGenericInfo *const nmc_fields_dev_show_wimax_prop[] = { - NMC_META_GENERIC ("NAME"), /* 0 */ - NMC_META_GENERIC ("CTR-FREQ"), /* 1 */ - NMC_META_GENERIC ("RSSI"), /* 2 */ - NMC_META_GENERIC ("CINR"), /* 3 */ - NMC_META_GENERIC ("TX-POW"), /* 4 */ - NMC_META_GENERIC ("BSID"), /* 5 */ - NULL, + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIRED_PROPERTIES_CARRIER: + return nmc_meta_generic_get_bool_onoff (nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (d)), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIRED_PROPERTIES_S390_SUBCHANNELS: + if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV)) + return NULL; + *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; + return nm_device_ethernet_get_s390_subchannels (NM_DEVICE_ETHERNET (d)); + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_device_detail_wired_properties[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIRED_PROPERTIES_NUM + 1] = { +#define _METAGEN_DEVICE_DETAIL_WIRED_PROPERTIES(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_wired_properties_get_fcn) + _METAGEN_DEVICE_DETAIL_WIRED_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIRED_PROPERTIES_CARRIER, "CARRIER"), + _METAGEN_DEVICE_DETAIL_WIRED_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIRED_PROPERTIES_S390_SUBCHANNELS, "S390-SUBCHANNELS"), }; -#define NMC_FIELDS_DEV_SHOW_WIMAX_PROP_COMMON "NAME,CTR-FREQ,RSSI,CINR,TX-POW,BSID" + +/*****************************************************************************/ + +static gconstpointer +_metagen_device_detail_wifi_properties_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMDevice *d = target; + NMDeviceWifiCapabilities wcaps; + + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + + wcaps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (d)); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WEP: + return nmc_meta_generic_get_bool (NM_FLAGS_ANY (wcaps, NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_WPA), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA2: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_RSN), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_TKIP: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_CIPHER_TKIP), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_CCMP: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_CIPHER_CCMP), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_AP: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_AP), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC: + return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_ADHOC), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_2GHZ: + return nmc_meta_generic_get_str_i18n ( NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_FREQ_VALID) + ? ( NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_FREQ_2GHZ) + ? N_("yes") + : N_("no")) + : N_("unknown"), + get_type); + case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ: + return nmc_meta_generic_get_str_i18n ( NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_FREQ_VALID) + ? ( NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_FREQ_5GHZ) + ? N_("yes") + : N_("no")) + : N_("unknown"), + get_type); + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_device_detail_wifi_properties[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_NUM + 1] = { +#define _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_wifi_properties_get_fcn) + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WEP, "WEP"), + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA, "WPA"), + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA2, "WPA2"), + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_TKIP, "TKIP"), + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_CCMP, "CCMP"), + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_AP, "AP"), + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC, "ADHOC"), + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_2GHZ, "2GHZ"), + _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ, "5GHZ"), +}; + +/*****************************************************************************/ + +const NmcMetaGenericInfo *const metagen_device_detail_wimax_properties[] = { + NMC_META_GENERIC ("CTR-FREQ"), + NMC_META_GENERIC ("RSSI"), + NMC_META_GENERIC ("CINR"), + NMC_META_GENERIC ("TX-POW"), + NMC_META_GENERIC ("BSID"), +}; + +/*****************************************************************************/ const NmcMetaGenericInfo *const nmc_fields_dev_wifi_list[] = { NMC_META_GENERIC ("NAME"), /* 0 */ @@ -485,10 +562,10 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_bluetooth[] = { const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = { NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_device_detail_general), /* 0 */ NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES", metagen_device_detail_capabilities), /* 1 */ - NMC_META_GENERIC_WITH_NESTED ("WIFI-PROPERTIES", nmc_fields_dev_show_wifi_prop + 1), /* 2 */ + NMC_META_GENERIC_WITH_NESTED ("WIFI-PROPERTIES", metagen_device_detail_wifi_properties), /* 2 */ NMC_META_GENERIC_WITH_NESTED ("AP", nmc_fields_dev_wifi_list + 1), /* 3 */ - NMC_META_GENERIC_WITH_NESTED ("WIRED-PROPERTIES", nmc_fields_dev_show_wired_prop + 1), /* 4 */ - NMC_META_GENERIC_WITH_NESTED ("WIMAX-PROPERTIES", nmc_fields_dev_show_wimax_prop + 1), /* 5 */ + NMC_META_GENERIC_WITH_NESTED ("WIRED-PROPERTIES", metagen_device_detail_wired_properties), /* 4 */ + NMC_META_GENERIC_WITH_NESTED ("WIMAX-PROPERTIES", metagen_device_detail_wimax_properties), /* 5 */ NMC_META_GENERIC_WITH_NESTED ("NSP", nmc_fields_dev_wimax_list + 1), /* 6 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 7 */ NMC_META_GENERIC_WITH_NESTED ("DHCP4", metagen_dhcp_config), /* 8 */ @@ -1418,46 +1495,27 @@ show_device_info (NMDevice *device, NmCli *nmc) continue; } + if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_wifi_properties) { + if (NM_IS_DEVICE_WIFI (device)) { + gs_free char *f = section_fld ? g_strdup_printf ("WIFI-PROPERTIES.%s", section_fld) : NULL; + + nmc_print (&nmc->nmc_config, + (gpointer[]) { device, NULL }, + NULL, + NMC_META_GENERIC_GROUP ("WIFI-PROPERTIES", metagen_device_detail_wifi_properties, N_("NAME")), + f, + NULL); + was_output = TRUE; + } + continue; + } + /* Wireless specific information */ if ((NM_IS_DEVICE_WIFI (device))) { - NMDeviceWifiCapabilities wcaps; NMAccessPoint *active_ap = NULL; const char *active_bssid = NULL; GPtrArray *aps; - /* section WIFI-PROPERTIES */ - if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[2]->name)) { - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - - wcaps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (device)); - - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_wifi_prop; - 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); - - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX); - set_val_strc (arr, 0, nmc_fields_dev_show_sections[2]->name); /* "WIFI-PROPERTIES" */ - set_val_strc (arr, 1, (wcaps & (NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104)) ? - _("yes") : _("no")); - set_val_strc (arr, 2, (wcaps & NM_WIFI_DEVICE_CAP_WPA) ? _("yes") : _("no")); - set_val_strc (arr, 3, (wcaps & NM_WIFI_DEVICE_CAP_RSN) ? _("yes") : _("no")); - set_val_strc (arr, 4, (wcaps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP) ? _("yes") : _("no")); - set_val_strc (arr, 5, (wcaps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP) ? _("yes") : _("no")); - set_val_strc (arr, 6, (wcaps & NM_WIFI_DEVICE_CAP_AP) ? _("yes") : _("no")); - set_val_strc (arr, 7, (wcaps & NM_WIFI_DEVICE_CAP_ADHOC) ? _("yes") : _("no")); - set_val_strc (arr, 8, !(wcaps & NM_WIFI_DEVICE_CAP_FREQ_VALID) ? _("unknown") : - ((wcaps & NM_WIFI_DEVICE_CAP_FREQ_2GHZ) ? _("yes") : _("no"))); - set_val_strc (arr, 9, !(wcaps & NM_WIFI_DEVICE_CAP_FREQ_VALID) ? _("unknown") : - ((wcaps & NM_WIFI_DEVICE_CAP_FREQ_5GHZ) ? _("yes") : _("no"))); - 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); - was_output = TRUE; - } - /* section AP */ if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[3]->name)) { NMC_OUTPUT_DATA_DEFINE_SCOPED (out); @@ -1492,28 +1550,21 @@ show_device_info (NMDevice *device, NmCli *nmc) print_data (&nmc->nmc_config, out_indices, NULL, 0, &out); was_output = TRUE; } - } else if (NM_IS_DEVICE_ETHERNET (device)) { - /* WIRED-PROPERTIES */ - if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[4]->name)) { - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); + } - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_wired_prop; - 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); + if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_wired_properties) { + if ((NM_IS_DEVICE_ETHERNET (device))) { + gs_free char *f = section_fld ? g_strdup_printf ("WIRED-PROPERTIES.%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[4]->name); /* "WIRED-PROPERTIES" */ - set_val_strc (arr, 1, (nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device))) ? - _("on") : _("off")); - set_val_arrc (arr, 2, ((const char **) nm_device_ethernet_get_s390_subchannels (NM_DEVICE_ETHERNET (device)))); - 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); + nmc_print (&nmc->nmc_config, + (gpointer[]) { device, NULL }, + NULL, + NMC_META_GENERIC_GROUP ("WIRED-PROPERTIES", metagen_device_detail_wired_properties, N_("NAME")), + f, + NULL); was_output = TRUE; } + continue; } /* IP configuration info */ diff --git a/clients/cli/devices.h b/clients/cli/devices.h index 963f06b555..7a05b50b2b 100644 --- a/clients/cli/devices.h +++ b/clients/cli/devices.h @@ -38,9 +38,9 @@ extern const NmcMetaGenericInfo *const metagen_device_status[]; extern const NmcMetaGenericInfo *const metagen_device_detail_general[]; extern const NmcMetaGenericInfo *const metagen_device_detail_connections[]; extern const NmcMetaGenericInfo *const metagen_device_detail_capabilities[]; -extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[]; -extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wifi_prop[]; -extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wimax_prop[]; +extern const NmcMetaGenericInfo *const metagen_device_detail_wired_properties[]; +extern const NmcMetaGenericInfo *const metagen_device_detail_wifi_properties[]; +extern const NmcMetaGenericInfo *const metagen_device_detail_wimax_properties[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_wifi_list[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_master_prop[]; diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 8dd214e31d..bbfc310d6c 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -199,9 +199,9 @@ complete_fields (const char *option, const char *prefix) complete_field (h, metagen_device_detail_general); complete_field (h, metagen_device_detail_connections); complete_field (h, metagen_device_detail_capabilities); - complete_field (h, nmc_fields_dev_show_wired_prop); - complete_field (h, nmc_fields_dev_show_wifi_prop); - complete_field (h, nmc_fields_dev_show_wimax_prop); + complete_field (h, metagen_device_detail_wired_properties); + complete_field (h, metagen_device_detail_wifi_properties); + complete_field (h, metagen_device_detail_wimax_properties); complete_field (h, nmc_fields_dev_wifi_list); complete_field (h, nmc_fields_dev_wimax_list); complete_field (h, nmc_fields_dev_show_master_prop); diff --git a/clients/cli/utils.h b/clients/cli/utils.h index 23509d9825..980c1234da 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -208,6 +208,21 @@ typedef enum { NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV, _NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_NUM, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIRED_PROPERTIES_CARRIER = 0, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIRED_PROPERTIES_S390_SUBCHANNELS, + _NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIRED_PROPERTIES_NUM, + + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WEP = 0, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA2, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_TKIP, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_CCMP, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_AP, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_2GHZ, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ, + _NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_NUM, + } NmcGenericInfoType; #define NMC_HANDLE_COLOR(color) \ @@ -276,6 +291,12 @@ nmc_meta_generic_get_bool (gboolean val, NMMetaAccessorGetType get_type) return nmc_meta_generic_get_str_i18n (val ? N_("yes") : N_("no"), get_type); } +static inline const char * +nmc_meta_generic_get_bool_onoff (gboolean val, NMMetaAccessorGetType get_type) +{ + return nmc_meta_generic_get_str_i18n (val ? N_("on") : N_("off"), get_type); +} + typedef enum { NMC_META_GENERIC_GET_ENUM_TYPE_PARENTHESES, NMC_META_GENERIC_GET_ENUM_TYPE_DASH, 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 43e602215c..09ceade26f 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:860:test_003()/33 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2030 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 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 69d8e0b76c..6aa1a92d04 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:860:test_003()/56 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2030 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_003-106.expected b/clients/tests/test-client.check-on-disk/test_003-106.expected index d077e24518..1f2f8e91b8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-106.expected +++ b/clients/tests/test-client.check-on-disk/test_003-106.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/106 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2030 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_003-116.expected b/clients/tests/test-client.check-on-disk/test_003-116.expected index 6d0ca206e3..30e76d96a7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-116.expected +++ b/clients/tests/test-client.check-on-disk/test_003-116.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/116 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2030 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_003-166.expected b/clients/tests/test-client.check-on-disk/test_003-166.expected index 93677ff833..38fd2cbe69 100644 --- a/clients/tests/test-client.check-on-disk/test_003-166.expected +++ b/clients/tests/test-client.check-on-disk/test_003-166.expected @@ -2,11 +2,11 @@ location: clients/tests/test-client.py:887:test_003()/166 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1195 bytes +stdout: 1187 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no -WIRED-PROPERTIES:wyłączone: +WIRED-PROPERTIES:off: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar diff --git a/clients/tests/test-client.check-on-disk/test_003-176.expected b/clients/tests/test-client.check-on-disk/test_003-176.expected index 22de4e7f8a..6cbc23f48c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-176.expected +++ b/clients/tests/test-client.check-on-disk/test_003-176.expected @@ -2,11 +2,11 @@ location: clients/tests/test-client.py:887:test_003()/176 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1195 bytes +stdout: 1187 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no -WIRED-PROPERTIES:wyłączone: +WIRED-PROPERTIES:off: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar diff --git a/clients/tests/test-client.check-on-disk/test_003-226.expected b/clients/tests/test-client.check-on-disk/test_003-226.expected index 0bb90b02d9..f76078781e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-226.expected +++ b/clients/tests/test-client.check-on-disk/test_003-226.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/226 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2030 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_003-236.expected b/clients/tests/test-client.check-on-disk/test_003-236.expected index e1df214459..c1426a3167 100644 --- a/clients/tests/test-client.check-on-disk/test_003-236.expected +++ b/clients/tests/test-client.check-on-disk/test_003-236.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/236 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2030 bytes +stdout: 2022 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_003-286.expected b/clients/tests/test-client.check-on-disk/test_003-286.expected index 8f7d9ec237..caa800d6ac 100644 --- a/clients/tests/test-client.check-on-disk/test_003-286.expected +++ b/clients/tests/test-client.check-on-disk/test_003-286.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/286 cmd: $NMCLI --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2050 bytes +stdout: 2042 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_003-296.expected b/clients/tests/test-client.check-on-disk/test_003-296.expected index ec3211d084..bf0e1ae1e7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-296.expected +++ b/clients/tests/test-client.check-on-disk/test_003-296.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/296 cmd: $NMCLI --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2050 bytes +stdout: 2042 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_003-346.expected b/clients/tests/test-client.check-on-disk/test_003-346.expected index 75b91cbbf5..8f6c7d1d41 100644 --- a/clients/tests/test-client.check-on-disk/test_003-346.expected +++ b/clients/tests/test-client.check-on-disk/test_003-346.expected @@ -2,11 +2,11 @@ location: clients/tests/test-client.py:887:test_003()/346 cmd: $NMCLI --mode tabular --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1215 bytes +stdout: 1207 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no -WIRED-PROPERTIES:wyłączone: +WIRED-PROPERTIES:off: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar diff --git a/clients/tests/test-client.check-on-disk/test_003-356.expected b/clients/tests/test-client.check-on-disk/test_003-356.expected index b3f2e0a49c..55f3d0fa84 100644 --- a/clients/tests/test-client.check-on-disk/test_003-356.expected +++ b/clients/tests/test-client.check-on-disk/test_003-356.expected @@ -2,11 +2,11 @@ location: clients/tests/test-client.py:887:test_003()/356 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1215 bytes +stdout: 1207 bytes >>> GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown CAPABILITIES:no:100 Mb/s:no:no -WIRED-PROPERTIES:wyłączone: +WIRED-PROPERTIES:off: IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 DHCP4: IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar diff --git a/clients/tests/test-client.check-on-disk/test_003-406.expected b/clients/tests/test-client.check-on-disk/test_003-406.expected index 6b869b53ed..d5d36f9cb6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-406.expected +++ b/clients/tests/test-client.check-on-disk/test_003-406.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/406 cmd: $NMCLI --mode multiline --terse -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2050 bytes +stdout: 2042 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_003-416.expected b/clients/tests/test-client.check-on-disk/test_003-416.expected index ce4c7b0e9a..9a5c386af4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-416.expected +++ b/clients/tests/test-client.check-on-disk/test_003-416.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/416 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2050 bytes +stdout: 2042 bytes >>> GENERAL.DEVICE:eth0 GENERAL.TYPE:ethernet @@ -32,7 +32,7 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:100 Mb/s CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIRED-PROPERTIES.CARRIER:wyłączone +WIRED-PROPERTIES.CARRIER:off IP4.ADDRESS[1]:192.168.6.238/29 IP4.GATEWAY: IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected index 17560ee4d2..fcf1996924 100644 --- a/clients/tests/test-client.check-on-disk/test_004-040.expected +++ b/clients/tests/test-client.check-on-disk/test_004-040.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:963:test_004()/40 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 933 bytes +stdout: 931 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -29,15 +29,15 @@ GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED:unknown GENERAL.HWADDR:13:E0:74:85:7C:D9 -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected index e17fa0fecb..122cb1a5bc 100644 --- a/clients/tests/test-client.check-on-disk/test_004-128.expected +++ b/clients/tests/test-client.check-on-disk/test_004-128.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/128 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2507 bytes +stdout: 2505 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -32,15 +32,15 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:unknown CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown AP[1].IN-USE: AP[1].SSID:wlan0-ap-2 AP[1].MODE:Infrastruktura diff --git a/clients/tests/test-client.check-on-disk/test_004-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected index ee250375a8..24cd2ba396 100644 --- a/clients/tests/test-client.check-on-disk/test_004-132.expected +++ b/clients/tests/test-client.check-on-disk/test_004-132.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/132 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2507 bytes +stdout: 2505 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -32,15 +32,15 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:unknown CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown AP[1].IN-USE: AP[1].SSID:wlan0-ap-2 AP[1].MODE:Infrastruktura diff --git a/clients/tests/test-client.check-on-disk/test_004-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected index 4647f0b145..03a5b00392 100644 --- a/clients/tests/test-client.check-on-disk/test_004-146.expected +++ b/clients/tests/test-client.check-on-disk/test_004-146.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/146 cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2723 bytes +stdout: 2721 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -32,15 +32,15 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:unknown CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown AP[1].IN-USE:  AP[1].SSID:wlan0-ap-2 AP[1].MODE:Infrastruktura diff --git a/clients/tests/test-client.check-on-disk/test_004-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected index b806e27cf4..abecf7462e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-150.expected +++ b/clients/tests/test-client.check-on-disk/test_004-150.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/150 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2723 bytes +stdout: 2721 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -32,15 +32,15 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:unknown CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown AP[1].IN-USE:  AP[1].SSID:wlan0-ap-2 AP[1].MODE:Infrastruktura diff --git a/clients/tests/test-client.check-on-disk/test_004-236.expected b/clients/tests/test-client.check-on-disk/test_004-236.expected index d88b65fbe4..d1aff0d1c0 100644 --- a/clients/tests/test-client.check-on-disk/test_004-236.expected +++ b/clients/tests/test-client.check-on-disk/test_004-236.expected @@ -2,11 +2,11 @@ location: clients/tests/test-client.py:984:test_004()/236 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1204 bytes +stdout: 1202 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no -WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane +WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-240.expected b/clients/tests/test-client.check-on-disk/test_004-240.expected index 01d7e17b95..731cbb1eec 100644 --- a/clients/tests/test-client.check-on-disk/test_004-240.expected +++ b/clients/tests/test-client.check-on-disk/test_004-240.expected @@ -2,11 +2,11 @@ location: clients/tests/test-client.py:988:test_004()/240 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1204 bytes +stdout: 1202 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no -WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane +WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-254.expected b/clients/tests/test-client.check-on-disk/test_004-254.expected index 745ac37d39..648160dee3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-254.expected +++ b/clients/tests/test-client.check-on-disk/test_004-254.expected @@ -2,11 +2,11 @@ location: clients/tests/test-client.py:984:test_004()/254 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1447 bytes +stdout: 1445 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no -WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane +WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-258.expected b/clients/tests/test-client.check-on-disk/test_004-258.expected index 55b9213b0c..26b160f4b6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-258.expected +++ b/clients/tests/test-client.check-on-disk/test_004-258.expected @@ -2,11 +2,11 @@ location: clients/tests/test-client.py:988:test_004()/258 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1447 bytes +stdout: 1445 bytes >>> GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown CAPABILITIES:no:unknown:no:no -WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane +WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_004-344.expected b/clients/tests/test-client.check-on-disk/test_004-344.expected index 716128b8db..483cc411c2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-344.expected +++ b/clients/tests/test-client.check-on-disk/test_004-344.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/344 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2507 bytes +stdout: 2505 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -32,15 +32,15 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:unknown CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown AP[1].IN-USE: AP[1].SSID:wlan0-ap-2 AP[1].MODE:Infrastruktura diff --git a/clients/tests/test-client.check-on-disk/test_004-348.expected b/clients/tests/test-client.check-on-disk/test_004-348.expected index ca91532302..e56d6f83ef 100644 --- a/clients/tests/test-client.check-on-disk/test_004-348.expected +++ b/clients/tests/test-client.check-on-disk/test_004-348.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/348 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2507 bytes +stdout: 2505 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -32,15 +32,15 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:unknown CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown AP[1].IN-USE: AP[1].SSID:wlan0-ap-2 AP[1].MODE:Infrastruktura diff --git a/clients/tests/test-client.check-on-disk/test_004-362.expected b/clients/tests/test-client.check-on-disk/test_004-362.expected index 022e8fbacb..6012df4ea3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-362.expected +++ b/clients/tests/test-client.check-on-disk/test_004-362.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/362 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2723 bytes +stdout: 2721 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -32,15 +32,15 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:unknown CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown AP[1].IN-USE:  AP[1].SSID:wlan0-ap-2 AP[1].MODE:Infrastruktura diff --git a/clients/tests/test-client.check-on-disk/test_004-366.expected b/clients/tests/test-client.check-on-disk/test_004-366.expected index 5ee35cc3e4..1834ed6782 100644 --- a/clients/tests/test-client.check-on-disk/test_004-366.expected +++ b/clients/tests/test-client.check-on-disk/test_004-366.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/366 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2723 bytes +stdout: 2721 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -32,15 +32,15 @@ CAPABILITIES.CARRIER-DETECT:no CAPABILITIES.SPEED:unknown CAPABILITIES.IS-SOFTWARE:no CAPABILITIES.SRIOV:no -WIFI-PROPERTIES.WEP:tak -WIFI-PROPERTIES.WPA:tak -WIFI-PROPERTIES.WPA2:tak -WIFI-PROPERTIES.TKIP:tak -WIFI-PROPERTIES.CCMP:tak -WIFI-PROPERTIES.AP:tak -WIFI-PROPERTIES.ADHOC:tak -WIFI-PROPERTIES.2GHZ:nieznane -WIFI-PROPERTIES.5GHZ:nieznane +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown AP[1].IN-USE:  AP[1].SSID:wlan0-ap-2 AP[1].MODE:Infrastruktura From ba350a3495f8e8c3b5bd50d96d5818fe8e5c5136 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Apr 2018 13:01:20 +0200 Subject: [PATCH 13/14] cli: add additional user-data argument to get_fcn() The function nmc_print() receives a list of "targets". These are essentially the rows that should be printed (while the "fields" list represents the columns). When filling the cells with values, it calles repeatedly get_fcn() on the column descriptors (fields), by passing each row (target). The caller must be well aware that the fields and targets are compatible. For example, in some cases the targets are NMDevice instances and the target type must correspond to what get_fcn() expects. Add another user-data pointer that is passed on along with the targets. That is useful, if we have a list of targets/rows, but pass in additional data that applies to all rows alike. It is still unused. --- clients/cli/common.c | 2 ++ clients/cli/connections.c | 5 ++++- clients/cli/devices.c | 6 ++++++ clients/cli/general.c | 3 +++ clients/cli/settings.c | 1 + clients/cli/utils.c | 10 +++++++++- clients/cli/utils.h | 2 ++ clients/common/nm-meta-setting-access.c | 2 ++ clients/common/nm-meta-setting-access.h | 1 + clients/common/nm-meta-setting-desc.c | 3 +++ clients/common/nm-meta-setting-desc.h | 1 + 11 files changed, 34 insertions(+), 2 deletions(-) diff --git a/clients/cli/common.c b/clients/cli/common.c index de55a49141..ede447bad0 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -356,6 +356,7 @@ print_ip_config (NMIPConfig *cfg, if (!nmc_print (nmc_config, (gpointer[]) { cfg, NULL }, NULL, + NULL, addr_family == AF_INET ? NMC_META_GENERIC_GROUP ("IP4", metagen_ip4_config, N_("GROUP")) : NMC_META_GENERIC_GROUP ("IP6", metagen_ip6_config, N_("GROUP")), @@ -387,6 +388,7 @@ print_dhcp_config (NMDhcpConfig *dhcp, if (!nmc_print (nmc_config, (gpointer[]) { dhcp, NULL }, NULL, + NULL, addr_family == AF_INET ? NMC_META_GENERIC_GROUP ("DHCP4", metagen_dhcp_config, N_("GROUP")) : NMC_META_GENERIC_GROUP ("DHCP6", metagen_dhcp_config, N_("GROUP")), diff --git a/clients/cli/connections.c b/clients/cli/connections.c index f947a45e34..0e286d7c05 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1380,6 +1380,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) nmc_print (&nmc->nmc_config, (gpointer[]) { acon, NULL }, NULL, + NULL, NMC_META_GENERIC_GROUP ("GENERAL", metagen_con_active_general, N_("GROUP")), f, NULL); @@ -1428,6 +1429,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) nmc_print (&nmc->nmc_config, (gpointer[]) { acon, NULL }, NULL, + NULL, NMC_META_GENERIC_GROUP ("VPN", metagen_con_active_vpn, N_("NAME")), group_fld, NULL); @@ -1985,10 +1987,11 @@ do_connections_show (NmCli *nmc, int argc, char **argv) g_ptr_array_add (items, NULL); if (!nmc_print (&nmc->nmc_config, items->pdata, + NULL, active_only ? _("NetworkManager active profiles") : _("NetworkManager connection profiles"), - (const NMMetaAbstractInfo *const*) metagen_con_show, + (const NMMetaAbstractInfo *const*) metagen_con_show, fields_str, &err)) goto finish; diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 4b2438b2bd..05b7c6defd 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1475,6 +1475,7 @@ show_device_info (NMDevice *device, NmCli *nmc) nmc_print (&nmc->nmc_config, (gpointer[]) { device, NULL }, NULL, + NULL, NMC_META_GENERIC_GROUP ("GENERAL", metagen_device_detail_general, N_("NAME")), f, NULL); @@ -1488,6 +1489,7 @@ show_device_info (NMDevice *device, NmCli *nmc) nmc_print (&nmc->nmc_config, (gpointer[]) { device, NULL }, NULL, + NULL, NMC_META_GENERIC_GROUP ("CAPABILITIES", metagen_device_detail_capabilities, N_("NAME")), f, NULL); @@ -1502,6 +1504,7 @@ show_device_info (NMDevice *device, NmCli *nmc) nmc_print (&nmc->nmc_config, (gpointer[]) { device, NULL }, NULL, + NULL, NMC_META_GENERIC_GROUP ("WIFI-PROPERTIES", metagen_device_detail_wifi_properties, N_("NAME")), f, NULL); @@ -1559,6 +1562,7 @@ show_device_info (NMDevice *device, NmCli *nmc) nmc_print (&nmc->nmc_config, (gpointer[]) { device, NULL }, NULL, + NULL, NMC_META_GENERIC_GROUP ("WIRED-PROPERTIES", metagen_device_detail_wired_properties, N_("NAME")), f, NULL); @@ -1660,6 +1664,7 @@ show_device_info (NMDevice *device, NmCli *nmc) nmc_print (&nmc->nmc_config, (gpointer[]) { device, NULL }, NULL, + NULL, NMC_META_GENERIC_GROUP ("CONNECTIONS", metagen_device_detail_connections, N_("NAME")), f, NULL); @@ -1718,6 +1723,7 @@ do_devices_status (NmCli *nmc, int argc, char **argv) if (!nmc_print (&nmc->nmc_config, (gpointer *) devices, + NULL, N_("Status of devices"), (const NMMetaAbstractInfo *const*) metagen_device_status, fields_str, diff --git a/clients/cli/general.c b/clients/cli/general.c index 2e030ec78a..cb87c11054 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -508,6 +508,7 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl if (!nmc_print (&nmc->nmc_config, (gpointer[]) { nmc, NULL }, + NULL, pretty_header_name ?: N_("NetworkManager status"), (const NMMetaAbstractInfo *const*) metagen_general_status, fields_str, @@ -565,6 +566,7 @@ print_permissions (void *user_data) if (!nmc_print (&nmc->nmc_config, permissions, + NULL, _("NetworkManager permissions"), (const NMMetaAbstractInfo *const*) metagen_general_permissions, fields_str, @@ -657,6 +659,7 @@ show_general_logging (NmCli *nmc) if (!nmc_print (&nmc->nmc_config, (gpointer const []) { &d, NULL }, + NULL, _("NetworkManager logging"), (const NMMetaAbstractInfo *const*) metagen_general_logging, fields_str, diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 01142ba262..b39713f901 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -814,6 +814,7 @@ setting_details (const NmcConfig *nmc_config, NMSetting *setting, const char *on if (!nmc_print (nmc_config, (gpointer[]) { setting, NULL }, NULL, + NULL, (const NMMetaAbstractInfo *const[]) { (const NMMetaAbstractInfo *) setting_info, NULL }, fields_str, &error)) diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 365a03030e..064343a151 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -72,6 +72,7 @@ _meta_type_nmc_generic_info_get_fcn (const NMMetaAbstractInfo *abstract_info, const NMMetaEnvironment *environment, gpointer environment_user_data, gpointer target, + gpointer target_data, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, @@ -95,7 +96,9 @@ _meta_type_nmc_generic_info_get_fcn (const NMMetaAbstractInfo *abstract_info, if (info->get_fcn) { return info->get_fcn (environment, environment_user_data, - info, target, + info, + target, + target_data, get_type, get_flags, out_flags, @@ -954,6 +957,7 @@ _print_data_cell_clear (gpointer cell_p) static void _print_fill (const NmcConfig *nmc_config, gpointer const *targets, + gpointer targets_data, const PrintDataCol *cols, guint cols_len, GArray **out_header_row, @@ -1040,6 +1044,7 @@ _print_fill (const NmcConfig *nmc_config, nmc_meta_environment, nmc_meta_environment_arg, target, + targets_data, text_get_type, text_get_flags, &text_out_flags, @@ -1072,6 +1077,7 @@ _print_fill (const NmcConfig *nmc_config, nmc_meta_environment, nmc_meta_environment_arg, target, + targets_data, NM_META_ACCESSOR_GET_TYPE_COLOR, NM_META_ACCESSOR_GET_FLAGS_NONE, &color_out_flags, @@ -1320,6 +1326,7 @@ _print_do (const NmcConfig *nmc_config, gboolean nmc_print (const NmcConfig *nmc_config, gpointer const *targets, + gpointer targets_data, const char *header_name_no_l10n, const NMMetaAbstractInfo *const*fields, const char *fields_str, @@ -1337,6 +1344,7 @@ nmc_print (const NmcConfig *nmc_config, _print_fill (nmc_config, targets, + targets_data, &g_array_index (cols, PrintDataCol, 0), cols->len, &header_row, diff --git a/clients/cli/utils.h b/clients/cli/utils.h index 980c1234da..b2a3e5ebbb 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -246,6 +246,7 @@ struct _NmcMetaGenericInfo { gpointer environment_user_data, \ const NmcMetaGenericInfo *info, \ gpointer target, \ + gpointer target_data, \ NMMetaAccessorGetType get_type, \ NMMetaAccessorGetFlags get_flags, \ NMMetaAccessorGetOutFlags *out_flags, \ @@ -337,6 +338,7 @@ nmc_meta_generic_get_enum_with_detail (NmcMetaGenericGetEnumType get_enum_type, gboolean nmc_print (const NmcConfig *nmc_config, gpointer const *targets, + gpointer targets_data, const char *header_name_no_l10n, const NMMetaAbstractInfo *const*fields, const char *fields_str, diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c index a1bfed47b7..26cc7a57e0 100644 --- a/clients/common/nm-meta-setting-access.c +++ b/clients/common/nm-meta-setting-access.c @@ -229,6 +229,7 @@ nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info, const NMMetaEnvironment *environment, gpointer environment_user_data, gpointer target, + gpointer target_data, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, @@ -250,6 +251,7 @@ nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info, environment, environment_user_data, target, + target_data, get_type, get_flags, out_flags, diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h index 577cad787a..591d65de0b 100644 --- a/clients/common/nm-meta-setting-access.h +++ b/clients/common/nm-meta-setting-access.h @@ -55,6 +55,7 @@ gconstpointer nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info const NMMetaEnvironment *environment, gpointer environment_user_data, gpointer target, + gpointer target_data, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 34c9d8e59f..37cefc2c5f 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -8007,6 +8007,7 @@ _meta_type_setting_info_editor_get_fcn (const NMMetaAbstractInfo *abstract_info, const NMMetaEnvironment *environment, gpointer environment_user_data, gpointer target, + gpointer target_data, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, @@ -8017,6 +8018,7 @@ _meta_type_setting_info_editor_get_fcn (const NMMetaAbstractInfo *abstract_info, nm_assert (!out_to_free || !*out_to_free); nm_assert (out_flags && !*out_flags); + nm_assert (!target_data); if (!NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PARSABLE, @@ -8033,6 +8035,7 @@ _meta_type_property_info_get_fcn (const NMMetaAbstractInfo *abstract_info, const NMMetaEnvironment *environment, gpointer environment_user_data, gpointer target, + gpointer target_data, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index 01a823cce2..2aa27f1b73 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -359,6 +359,7 @@ struct _NMMetaType { const NMMetaEnvironment *environment, gpointer environment_user_data, gpointer target, + gpointer target_data, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, From d7b643f66fdf5518c922e01a77d7de149d57e27a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Apr 2018 13:13:52 +0200 Subject: [PATCH 14/14] cli/trivial: move code --- clients/cli/devices.c | 116 +++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 05b7c6defd..7f933d1278 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -41,6 +41,65 @@ /*****************************************************************************/ +static char * +ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags) +{ + char *flags_str[16]; /* Enough space for flags and terminating NULL */ + char *ret_str; + int i = 0; + + if (flags & NM_802_11_AP_SEC_PAIR_WEP40) + flags_str[i++] = g_strdup ("pair_wpe40"); + if (flags & NM_802_11_AP_SEC_PAIR_WEP104) + flags_str[i++] = g_strdup ("pair_wpe104"); + if (flags & NM_802_11_AP_SEC_PAIR_TKIP) + flags_str[i++] = g_strdup ("pair_tkip"); + if (flags & NM_802_11_AP_SEC_PAIR_CCMP) + flags_str[i++] = g_strdup ("pair_ccmp"); + if (flags & NM_802_11_AP_SEC_GROUP_WEP40) + flags_str[i++] = g_strdup ("group_wpe40"); + if (flags & NM_802_11_AP_SEC_GROUP_WEP104) + flags_str[i++] = g_strdup ("group_wpe104"); + if (flags & NM_802_11_AP_SEC_GROUP_TKIP) + flags_str[i++] = g_strdup ("group_tkip"); + if (flags & NM_802_11_AP_SEC_GROUP_CCMP) + flags_str[i++] = g_strdup ("group_ccmp"); + if (flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) + flags_str[i++] = g_strdup ("psk"); + if (flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) + flags_str[i++] = g_strdup ("802.1X"); + + if (i == 0) + flags_str[i++] = g_strdup (_("(none)")); + + flags_str[i] = NULL; + + ret_str = g_strjoinv (" ", flags_str); + + i = 0; + while (flags_str[i]) + g_free (flags_str[i++]); + + return ret_str; +} + +static NMMetaColor +wifi_signal_to_color (guint8 strength) +{ + if (strength > 80) + return NM_META_COLOR_WIFI_SIGNAL_EXCELLENT; + else if (strength > 55) + return NM_META_COLOR_WIFI_SIGNAL_GOOD; + else if (strength > 30) + return NM_META_COLOR_WIFI_SIGNAL_FAIR; + else if (strength > 5) + return NM_META_COLOR_WIFI_SIGNAL_POOR; + else + return NM_META_COLOR_WIFI_SIGNAL_UNKNOWN; +} + +/*****************************************************************************/ + static gconstpointer _metagen_device_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) { @@ -1066,63 +1125,6 @@ sort_access_points (const GPtrArray *aps) return sorted; } -static NMMetaColor -wifi_signal_to_color (guint8 strength) -{ - if (strength > 80) - return NM_META_COLOR_WIFI_SIGNAL_EXCELLENT; - else if (strength > 55) - return NM_META_COLOR_WIFI_SIGNAL_GOOD; - else if (strength > 30) - return NM_META_COLOR_WIFI_SIGNAL_FAIR; - else if (strength > 5) - return NM_META_COLOR_WIFI_SIGNAL_POOR; - else - return NM_META_COLOR_WIFI_SIGNAL_UNKNOWN; -} - -static char * -ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags) -{ - char *flags_str[16]; /* Enough space for flags and terminating NULL */ - char *ret_str; - int i = 0; - - if (flags & NM_802_11_AP_SEC_PAIR_WEP40) - flags_str[i++] = g_strdup ("pair_wpe40"); - if (flags & NM_802_11_AP_SEC_PAIR_WEP104) - flags_str[i++] = g_strdup ("pair_wpe104"); - if (flags & NM_802_11_AP_SEC_PAIR_TKIP) - flags_str[i++] = g_strdup ("pair_tkip"); - if (flags & NM_802_11_AP_SEC_PAIR_CCMP) - flags_str[i++] = g_strdup ("pair_ccmp"); - if (flags & NM_802_11_AP_SEC_GROUP_WEP40) - flags_str[i++] = g_strdup ("group_wpe40"); - if (flags & NM_802_11_AP_SEC_GROUP_WEP104) - flags_str[i++] = g_strdup ("group_wpe104"); - if (flags & NM_802_11_AP_SEC_GROUP_TKIP) - flags_str[i++] = g_strdup ("group_tkip"); - if (flags & NM_802_11_AP_SEC_GROUP_CCMP) - flags_str[i++] = g_strdup ("group_ccmp"); - if (flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) - flags_str[i++] = g_strdup ("psk"); - if (flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) - flags_str[i++] = g_strdup ("802.1X"); - - if (i == 0) - flags_str[i++] = g_strdup (_("(none)")); - - flags_str[i] = NULL; - - ret_str = g_strjoinv (" ", flags_str); - - i = 0; - while (flags_str[i]) - g_free (flags_str[i++]); - - return ret_str; -} - typedef struct { NmCli *nmc; int index;