diff options
author | Thomas Haller <thaller@redhat.com> | 2018-04-26 21:28:14 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-06-26 16:44:35 +0200 |
commit | e37a745bb1198dbe63772dff6e941e9242d63864 (patch) | |
tree | 7bd24982133f471333023916cb1e7003f72efcc0 | |
parent | a66afbc651f5ae5d6f550df84e920b720c0c832b (diff) | |
download | NetworkManager-e37a745bb1198dbe63772dff6e941e9242d63864.tar.gz |
cli: rework printing of "general" device details
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); - 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); + 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; - 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 [32mAP[1][0m:[32m [0m:[32mwlan0-ap-2[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m 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 [32mAP[1][0m:[32m [0m:[32mwlan0-ap-2[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m 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 |