From 918be83493f8f5d73092b43afcfeef94d4dc113e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 Apr 2018 09:00:08 +0200 Subject: 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, +static gconstpointer +_metagen_device_detail_wired_properties_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMDevice *d = target; + + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + + 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_WIRED_PROP_COMMON "NAME,CARRIER,S390-SUBCHANNELS" - -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, + +/*****************************************************************************/ + +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"), }; -#define NMC_FIELDS_DEV_SHOW_WIFI_PROP_COMMON "NAME,WEP,WPA,WPA2,TKIP,CCMP,AP,ADHOC" - -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, + +/*****************************************************************************/ + +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"), }; -#define NMC_FIELDS_DEV_SHOW_WIMAX_PROP_COMMON "NAME,CTR-FREQ,RSSI,CINR,TX-POW,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); + } - 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); + 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; - 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 -- cgit v1.2.1