diff options
| author | Michael Biebl <biebl@debian.org> | 2018-06-17 14:54:10 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-06-17 14:54:10 +0200 |
| commit | 069cb5c3a525ebcc19cc2927964258acaca87b13 (patch) | |
| tree | 66ac6b21a44d630c0fc281c0df327239d491226a /clients | |
| parent | 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 (diff) | |
New upstream version 1.11.90 upstream/1.11.90
Diffstat (limited to 'clients')
368 files changed, 13368 insertions, 2232 deletions
diff --git a/clients/cli/common.c b/clients/cli/common.c index e566de47..09c86334 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -49,6 +49,9 @@ _ip_config_get_routes (NMIPConfig *cfg) if (!ptr_array) return NULL; + if (ptr_array->len == 0) + return NULL; + arr = g_new (char *, ptr_array->len + 1); for (i = 0; i < ptr_array->len; i++) { NMIPRoute *route = g_ptr_array_index (ptr_array, i); @@ -384,7 +387,7 @@ print_dhcp_config (NMDhcpConfig *dhcp, /* * nmc_find_connection: * @connections: array of NMConnections to search in - * @filter_type: "id", "uuid", "path" or %NULL + * @filter_type: "id", "uuid", "path", "filename", or %NULL * @filter_val: connection to find (connection name, UUID or path) * @out_result: if not NULL, attach all matching connection to this * list. If necessary, a new array will be allocated. If the array @@ -452,6 +455,14 @@ nmc_find_connection (const GPtrArray *connections, goto found; } + if (NM_IN_STRSET (filter_type, NULL, "filename")) { + v = nm_remote_connection_get_filename (NM_REMOTE_CONNECTION (connections->pdata[i])); + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, v, NULL); + if (nm_streq0 (filter_val, v)) + goto found; + } + continue; found: if (!out_result) @@ -523,6 +534,14 @@ nmc_find_active_connection (const GPtrArray *active_cons, goto found; } + if (NM_IN_STRSET (filter_type, NULL, "filename")) { + v = nm_remote_connection_get_filename (con); + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, v, NULL); + if (nm_streq0 (filter_val, v)) + goto found; + } + if (NM_IN_STRSET (filter_type, NULL, "apath")) { v = nm_object_get_path (NM_OBJECT (candidate)); v_num = nm_utils_dbus_path_get_last_component (v); diff --git a/clients/cli/connections.c b/clients/cli/connections.c index a4f129b6..1563178d 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -101,27 +101,57 @@ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (vpn_connection_state_to_string, NMVpnConnecti * prefers an alias instead of the settings name when in pretty print mode. * That is so that we print "wifi" instead of "802-11-wireless" in "nmcli c". */ static const char * -connection_type_pretty (const char *type, NMCPrintOutput print_output) +connection_type_to_display (const char *type, NMMetaAccessorGetType get_type) { const NMMetaSettingInfoEditor *editor; int i; - if (print_output == NMC_PRINT_TERSE) + nm_assert (NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE)); + + if (!type) + return NULL; + + if (get_type != NM_META_ACCESSOR_GET_TYPE_PRETTY) return type; for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { editor = &nm_meta_setting_infos_editor[i]; - if (strcmp (type, editor->general->setting_name) == 0) { - if (editor->alias) - return editor->alias; - break; - } + if (nm_streq (type, editor->general->setting_name)) + return editor->alias ?: type; } - return type; } -/* Caller has to free the returned string */ +static int +active_connection_get_state_ord (NMActiveConnection *active) +{ + /* returns an integer related to @active's state, that can be used for sorting + * active connections based on their activation state. */ + if (!active) + return -2; + + switch (nm_active_connection_get_state (active)) { + case NM_ACTIVE_CONNECTION_STATE_UNKNOWN: return 0; + case NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: return 1; + case NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: return 2; + case NM_ACTIVE_CONNECTION_STATE_ACTIVATING: return 3; + case NM_ACTIVE_CONNECTION_STATE_ACTIVATED: return 4; + } + return -1; +} + +static int +active_connection_cmp (NMActiveConnection *ac_a, NMActiveConnection *ac_b) +{ + NM_CMP_SELF (ac_a, ac_b); + NM_CMP_DIRECT (active_connection_get_state_ord (ac_b), + active_connection_get_state_ord (ac_a)); + NM_CMP_DIRECT_STRCMP0 (nm_active_connection_get_id (ac_a), nm_active_connection_get_id (ac_b)); + NM_CMP_DIRECT_STRCMP0 (nm_active_connection_get_connection_type (ac_a), nm_active_connection_get_connection_type (ac_b)); + NM_CMP_DIRECT_STRCMP0 (nm_object_get_path (NM_OBJECT (ac_a)), nm_object_get_path (NM_OBJECT (ac_b))); + return 0; +} + static char * get_ac_device_string (NMActiveConnection *active) { @@ -152,41 +182,451 @@ get_ac_device_string (NMActiveConnection *active) /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_con_show[] = { - NMC_META_GENERIC ("NAME"), /* 0 */ - NMC_META_GENERIC ("UUID"), /* 1 */ - NMC_META_GENERIC ("TYPE"), /* 2 */ - NMC_META_GENERIC ("TIMESTAMP"), /* 3 */ - NMC_META_GENERIC ("TIMESTAMP-REAL"), /* 4 */ - NMC_META_GENERIC ("AUTOCONNECT"), /* 5 */ - NMC_META_GENERIC ("AUTOCONNECT-PRIORITY"), /* 6 */ - NMC_META_GENERIC ("READONLY"), /* 7 */ - NMC_META_GENERIC ("DBUS-PATH"), /* 8 */ - NMC_META_GENERIC ("ACTIVE"), /* 9 */ - NMC_META_GENERIC ("DEVICE"), /* 10 */ - NMC_META_GENERIC ("STATE"), /* 11 */ - NMC_META_GENERIC ("ACTIVE-PATH"), /* 12 */ - NMC_META_GENERIC ("SLAVE"), /* 13 */ - NULL, +/* FIXME: The same or similar code for VPN info appears also in nm-applet (applet-dialogs.c), + * and in gnome-control-center as well. It could probably be shared somehow. */ + +static char * +get_vpn_connection_type (NMConnection *connection) +{ + const char *type, *p; + + /* The service type is in form of "org.freedesktop.NetworkManager.vpnc". + * Extract end part after last dot, e.g. "vpnc" + */ + type = nm_setting_vpn_get_service_type (nm_connection_get_setting_vpn (connection)); + p = strrchr (type, '.'); + return g_strdup (p ? p + 1 : type); +} + +/* VPN parameters can be found at: + * http://git.gnome.org/browse/network-manager-openvpn/tree/src/nm-openvpn-service.h + * http://git.gnome.org/browse/network-manager-vpnc/tree/src/nm-vpnc-service.h + * http://git.gnome.org/browse/network-manager-pptp/tree/src/nm-pptp-service.h + * http://git.gnome.org/browse/network-manager-openconnect/tree/src/nm-openconnect-service.h + * http://git.gnome.org/browse/network-manager-openswan/tree/src/nm-openswan-service.h + * See also 'properties' directory in these plugins. + */ +static const gchar * +find_vpn_gateway_key (const char *vpn_type) +{ + if (g_strcmp0 (vpn_type, "openvpn") == 0) return "remote"; + if (g_strcmp0 (vpn_type, "vpnc") == 0) return "IPSec gateway"; + if (g_strcmp0 (vpn_type, "pptp") == 0) return "gateway"; + if (g_strcmp0 (vpn_type, "openconnect") == 0) return "gateway"; + if (g_strcmp0 (vpn_type, "openswan") == 0) return "right"; + if (g_strcmp0 (vpn_type, "libreswan") == 0) return "right"; + if (g_strcmp0 (vpn_type, "ssh") == 0) return "remote"; + if (g_strcmp0 (vpn_type, "l2tp") == 0) return "gateway"; + return ""; +} + +static const gchar * +find_vpn_username_key (const char *vpn_type) +{ + if (g_strcmp0 (vpn_type, "openvpn") == 0) return "username"; + if (g_strcmp0 (vpn_type, "vpnc") == 0) return "Xauth username"; + if (g_strcmp0 (vpn_type, "pptp") == 0) return "user"; + if (g_strcmp0 (vpn_type, "openconnect") == 0) return "username"; + if (g_strcmp0 (vpn_type, "openswan") == 0) return "leftxauthusername"; + if (g_strcmp0 (vpn_type, "libreswan") == 0) return "leftxauthusername"; + if (g_strcmp0 (vpn_type, "l2tp") == 0) return "user"; + return ""; +} + +enum VpnDataItem { + VPN_DATA_ITEM_GATEWAY, + VPN_DATA_ITEM_USERNAME +}; + +static const gchar * +get_vpn_data_item (NMConnection *connection, enum VpnDataItem vpn_data_item) +{ + const char *key; + gs_free char *type = NULL; + + type = get_vpn_connection_type (connection); + + switch (vpn_data_item) { + case VPN_DATA_ITEM_GATEWAY: + key = find_vpn_gateway_key (type); + break; + case VPN_DATA_ITEM_USERNAME: + key = find_vpn_username_key (type); + break; + default: + key = ""; + break; + } + + return nm_setting_vpn_get_data_item (nm_connection_get_setting_vpn (connection), key); +} + +/*****************************************************************************/ + +typedef struct { + NMConnection *connection; + NMActiveConnection *primary_active; + GPtrArray *all_active; + bool show_active_fields; +} MetagenConShowRowData; + +static MetagenConShowRowData * +_metagen_con_show_row_data_new_for_connection (NMRemoteConnection *connection, gboolean show_active_fields) +{ + MetagenConShowRowData *row_data; + + row_data = g_slice_new0 (MetagenConShowRowData); + row_data->connection = g_object_ref (NM_CONNECTION (connection)); + row_data->show_active_fields = show_active_fields; + return row_data; +} + +static MetagenConShowRowData * +_metagen_con_show_row_data_new_for_active_connection (NMRemoteConnection *connection, NMActiveConnection *active, gboolean show_active_fields) +{ + MetagenConShowRowData *row_data; + + row_data = g_slice_new0 (MetagenConShowRowData); + if (connection) + row_data->connection = g_object_ref (NM_CONNECTION (connection)); + row_data->primary_active = g_object_ref (active); + row_data->show_active_fields = show_active_fields; + return row_data; +} + +static void +_metagen_con_show_row_data_add_active_connection (MetagenConShowRowData *row_data, NMActiveConnection *active) +{ + if (!row_data->primary_active) { + row_data->primary_active = g_object_ref (active); + return; + } + if (!row_data->all_active) { + row_data->all_active = g_ptr_array_new_with_free_func (g_object_unref); + g_ptr_array_add (row_data->all_active, g_object_ref (row_data->primary_active)); + } + g_ptr_array_add (row_data->all_active, g_object_ref (active)); +} + +static void +_metagen_con_show_row_data_init_primary_active (MetagenConShowRowData *row_data) +{ + NMActiveConnection *ac, *best_ac; + guint i; + + if (!row_data->all_active) + return; + + best_ac = row_data->all_active->pdata[0]; + for (i = 1; i < row_data->all_active->len; i++) { + ac = row_data->all_active->pdata[i]; + + if (active_connection_get_state_ord (ac) > active_connection_get_state_ord (best_ac)) + best_ac = ac; + } + + if (row_data->primary_active != best_ac) { + g_object_unref (row_data->primary_active); + row_data->primary_active = g_object_ref (best_ac); + } + g_clear_pointer (&row_data->all_active, g_ptr_array_unref); +} + +static void +_metagen_con_show_row_data_destroy (gpointer data) +{ + MetagenConShowRowData *row_data = data; + + if (!row_data) + return; + + g_clear_object (&row_data->connection); + g_clear_object (&row_data->primary_active); + g_clear_pointer (&row_data->all_active, g_ptr_array_unref); + g_slice_free (MetagenConShowRowData, row_data); +} + +static const char * +_con_show_fcn_get_id (NMConnection *c, NMActiveConnection *ac) +{ + NMSettingConnection *s_con = NULL; + const char *s; + + if (c) + s_con = nm_connection_get_setting_connection (c); + + s = s_con ? nm_setting_connection_get_id (s_con) : NULL; + if (!s && ac) { + /* note that if we have no s_con, that usually means that the user has no permissions + * to see the connection. We still fall to get the ID from the active-connection, + * which exposes it despite the user having no permissions. + * + * That might be unexpected, because the user is shown an ID, which he later + * is unable to resolve in other operations. */ + s = nm_active_connection_get_id (ac); + } + return s; +} + +static const char * +_con_show_fcn_get_type (NMConnection *c, NMActiveConnection *ac, NMMetaAccessorGetType get_type) +{ + NMSettingConnection *s_con = NULL; + const char *s; + + if (c) + s_con = nm_connection_get_setting_connection (c); + + s = s_con ? nm_setting_connection_get_connection_type (s_con) : NULL; + if (!s && ac) { + /* see _con_show_fcn_get_id() for why we fallback to get the value + * from @ac. */ + s = nm_active_connection_get_connection_type (ac); + } + return connection_type_to_display (s, get_type); +} + +static gconstpointer +_metagen_con_show_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + const MetagenConShowRowData *row_data = target; + NMConnection *c = row_data->connection; + NMActiveConnection *ac = row_data->primary_active; + NMSettingConnection *s_con = NULL; + const char *s; + char *s_mut; + + NMC_HANDLE_COLOR ( ac + ? nmc_active_connection_state_to_color (nm_active_connection_get_state (ac)) + : NM_META_COLOR_CONNECTION_UNKNOWN); + + if (c) + s_con = nm_connection_get_setting_connection (c); + + if (!row_data->show_active_fields) { + /* we are not supposed to show any fields of the active connection. + * We only tracked the primary_active to get the coloring right. + * From now on, there is no active connection. */ + ac = NULL; + + /* in this mode, we expect that we are called only with connections that + * have a [connection] setting and a UUID. Otherwise, the connection is + * effectively invisible to the user, and should be hidden. + * + * But in that case, we expect that the caller pre-filtered this row out. + * So assert(). */ + nm_assert (s_con); + nm_assert (nm_setting_connection_get_uuid (s_con)); + } + + nm_assert (NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE)); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_CON_SHOW_NAME: + return _con_show_fcn_get_id (c, ac); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_UUID: + s = s_con ? nm_setting_connection_get_uuid (s_con) : NULL; + if (!s && ac) { + /* see _con_show_fcn_get_id() for why we fallback to get the value + * from @ac. */ + s = nm_active_connection_get_uuid (ac); + } + return s; + case NMC_GENERIC_INFO_TYPE_CON_SHOW_TYPE: + return _con_show_fcn_get_type (c, ac, get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP: + case NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP_REAL: + if (!s_con) + return NULL; + { + guint64 timestamp; + time_t timestamp_real; + + timestamp = nm_setting_connection_get_timestamp (s_con); + + if (info->info_type == NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP) + return (*out_to_free = g_strdup_printf ("%" G_GUINT64_FORMAT, timestamp)); + else { + if (!timestamp) { + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) + return _("never"); + return "never"; + } + timestamp_real = timestamp; + s_mut = g_malloc0 (128); + strftime (s_mut, 64, "%c", localtime (×tamp_real)); + return (*out_to_free = s_mut); + } + } + case NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT: + if (!s_con) + return NULL; + return nmc_meta_generic_get_bool (nm_setting_connection_get_autoconnect (s_con), get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT_PRIORITY: + if (!s_con) + return NULL; + return (*out_to_free = g_strdup_printf ("%d", nm_setting_connection_get_autoconnect_priority (s_con))); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_READONLY: + if (!s_con) + return NULL; + return nmc_meta_generic_get_bool (nm_setting_connection_get_read_only (s_con), get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_DBUS_PATH: + if (!c) + return NULL; + return nm_connection_get_path (c); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE: + return nmc_meta_generic_get_bool (!!ac, get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE: + if (ac) + return (*out_to_free = get_ac_device_string (ac)); + return NULL; + case NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE: + return nmc_meta_generic_get_str_i18n (ac + ? active_connection_state_to_string (nm_active_connection_get_state (ac)) + : NULL, + get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH: + if (ac) + return nm_object_get_path (NM_OBJECT (ac)); + return NULL; + case NMC_GENERIC_INFO_TYPE_CON_SHOW_SLAVE: + if (!s_con) + return NULL; + return nm_setting_connection_get_slave_type (s_con); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_FILENAME: + if (!NM_IS_REMOTE_CONNECTION (c)) + return NULL; + return nm_remote_connection_get_filename (NM_REMOTE_CONNECTION (c)); + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_con_show[_NMC_GENERIC_INFO_TYPE_CON_SHOW_NUM + 1] = { +#define _METAGEN_CON_SHOW(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_con_show_get_fcn) + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_NAME, "NAME"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_UUID, "UUID"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_TYPE, "TYPE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP, "TIMESTAMP"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP_REAL, "TIMESTAMP-REAL"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT, "AUTOCONNECT"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT_PRIORITY, "AUTOCONNECT-PRIORITY"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_READONLY, "READONLY"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_DBUS_PATH, "DBUS-PATH"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE, "ACTIVE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE, "DEVICE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE, "STATE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH, "ACTIVE-PATH"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_SLAVE, "SLAVE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_FILENAME, "FILENAME"), }; #define NMC_FIELDS_CON_SHOW_COMMON "NAME,UUID,TYPE,DEVICE" -const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[] = { - NMC_META_GENERIC ("GROUP"), /* 0 */ - NMC_META_GENERIC ("NAME"), /* 1 */ - NMC_META_GENERIC ("UUID"), /* 2 */ - NMC_META_GENERIC ("DEVICES"), /* 3 */ - NMC_META_GENERIC ("STATE"), /* 4 */ - NMC_META_GENERIC ("DEFAULT"), /* 5 */ - NMC_META_GENERIC ("DEFAULT6"), /* 6 */ - NMC_META_GENERIC ("SPEC-OBJECT"), /* 7 */ - NMC_META_GENERIC ("VPN"), /* 8 */ - NMC_META_GENERIC ("DBUS-PATH"), /* 9 */ - NMC_META_GENERIC ("CON-PATH"), /* 10 */ - NMC_META_GENERIC ("ZONE"), /* 11 */ - NMC_META_GENERIC ("MASTER-PATH"), /* 12 */ - NULL, +/*****************************************************************************/ + +static gconstpointer +_metagen_con_active_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMActiveConnection *ac = target; + NMConnection *c; + NMSettingConnection *s_con = NULL; + NMDevice *dev; + guint i; + const char *s; + + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + + nm_assert (NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE)); + + c = NM_CONNECTION (nm_active_connection_get_connection (ac)); + if (c) + s_con = nm_connection_get_setting_connection (c); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NAME: + return nm_active_connection_get_id (ac); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID: + return nm_active_connection_get_uuid (ac); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES: + { + GString *str = NULL; + const GPtrArray *devices; + + s = NULL; + devices = nm_active_connection_get_devices (ac); + if (devices) { + for (i = 0; i < devices->len; i++) { + NMDevice *device = devices->pdata[i]; + const char *iface; + + iface = nm_device_get_iface (device); + if (!iface) + continue; + if (!s) { + s = iface; + continue; + } + if (!str) + str = g_string_new (s); + g_string_append_c (str, ','); + g_string_append (str, iface); + } + } + if (str) + return (*out_to_free = g_string_free (str, FALSE)); + return s; + } + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_STATE: + return nmc_meta_generic_get_str_i18n (active_connection_state_to_string (nm_active_connection_get_state (ac)), + get_type); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT: + return nmc_meta_generic_get_bool (nm_active_connection_get_default (ac), get_type); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT6: + return nmc_meta_generic_get_bool (nm_active_connection_get_default6 (ac), get_type); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_SPEC_OBJECT: + return nm_active_connection_get_specific_object_path (ac); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_VPN: + return nmc_meta_generic_get_bool (NM_IS_VPN_CONNECTION (ac), get_type); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DBUS_PATH: + return nm_object_get_path (NM_OBJECT (ac)); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CON_PATH: + return c ? nm_connection_get_path (c) : NULL; + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_ZONE: + /* this is really ugly, because the zone is not a property of the active-connection, + * but the settings-connection profile. There is no guarantee, that they agree. */ + return s_con ? nm_setting_connection_get_zone (s_con) : NULL; + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH: + dev = nm_active_connection_get_master (ac); + return dev ? nm_object_get_path (NM_OBJECT (dev)) : NULL; + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NUM + 1] = { +#define _METAGEN_CON_ACTIVE_GENERAL(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_con_active_general_get_fcn) + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NAME, "NAME"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID, "UUID"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES, "DEVICES"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_STATE, "STATE"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT, "DEFAULT"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT6, "DEFAULT6"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_SPEC_OBJECT, "SPEC-OBJECT"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_VPN, "VPN"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DBUS_PATH, "DBUS-PATH"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CON_PATH, "CON-PATH"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_ZONE, "ZONE"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH, "MASTER-PATH"), }; + +/*****************************************************************************/ + #define NMC_FIELDS_SETTINGS_NAMES_ALL NM_SETTING_CONNECTION_SETTING_NAME","\ NM_SETTING_WIRED_SETTING_NAME","\ NM_SETTING_802_1X_SETTING_NAME","\ @@ -237,7 +677,7 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[] = { }; const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[] = { - NMC_META_GENERIC_WITH_NESTED ("GENERAL", nmc_fields_con_active_details_general + 1), /* 0 */ + NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_con_active_general), /* 0 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 1 */ NMC_META_GENERIC_WITH_NESTED ("DHCP4", nmc_fields_dhcp_config + 1), /* 2 */ NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 3 */ @@ -595,36 +1035,42 @@ construct_header_name (const char *base, const char *spec) return g_strdup_printf ("%s (%s)", base, spec); } +static int +get_ac_for_connection_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data) +{ + NMActiveConnection *ac_a = *((NMActiveConnection *const*) pa); + NMActiveConnection *ac_b = *((NMActiveConnection *const*) pb); + + return active_connection_cmp (ac_a, ac_b); +} + static NMActiveConnection * get_ac_for_connection (const GPtrArray *active_cons, NMConnection *connection, GPtrArray **out_result) { - const char *con_path, *ac_con_path; guint i; NMActiveConnection *best_candidate = NULL; GPtrArray *result = out_result ? *out_result : NULL; - con_path = nm_connection_get_path (connection); for (i = 0; i < active_cons->len; i++) { NMActiveConnection *candidate = g_ptr_array_index (active_cons, i); NMRemoteConnection *con; con = nm_active_connection_get_connection (candidate); - if (NM_CONNECTION (con) != connection) { - /* also compare the D-Bus paths. Why? I don't know. */ - ac_con_path = con ? nm_connection_get_path (NM_CONNECTION (con)) : NULL; - if (!nm_streq0 (ac_con_path, con_path)) - continue; - } + if (NM_CONNECTION (con) != connection) + continue; if (!out_result) return candidate; - if (!best_candidate) - best_candidate = candidate; if (!result) result = g_ptr_array_new_with_free_func (g_object_unref); g_ptr_array_add (result, g_object_ref (candidate)); } + if (result) { + g_ptr_array_sort_with_data (result, get_ac_for_connection_cmp, NULL); + best_candidate = result->pdata[0]; + } + NM_SET_OUT (out_result, result); return best_candidate; } @@ -767,178 +1213,6 @@ nmc_active_connection_state_to_color (NMActiveConnectionState state) return NM_META_COLOR_CONNECTION_UNKNOWN; } -static void -fill_output_connection (NMConnection *connection, NMClient *client, NMCPrintOutput print_output, - GPtrArray *output_data, gboolean active_only) -{ - NMSettingConnection *s_con; - guint64 timestamp; - time_t timestamp_real; - char *timestamp_str; - char *timestamp_real_str = ""; - char *prio_str; - NmcOutputField *arr; - NMActiveConnection *ac = NULL; - const char *ac_path = NULL; - const char *ac_state = NULL; - NMActiveConnectionState ac_state_int = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; - char *ac_dev = NULL; - NMMetaColor color; - - s_con = nm_connection_get_setting_connection (connection); - g_assert (s_con); - - ac = get_ac_for_connection (nm_client_get_active_connections (client), connection, NULL); - if (active_only && !ac) - return; - - if (ac) { - ac_path = nm_object_get_path (NM_OBJECT (ac)); - ac_state_int = nm_active_connection_get_state (ac); - ac_state = gettext (active_connection_state_to_string (ac_state_int)); - ac_dev = get_ac_device_string (ac); - } - - /* Obtain field values */ - timestamp = nm_setting_connection_get_timestamp (s_con); - timestamp_str = g_strdup_printf ("%" G_GUINT64_FORMAT, timestamp); - if (timestamp) { - timestamp_real = timestamp; - timestamp_real_str = g_malloc0 (64); - strftime (timestamp_real_str, 64, "%c", localtime (×tamp_real)); - } - prio_str = g_strdup_printf ("%u", nm_setting_connection_get_autoconnect_priority (s_con)); - - arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_con_show, 0); - - /* Show active connections in color */ - color = nmc_active_connection_state_to_color (ac_state_int); - set_val_color_all (arr, color); - - set_val_strc (arr, 0, nm_setting_connection_get_id (s_con)); - set_val_strc (arr, 1, nm_setting_connection_get_uuid (s_con)); - set_val_strc (arr, 2, connection_type_pretty (nm_setting_connection_get_connection_type (s_con), print_output)); - set_val_str (arr, 3, timestamp_str); - set_val_str (arr, 4, timestamp ? timestamp_real_str : g_strdup (_("never"))); - set_val_strc (arr, 5, nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no")); - set_val_str (arr, 6, prio_str); - set_val_strc (arr, 7, nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no")); - set_val_strc (arr, 8, nm_connection_get_path (connection)); - set_val_strc (arr, 9, ac ? _("yes") : _("no")); - set_val_str (arr, 10, ac_dev); - set_val_strc (arr, 11, ac_state); - set_val_strc (arr, 12, ac_path); - set_val_strc (arr, 13, nm_setting_connection_get_slave_type (s_con)); - - g_ptr_array_add (output_data, arr); -} - -static void -fill_output_connection_for_invisible (NMActiveConnection *ac, NMCPrintOutput print_output, GPtrArray *output_data) -{ - NmcOutputField *arr; - const char *ac_path = NULL; - const char *ac_state = NULL; - char *name, *ac_dev = NULL; - - name = g_strdup_printf ("<invisible> %s", nm_active_connection_get_id (ac)); - ac_path = nm_object_get_path (NM_OBJECT (ac)); - ac_state = active_connection_state_to_string (nm_active_connection_get_state (ac)); - ac_dev = get_ac_device_string (ac); - - arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_con_show, 0); - - set_val_str (arr, 0, name); - set_val_strc (arr, 1, nm_active_connection_get_uuid (ac)); - set_val_strc (arr, 2, connection_type_pretty (nm_active_connection_get_connection_type (ac), print_output)); - set_val_strc (arr, 3, NULL); - set_val_strc (arr, 4, NULL); - set_val_strc (arr, 5, NULL); - set_val_strc (arr, 6, NULL); - set_val_strc (arr, 7, NULL); - set_val_strc (arr, 8, NULL); - set_val_strc (arr, 9, _("yes")); - set_val_str (arr, 10, ac_dev); - set_val_strc (arr, 11, ac_state); - set_val_strc (arr, 12, ac_path); - set_val_strc (arr, 13, NULL); - - set_val_color_all (arr, NM_META_COLOR_CONNECTION_INVISIBLE); - - g_ptr_array_add (output_data, arr); -} - -static void -fill_output_active_connection (NMActiveConnection *active, - GPtrArray *output_data, - gboolean with_group, - guint32 o_flags) -{ - NMRemoteConnection *con; - NMSettingConnection *s_con = NULL; - const GPtrArray *devices; - GString *dev_str; - NMActiveConnectionState state; - NMDevice *master; - const char *con_path = NULL, *con_zone = NULL; - int i; - const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; - int idx_start = with_group ? 0 : 1; - - con = nm_active_connection_get_connection (active); - if (con) { - con_path = nm_connection_get_path (NM_CONNECTION (con)); - s_con = nm_connection_get_setting_connection (NM_CONNECTION (con)); - g_assert (s_con); - con_zone = nm_setting_connection_get_zone (s_con); - } - - state = nm_active_connection_get_state (active); - master = nm_active_connection_get_master (active); - - /* Get devices of the active connection */ - dev_str = g_string_new (NULL); - devices = nm_active_connection_get_devices (active); - for (i = 0; i < devices->len; i++) { - NMDevice *device = g_ptr_array_index (devices, i); - const char *dev_iface = nm_device_get_iface (device); - - if (dev_iface) { - g_string_append (dev_str, dev_iface); - g_string_append_c (dev_str, ','); - } - } - if (dev_str->len > 0) - g_string_truncate (dev_str, dev_str->len - 1); /* Cut off last ',' */ - - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_general; - if (!with_group) - tmpl++; - - /* Fill field values */ - arr = nmc_dup_fields_array (tmpl, o_flags); - if (with_group) - set_val_strc (arr, 0, nmc_fields_con_active_details_groups[0]->name); - set_val_strc (arr, 1-idx_start, nm_active_connection_get_id (active)); - set_val_strc (arr, 2-idx_start, nm_active_connection_get_uuid (active)); - set_val_str (arr, 3-idx_start, dev_str->str); - set_val_strc (arr, 4-idx_start, active_connection_state_to_string (state)); - set_val_strc (arr, 5-idx_start, nm_active_connection_get_default (active) ? _("yes") : _("no")); - set_val_strc (arr, 6-idx_start, nm_active_connection_get_default6 (active) ? _("yes") : _("no")); - set_val_strc (arr, 7-idx_start, nm_active_connection_get_specific_object_path (active)); - set_val_strc (arr, 8-idx_start, NM_IS_VPN_CONNECTION (active) ? _("yes") : _("no")); - set_val_strc (arr, 9-idx_start, nm_object_get_path (NM_OBJECT (active))); - set_val_strc (arr, 10-idx_start, con_path); - set_val_strc (arr, 11-idx_start, con_zone); - set_val_strc (arr, 12-idx_start, master ? nm_object_get_path (NM_OBJECT (master)) : NULL); - set_val_strc (arr, 13-idx_start, s_con ? nm_setting_connection_get_slave_type (s_con) : NULL); - - g_ptr_array_add (output_data, arr); - - g_string_free (dev_str, FALSE); -} - typedef struct { char **array; guint32 idx; @@ -952,85 +1226,6 @@ fill_vpn_data_item (const char *key, const char *value, gpointer user_data) info->array[info->idx++] = g_strdup_printf ("%s = %s", key, value); } -// FIXME: The same or similar code for VPN info appears also in nm-applet (applet-dialogs.c), -// and in gnome-control-center as well. It could probably be shared somehow. -static char * -get_vpn_connection_type (NMConnection *connection) -{ - const char *type, *p; - - /* The service type is in form of "org.freedesktop.NetworkManager.vpnc". - * Extract end part after last dot, e.g. "vpnc" - */ - type = nm_setting_vpn_get_service_type (nm_connection_get_setting_vpn (connection)); - p = strrchr (type, '.'); - return g_strdup (p ? p + 1 : type); -} - -/* VPN parameters can be found at: - * http://git.gnome.org/browse/network-manager-openvpn/tree/src/nm-openvpn-service.h - * http://git.gnome.org/browse/network-manager-vpnc/tree/src/nm-vpnc-service.h - * http://git.gnome.org/browse/network-manager-pptp/tree/src/nm-pptp-service.h - * http://git.gnome.org/browse/network-manager-openconnect/tree/src/nm-openconnect-service.h - * http://git.gnome.org/browse/network-manager-openswan/tree/src/nm-openswan-service.h - * See also 'properties' directory in these plugins. - */ -static const gchar * -find_vpn_gateway_key (const char *vpn_type) -{ - if (g_strcmp0 (vpn_type, "openvpn") == 0) return "remote"; - if (g_strcmp0 (vpn_type, "vpnc") == 0) return "IPSec gateway"; - if (g_strcmp0 (vpn_type, "pptp") == 0) return "gateway"; - if (g_strcmp0 (vpn_type, "openconnect") == 0) return "gateway"; - if (g_strcmp0 (vpn_type, "openswan") == 0) return "right"; - if (g_strcmp0 (vpn_type, "libreswan") == 0) return "right"; - if (g_strcmp0 (vpn_type, "ssh") == 0) return "remote"; - if (g_strcmp0 (vpn_type, "l2tp") == 0) return "gateway"; - return ""; -} - -static const gchar * -find_vpn_username_key (const char *vpn_type) -{ - if (g_strcmp0 (vpn_type, "openvpn") == 0) return "username"; - if (g_strcmp0 (vpn_type, "vpnc") == 0) return "Xauth username"; - if (g_strcmp0 (vpn_type, "pptp") == 0) return "user"; - if (g_strcmp0 (vpn_type, "openconnect") == 0) return "username"; - if (g_strcmp0 (vpn_type, "openswan") == 0) return "leftxauthusername"; - if (g_strcmp0 (vpn_type, "libreswan") == 0) return "leftxauthusername"; - if (g_strcmp0 (vpn_type, "l2tp") == 0) return "user"; - return ""; -} - -enum VpnDataItem { - VPN_DATA_ITEM_GATEWAY, - VPN_DATA_ITEM_USERNAME -}; - -static const gchar * -get_vpn_data_item (NMConnection *connection, enum VpnDataItem vpn_data_item) -{ - const char *key; - gs_free char *type = NULL; - - type = get_vpn_connection_type (connection); - - switch (vpn_data_item) { - case VPN_DATA_ITEM_GATEWAY: - key = find_vpn_gateway_key (type); - break; - case VPN_DATA_ITEM_USERNAME: - key = find_vpn_username_key (type); - break; - default: - key = ""; - break; - } - - return nm_setting_vpn_get_data_item (nm_connection_get_setting_vpn (connection), key); -} -/* FIXME end */ - static gboolean nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) { @@ -1083,29 +1278,27 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) int group_idx = g_array_index (print_groups, int, i); char *group_fld = (char *) g_ptr_array_index (group_fields, i); - if (nmc->nmc_config.print_output != NMC_PRINT_TERSE && !nmc->nmc_config.multiline_output && was_output) - g_print ("\n"); /* Empty line */ + if ( nmc->nmc_config.print_output != NMC_PRINT_TERSE + && !nmc->nmc_config.multiline_output + && was_output) + g_print ("\n"); was_output = FALSE; - /* GENERAL */ - if (strcasecmp (nmc_fields_con_active_details_groups[group_idx]->name, nmc_fields_con_active_details_groups[0]->name) == 0) { - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - - /* Add field names */ - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_general; - out_indices = parse_output_fields (group_fld, - tmpl, FALSE, NULL, NULL); - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - /* Fill in values */ - fill_output_active_connection (acon, out.output_data, TRUE, NMC_OF_FLAG_SECTION_PREFIX); + if (nmc_fields_con_active_details_groups[group_idx]->nested == metagen_con_active_general) { + gs_free char *f = NULL; - print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, out_indices, NULL, 0, &out); + if (group_fld) + f = g_strdup_printf ("GENERAL.%s", group_fld); + nmc_print (&nmc->nmc_config, + (gpointer[]) { acon, NULL }, + NULL, + NMC_META_GENERIC_GROUP ("GENERAL", metagen_con_active_general, N_("GROUP")), + f, + NULL); was_output = TRUE; + continue; } /* IP4 */ @@ -1347,154 +1540,220 @@ typedef enum { typedef struct { NmCli *nmc; const GArray *order; -} NmcSortInfo; + gboolean show_active_fields; +} ConShowSortInfo; static int -compare_connections (gconstpointer a, gconstpointer b, gpointer user_data) -{ - NMConnection *ca = *(NMConnection **) a; - NMConnection *cb = *(NMConnection **) b; - const NmcSortInfo *info = user_data; - NMActiveConnection *aca, *acb; - const NmcSortOrder *order_arr; - guint i, order_len; - const char *tmp1, *tmp2; - unsigned long tmp1_int, tmp2_int; - - if (info->order) { - order_arr = &g_array_index (info->order, NmcSortOrder, 0); - order_len = info->order->len; - } else { - static const NmcSortOrder def[] = { NMC_SORT_ACTIVE, NMC_SORT_NAME, NMC_SORT_PATH }; +con_show_get_items_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data) +{ + const ConShowSortInfo *sort_info = user_data; + const MetagenConShowRowData *row_data_a = *((const MetagenConShowRowData *const*) pa); + const MetagenConShowRowData *row_data_b = *((const MetagenConShowRowData *const*) pb); + NMConnection *c_a = row_data_a->connection; + NMConnection *c_b = row_data_b->connection; + NMActiveConnection *ac_a = row_data_a->primary_active; + NMActiveConnection *ac_b = row_data_b->primary_active; + NMActiveConnection *ac_a_effective = sort_info->show_active_fields ? ac_a : NULL; + NMActiveConnection *ac_b_effective = sort_info->show_active_fields ? ac_b : NULL; + + /* first sort active-connections which are invisible, i.e. that have no connection */ + if (!c_a && c_b) + return -1; + if (!c_b && c_a) + return 1; + + /* we have two connections... */ + if (c_a && c_b && c_a != c_b) { + const NmcSortOrder *order_arr; + guint i, order_len; + NMMetaAccessorGetType get_type = nmc_print_output_to_accessor_get_type (sort_info->nmc->nmc_config.print_output); + + if (sort_info->order) { + order_arr = &g_array_index (sort_info->order, NmcSortOrder, 0); + order_len = sort_info->order->len; + } else { + static const NmcSortOrder def[] = { NMC_SORT_ACTIVE, NMC_SORT_NAME, NMC_SORT_PATH }; - order_arr = def; - order_len = G_N_ELEMENTS (def); - } + /* Note: the default order does not consider whether a column is shown. + * That means, the selection of the output fields, does not affect the + * order (although there could be an argument that it should). */ + order_arr = def; + order_len = G_N_ELEMENTS (def); + } - for (i = 0; i < order_len; i++) { - NmcSortOrder item = order_arr[i]; - int cmp = 0; + for (i = 0; i < order_len; i++) { + NmcSortOrder item = order_arr[i]; - switch (item) { - case NMC_SORT_ACTIVE: - case NMC_SORT_ACTIVE_INV: - aca = get_ac_for_connection (nm_client_get_active_connections (info->nmc->client), ca, NULL); - acb = get_ac_for_connection (nm_client_get_active_connections (info->nmc->client), cb, NULL); - cmp = (aca && !acb) ? -1 : (!aca && acb) ? 1 : 0; - if (item == NMC_SORT_ACTIVE_INV) - cmp = -(cmp); - break; - case NMC_SORT_TYPE: - case NMC_SORT_TYPE_INV: - cmp = g_strcmp0 (nm_connection_get_connection_type (ca), - nm_connection_get_connection_type (cb)); - if (item == NMC_SORT_TYPE_INV) - cmp = -(cmp); - break; - case NMC_SORT_NAME: - case NMC_SORT_NAME_INV: - cmp = g_strcmp0 (nm_connection_get_id (ca), - nm_connection_get_id (cb)); - if (item == NMC_SORT_NAME_INV) - cmp = -(cmp); - break; - case NMC_SORT_PATH: - case NMC_SORT_PATH_INV: - tmp1 = nm_connection_get_path (ca); - tmp2 = nm_connection_get_path (cb); - tmp1 = tmp1 ? strrchr (tmp1, '/') : "0"; - tmp2 = tmp2 ? strrchr (tmp2, '/') : "0"; - nmc_string_to_uint (tmp1 ? tmp1+1 : "0", FALSE, 0, 0, &tmp1_int); - nmc_string_to_uint (tmp2 ? tmp2+1 : "0", FALSE, 0, 0, &tmp2_int); - cmp = (int) tmp1_int - tmp2_int; - if (item == NMC_SORT_PATH_INV) - cmp = -(cmp); - break; - default: - cmp = 0; - break; - } - if (cmp != 0) - return cmp; - } + switch (item) { - return 0; -} + case NMC_SORT_ACTIVE: + NM_CMP_DIRECT (active_connection_get_state_ord (ac_b), + active_connection_get_state_ord (ac_a)); + break; + case NMC_SORT_ACTIVE_INV: + NM_CMP_DIRECT (active_connection_get_state_ord (ac_a), + active_connection_get_state_ord (ac_b)); + break; -static GPtrArray * -sort_connections (const GPtrArray *cons, NmCli *nmc, const GArray *order) -{ - GPtrArray *sorted; - int i; - NmcSortInfo compare_info; + case NMC_SORT_TYPE: + NM_CMP_DIRECT_STRCMP0 (_con_show_fcn_get_type (c_a, ac_a_effective, get_type), + _con_show_fcn_get_type (c_b, ac_b_effective, get_type)); + break; + case NMC_SORT_TYPE_INV: + NM_CMP_DIRECT_STRCMP0 (_con_show_fcn_get_type (c_b, ac_b_effective, get_type), + _con_show_fcn_get_type (c_a, ac_a_effective, get_type)); + break; - if (!cons) - return NULL; + case NMC_SORT_NAME: + NM_CMP_RETURN (nm_utf8_collate0 (_con_show_fcn_get_id (c_a, ac_a_effective), + _con_show_fcn_get_id (c_b, ac_b_effective))); + break; + case NMC_SORT_NAME_INV: + NM_CMP_RETURN (nm_utf8_collate0 (_con_show_fcn_get_id (c_b, ac_b_effective), + _con_show_fcn_get_id (c_a, ac_a_effective))); + break; - compare_info.nmc = nmc; - compare_info.order = order; + case NMC_SORT_PATH: + NM_CMP_RETURN (nm_utils_dbus_path_cmp (nm_connection_get_path (c_a), nm_connection_get_path (c_b))); + break; - sorted = g_ptr_array_sized_new (cons->len); - for (i = 0; i < cons->len; i++) - g_ptr_array_add (sorted, cons->pdata[i]); - g_ptr_array_sort_with_data (sorted, compare_connections, &compare_info); - return sorted; -} + case NMC_SORT_PATH_INV: + NM_CMP_RETURN (nm_utils_dbus_path_cmp (nm_connection_get_path (c_b), nm_connection_get_path (c_a))); + break; -static int -compare_ac_connections (gconstpointer a, gconstpointer b, gpointer user_data) -{ - NMActiveConnection *ca = *(NMActiveConnection **)a; - NMActiveConnection *cb = *(NMActiveConnection **)b; - int cmp; + default: + nm_assert_not_reached (); + break; + } + } - /* Sort states first */ - cmp = nm_active_connection_get_state (cb) - nm_active_connection_get_state (ca); - if (cmp != 0) - return cmp; + NM_CMP_DIRECT_STRCMP0 (nm_connection_get_uuid (c_a), + nm_connection_get_uuid (c_b)); + NM_CMP_DIRECT_STRCMP0 (nm_connection_get_path (c_a), + nm_connection_get_path (c_b)); - cmp = g_strcmp0 (nm_active_connection_get_id (ca), - nm_active_connection_get_id (cb)); - if (cmp != 0) - return cmp; + /* This line is not expected to be reached, because there shouldn't be two + * different connections with the same path. Anyway, fall-through and compare by + * active connections... */ + } - return g_strcmp0 (nm_active_connection_get_connection_type (ca), - nm_active_connection_get_connection_type (cb)); + return active_connection_cmp (ac_a, ac_b); } static GPtrArray * -get_invisible_active_connections (NmCli *nmc) -{ - const GPtrArray *acons; - const GPtrArray *connections; - GPtrArray *invisibles; - int a, c; +con_show_get_items (NmCli *nmc, gboolean active_only, gboolean show_active_fields, GArray *order) +{ + gs_unref_hashtable GHashTable *row_hash = NULL; + GHashTableIter hiter; + GPtrArray *result; + const GPtrArray *arr; + NMRemoteConnection *c; + MetagenConShowRowData *row_data; + guint i; + const ConShowSortInfo sort_info = { + .nmc = nmc, + .order = order, + .show_active_fields = show_active_fields, + }; - g_return_val_if_fail (nmc, NULL); + row_hash = g_hash_table_new (nm_direct_hash, NULL); + + arr = nm_client_get_connections (nmc->client); + for (i = 0; i < arr->len; i++) { + /* Note: libnm will not expose connection that are invisible + * to the user but currently inactive. + * + * That differs from get-active-connection(). If an invisible connection + * is active, we can get its NMActiveConnection. We can even obtain + * the corresponding NMRemoteConnection (although, of course it has + * no visible settings). + * + * I think this inconsistency is a bug in libnm. Anyway, the result is, + * that we print invisible connections if they are active, but otherwise + * we exclude them. */ + c = arr->pdata[i]; + g_hash_table_insert (row_hash, + c, + _metagen_con_show_row_data_new_for_connection (c, + show_active_fields)); + } + + arr = nm_client_get_active_connections (nmc->client); + for (i = 0; i < arr->len; i++) { + NMActiveConnection *ac = arr->pdata[i]; + + c = nm_active_connection_get_connection (ac); + if (!show_active_fields && !c) { + /* the active connection has no connection, and we don't show + * any active fields. Skip this row. */ + continue; + } - invisibles = g_ptr_array_new (); - acons = nm_client_get_active_connections (nmc->client); - connections = nm_client_get_connections (nmc->client); - for (a = 0; a < acons->len; a++) { - gboolean found = FALSE; - NMActiveConnection *acon = g_ptr_array_index (acons, a); - const char *a_uuid = nm_active_connection_get_uuid (acon); + row_data = c + ? g_hash_table_lookup (row_hash, c) + : NULL; + + if (show_active_fields || !c) { + /* the active connection either has no connection (in which we create a + * connection-less row), or we are interested in showing each active + * connection in its own row. Add a row. */ + if (row_data) { + /* we create a rowdata for this connection earlier. We drop it, because this + * connection is tracked via the rowdata of the active connection. */ + g_hash_table_remove (row_hash, c); + _metagen_con_show_row_data_destroy (row_data); + } + row_data = _metagen_con_show_row_data_new_for_active_connection (c, ac, show_active_fields); + g_hash_table_insert (row_hash, ac, row_data); + continue; + } - for (c = 0; c < connections->len; c++) { - NMConnection *con = g_ptr_array_index (connections, c); - const char *c_uuid = nm_connection_get_uuid (con); + /* we add the active connection to the row for the referenced + * connection. We need to group them this way, to print the proper + * color (activated or not) based on primary_active. */ + if (!row_data) { + /* this is unexpected. The active connection references a connection that + * seemingly no longer exists. It's a bug in libnm. Add a row nontheless. */ + row_data = _metagen_con_show_row_data_new_for_connection (c, show_active_fields); + g_hash_table_insert (row_hash, c, row_data); + } + _metagen_con_show_row_data_add_active_connection (row_data, ac); + } - if (strcmp (a_uuid, c_uuid) == 0) { - found = TRUE; - break; - } + result = g_ptr_array_new_with_free_func (_metagen_con_show_row_data_destroy); + + g_hash_table_iter_init (&hiter, row_hash); + while (g_hash_table_iter_next (&hiter, NULL, (gpointer *) &row_data)) { + if ( active_only + && !row_data->primary_active) { + /* We only print connections that are active. Skip this row. */ + _metagen_con_show_row_data_destroy (row_data); + continue; } - /* Active connection is not in connections array, add it to */ - if (!found) - g_ptr_array_add (invisibles, acon); + if (!show_active_fields) { + NMSettingConnection *s_con; + + nm_assert (NM_IS_REMOTE_CONNECTION (row_data->connection)); + s_con = nm_connection_get_setting_connection (row_data->connection); + if ( !s_con + || !nm_setting_connection_get_uuid (s_con)) { + /* we are in a mode, where we only print rows for connection. + * For that we require that all rows are visible to the user, + * meaning: the have a [connection] setting and a UUID. + * + * Otherwise, this connection is likely invisible to the user. + * Skip it. */ + _metagen_con_show_row_data_destroy (row_data); + continue; + } + _metagen_con_show_row_data_init_primary_active (row_data); + } else + nm_assert (!row_data->all_active); + g_ptr_array_add (result, row_data); } - g_ptr_array_sort_with_data (invisibles, compare_ac_connections, NULL); - return invisibles; + + g_ptr_array_sort_with_data (result, con_show_get_items_cmp, (gpointer) &sort_info); + return result; } static GArray * @@ -1579,9 +1838,9 @@ get_connection (NmCli *nmc, } if (*argc == 1 && nmc->complete) - nmc_complete_strings (**argv, "id", "uuid", "path", NULL); + nmc_complete_strings (**argv, "id", "uuid", "path", "filename", NULL); - if (NM_IN_STRSET (**argv, "id", "uuid", "path")) { + if (NM_IN_STRSET (**argv, "id", "uuid", "path", "filename")) { if (*argc == 1) { if (!nmc->complete) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, @@ -1616,10 +1875,9 @@ do_connections_show (NmCli *nmc, int argc, char **argv) gs_free_error GError *err = NULL; gs_free char *profile_flds = NULL; gs_free char *active_flds = NULL; - GPtrArray *invisibles, *sorted_cons; gboolean active_only = FALSE; gs_unref_array GArray *order = NULL; - guint i, j; + guint i; int option; /* check connection show options [--active] [--order <order spec>] */ @@ -1647,50 +1905,59 @@ do_connections_show (NmCli *nmc, int argc, char **argv) } if (argc == 0) { - const GPtrArray *connections; const char *fields_str = NULL; - char *fields_common = NMC_FIELDS_CON_SHOW_COMMON; - const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); + gs_unref_ptrarray GPtrArray *items = NULL; + gs_free NMMetaSelectionResultList *selection = NULL; + gboolean show_active_fields = TRUE; if (nmc->complete) goto finish; if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) - fields_str = fields_common; + fields_str = NMC_FIELDS_CON_SHOW_COMMON; else if (!nmc->required_fields || strcasecmp (nmc->required_fields, "all") == 0) { } else fields_str = nmc->required_fields; - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_show; - out_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &err); - if (err) - goto finish; - - /* Add headers */ - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - /* There might be active connections not present in connection list - * (e.g. private connections of a different user). Show them as well. */ - invisibles = get_invisible_active_connections (nmc); - for (i = 0; i < invisibles->len; i++) - fill_output_connection_for_invisible (invisibles->pdata[i], nmc->nmc_config.print_output, out.output_data); - g_ptr_array_free (invisibles, TRUE); + /* determine whether the user wants to see any fields that are related to active-connections + * (e.g. the apath, the current state, or the device where the profile is active). + * + * If that's the case, then we will show one line for each active connection. In case + * a profile has multiple active connections, it will be listed multiple times. + * If that's not the case, we filter out these duplicate lines. */ + selection = nm_meta_selection_create_parse_list ((const NMMetaAbstractInfo *const*) metagen_con_show, + NULL, + fields_str, + FALSE, + NULL); + if (selection && selection->num > 0) { + show_active_fields = FALSE; + for (i = 0; i < selection->num; i++) { + const NmcMetaGenericInfo *info = (const NmcMetaGenericInfo *) selection->items[i].info; + + if (NM_IN_SET (info->info_type, NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH)) { + show_active_fields = TRUE; + break; + } + } + } - /* Sort the connections and fill the output data */ - connections = nm_client_get_connections (nmc->client); - sorted_cons = sort_connections (connections, nmc, order); - for (i = 0; i < sorted_cons->len; i++) - fill_output_connection (sorted_cons->pdata[i], nmc->client, nmc->nmc_config.print_output, out.output_data, active_only); - g_ptr_array_free (sorted_cons, TRUE); - - print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, out_indices, - active_only ? _("NetworkManager active profiles") - : _("NetworkManager connection profiles"), - 0, &out); + /* Optionally start paging the output. */ + nmc_terminal_spawn_pager (&nmc->nmc_config); + + items = con_show_get_items (nmc, active_only, show_active_fields, order); + g_ptr_array_add (items, NULL); + if (!nmc_print (&nmc->nmc_config, + items->pdata, + active_only + ? _("NetworkManager active profiles") + : _("NetworkManager connection profiles"), + (const NMMetaAbstractInfo *const*) metagen_con_show, + fields_str, + &err)) + goto finish; } else { gboolean new_line = FALSE; gboolean without_fields = (nmc->required_fields == NULL); @@ -1713,7 +1980,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv) char **argv_cp = argv; do { - if (NM_IN_STRSET (*argv_cp, "id", "uuid", "path", "apath")) { + if (NM_IN_STRSET (*argv_cp, "id", "uuid", "path", "filename", "apath")) { argc_cp--; argv_cp++; } @@ -1731,9 +1998,9 @@ do_connections_show (NmCli *nmc, int argc, char **argv) guint i_found_cons; if (argc == 1 && nmc->complete) - nmc_complete_strings (*argv, "id", "uuid", "path", "apath", NULL); + nmc_complete_strings (*argv, "id", "uuid", "path", "filename", "apath", NULL); - if (NM_IN_STRSET (*argv, "id", "uuid", "path", "apath")) { + if (NM_IN_STRSET (*argv, "id", "uuid", "path", "filename", "apath")) { selector = *argv; argc--; argv++; @@ -1827,10 +2094,10 @@ do_connections_show (NmCli *nmc, int argc, char **argv) if (without_fields || active_flds) { guint l = explicit_acon ? 1 : (found_acons ? found_acons->len : 0); - for (j = 0; j < l; j++) { + for (i = 0; i < l; i++) { NMActiveConnection *acon; - if (j > 0) { + if (i > 0) { /* if there are multiple active connections, separate them with newline. * that is a bit odd, because we already separate connections with newlines, * and commonly don't separate the connection from the first active connection. */ @@ -1840,7 +2107,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv) if (explicit_acon) acon = explicit_acon; else - acon = found_acons->pdata[j]; + acon = found_acons->pdata[i]; nmc->required_fields = active_flds; res = nmc_active_connection_details (acon, nmc); @@ -2579,7 +2846,7 @@ connection_cb_info_finish (ConnectionCbInfo *info, gpointer obj) } else { while (info->obj_list->len > 0) { obj = info->obj_list->pdata[info->obj_list->len - 1]; - g_ptr_array_remove_index (info->obj_list, info->obj_list->len); + g_ptr_array_remove_index (info->obj_list, info->obj_list->len - 1); connection_cb_info_obj_list_destroy (info, obj); } } @@ -2680,9 +2947,9 @@ do_connection_down (NmCli *nmc, int argc, char **argv) const char *selector = NULL; if (arg_num == 1 && nmc->complete) - nmc_complete_strings (*arg_ptr, "id", "uuid", "path", "apath", NULL); + nmc_complete_strings (*arg_ptr, "id", "uuid", "path", "filename", "apath", NULL); - if (NM_IN_STRSET (*arg_ptr, "id", "uuid", "path", "apath")) { + if (NM_IN_STRSET (*arg_ptr, "id", "uuid", "path", "filename", "apath")) { selector = *arg_ptr; arg_num--; arg_ptr++; @@ -7681,6 +7948,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) const char *con_id = NULL; const char *con_uuid = NULL; const char *con_path = NULL; + const char *con_filename = NULL; const char *selector = NULL; gs_free_error GError *error = NULL; GError *err1 = NULL; @@ -7689,11 +7957,12 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) { "id", TRUE, &con_id, FALSE }, { "uuid", TRUE, &con_uuid, FALSE }, { "path", TRUE, &con_path, FALSE }, + { "filename", TRUE, &con_filename, FALSE }, { NULL } }; next_arg (nmc, &argc, &argv, NULL); if (argc == 1 && nmc->complete) - nmc_complete_strings (*argv, "type", "con-name", "id", "uuid", "path", NULL); + nmc_complete_strings (*argv, "type", "con-name", "id", "uuid", "path", "filename", NULL); nmc->return_value = NMC_RESULT_SUCCESS; @@ -7715,20 +7984,23 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) connections = nm_client_get_connections (nmc->client); if (!con) { - if (con_id && !con_uuid && !con_path) { + if (con_id && !con_uuid && !con_path && !con_filename) { con = con_id; selector = "id"; - } else if (con_uuid && !con_id && !con_path) { + } else if (con_uuid && !con_id && !con_path && !con_filename) { con = con_uuid; selector = "uuid"; - } else if (con_path && !con_id && !con_uuid) { + } else if (con_path && !con_id && !con_uuid && !con_filename) { con = con_path; selector = "path"; - } else if (!con_path && !con_id && !con_uuid) { + } else if (con_filename && !con_path && !con_id && !con_uuid) { + con = con_filename; + selector = "filename"; + } else if (!con_path && !con_id && !con_uuid && !con_filename) { /* no-op */ } else { g_string_printf (nmc->return_text, - _("Error: only one of 'id', uuid, or 'path' can be provided.")); + _("Error: only one of 'id', 'filename', uuid, or 'path' can be provided.")); NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } } diff --git a/clients/cli/connections.h b/clients/cli/connections.h index 591e9cda..43cd97f6 100644 --- a/clients/cli/connections.h +++ b/clients/cli/connections.h @@ -35,8 +35,8 @@ nmc_read_connection_properties (NmCli *nmc, NMMetaColor nmc_active_connection_state_to_color (NMActiveConnectionState state); -extern const NmcMetaGenericInfo *const nmc_fields_con_show[]; -extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[]; +extern const NmcMetaGenericInfo *const metagen_con_show[]; +extern const NmcMetaGenericInfo *const metagen_con_active_general[]; extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[]; extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[]; diff --git a/clients/cli/devices.c b/clients/cli/devices.c index b99e606a..58102ed3 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1725,7 +1725,7 @@ add_and_activate_cb (GObject *client, if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); - if (info->hotspot) + if (!info->hotspot) g_print (_("Connection with UUID '%s' created and activated on device '%s'\n"), nm_active_connection_get_uuid (active), nm_device_get_iface (device)); else @@ -2488,41 +2488,6 @@ do_devices_monitor (NmCli *nmc, int argc, char **argv) return nmc->return_value; } -static void -show_access_point_info (NMDevice *device, NmCli *nmc, NmcOutputData *out) -{ - NMAccessPoint *active_ap = NULL; - const char *active_bssid = NULL; - GPtrArray *aps; - NmcOutputField *arr; - - if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED) { - active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (device)); - active_bssid = active_ap ? nm_access_point_get_bssid (active_ap) : NULL; - } - - arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_dev_wifi_list, - NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out->output_data, arr); - - { - APInfo info = { - .nmc = nmc, - .index = 1, - .output_flags = 0, - .active_bssid = active_bssid, - .device = nm_device_get_iface (device), - .output_data = out->output_data, - }; - - aps = sort_access_points (nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device))); - g_ptr_array_foreach (aps, fill_output_access_point, &info); - g_ptr_array_free (aps, FALSE); - } - - print_data_prepare_width (out->output_data); -} - /* * Find a Wi-Fi device with 'iface' in 'devices' array. If 'iface' is NULL, * the first Wi-Fi device is returned. 'idx' parameter is updated to the point @@ -2616,6 +2581,217 @@ find_ap_on_device (NMDevice *device, const char *bssid, const char *ssid, gboole } static void +show_access_point_info (NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out) +{ + NMAccessPoint *active_ap = NULL; + const char *active_bssid = NULL; + GPtrArray *aps; + NmcOutputField *arr; + + if (nm_device_get_state (NM_DEVICE (wifi)) == NM_DEVICE_STATE_ACTIVATED) { + active_ap = nm_device_wifi_get_active_access_point (wifi); + active_bssid = active_ap ? nm_access_point_get_bssid (active_ap) : NULL; + } + + arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_dev_wifi_list, + NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (out->output_data, arr); + + { + APInfo info = { + .nmc = nmc, + .index = 1, + .output_flags = 0, + .active_bssid = active_bssid, + .device = nm_device_get_iface (NM_DEVICE (wifi)), + .output_data = out->output_data, + }; + + aps = sort_access_points (nm_device_wifi_get_access_points (wifi)); + g_ptr_array_foreach (aps, fill_output_access_point, &info); + g_ptr_array_free (aps, FALSE); + } + + print_data_prepare_width (out->output_data); +} + +static void +wifi_print_aps (NMDeviceWifi *wifi, + NmCli *nmc, + GArray *_out_indices, + const NMMetaAbstractInfo *const*tmpl, + const char *bssid_user) +{ + NMAccessPoint *ap = NULL; + const GPtrArray *aps; + APInfo *info; + guint i; + NmcOutputField *arr; + const char *base_hdr = _("Wi-Fi scan list"); + NMC_OUTPUT_DATA_DEFINE_SCOPED (out); + gs_free char *header_name = NULL; + static gboolean empty_line = FALSE; + + if (empty_line) + g_print ("\n"); /* Empty line between devices' APs */ + + /* Main header name */ + header_name = construct_header_name (base_hdr, nm_device_get_iface (NM_DEVICE (wifi))); + + out_indices = g_array_ref (_out_indices); + + if (bssid_user) { + /* Specific AP requested - list only that */ + aps = nm_device_wifi_get_access_points (wifi); + for (i = 0; i < aps->len; i++) { + char *bssid_up; + NMAccessPoint *candidate_ap = g_ptr_array_index (aps, i); + const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); + + bssid_up = g_ascii_strup (bssid_user, -1); + if (!strcmp (bssid_up, candidate_bssid)) + ap = candidate_ap; + g_free (bssid_up); + } + if (ap) { + /* Add headers (field names) */ + arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (out.output_data, arr); + + info = g_malloc0 (sizeof (APInfo)); + info->nmc = nmc; + info->index = 1; + info->output_flags = 0; + info->active_bssid = NULL; + info->device = nm_device_get_iface (NM_DEVICE (wifi)); + info->output_data = out.output_data; + + fill_output_access_point (ap, info); + + print_data_prepare_width (out.output_data); + print_data (&nmc->nmc_config, out_indices, header_name, 0, &out); + g_free (info); + + nmc->return_value = NMC_RESULT_SUCCESS; + empty_line = TRUE; + } + } else { + show_access_point_info (wifi, nmc, &out); + print_data (&nmc->nmc_config, out_indices, header_name, 0, &out); + empty_line = TRUE; + } +} + +typedef struct { + NmCli *nmc; + NMDeviceWifi *wifi; + const NMMetaAbstractInfo *const*tmpl; + + const char *bssid_user; + gulong last_scan_id; + guint timeout_id; + GCancellable *scan_cancellable; + GArray *out_indices; +} WifiListData; + +static void +wifi_list_finish (WifiListData *data) +{ + NmCli *nmc = data->nmc; + + wifi_print_aps (data->wifi, data->nmc, data->out_indices, + data->tmpl, data->bssid_user); + + if (--nmc->should_wait == 0) { + if (nmc->return_value == NMC_RESULT_ERROR_NOT_FOUND) { + g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), + data->bssid_user); + } + g_main_loop_quit (loop); + } + + g_signal_handler_disconnect (data->wifi, data->last_scan_id); + nm_clear_g_source (&data->timeout_id); + nm_clear_g_cancellable (&data->scan_cancellable); + g_array_unref (data->out_indices); + g_object_unref (data->wifi); + g_slice_free (WifiListData, data); +} + +static void +wifi_last_scan_updated (GObject *gobject, GParamSpec *pspec, gpointer user_data) +{ + WifiListData *data = user_data; + + wifi_list_finish (data); +} + +static void +wifi_list_rescan_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) +{ + NMDeviceWifi *wifi = NM_DEVICE_WIFI (source_object); + WifiListData *data = user_data; + gs_free_error GError *error = NULL; + + if (!nm_device_wifi_request_scan_finish (wifi, res, &error)) { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + return; + + if (g_error_matches (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_NOT_ALLOWED)) { + /* This likely means that scanning is already in progress. There's + * a good chance we'll get updated results soon; wait for them. */ + return; + } + + /* Scanning could not be initiated for unknown reason, + * no point in waiting for results. */ + wifi_list_finish (data); + } +} + +static gboolean +wifi_list_scan_timeout (gpointer user_data) +{ + WifiListData *data = user_data; + + wifi_list_finish (data); + + return G_SOURCE_REMOVE; +} + +static void +wifi_list_aps (NMDeviceWifi *wifi, + NmCli *nmc, + GArray *out_indices, + const NMMetaAbstractInfo *const*tmpl, + const char *bssid_user, + gint64 rescan_cutoff) +{ + gboolean needs_rescan; + WifiListData *data; + + needs_rescan = rescan_cutoff < 0 || (rescan_cutoff > 0 && nm_device_wifi_get_last_scan (wifi) < rescan_cutoff); + + if (needs_rescan) { + data = g_slice_new0 (WifiListData); + data->nmc = nmc; + data->wifi = g_object_ref (wifi); + data->tmpl = tmpl; + data->out_indices = g_array_ref (out_indices);; + data->bssid_user = bssid_user; + data->last_scan_id = g_signal_connect (wifi, "notify::" NM_DEVICE_WIFI_LAST_SCAN, + G_CALLBACK (wifi_last_scan_updated), data); + data->scan_cancellable = g_cancellable_new (); + data->timeout_id = g_timeout_add_seconds (15, wifi_list_scan_timeout, data); + nm_device_wifi_request_scan_async (wifi, data->scan_cancellable, wifi_list_rescan_cb, data); + + nmc->should_wait++; + } else { + wifi_print_aps (wifi, nmc, out_indices, tmpl, bssid_user); + } +} + +static void complete_aps (NMDevice **devices, const char *ifname, const char *bssid_prefix, const char *ssid_prefix) { @@ -2640,28 +2816,22 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) { GError *error = NULL; NMDevice *device = NULL; - NMAccessPoint *ap = NULL; const char *ifname = NULL; const char *bssid_user = NULL; + const char *rescan = NULL; gs_free NMDevice **devices = NULL; - const GPtrArray *aps; - APInfo *info; - int i, j; + guint i; const char *fields_str = NULL; const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; - const char *base_hdr = _("Wi-Fi scan list"); - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - gs_free char *header_name = NULL; + gs_unref_array GArray *out_indices = NULL; + int option; + guint64 rescan_cutoff; devices = nmc_get_devices_sorted (nmc->client); - next_arg (nmc, &argc, &argv, NULL); - while (argc > 0) { - if (argc == 1 && nmc->complete) - nmc_complete_strings (*argv, "ifname", "bssid", NULL); - - if (strcmp (*argv, "ifname") == 0) { + while ((option = next_arg (nmc, &argc, &argv, "ifname", "hwaddr", "bssid", "--rescan", NULL)) > 0) { + switch (option) { + case 1: /* ifname */ argc--; argv++; if (!argc) { @@ -2671,8 +2841,9 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) ifname = *argv; if (argc == 1 && nmc->complete) complete_device (devices, ifname, TRUE); - } else if (strcmp (*argv, "bssid") == 0 || strcmp (*argv, "hwaddr") == 0) { - /* hwaddr is deprecated and will be removed later */ + break; + case 2: /* hwaddr is deprecated and will be removed later */ + case 3: /* bssid */ argc--; argv++; if (!argc) { @@ -2682,11 +2853,24 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) bssid_user = *argv; if (argc == 1 && nmc->complete) complete_aps (devices, NULL, bssid_user, NULL); - } else if (!nmc->complete) { - g_printerr (_("Unknown parameter: %s\n"), *argv); + /* We'll switch this to NMC_RESULT_SUCCESS if we find an access point. */ + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + break; + case 4: /* --rescan */ + argc--; + argv++; + if (!argc) { + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); + return NMC_RESULT_ERROR_USER_INPUT; + } + rescan = *argv; + if (argc == 1 && nmc->complete) + nmc_complete_strings (rescan, "auto", "no", "yes", NULL); + break; + default: + g_assert_not_reached(); + break; } - - next_arg (nmc, &argc, &argv, NULL); } if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) @@ -2707,55 +2891,29 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) if (nmc->complete) return nmc->return_value; - if (ifname) { + if (argc) + g_printerr (_("Unknown parameter: %s\n"), *argv); + + if (rescan == NULL || strcmp (rescan, "auto") == 0) { + rescan_cutoff = NM_MAX (nm_utils_get_timestamp_msec () - 30 * NM_UTILS_MSEC_PER_SECOND, 0); + } else if (strcmp (rescan, "no") == 0) { + rescan_cutoff = 0; + } else if (strcmp (rescan, "yes") == 0) { + rescan_cutoff = -1; + } else { + g_string_printf (nmc->return_text, _("Error: invalid rescan argument: '%s' not among [auto, no, yes]"), rescan); + return NMC_RESULT_ERROR_USER_INPUT; + } + if (ifname) { device = find_wifi_device_by_iface (devices, ifname, NULL); if (!device) { g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); return NMC_RESULT_ERROR_NOT_FOUND; } - /* Main header name */ - header_name = construct_header_name (base_hdr, ifname); if (NM_IS_DEVICE_WIFI (device)) { - if (bssid_user) { - /* Specific AP requested - list only that */ - aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device)); - for (j = 0; j < aps->len; j++) { - char *bssid_up; - NMAccessPoint *candidate_ap = g_ptr_array_index (aps, j); - const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); - - bssid_up = g_ascii_strup (bssid_user, -1); - if (!strcmp (bssid_up, candidate_bssid)) - ap = candidate_ap; - g_free (bssid_up); - } - if (!ap) { - g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), - bssid_user); - return NMC_RESULT_ERROR_NOT_FOUND; - } - /* Add headers (field names) */ - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - info = g_malloc0 (sizeof (APInfo)); - info->nmc = nmc; - info->index = 1; - info->output_flags = 0; - info->active_bssid = NULL; - info->device = nm_device_get_iface (device); - - fill_output_access_point (ap, info); - - print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, out_indices, header_name, 0, &out); - g_free (info); - } else { - show_access_point_info (device, nmc, &out); - print_data (&nmc->nmc_config, out_indices, NULL, 0, &out); - } + wifi_list_aps (NM_DEVICE_WIFI (device), nmc, out_indices, tmpl, bssid_user, rescan_cutoff); } else { if ( nm_device_get_device_type (device) == NM_DEVICE_TYPE_GENERIC && g_strcmp0 (nm_device_get_type_description (device), "wifi") == 0) { @@ -2770,76 +2928,11 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) return NMC_RESULT_ERROR_UNKNOWN; } } else { - gboolean empty_line = FALSE; - - /* List APs for all devices */ - if (bssid_user) { - /* Specific AP requested - list only that */ - for (i = 0; devices[i]; i++) { - NMDevice *dev = devices[i]; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out2); - gs_free char *header_name2 = NULL; - - if (!NM_IS_DEVICE_WIFI (dev)) - continue; - - /* Main header name */ - header_name2 = construct_header_name (base_hdr, nm_device_get_iface (dev)); - out2_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, NULL); - - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out2.output_data, arr); - - aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev)); - for (j = 0; j < aps->len; j++) { - char *bssid_up; - NMAccessPoint *candidate_ap = g_ptr_array_index (aps, j); - const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); - - bssid_up = g_ascii_strup (bssid_user, -1); - if (!strcmp (bssid_up, candidate_bssid)) { - ap = candidate_ap; - - info = g_malloc0 (sizeof (APInfo)); - info->nmc = nmc; - info->index = 1; - info->output_flags = 0; - info->active_bssid = NULL; - info->device = nm_device_get_iface (dev); - fill_output_access_point (ap, info); - g_free (info); - } - g_free (bssid_up); - } - if (empty_line) - g_print ("\n"); /* Empty line between devices' APs */ - print_data_prepare_width (out2.output_data); - print_data (&nmc->nmc_config, out2_indices, header_name2, 0, &out2); - empty_line = TRUE; - } - if (!ap) { - g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), - bssid_user); - return NMC_RESULT_ERROR_NOT_FOUND; - } - } else { - for (i = 0; devices[i]; i++) { - NMDevice *dev = devices[i]; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out2); - gs_free char *header_name2 = NULL; - - /* Main header name */ - header_name2 = construct_header_name (base_hdr, - nm_device_get_iface (dev)); - out2_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, NULL); - - if (NM_IS_DEVICE_WIFI (dev)) { - if (empty_line) - g_print ("\n"); /* Empty line between devices' APs */ - show_access_point_info (dev, nmc, &out2); - print_data (&nmc->nmc_config, out2_indices, header_name2, 0, &out2); - empty_line = TRUE; - } + for (i = 0; devices[i]; i++) { + NMDevice *dev = devices[i]; + + if (NM_IS_DEVICE_WIFI (dev)) { + wifi_list_aps (NM_DEVICE_WIFI (dev), nmc, out_indices, tmpl, bssid_user, rescan_cutoff); } } } @@ -2852,9 +2945,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) { NMDevice *device = NULL; NMAccessPoint *ap = NULL; - NM80211ApFlags ap_flags = NM_802_11_AP_FLAGS_NONE; - NM80211ApSecurityFlags ap_wpa_flags = NM_802_11_AP_SEC_NONE; - NM80211ApSecurityFlags ap_rsn_flags = NM_802_11_AP_SEC_NONE; + NM80211ApFlags ap_flags; + NM80211ApSecurityFlags ap_wpa_flags; + NM80211ApSecurityFlags ap_rsn_flags; NMConnection *connection = NULL; NMSettingConnection *s_con; NMSettingWireless *s_wifi; @@ -3151,7 +3244,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) ap_rsn_flags = nm_access_point_get_rsn_flags (ap); /* Set password for WEP or WPA-PSK. */ - if (ap_flags & NM_802_11_AP_FLAGS_PRIVACY) { + if ( (ap_flags & NM_802_11_AP_FLAGS_PRIVACY) + || ap_wpa_flags != NM_802_11_AP_SEC_NONE + || ap_rsn_flags != NM_802_11_AP_SEC_NONE) { /* Ask for missing password when one is expected and '--ask' is used */ if (!password && nmc->ask) password = passwd_ask = nmc_readline_echo (nmc->nmc_config.show_secrets, _("Password: ")); diff --git a/clients/cli/general.c b/clients/cli/general.c index 841df8bd..de743970 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -560,6 +560,9 @@ print_permissions (void *user_data) permissions[i++] = GINT_TO_POINTER (perm); permissions[i++] = NULL; + /* Optionally start paging the output. */ + nmc_terminal_spawn_pager (&nmc->nmc_config); + if (!nmc_print (&nmc->nmc_config, permissions, _("NetworkManager permissions"), diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index e9752952..6407f50b 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -188,8 +188,8 @@ complete_fields (const char *option, const char *prefix) complete_field (h, metagen_ip4_config); complete_field (h, nmc_fields_dhcp_config); complete_field (h, nmc_fields_ip6_config); - complete_field (h, nmc_fields_con_show); - complete_field (h, nmc_fields_con_active_details_general); + complete_field (h, metagen_con_show); + complete_field (h, metagen_con_active_general); complete_field (h, nmc_fields_con_active_details_vpn); complete_field (h, nmc_fields_con_active_details_groups); complete_field (h, nmc_fields_dev_status); diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 61bf86de..bcf1c01b 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -72,6 +72,14 @@ typedef enum { NMC_PRINT_PRETTY = 2 } NMCPrintOutput; +static inline NMMetaAccessorGetType +nmc_print_output_to_accessor_get_type (NMCPrintOutput print_output) +{ + return (print_output != NMC_PRINT_TERSE) + ? NM_META_ACCESSOR_GET_TYPE_PRETTY + : NM_META_ACCESSOR_GET_TYPE_PARSABLE; +} + /* === Output fields === */ typedef enum { diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 32c44e39..365a0303 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -199,10 +199,18 @@ next_arg (NmCli *nmc, int *argc, char ***argv, ...) /* Check command dependent options first */ while ((cmd_option = va_arg (args, const char *))) { - /* strip heading "--" form cmd_option */ - if (nmc_arg_is_option (**argv, cmd_option + 2)) { - va_end (args); - return cmd_option_pos; + if (cmd_option[0] == '-' && cmd_option[1] == '-') { + /* Match as an option (leading "--" stripped) */ + if (nmc_arg_is_option (**argv, cmd_option + 2)) { + va_end (args); + return cmd_option_pos; + } + } else { + /* Match literally. */ + if (strcmp (**argv, cmd_option) == 0) { + va_end (args); + return cmd_option_pos; + } } cmd_option_pos++; } @@ -1004,9 +1012,7 @@ _print_fill (const NmcConfig *nmc_config, g_array_set_clear_func (cells, _print_data_cell_clear); g_array_set_size (cells, targets_len * header_row->len); - text_get_type = pretty - ? NM_META_ACCESSOR_GET_TYPE_PRETTY - : NM_META_ACCESSOR_GET_TYPE_PARSABLE; + text_get_type = nmc_print_output_to_accessor_get_type (nmc_config->print_output); text_get_flags = NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV; if (nmc_config->show_secrets) text_get_flags |= NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS; @@ -1040,20 +1046,22 @@ _print_fill (const NmcConfig *nmc_config, &is_default, (gpointer *) &to_free); + nm_assert (!to_free || value == to_free); + header_cell->skip = nmc_config->overview && is_default; if (NM_FLAGS_HAS (text_out_flags, NM_META_ACCESSOR_GET_OUT_FLAGS_STRV)) { - if (value) { - if (nmc_config->multiline_output) { - cell->text_format = PRINT_DATA_CELL_FORMAT_TYPE_STRV; - cell->text.strv = value; - cell->text_to_free = !!to_free; - } else { + if (nmc_config->multiline_output) { + cell->text_format = PRINT_DATA_CELL_FORMAT_TYPE_STRV; + cell->text.strv = value; + cell->text_to_free = !!to_free; + } else { + if (value && ((const char *const*) value)[0]) { cell->text.plain = g_strjoinv (" | ", (char **) value); cell->text_to_free = TRUE; - if (to_free) - g_strfreev ((char **) to_free); } + if (to_free) + g_strfreev ((char **) to_free); } } else { cell->text.plain = value; @@ -1165,7 +1173,7 @@ _print_do (const NmcConfig *nmc_config, guint i_row, i_col; nm_auto_free_gstring GString *str = NULL; - g_assert (col_len && row_len); + g_assert (col_len); /* Main header */ if (pretty && header_name_no_l10n) { diff --git a/clients/cli/utils.h b/clients/cli/utils.h index dc0ce083..19694d11 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -121,6 +121,37 @@ typedef enum { NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN, _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM, + NMC_GENERIC_INFO_TYPE_CON_SHOW_NAME = 0, + NMC_GENERIC_INFO_TYPE_CON_SHOW_UUID, + NMC_GENERIC_INFO_TYPE_CON_SHOW_TYPE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP, + NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP_REAL, + NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT, + NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT_PRIORITY, + NMC_GENERIC_INFO_TYPE_CON_SHOW_READONLY, + NMC_GENERIC_INFO_TYPE_CON_SHOW_DBUS_PATH, + NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH, + NMC_GENERIC_INFO_TYPE_CON_SHOW_SLAVE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_FILENAME, + _NMC_GENERIC_INFO_TYPE_CON_SHOW_NUM, + + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NAME = 0, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_STATE, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT6, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_SPEC_OBJECT, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_VPN, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DBUS_PATH, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CON_PATH, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_ZONE, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH, + _NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NUM, + } NmcGenericInfoType; #define NMC_HANDLE_COLOR(color) \ diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 2988b084..3e4bd1bb 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -6073,6 +6073,9 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = { | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT, ), ), + PROPERTY_INFO (NM_SETTING_IP6_CONFIG_DHCP_DUID, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID, + .property_type = &_pt_gobject_string, + ), PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME, .property_type = &_pt_gobject_bool, ), @@ -6221,6 +6224,9 @@ static const NMMetaPropertyInfo *const property_infos_MACSEC[] = { | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT, ), ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_SEND_SCI, + .property_type = &_pt_gobject_bool, + ), NULL }; @@ -7252,6 +7258,20 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = { .typ_flags = NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT, ), ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_WAKE_ON_WLAN, + .property_type = &_pt_gobject_enum, + .property_typ_data = DEFINE_PROPERTY_TYP_DATA ( + PROPERTY_TYP_DATA_SUBTYPE (gobject_enum, + .get_gtype = nm_setting_wireless_wake_on_wlan_get_type, + .value_infos = ENUM_VALUE_INFOS ( + { + .value = NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE, + .nick = "disabled", + } + ), + ), + ), + ), NULL }; diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h index 06f96a4e..5e5151b0 100644 --- a/clients/common/settings-docs.h +++ b/clients/common/settings-docs.h @@ -21,6 +21,7 @@ #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SEEN_BSSIDS N_("A list of BSSIDs (each BSSID formatted as a MAC address like \"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SSID N_("SSID of the Wi-Fi network. Must be specified.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_TX_POWER N_("If non-zero, directs the device to use the specified transmit power. Units are dBm. This property is highly driver dependent and not all devices support setting a static transmit power.") +#define DESCRIBE_DOC_NM_SETTING_WIRELESS_WAKE_ON_WLAN N_("The NMSettingWirelessWakeOnWLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_AUTH_ALG N_("When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802.11 authentication algorithm required by the AP here. One of \"open\" for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP. When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the \"leap-username\" and \"leap-password\" properties must be specified.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_FILS N_("Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the connection. One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not supported). When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and no global default is set, FILS will be optionally enabled.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty. Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".") @@ -87,9 +88,9 @@ #define DESCRIBE_DOC_NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS N_("Flags indicating how to handle the \"private-key-password\" property.") #define DESCRIBE_DOC_NM_SETTING_802_1X_SUBJECT_MATCH N_("Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed. This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.") #define DESCRIBE_DOC_NM_SETTING_802_1X_SYSTEM_CA_CERTS N_("When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the \"ca-cert\" and \"phase2-ca-cert\" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides \"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).") -#define DESCRIBE_DOC_NM_SETTING_WIRED_AUTO_NEGOTIATE N_("If TRUE, enforce auto-negotiation of port speed and duplex mode. If FALSE, \"speed\" and \"duplex\" properties should be both set or link configuration will be skipped.") +#define DESCRIBE_DOC_NM_SETTING_WIRED_AUTO_NEGOTIATE N_("When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" and \"duplex\" properties are both specified, only that single mode will be advertised and accepted during the link auto-negotiation process: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. When FALSE, \"speed\" and \"duplex\" properties should be both set or link configuration will be skipped.") #define DESCRIBE_DOC_NM_SETTING_WIRED_CLONED_MAC_ADDRESS N_("If specified, request that the device use this MAC address instead. This is known as MAC cloning or spoofing. Beside explicitly specifying a MAC address, the special values \"preserve\", \"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means not to touch the MAC address on activation. \"permanent\" means to use the permanent hardware address if the device has one (otherwise this is treated as \"preserve\"). \"random\" creates a random MAC address on each connect. \"stable\" creates a hashed MAC address based on connection.stable-id and a machine dependent key. If unspecified, the value can be overwritten via global defaults, see manual of NetworkManager.conf. If still unspecified, it defaults to \"preserve\" (older versions of NetworkManager may use a different default value). On D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address\".") -#define DESCRIBE_DOC_NM_SETTING_WIRED_DUPLEX N_("Can be specified only when \"auto-negotiate\" is \"off\". In that case, statically configures the device to use that specified duplex mode, either \"half\" or \"full\". Must be set together with the \"speed\" property if specified. Before specifying a duplex mode be sure your device supports it.") +#define DESCRIBE_DOC_NM_SETTING_WIRED_DUPLEX N_("When a value is set, either \"half\" or \"full\", configures the device to use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the specified duplex mode will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. If the value is unset (the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported duplex modes. Must be set together with the \"speed\" property if specified. Before specifying a duplex mode be sure your device supports it.") #define DESCRIBE_DOC_NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK N_("With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting \"FE:FF:FF:00:00:00\" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the \"random\" or \"stable\" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of \"02:00:00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more than one additional MAC addresses, one of them is chosen randomly. For example, \"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will create a fully scrambled MAC address, randomly locally or globally administered.") #define DESCRIBE_DOC_NM_SETTING_WIRED_MAC_ADDRESS N_("If specified, this connection will only apply to the Ethernet device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).") #define DESCRIBE_DOC_NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST N_("If specified, this connection will never apply to the Ethernet device whose permanent MAC address matches an address in the list. Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).") @@ -99,7 +100,7 @@ #define DESCRIBE_DOC_NM_SETTING_WIRED_S390_NETTYPE N_("s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing the different types of virtual network devices available on s390 systems.") #define DESCRIBE_DOC_NM_SETTING_WIRED_S390_OPTIONS N_("Dictionary of key/value pairs of s390-specific device options. Both keys and values must be strings. Allowed keys include \"portno\", \"layer2\", \"portname\", \"protocol\", among others. Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).") #define DESCRIBE_DOC_NM_SETTING_WIRED_S390_SUBCHANNELS N_("Identifies specific subchannels that this network device uses for communication with z/VM or s390 host. Like the \"mac-address\" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.") -#define DESCRIBE_DOC_NM_SETTING_WIRED_SPEED N_("Can be set to a value greater than zero only when \"auto-negotiate\" is \"off\". In that case, statically configures the device to use that specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" property when non-zero. Before specifying a speed value be sure your device supports it.") +#define DESCRIBE_DOC_NM_SETTING_WIRED_SPEED N_("When a value grater than 0 is set, configures the device to use the specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabit speeds, as in this case link negotiation is mandatory. If the value is unset (0, the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported speeds. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" property when non-zero. Before specifying a speed value be sure your device supports it.") #define DESCRIBE_DOC_NM_SETTING_WIRED_WAKE_ON_LAN N_("The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).") #define DESCRIBE_DOC_NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD N_("If specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address. If NULL, no password will be required.") #define DESCRIBE_DOC_NM_SETTING_ADSL_ENCAPSULATION N_("Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\".") @@ -152,7 +153,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this slave's master connection (eg, \"bond\"), or NULL if this connection is not a slave.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid. It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network. For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").") @@ -233,6 +234,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) or NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1). If the property is set to EUI64, the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of stable-privacy enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling stable-privacy. For keyfile plugin, the absence of the setting on disk means EUI64 so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("Array of IP addresses.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.") +#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.") @@ -260,6 +262,7 @@ #define DESCRIBE_DOC_NM_SETTING_MACSEC_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_MACSEC_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created. If this property is not specified, the connection must contain an \"802-3-ethernet\" setting with a \"mac-address\" property.") #define DESCRIBE_DOC_NM_SETTING_MACSEC_PORT N_("The port component of the SCI (Secure Channel Identifier), between 1 and 65534.") +#define DESCRIBE_DOC_NM_SETTING_MACSEC_SEND_SCI N_("Specifies whether the SCI (Secure Channel Identifier) is included in every packet.") #define DESCRIBE_DOC_NM_SETTING_MACSEC_VALIDATION N_("Specifies the validation mode for incoming frames.") #define DESCRIBE_DOC_NM_SETTING_MACVLAN_MODE N_("The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.") #define DESCRIBE_DOC_NM_SETTING_MACVLAN_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") @@ -328,7 +331,7 @@ #define DESCRIBE_DOC_NM_SETTING_TEAM_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.") -#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).") +#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.") diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index 06f96a4e..5e5151b0 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -21,6 +21,7 @@ #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SEEN_BSSIDS N_("A list of BSSIDs (each BSSID formatted as a MAC address like \"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SSID N_("SSID of the Wi-Fi network. Must be specified.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_TX_POWER N_("If non-zero, directs the device to use the specified transmit power. Units are dBm. This property is highly driver dependent and not all devices support setting a static transmit power.") +#define DESCRIBE_DOC_NM_SETTING_WIRELESS_WAKE_ON_WLAN N_("The NMSettingWirelessWakeOnWLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_AUTH_ALG N_("When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802.11 authentication algorithm required by the AP here. One of \"open\" for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP. When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the \"leap-username\" and \"leap-password\" properties must be specified.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_FILS N_("Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the connection. One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not supported). When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and no global default is set, FILS will be optionally enabled.") #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty. Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".") @@ -87,9 +88,9 @@ #define DESCRIBE_DOC_NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS N_("Flags indicating how to handle the \"private-key-password\" property.") #define DESCRIBE_DOC_NM_SETTING_802_1X_SUBJECT_MATCH N_("Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed. This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.") #define DESCRIBE_DOC_NM_SETTING_802_1X_SYSTEM_CA_CERTS N_("When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the \"ca-cert\" and \"phase2-ca-cert\" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides \"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).") -#define DESCRIBE_DOC_NM_SETTING_WIRED_AUTO_NEGOTIATE N_("If TRUE, enforce auto-negotiation of port speed and duplex mode. If FALSE, \"speed\" and \"duplex\" properties should be both set or link configuration will be skipped.") +#define DESCRIBE_DOC_NM_SETTING_WIRED_AUTO_NEGOTIATE N_("When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" and \"duplex\" properties are both specified, only that single mode will be advertised and accepted during the link auto-negotiation process: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. When FALSE, \"speed\" and \"duplex\" properties should be both set or link configuration will be skipped.") #define DESCRIBE_DOC_NM_SETTING_WIRED_CLONED_MAC_ADDRESS N_("If specified, request that the device use this MAC address instead. This is known as MAC cloning or spoofing. Beside explicitly specifying a MAC address, the special values \"preserve\", \"permanent\", \"random\" and \"stable\" are supported. \"preserve\" means not to touch the MAC address on activation. \"permanent\" means to use the permanent hardware address if the device has one (otherwise this is treated as \"preserve\"). \"random\" creates a random MAC address on each connect. \"stable\" creates a hashed MAC address based on connection.stable-id and a machine dependent key. If unspecified, the value can be overwritten via global defaults, see manual of NetworkManager.conf. If still unspecified, it defaults to \"preserve\" (older versions of NetworkManager may use a different default value). On D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated \"cloned-mac-address\".") -#define DESCRIBE_DOC_NM_SETTING_WIRED_DUPLEX N_("Can be specified only when \"auto-negotiate\" is \"off\". In that case, statically configures the device to use that specified duplex mode, either \"half\" or \"full\". Must be set together with the \"speed\" property if specified. Before specifying a duplex mode be sure your device supports it.") +#define DESCRIBE_DOC_NM_SETTING_WIRED_DUPLEX N_("When a value is set, either \"half\" or \"full\", configures the device to use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the specified duplex mode will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabits modes, as in these cases link negotiation is mandatory. If the value is unset (the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported duplex modes. Must be set together with the \"speed\" property if specified. Before specifying a duplex mode be sure your device supports it.") #define DESCRIBE_DOC_NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK N_("With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all bits of the MAC address are scrambled and a locally-administered, unicast MAC address is created. This property allows to specify that certain bits are fixed. Note that the least significant bit of the first MAC address will always be unset to create a unicast MAC address. If the property is NULL, it is eligible to be overwritten by a default connection setting. If the value is still NULL or an empty string, the default is to create a locally-administered, unicast MAC address. If the value contains one MAC address, this address is used as mask. The set bits of the mask are to be filled with the current MAC address of the device, while the unset bits are subject to randomization. Setting \"FE:FF:FF:00:00:00\" means to preserve the OUI of the current MAC address and only randomize the lower 3 bytes using the \"random\" or \"stable\" algorithm. If the value contains one additional MAC address after the mask, this address is used instead of the current MAC address to fill the bits that shall not be randomized. For example, a value of \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" will set the OUI of the MAC address to 68:F7:28, while the lower bits are randomized. A value of \"02:00:00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled globally-administered, burned-in MAC address. If the value contains more than one additional MAC addresses, one of them is chosen randomly. For example, \"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will create a fully scrambled MAC address, randomly locally or globally administered.") #define DESCRIBE_DOC_NM_SETTING_WIRED_MAC_ADDRESS N_("If specified, this connection will only apply to the Ethernet device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).") #define DESCRIBE_DOC_NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST N_("If specified, this connection will never apply to the Ethernet device whose permanent MAC address matches an address in the list. Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).") @@ -99,7 +100,7 @@ #define DESCRIBE_DOC_NM_SETTING_WIRED_S390_NETTYPE N_("s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing the different types of virtual network devices available on s390 systems.") #define DESCRIBE_DOC_NM_SETTING_WIRED_S390_OPTIONS N_("Dictionary of key/value pairs of s390-specific device options. Both keys and values must be strings. Allowed keys include \"portno\", \"layer2\", \"portname\", \"protocol\", among others. Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).") #define DESCRIBE_DOC_NM_SETTING_WIRED_S390_SUBCHANNELS N_("Identifies specific subchannels that this network device uses for communication with z/VM or s390 host. Like the \"mac-address\" property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.") -#define DESCRIBE_DOC_NM_SETTING_WIRED_SPEED N_("Can be set to a value greater than zero only when \"auto-negotiate\" is \"off\". In that case, statically configures the device to use that specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" property when non-zero. Before specifying a speed value be sure your device supports it.") +#define DESCRIBE_DOC_NM_SETTING_WIRED_SPEED N_("When a value grater than 0 is set, configures the device to use the specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will be the only one advertised during link negotiation: this works only for BASE-T 802.3 specifications and is useful for enforcing gigabit speeds, as in this case link negotiation is mandatory. If the value is unset (0, the default), the link configuration will be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will advertise all the supported speeds. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" property when non-zero. Before specifying a speed value be sure your device supports it.") #define DESCRIBE_DOC_NM_SETTING_WIRED_WAKE_ON_LAN N_("The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).") #define DESCRIBE_DOC_NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD N_("If specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address. If NULL, no password will be required.") #define DESCRIBE_DOC_NM_SETTING_ADSL_ENCAPSULATION N_("Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\".") @@ -152,7 +153,7 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this slave's master connection (eg, \"bond\"), or NULL if this connection is not a slave.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid. It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network. For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").") @@ -233,6 +234,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) or NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1). If the property is set to EUI64, the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of stable-privacy enables use of cryptographically secure hash of a secret host-specific key along with the connection's stable-id and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling stable-privacy. For keyfile plugin, the absence of the setting on disk means EUI64 so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("Array of IP addresses.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.") +#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.") @@ -260,6 +262,7 @@ #define DESCRIBE_DOC_NM_SETTING_MACSEC_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_MACSEC_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created. If this property is not specified, the connection must contain an \"802-3-ethernet\" setting with a \"mac-address\" property.") #define DESCRIBE_DOC_NM_SETTING_MACSEC_PORT N_("The port component of the SCI (Secure Channel Identifier), between 1 and 65534.") +#define DESCRIBE_DOC_NM_SETTING_MACSEC_SEND_SCI N_("Specifies whether the SCI (Secure Channel Identifier) is included in every packet.") #define DESCRIBE_DOC_NM_SETTING_MACSEC_VALIDATION N_("Specifies the validation mode for incoming frames.") #define DESCRIBE_DOC_NM_SETTING_MACVLAN_MODE N_("The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.") #define DESCRIBE_DOC_NM_SETTING_MACVLAN_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") @@ -328,7 +331,7 @@ #define DESCRIBE_DOC_NM_SETTING_TEAM_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.") -#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).") +#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.") diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am index aa49eda6..298ca689 100644 --- a/clients/tests/test-client.check-on-disk/Makefile.am +++ b/clients/tests/test-client.check-on-disk/Makefile.am @@ -1,4 +1,5 @@ # generated with `NM_TEST_REGENERATE=1 make check` +# See howto in "clients/tests/test-client.py" clients_tests_expected_files = \ clients/tests/test-client.check-on-disk/test_001-001.expected \ @@ -105,10 +106,254 @@ clients_tests_expected_files = \ clients/tests/test-client.check-on-disk/test_003-052.expected \ clients/tests/test-client.check-on-disk/test_003-053.expected \ clients/tests/test-client.check-on-disk/test_003-054.expected \ + clients/tests/test-client.check-on-disk/test_003-055.expected \ + clients/tests/test-client.check-on-disk/test_003-056.expected \ + clients/tests/test-client.check-on-disk/test_003-057.expected \ + clients/tests/test-client.check-on-disk/test_003-058.expected \ + clients/tests/test-client.check-on-disk/test_003-059.expected \ + clients/tests/test-client.check-on-disk/test_003-060.expected \ + clients/tests/test-client.check-on-disk/test_003-061.expected \ + clients/tests/test-client.check-on-disk/test_003-062.expected \ + clients/tests/test-client.check-on-disk/test_003-063.expected \ + clients/tests/test-client.check-on-disk/test_003-064.expected \ + clients/tests/test-client.check-on-disk/test_003-065.expected \ + clients/tests/test-client.check-on-disk/test_003-066.expected \ + clients/tests/test-client.check-on-disk/test_003-067.expected \ + clients/tests/test-client.check-on-disk/test_003-068.expected \ + clients/tests/test-client.check-on-disk/test_003-069.expected \ + clients/tests/test-client.check-on-disk/test_003-070.expected \ + clients/tests/test-client.check-on-disk/test_003-071.expected \ + clients/tests/test-client.check-on-disk/test_003-072.expected \ + clients/tests/test-client.check-on-disk/test_003-073.expected \ + clients/tests/test-client.check-on-disk/test_003-074.expected \ + clients/tests/test-client.check-on-disk/test_003-075.expected \ + clients/tests/test-client.check-on-disk/test_003-076.expected \ + clients/tests/test-client.check-on-disk/test_003-077.expected \ + clients/tests/test-client.check-on-disk/test_003-078.expected \ + clients/tests/test-client.check-on-disk/test_003-079.expected \ + clients/tests/test-client.check-on-disk/test_003-080.expected \ + clients/tests/test-client.check-on-disk/test_003-081.expected \ + clients/tests/test-client.check-on-disk/test_003-082.expected \ + clients/tests/test-client.check-on-disk/test_003-083.expected \ + clients/tests/test-client.check-on-disk/test_003-084.expected \ + clients/tests/test-client.check-on-disk/test_003-085.expected \ + clients/tests/test-client.check-on-disk/test_003-086.expected \ + clients/tests/test-client.check-on-disk/test_003-087.expected \ + clients/tests/test-client.check-on-disk/test_003-088.expected \ + clients/tests/test-client.check-on-disk/test_003-089.expected \ + clients/tests/test-client.check-on-disk/test_003-090.expected \ + clients/tests/test-client.check-on-disk/test_003-091.expected \ + clients/tests/test-client.check-on-disk/test_003-092.expected \ + clients/tests/test-client.check-on-disk/test_003-093.expected \ + clients/tests/test-client.check-on-disk/test_003-094.expected \ + clients/tests/test-client.check-on-disk/test_003-095.expected \ + clients/tests/test-client.check-on-disk/test_003-096.expected \ + clients/tests/test-client.check-on-disk/test_003-097.expected \ + clients/tests/test-client.check-on-disk/test_003-098.expected \ + clients/tests/test-client.check-on-disk/test_003-099.expected \ + clients/tests/test-client.check-on-disk/test_003-100.expected \ clients/tests/test-client.check-on-disk/test_004-001.expected \ clients/tests/test-client.check-on-disk/test_004-002.expected \ clients/tests/test-client.check-on-disk/test_004-003.expected \ clients/tests/test-client.check-on-disk/test_004-004.expected \ clients/tests/test-client.check-on-disk/test_004-005.expected \ clients/tests/test-client.check-on-disk/test_004-006.expected \ + clients/tests/test-client.check-on-disk/test_004-007.expected \ + clients/tests/test-client.check-on-disk/test_004-008.expected \ + clients/tests/test-client.check-on-disk/test_004-009.expected \ + clients/tests/test-client.check-on-disk/test_004-010.expected \ + clients/tests/test-client.check-on-disk/test_004-011.expected \ + clients/tests/test-client.check-on-disk/test_004-012.expected \ + clients/tests/test-client.check-on-disk/test_004-013.expected \ + clients/tests/test-client.check-on-disk/test_004-014.expected \ + clients/tests/test-client.check-on-disk/test_004-015.expected \ + clients/tests/test-client.check-on-disk/test_004-016.expected \ + clients/tests/test-client.check-on-disk/test_004-017.expected \ + clients/tests/test-client.check-on-disk/test_004-018.expected \ + clients/tests/test-client.check-on-disk/test_004-019.expected \ + clients/tests/test-client.check-on-disk/test_004-020.expected \ + clients/tests/test-client.check-on-disk/test_004-021.expected \ + clients/tests/test-client.check-on-disk/test_004-022.expected \ + clients/tests/test-client.check-on-disk/test_004-023.expected \ + clients/tests/test-client.check-on-disk/test_004-024.expected \ + clients/tests/test-client.check-on-disk/test_004-025.expected \ + clients/tests/test-client.check-on-disk/test_004-026.expected \ + clients/tests/test-client.check-on-disk/test_004-027.expected \ + clients/tests/test-client.check-on-disk/test_004-028.expected \ + clients/tests/test-client.check-on-disk/test_004-029.expected \ + clients/tests/test-client.check-on-disk/test_004-030.expected \ + clients/tests/test-client.check-on-disk/test_004-031.expected \ + clients/tests/test-client.check-on-disk/test_004-032.expected \ + clients/tests/test-client.check-on-disk/test_004-033.expected \ + clients/tests/test-client.check-on-disk/test_004-034.expected \ + clients/tests/test-client.check-on-disk/test_004-035.expected \ + clients/tests/test-client.check-on-disk/test_004-036.expected \ + clients/tests/test-client.check-on-disk/test_004-037.expected \ + clients/tests/test-client.check-on-disk/test_004-038.expected \ + clients/tests/test-client.check-on-disk/test_004-039.expected \ + clients/tests/test-client.check-on-disk/test_004-040.expected \ + clients/tests/test-client.check-on-disk/test_004-041.expected \ + clients/tests/test-client.check-on-disk/test_004-042.expected \ + clients/tests/test-client.check-on-disk/test_004-043.expected \ + clients/tests/test-client.check-on-disk/test_004-044.expected \ + clients/tests/test-client.check-on-disk/test_004-045.expected \ + clients/tests/test-client.check-on-disk/test_004-046.expected \ + clients/tests/test-client.check-on-disk/test_004-047.expected \ + clients/tests/test-client.check-on-disk/test_004-048.expected \ + clients/tests/test-client.check-on-disk/test_004-049.expected \ + clients/tests/test-client.check-on-disk/test_004-050.expected \ + clients/tests/test-client.check-on-disk/test_004-051.expected \ + clients/tests/test-client.check-on-disk/test_004-052.expected \ + clients/tests/test-client.check-on-disk/test_004-053.expected \ + clients/tests/test-client.check-on-disk/test_004-054.expected \ + clients/tests/test-client.check-on-disk/test_004-055.expected \ + clients/tests/test-client.check-on-disk/test_004-056.expected \ + clients/tests/test-client.check-on-disk/test_004-057.expected \ + clients/tests/test-client.check-on-disk/test_004-058.expected \ + clients/tests/test-client.check-on-disk/test_004-059.expected \ + clients/tests/test-client.check-on-disk/test_004-060.expected \ + clients/tests/test-client.check-on-disk/test_004-061.expected \ + clients/tests/test-client.check-on-disk/test_004-062.expected \ + clients/tests/test-client.check-on-disk/test_004-063.expected \ + clients/tests/test-client.check-on-disk/test_004-064.expected \ + clients/tests/test-client.check-on-disk/test_004-065.expected \ + clients/tests/test-client.check-on-disk/test_004-066.expected \ + clients/tests/test-client.check-on-disk/test_004-067.expected \ + clients/tests/test-client.check-on-disk/test_004-068.expected \ + clients/tests/test-client.check-on-disk/test_004-069.expected \ + clients/tests/test-client.check-on-disk/test_004-070.expected \ + clients/tests/test-client.check-on-disk/test_004-071.expected \ + clients/tests/test-client.check-on-disk/test_004-072.expected \ + clients/tests/test-client.check-on-disk/test_004-073.expected \ + clients/tests/test-client.check-on-disk/test_004-074.expected \ + clients/tests/test-client.check-on-disk/test_004-075.expected \ + clients/tests/test-client.check-on-disk/test_004-076.expected \ + clients/tests/test-client.check-on-disk/test_004-077.expected \ + clients/tests/test-client.check-on-disk/test_004-078.expected \ + clients/tests/test-client.check-on-disk/test_004-079.expected \ + clients/tests/test-client.check-on-disk/test_004-080.expected \ + clients/tests/test-client.check-on-disk/test_004-081.expected \ + clients/tests/test-client.check-on-disk/test_004-082.expected \ + clients/tests/test-client.check-on-disk/test_004-083.expected \ + clients/tests/test-client.check-on-disk/test_004-084.expected \ + clients/tests/test-client.check-on-disk/test_004-085.expected \ + clients/tests/test-client.check-on-disk/test_004-086.expected \ + clients/tests/test-client.check-on-disk/test_004-087.expected \ + clients/tests/test-client.check-on-disk/test_004-088.expected \ + clients/tests/test-client.check-on-disk/test_004-089.expected \ + clients/tests/test-client.check-on-disk/test_004-090.expected \ + clients/tests/test-client.check-on-disk/test_004-091.expected \ + clients/tests/test-client.check-on-disk/test_004-092.expected \ + clients/tests/test-client.check-on-disk/test_004-093.expected \ + clients/tests/test-client.check-on-disk/test_004-094.expected \ + clients/tests/test-client.check-on-disk/test_004-095.expected \ + clients/tests/test-client.check-on-disk/test_004-096.expected \ + clients/tests/test-client.check-on-disk/test_004-097.expected \ + clients/tests/test-client.check-on-disk/test_004-098.expected \ + clients/tests/test-client.check-on-disk/test_004-099.expected \ + clients/tests/test-client.check-on-disk/test_004-100.expected \ + clients/tests/test-client.check-on-disk/test_004-101.expected \ + clients/tests/test-client.check-on-disk/test_004-102.expected \ + clients/tests/test-client.check-on-disk/test_004-103.expected \ + clients/tests/test-client.check-on-disk/test_004-104.expected \ + clients/tests/test-client.check-on-disk/test_004-105.expected \ + clients/tests/test-client.check-on-disk/test_004-106.expected \ + clients/tests/test-client.check-on-disk/test_004-107.expected \ + clients/tests/test-client.check-on-disk/test_004-108.expected \ + clients/tests/test-client.check-on-disk/test_004-109.expected \ + clients/tests/test-client.check-on-disk/test_004-110.expected \ + clients/tests/test-client.check-on-disk/test_004-111.expected \ + clients/tests/test-client.check-on-disk/test_004-112.expected \ + clients/tests/test-client.check-on-disk/test_004-113.expected \ + clients/tests/test-client.check-on-disk/test_004-114.expected \ + clients/tests/test-client.check-on-disk/test_004-115.expected \ + clients/tests/test-client.check-on-disk/test_004-116.expected \ + clients/tests/test-client.check-on-disk/test_004-117.expected \ + clients/tests/test-client.check-on-disk/test_004-118.expected \ + clients/tests/test-client.check-on-disk/test_004-119.expected \ + clients/tests/test-client.check-on-disk/test_004-120.expected \ + clients/tests/test-client.check-on-disk/test_004-121.expected \ + clients/tests/test-client.check-on-disk/test_004-122.expected \ + clients/tests/test-client.check-on-disk/test_004-123.expected \ + clients/tests/test-client.check-on-disk/test_004-124.expected \ + clients/tests/test-client.check-on-disk/test_004-125.expected \ + clients/tests/test-client.check-on-disk/test_004-126.expected \ + clients/tests/test-client.check-on-disk/test_004-127.expected \ + clients/tests/test-client.check-on-disk/test_004-128.expected \ + clients/tests/test-client.check-on-disk/test_004-129.expected \ + clients/tests/test-client.check-on-disk/test_004-130.expected \ + clients/tests/test-client.check-on-disk/test_004-131.expected \ + clients/tests/test-client.check-on-disk/test_004-132.expected \ + clients/tests/test-client.check-on-disk/test_004-133.expected \ + clients/tests/test-client.check-on-disk/test_004-134.expected \ + clients/tests/test-client.check-on-disk/test_004-135.expected \ + clients/tests/test-client.check-on-disk/test_004-136.expected \ + clients/tests/test-client.check-on-disk/test_004-137.expected \ + clients/tests/test-client.check-on-disk/test_004-138.expected \ + clients/tests/test-client.check-on-disk/test_004-139.expected \ + clients/tests/test-client.check-on-disk/test_004-140.expected \ + clients/tests/test-client.check-on-disk/test_004-141.expected \ + clients/tests/test-client.check-on-disk/test_004-142.expected \ + clients/tests/test-client.check-on-disk/test_004-143.expected \ + clients/tests/test-client.check-on-disk/test_004-144.expected \ + clients/tests/test-client.check-on-disk/test_004-145.expected \ + clients/tests/test-client.check-on-disk/test_004-146.expected \ + clients/tests/test-client.check-on-disk/test_004-147.expected \ + clients/tests/test-client.check-on-disk/test_004-148.expected \ + clients/tests/test-client.check-on-disk/test_004-149.expected \ + clients/tests/test-client.check-on-disk/test_004-150.expected \ + clients/tests/test-client.check-on-disk/test_004-151.expected \ + clients/tests/test-client.check-on-disk/test_004-152.expected \ + clients/tests/test-client.check-on-disk/test_004-153.expected \ + clients/tests/test-client.check-on-disk/test_004-154.expected \ + clients/tests/test-client.check-on-disk/test_004-155.expected \ + clients/tests/test-client.check-on-disk/test_004-156.expected \ + clients/tests/test-client.check-on-disk/test_004-157.expected \ + clients/tests/test-client.check-on-disk/test_004-158.expected \ + clients/tests/test-client.check-on-disk/test_004-159.expected \ + clients/tests/test-client.check-on-disk/test_004-160.expected \ + clients/tests/test-client.check-on-disk/test_004-161.expected \ + clients/tests/test-client.check-on-disk/test_004-162.expected \ + clients/tests/test-client.check-on-disk/test_004-163.expected \ + clients/tests/test-client.check-on-disk/test_004-164.expected \ + clients/tests/test-client.check-on-disk/test_004-165.expected \ + clients/tests/test-client.check-on-disk/test_004-166.expected \ + clients/tests/test-client.check-on-disk/test_004-167.expected \ + clients/tests/test-client.check-on-disk/test_004-168.expected \ + clients/tests/test-client.check-on-disk/test_004-169.expected \ + clients/tests/test-client.check-on-disk/test_004-170.expected \ + clients/tests/test-client.check-on-disk/test_004-171.expected \ + clients/tests/test-client.check-on-disk/test_004-172.expected \ + clients/tests/test-client.check-on-disk/test_004-173.expected \ + clients/tests/test-client.check-on-disk/test_004-174.expected \ + clients/tests/test-client.check-on-disk/test_004-175.expected \ + clients/tests/test-client.check-on-disk/test_004-176.expected \ + clients/tests/test-client.check-on-disk/test_004-177.expected \ + clients/tests/test-client.check-on-disk/test_004-178.expected \ + clients/tests/test-client.check-on-disk/test_004-179.expected \ + clients/tests/test-client.check-on-disk/test_004-180.expected \ + clients/tests/test-client.check-on-disk/test_004-181.expected \ + clients/tests/test-client.check-on-disk/test_004-182.expected \ + clients/tests/test-client.check-on-disk/test_004-183.expected \ + clients/tests/test-client.check-on-disk/test_004-184.expected \ + clients/tests/test-client.check-on-disk/test_004-185.expected \ + clients/tests/test-client.check-on-disk/test_004-186.expected \ + clients/tests/test-client.check-on-disk/test_004-187.expected \ + clients/tests/test-client.check-on-disk/test_004-188.expected \ + clients/tests/test-client.check-on-disk/test_004-189.expected \ + clients/tests/test-client.check-on-disk/test_004-190.expected \ + clients/tests/test-client.check-on-disk/test_004-191.expected \ + clients/tests/test-client.check-on-disk/test_004-192.expected \ + clients/tests/test-client.check-on-disk/test_004-193.expected \ + clients/tests/test-client.check-on-disk/test_004-194.expected \ + clients/tests/test-client.check-on-disk/test_004-195.expected \ + clients/tests/test-client.check-on-disk/test_004-196.expected \ + clients/tests/test-client.check-on-disk/test_004-197.expected \ + clients/tests/test-client.check-on-disk/test_004-198.expected \ + clients/tests/test-client.check-on-disk/test_004-199.expected \ + clients/tests/test-client.check-on-disk/test_004-200.expected \ + clients/tests/test-client.check-on-disk/test_004-201.expected \ + clients/tests/test-client.check-on-disk/test_004-202.expected \ + clients/tests/test-client.check-on-disk/test_004-203.expected \ + clients/tests/test-client.check-on-disk/test_004-204.expected \ $(NULL) diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected index 23f546bf..87620388 100644 --- a/clients/tests/test-client.check-on-disk/test_001-001.expected +++ b/clients/tests/test-client.check-on-disk/test_001-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:651:test_001()/1 +location: clients/tests/test-client.py:752:test_001()/1 cmd: $NMCLI lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-002.expected b/clients/tests/test-client.check-on-disk/test_001-002.expected index bcbb86ee..7d995122 100644 --- a/clients/tests/test-client.check-on-disk/test_001-002.expected +++ b/clients/tests/test-client.check-on-disk/test_001-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:651:test_001()/2 +location: clients/tests/test-client.py:752:test_001()/2 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-003.expected b/clients/tests/test-client.check-on-disk/test_001-003.expected index f08e8df7..1378170e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:653:test_001()/3 +location: clients/tests/test-client.py:754:test_001()/3 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-004.expected b/clients/tests/test-client.check-on-disk/test_001-004.expected index 1e01f6cd..3826df45 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:653:test_001()/4 +location: clients/tests/test-client.py:754:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected index c3ddbd52..0ce8a626 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:655:test_001()/5 +location: clients/tests/test-client.py:756:test_001()/5 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected index 6e1bbca1..52665c26 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:655:test_001()/6 +location: clients/tests/test-client.py:756:test_001()/6 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected index 759cfe56..c5b269f0 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:657:test_001()/7 +location: clients/tests/test-client.py:758:test_001()/7 cmd: $NMCLI bogus s lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected index ba4d941c..b7f5f04d 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:657:test_001()/8 +location: clients/tests/test-client.py:758:test_001()/8 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected index 2614409a..c762e51c 100644 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/9 +location: clients/tests/test-client.py:761:test_001()/9 cmd: $NMCLI general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected index 0c9f540f..677d7429 100644 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/10 +location: clients/tests/test-client.py:761:test_001()/10 cmd: $NMCLI general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected index fc6cc6b6..757a19cb 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/11 +location: clients/tests/test-client.py:761:test_001()/11 cmd: $NMCLI --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected index cb1793d2..6cca955c 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/12 +location: clients/tests/test-client.py:761:test_001()/12 cmd: $NMCLI --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-013.expected b/clients/tests/test-client.check-on-disk/test_001-013.expected index 1317ee13..82241f0e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-013.expected +++ b/clients/tests/test-client.check-on-disk/test_001-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/13 +location: clients/tests/test-client.py:761:test_001()/13 cmd: $NMCLI --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-014.expected b/clients/tests/test-client.check-on-disk/test_001-014.expected index 73e62b7e..f77108c9 100644 --- a/clients/tests/test-client.check-on-disk/test_001-014.expected +++ b/clients/tests/test-client.check-on-disk/test_001-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/14 +location: clients/tests/test-client.py:761:test_001()/14 cmd: $NMCLI --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-015.expected b/clients/tests/test-client.check-on-disk/test_001-015.expected index 426d9834..a7dc5316 100644 --- a/clients/tests/test-client.check-on-disk/test_001-015.expected +++ b/clients/tests/test-client.check-on-disk/test_001-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/15 +location: clients/tests/test-client.py:761:test_001()/15 cmd: $NMCLI --mode tabular general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-016.expected b/clients/tests/test-client.check-on-disk/test_001-016.expected index e501a8d3..4bb5a267 100644 --- a/clients/tests/test-client.check-on-disk/test_001-016.expected +++ b/clients/tests/test-client.check-on-disk/test_001-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/16 +location: clients/tests/test-client.py:761:test_001()/16 cmd: $NMCLI --mode tabular general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-017.expected b/clients/tests/test-client.check-on-disk/test_001-017.expected index ab38df97..c6010f4d 100644 --- a/clients/tests/test-client.check-on-disk/test_001-017.expected +++ b/clients/tests/test-client.check-on-disk/test_001-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/17 +location: clients/tests/test-client.py:761:test_001()/17 cmd: $NMCLI --mode tabular --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-018.expected b/clients/tests/test-client.check-on-disk/test_001-018.expected index 7bbf78f5..6d594751 100644 --- a/clients/tests/test-client.check-on-disk/test_001-018.expected +++ b/clients/tests/test-client.check-on-disk/test_001-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/18 +location: clients/tests/test-client.py:761:test_001()/18 cmd: $NMCLI --mode tabular --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-019.expected b/clients/tests/test-client.check-on-disk/test_001-019.expected index 23692b05..c2d8fa0e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-019.expected +++ b/clients/tests/test-client.check-on-disk/test_001-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/19 +location: clients/tests/test-client.py:761:test_001()/19 cmd: $NMCLI --mode tabular --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-020.expected b/clients/tests/test-client.check-on-disk/test_001-020.expected index b0987d67..b64e9233 100644 --- a/clients/tests/test-client.check-on-disk/test_001-020.expected +++ b/clients/tests/test-client.check-on-disk/test_001-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/20 +location: clients/tests/test-client.py:761:test_001()/20 cmd: $NMCLI --mode tabular --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-021.expected b/clients/tests/test-client.check-on-disk/test_001-021.expected index eb082c02..5320e865 100644 --- a/clients/tests/test-client.check-on-disk/test_001-021.expected +++ b/clients/tests/test-client.check-on-disk/test_001-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/21 +location: clients/tests/test-client.py:761:test_001()/21 cmd: $NMCLI --mode multiline general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-022.expected b/clients/tests/test-client.check-on-disk/test_001-022.expected index df002053..ba9c8e4d 100644 --- a/clients/tests/test-client.check-on-disk/test_001-022.expected +++ b/clients/tests/test-client.check-on-disk/test_001-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/22 +location: clients/tests/test-client.py:761:test_001()/22 cmd: $NMCLI --mode multiline general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-023.expected b/clients/tests/test-client.check-on-disk/test_001-023.expected index 55376eb9..ffcc9cb8 100644 --- a/clients/tests/test-client.check-on-disk/test_001-023.expected +++ b/clients/tests/test-client.check-on-disk/test_001-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/23 +location: clients/tests/test-client.py:761:test_001()/23 cmd: $NMCLI --mode multiline --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-024.expected b/clients/tests/test-client.check-on-disk/test_001-024.expected index 10b3b04c..a14523d8 100644 --- a/clients/tests/test-client.check-on-disk/test_001-024.expected +++ b/clients/tests/test-client.check-on-disk/test_001-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/24 +location: clients/tests/test-client.py:761:test_001()/24 cmd: $NMCLI --mode multiline --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-025.expected b/clients/tests/test-client.check-on-disk/test_001-025.expected index 687e62bf..1c8ee11f 100644 --- a/clients/tests/test-client.check-on-disk/test_001-025.expected +++ b/clients/tests/test-client.check-on-disk/test_001-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/25 +location: clients/tests/test-client.py:761:test_001()/25 cmd: $NMCLI --mode multiline --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-026.expected b/clients/tests/test-client.check-on-disk/test_001-026.expected index 1b01d876..2c11a85d 100644 --- a/clients/tests/test-client.check-on-disk/test_001-026.expected +++ b/clients/tests/test-client.check-on-disk/test_001-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:665:test_001()/26 +location: clients/tests/test-client.py:761:test_001()/26 cmd: $NMCLI --mode multiline --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-001.expected b/clients/tests/test-client.check-on-disk/test_002-001.expected index 5f3d7d6a..c952c9c9 100644 --- a/clients/tests/test-client.check-on-disk/test_002-001.expected +++ b/clients/tests/test-client.check-on-disk/test_002-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_002()/1 +location: clients/tests/test-client.py:766:test_002()/1 cmd: $NMCLI d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-002.expected b/clients/tests/test-client.check-on-disk/test_002-002.expected index 3bdc45e4..6b244d5e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-002.expected +++ b/clients/tests/test-client.check-on-disk/test_002-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_002()/2 +location: clients/tests/test-client.py:766:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected index e2e56101..f406aa70 100644 --- a/clients/tests/test-client.check-on-disk/test_002-003.expected +++ b/clients/tests/test-client.check-on-disk/test_002-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_002()/3 +location: clients/tests/test-client.py:768:test_002()/3 cmd: $NMCLI -f all d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected index 0e884ed0..b1cfa7ae 100644 --- a/clients/tests/test-client.check-on-disk/test_002-004.expected +++ b/clients/tests/test-client.check-on-disk/test_002-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_002()/4 +location: clients/tests/test-client.py:768:test_002()/4 cmd: $NMCLI -f all d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected index 3d1440ea..144b3908 100644 --- a/clients/tests/test-client.check-on-disk/test_002-005.expected +++ b/clients/tests/test-client.check-on-disk/test_002-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:674:test_002()/5 +location: clients/tests/test-client.py:770:test_002()/5 cmd: $NMCLI lang: C returncode: 0 @@ -6,23 +6,23 @@ stdout: 621 bytes >>> eth0: unavailable "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, hw + ethernet (virtual), 65:2E:D3:9E:0A:0D, hw eth1: unavailable "eth1" - ethernet (virtual), 1F:E6:D1:E6:1D:53, hw + ethernet (virtual), 47:D5:6B:65:FD:6A, hw wlan0: unavailable "wlan0" - wifi (virtual), 5A:88:5E:B6:90:40, hw + wifi (virtual), 3D:99:1D:8B:74:4D, hw wlan1: unavailable "wlan1" - wifi (virtual), 7C:D4:69:31:67:0B, hw + wifi (virtual), 99:09:77:FD:FE:1D, hw wlan1: unavailable "wlan1" - wifi (virtual), 41:21:6B:F3:C9:4A, hw + wifi (virtual), 5D:30:4A:EC:3F:61, hw DNS configuration: servers: 1.2.3.4 5.6.7.8 diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected index a676f62d..f1a229ba 100644 --- a/clients/tests/test-client.check-on-disk/test_002-006.expected +++ b/clients/tests/test-client.check-on-disk/test_002-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:674:test_002()/6 +location: clients/tests/test-client.py:770:test_002()/6 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 @@ -6,23 +6,23 @@ stdout: 684 bytes >>> eth0: niedostępne "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, sprzęt + ethernet (virtual), 65:2E:D3:9E:0A:0D, sprzęt eth1: niedostępne "eth1" - ethernet (virtual), 1F:E6:D1:E6:1D:53, sprzęt + ethernet (virtual), 47:D5:6B:65:FD:6A, sprzęt wlan0: niedostępne "wlan0" - wifi (virtual), 5A:88:5E:B6:90:40, sprzęt + wifi (virtual), 3D:99:1D:8B:74:4D, sprzęt wlan1: niedostępne "wlan1" - wifi (virtual), 7C:D4:69:31:67:0B, sprzęt + wifi (virtual), 99:09:77:FD:FE:1D, sprzęt wlan1: niedostępne "wlan1" - wifi (virtual), 41:21:6B:F3:C9:4A, sprzęt + wifi (virtual), 5D:30:4A:EC:3F:61, sprzęt DNS configuration: servers: 1.2.3.4 5.6.7.8 diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected index 780e7f6e..e522a6bc 100644 --- a/clients/tests/test-client.check-on-disk/test_002-007.expected +++ b/clients/tests/test-client.check-on-disk/test_002-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:676:test_002()/7 +location: clients/tests/test-client.py:772:test_002()/7 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 @@ -9,24 +9,24 @@ AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infra AP[1].CHAN: 1 AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** +AP[1].SIGNAL: 55 +AP[1].BARS: ** AP[1].SECURITY: WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infra AP[2].CHAN: 1 AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 44 +AP[2].BARS: ** AP[2].SECURITY: WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-2 AP[3].MODE: Infra AP[3].CHAN: 1 AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 34 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 <<< diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected index c605e8e7..9fb89b1a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-008.expected +++ b/clients/tests/test-client.check-on-disk/test_002-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:676:test_002()/8 +location: clients/tests/test-client.py:772:test_002()/8 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9,24 +9,24 @@ AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infrastruktura AP[1].CHAN: 1 AP[1].RATE: 54 Mb/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** +AP[1].SIGNAL: 55 +AP[1].BARS: ** AP[1].SECURITY: WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infrastruktura AP[2].CHAN: 1 AP[2].RATE: 54 Mb/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 44 +AP[2].BARS: ** AP[2].SECURITY: WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-2 AP[3].MODE: Infrastruktura AP[3].CHAN: 1 AP[3].RATE: 54 Mb/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 34 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 <<< diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected index bd1bbe90..6db902aa 100644 --- a/clients/tests/test-client.check-on-disk/test_002-009.expected +++ b/clients/tests/test-client.check-on-disk/test_002-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:677:test_002()/9 +location: clients/tests/test-client.py:773:test_002()/9 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 @@ -12,26 +12,26 @@ AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infra AP[1].CHAN: 1 AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** +AP[1].SIGNAL: 55 +AP[1].BARS: ** AP[1].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infra AP[2].CHAN: 1 AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 44 +AP[2].BARS: ** AP[2].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-2 AP[3].MODE: Infra AP[3].CHAN: 1 AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 34 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected index d3c06c7b..fac540ea 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:677:test_002()/10 +location: clients/tests/test-client.py:773:test_002()/10 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -12,26 +12,26 @@ AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infrastruktura AP[1].CHAN: 1 AP[1].RATE: 54 Mb/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** +AP[1].SIGNAL: 55 +AP[1].BARS: ** AP[1].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infrastruktura AP[2].CHAN: 1 AP[2].RATE: 54 Mb/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 44 +AP[2].BARS: ** AP[2].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-2 AP[3].MODE: Infrastruktura AP[3].CHAN: 1 AP[3].RATE: 54 Mb/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 34 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index e943c114..1e7952d4 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:678:test_002()/11 +location: clients/tests/test-client.py:774:test_002()/11 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 @@ -9,24 +9,24 @@ AP[1].SSID:wlan0-ap-3 AP[1].MODE:Infra AP[1].CHAN:1 AP[1].RATE:54 Mbit/s -AP[1].SIGNAL:88 -AP[1].BARS:**** +AP[1].SIGNAL:55 +AP[1].BARS:** AP[1].SECURITY:WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 +AP[2].SSID:wlan0-ap-1 AP[2].MODE:Infra AP[2].CHAN:1 AP[2].RATE:54 Mbit/s -AP[2].SIGNAL:61 -AP[2].BARS:*** +AP[2].SIGNAL:44 +AP[2].BARS:** AP[2].SECURITY:WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 +AP[3].SSID:wlan0-ap-2 AP[3].MODE:Infra AP[3].CHAN:1 AP[3].RATE:54 Mbit/s -AP[3].SIGNAL:29 -AP[3].BARS:* +AP[3].SIGNAL:34 +AP[3].BARS:** AP[3].SECURITY:WPA1 WPA2 <<< diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index 6e3e5d56..8476e693 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:678:test_002()/12 +location: clients/tests/test-client.py:774:test_002()/12 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9,24 +9,24 @@ AP[1].SSID:wlan0-ap-3 AP[1].MODE:Infrastruktura AP[1].CHAN:1 AP[1].RATE:54 Mb/s -AP[1].SIGNAL:88 -AP[1].BARS:**** +AP[1].SIGNAL:55 +AP[1].BARS:** AP[1].SECURITY:WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 +AP[2].SSID:wlan0-ap-1 AP[2].MODE:Infrastruktura AP[2].CHAN:1 AP[2].RATE:54 Mb/s -AP[2].SIGNAL:61 -AP[2].BARS:*** +AP[2].SIGNAL:44 +AP[2].BARS:** AP[2].SECURITY:WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 +AP[3].SSID:wlan0-ap-2 AP[3].MODE:Infrastruktura AP[3].CHAN:1 AP[3].RATE:54 Mb/s -AP[3].SIGNAL:29 -AP[3].BARS:* +AP[3].SIGNAL:34 +AP[3].BARS:** AP[3].SECURITY:WPA1 WPA2 <<< diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index a649addd..58e22048 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:679:test_002()/13 +location: clients/tests/test-client.py:775:test_002()/13 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 stdout: 304 bytes >>> NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 +AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1 WPA2 +AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index d2a8a667..6d8126d6 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:679:test_002()/14 +location: clients/tests/test-client.py:775:test_002()/14 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 stdout: 338 bytes >>> NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 +AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 +AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 44 ** WPA1 WPA2 +AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index 1b28741f..3806f6b3 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:680:test_002()/15 +location: clients/tests/test-client.py:776:test_002()/15 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 @@ -9,9 +9,9 @@ stdout: 460 bytes ========================== NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ---------------------------------------------------------------------------- -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 +AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1 WPA2 +AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index a5970447..8eab1457 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:680:test_002()/16 +location: clients/tests/test-client.py:776:test_002()/16 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9,9 +9,9 @@ stdout: 530 bytes =================================== NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------------- -AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 +AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 +AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 44 ** WPA1 WPA2 +AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index 61499b6d..f0119718 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,12 +1,12 @@ -location: clients/tests/test-client.py:681:test_002()/17 +location: clients/tests/test-client.py:777:test_002()/17 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 stdout: 165 bytes >>> -AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2 +AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 +AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:** :WPA1 WPA2 +AP[3]: :wlan0-ap-2:Infra:1:54 Mbit/s:34:** :WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index bbac7a72..61528cb9 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,12 +1,12 @@ -location: clients/tests/test-client.py:681:test_002()/18 +location: clients/tests/test-client.py:777:test_002()/18 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 stdout: 192 bytes >>> -AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:29:* :WPA1 WPA2 +AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 +AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:** :WPA1 WPA2 +AP[3]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:34:** :WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected index 0bcc5e9d..a45f657a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,16 +1,16 @@ -location: clients/tests/test-client.py:683:test_002()/19 +location: clients/tests/test-client.py:779:test_002()/19 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 stdout: 1840 bytes >>> NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 -AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 -AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infra 1 2412 MHz 54 Mbit/s 44 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 +AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infra 1 2412 MHz 54 Mbit/s 38 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected index f433340e..cabc853d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,16 +1,16 @@ -location: clients/tests/test-client.py:683:test_002()/20 +location: clients/tests/test-client.py:779:test_002()/20 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 stdout: 1898 bytes >>> NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infrastruktura 1 2412 MHz 54 Mb/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 -AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infrastruktura 1 2412 MHz 54 Mb/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 -AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infrastruktura 1 2412 MHz 54 Mb/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infrastruktura 1 2412 MHz 54 Mb/s 44 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 +AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infrastruktura 1 2412 MHz 54 Mb/s 38 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected index 8dd7f647..fd5c1542 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:685:test_002()/21 +location: clients/tests/test-client.py:781:test_002()/21 cmd: $NMCLI c lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected index 25d7bed2..cea22e1d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:685:test_002()/22 +location: clients/tests/test-client.py:781:test_002()/22 cmd: $NMCLI c lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected index 43ce6419..60b138d3 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:687:test_002()/23 +location: clients/tests/test-client.py:783:test_002()/23 cmd: $NMCLI c s con-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected index a5b7bc4a..2527453f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:687:test_002()/24 +location: clients/tests/test-client.py:783:test_002()/24 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected index e131cb36..a83e8adf 100644 --- a/clients/tests/test-client.check-on-disk/test_003-001.expected +++ b/clients/tests/test-client.check-on-disk/test_003-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:697:test_003()/1 +location: clients/tests/test-client.py:793:test_003()/1 cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-002.expected b/clients/tests/test-client.check-on-disk/test_003-002.expected index 9c9cfb2d..fe5b3d79 100644 --- a/clients/tests/test-client.check-on-disk/test_003-002.expected +++ b/clients/tests/test-client.check-on-disk/test_003-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:700:test_003()/2 +location: clients/tests/test-client.py:796:test_003()/2 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-003.expected b/clients/tests/test-client.check-on-disk/test_003-003.expected index 882d1b4d..ef70c516 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:700:test_003()/3 +location: clients/tests/test-client.py:796:test_003()/3 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index 37c67f27..74844be8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:705:test_003()/4 +location: clients/tests/test-client.py:801:test_003()/4 cmd: $NMCLI c add type ethernet ifname '*' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected index 15ef586b..1a116f0e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:708:test_003()/5 +location: clients/tests/test-client.py:804:test_003()/5 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected index cd89b202..592b92e3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:708:test_003()/6 +location: clients/tests/test-client.py:804:test_003()/6 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected index c2e5a566..44ad7097 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:711:test_003()/7 +location: clients/tests/test-client.py:807:test_003()/7 cmd: $NMCLI -f ALL c s lang: C returncode: 0 -stdout: 912 bytes +stdout: 1108 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- -- /etc/NetworkManager/system-connections/ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index 1100563f..d9933f37 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:711:test_003()/8 +location: clients/tests/test-client.py:807:test_003()/8 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 -stdout: 912 bytes +stdout: 1108 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 nie -- -- -- -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 nie -- -- -- -- /etc/NetworkManager/system-connections/ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected index f3d9d292..5eb0bcae 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,8 +1,8 @@ -location: clients/tests/test-client.py:715:test_003()/9 +location: clients/tests/test-client.py:811:test_003()/9 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 -stdout: 64 bytes +stdout: 73 bytes >>> --active @@ -11,6 +11,7 @@ apath con-1 con-xx1 ethernet +filename help id path diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected index 86c4dea0..97792be6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,8 +1,8 @@ -location: clients/tests/test-client.py:715:test_003()/10 +location: clients/tests/test-client.py:811:test_003()/10 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 -stdout: 64 bytes +stdout: 73 bytes >>> --active @@ -11,6 +11,7 @@ apath con-1 con-xx1 ethernet +filename help id path diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected index 3da70bbf..2e792875 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:728:test_003()/11 +location: clients/tests/test-client.py:824:test_003()/11 cmd: $NMCLI con up ethernet ifname eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected index 810ffc8b..0902837e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:731:test_003()/12 +location: clients/tests/test-client.py:827:test_003()/12 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected index b17bbf28..458cfde5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:731:test_003()/13 +location: clients/tests/test-client.py:827:test_003()/13 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected index da785a2c..10a90fee 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:734:test_003()/14 +location: clients/tests/test-client.py:830:test_003()/14 cmd: $NMCLI -f ALL con lang: C returncode: 0 -stdout: 1084 bytes +stdout: 1280 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected index ad645f8f..ea80926d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:734:test_003()/15 +location: clients/tests/test-client.py:830:test_003()/15 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 1088 bytes +stdout: 1284 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected index 8d68221f..b68edc98 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,87 +1,11 @@ -location: clients/tests/test-client.py:737:test_003()/16 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:833:test_003()/16 +cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 -stdout: 3516 bytes +stdout: 640 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected index 7e99138c..aa621f28 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,87 +1,11 @@ -location: clients/tests/test-client.py:737:test_003()/17 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:833:test_003()/17 +cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 -stdout: 3534 bytes +stdout: 642 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected index bc74883d..3d99a000 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,99 +1,11 @@ -location: clients/tests/test-client.py:740:test_003()/18 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:836:test_003()/18 +cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 -stdout: 4180 bytes +stdout: 196 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +ACTIVE-PATH DEVICE UUID +/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index 5e37312d..aabab154 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,99 +1,11 @@ -location: clients/tests/test-client.py:740:test_003()/19 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:836:test_003()/19 +cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 -stdout: 4201 bytes +stdout: 196 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +ACTIVE-PATH DEVICE UUID +/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index 513985a5..5575cca5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,19 +1,14 @@ -location: clients/tests/test-client.py:743:test_003()/20 -cmd: $NMCLI -f ALL dev s eth0 +location: clients/tests/test-client.py:839:test_003()/20 +cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 -stdout: 1056 bytes +stdout: 96 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +UUID NAME +UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected index 6809f290..4ff536cc 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,19 +1,14 @@ -location: clients/tests/test-client.py:743:test_003()/21 -cmd: $NMCLI -f ALL dev s eth0 +location: clients/tests/test-client.py:839:test_003()/21 +cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 -stdout: 1061 bytes +stdout: 96 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +UUID NAME +UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected index 57d4e4a8..18c83c0a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,39 +1,88 @@ -location: clients/tests/test-client.py:746:test_003()/22 -cmd: $NMCLI -f ALL dev show eth0 +location: clients/tests/test-client.py:842:test_003()/22 +cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 1487 bytes +stdout: 3559 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -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 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unknown -CAPABILITIES.CARRIER-DETECT: no -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: no -CAPABILITIES.SRIOV: no -WIRED-PROPERTIES.CARRIER: off -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected index 0455374f..94796450 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,39 +1,88 @@ -location: clients/tests/test-client.py:746:test_003()/23 -cmd: $NMCLI -f ALL dev show eth0 +location: clients/tests/test-client.py:842:test_003()/23 +cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 1510 bytes +stdout: 3577 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -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.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: nieznane -CAPABILITIES.CARRIER-DETECT: nie -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nie -CAPABILITIES.SRIOV: nie -WIRED-PROPERTIES.CARRIER: wyłączone -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected index b20a45d4..cf698874 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,10 +1,10 @@ -location: clients/tests/test-client.py:728:test_003()/24 -cmd: $NMCLI con up ethernet ifname eth1 +location: clients/tests/test-client.py:845:test_003()/24 +cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 -stdout: 106 bytes +stdout: 50 bytes >>> -Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) +GENERAL.STATE: activated <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index 3806099b..8e0eef21 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,13 +1,10 @@ -location: clients/tests/test-client.py:731:test_003()/25 -cmd: $NMCLI con -lang: C +location: clients/tests/test-client.py:845:test_003()/25 +cmd: $NMCLI -f GENERAL.STATE con s ethernet +lang: pl_PL.UTF-8 returncode: 0 -stdout: 264 bytes +stdout: 51 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +GENERAL.STATE: aktywowano <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index ee609134..c6639a34 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,13 +1,100 @@ -location: clients/tests/test-client.py:731:test_003()/26 -cmd: $NMCLI con -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:848:test_003()/26 +cmd: $NMCLI con s ethernet +lang: C returncode: 0 -stdout: 264 bytes +stdout: 4223 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index 96924a42..ad84cdb1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,13 +1,100 @@ -location: clients/tests/test-client.py:734:test_003()/27 -cmd: $NMCLI -f ALL con -lang: C +location: clients/tests/test-client.py:848:test_003()/27 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1084 bytes +stdout: 4245 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index 6065d1ea..c3f04638 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,16 +1,19 @@ -location: clients/tests/test-client.py:734:test_003()/28 -cmd: $NMCLI -f ALL con -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:851:test_003()/28 +cmd: $NMCLI -f ALL dev s eth0 +lang: C returncode: 0 -stdout: 1088 bytes +stdout: 1056 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index ebb89619..10688630 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,90 +1,19 @@ -location: clients/tests/test-client.py:737:test_003()/29 -cmd: $NMCLI -f ALL con s ethernet -lang: C +location: clients/tests/test-client.py:851:test_003()/29 +cmd: $NMCLI -f ALL dev s eth0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 3516 bytes +stdout: 1061 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index adf743d8..b9b9ad23 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,87 +1,64 @@ -location: clients/tests/test-client.py:737:test_003()/30 -cmd: $NMCLI -f ALL con s ethernet -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:854:test_003()/30 +cmd: $NMCLI -f ALL dev show eth0 +lang: C returncode: 0 -stdout: 3534 bytes +stdout: 3239 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index cbf57afc..29485ead 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -1,112 +1,64 @@ -location: clients/tests/test-client.py:740:test_003()/31 -cmd: $NMCLI con s ethernet -lang: C +location: clients/tests/test-client.py:854:test_003()/31 +cmd: $NMCLI -f ALL dev show eth0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 4845 bytes +stdout: 3262 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +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 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index e5d74a1b..8ce56ad7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,112 +1,64 @@ -location: clients/tests/test-client.py:740:test_003()/32 -cmd: $NMCLI con s ethernet -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:857:test_003()/32 +cmd: $NMCLI -f ALL -t dev show eth0 +lang: C returncode: 0 -stdout: 4869 bytes +stdout: 2011 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +GENERAL.DEVICE:eth0 +GENERAL.TYPE:ethernet +GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:C0:61:AE:26:4D:D7 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/eth0 +GENERAL.IP-IFACE: +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 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED:unknown +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no +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 +IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]:192.168.213.113 +IP4.DOMAIN[1]:sear4.foo4.bar +IP4.WINS[1]:192.168.156.115 +IP4.WINS[2]:192.168.8.33 +IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]:sear6.fo.x.y +IP6.DOMAIN[2]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index 46b70521..9b9ca5e1 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 @@ -1,19 +1,67 @@ -location: clients/tests/test-client.py:743:test_003()/33 -cmd: $NMCLI -f ALL dev s eth0 -lang: C +location: clients/tests/test-client.py:857:test_003()/33 +cmd: $NMCLI -f ALL -t dev show eth0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1056 bytes +stdout: 2034 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 -eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.DEVICE:eth0 +GENERAL.TYPE:ethernet +GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:C0:61:AE:26:4D:D7 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: +GENERAL.CONNECTION:ethernet +GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED:nieznane +CAPABILITIES.CARRIER-DETECT:nie +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:nie +CAPABILITIES.SRIOV:nie +WIRED-PROPERTIES.CARRIER:wyłączone +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 +IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]:192.168.213.113 +IP4.DOMAIN[1]:sear4.foo4.bar +IP4.WINS[1]:192.168.156.115 +IP4.WINS[2]:192.168.8.33 +IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]:sear6.fo.x.y +IP6.DOMAIN[2]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected index 77cc99fd..ab807e0d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-034.expected +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -1,19 +1,13 @@ -location: clients/tests/test-client.py:743:test_003()/34 -cmd: $NMCLI -f ALL dev s eth0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:824:test_003()/34 +cmd: $NMCLI con up ethernet ifname eth1 +lang: C returncode: 0 -stdout: 1061 bytes +stdout: 106 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 -eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected index ae928657..b1b60932 100644 --- a/clients/tests/test-client.check-on-disk/test_003-035.expected +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -1,39 +1,14 @@ -location: clients/tests/test-client.py:746:test_003()/35 -cmd: $NMCLI -f ALL dev show eth0 +location: clients/tests/test-client.py:827:test_003()/35 +cmd: $NMCLI con lang: C returncode: 0 -stdout: 1487 bytes +stdout: 330 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -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 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unknown -CAPABILITIES.CARRIER-DETECT: no -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: no -CAPABILITIES.SRIOV: no -WIRED-PROPERTIES.CARRIER: off -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected index 11b511f7..8cf42cf9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-036.expected +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -1,39 +1,14 @@ -location: clients/tests/test-client.py:746:test_003()/36 -cmd: $NMCLI -f ALL dev show eth0 +location: clients/tests/test-client.py:827:test_003()/36 +cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 -stdout: 1510 bytes +stdout: 330 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -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.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: nieznane -CAPABILITIES.CARRIER-DETECT: nie -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nie -CAPABILITIES.SRIOV: nie -WIRED-PROPERTIES.CARRIER: wyłączone -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected index 0346b310..2eebd4a4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-037.expected +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:755:test_003()/37 +location: clients/tests/test-client.py:830:test_003()/37 cmd: $NMCLI -f ALL con lang: C returncode: 0 -stdout: 1096 bytes +stdout: 1600 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected index 81c7c237..a6b4b459 100644 --- a/clients/tests/test-client.check-on-disk/test_003-038.expected +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:755:test_003()/38 +location: clients/tests/test-client.py:830:test_003()/38 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 1104 bytes +stdout: 1605 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected index 3640d0c9..337735b1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-039.expected +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -1,13 +1,12 @@ -location: clients/tests/test-client.py:758:test_003()/39 -cmd: $NMCLI -f UUID,TYPE con +location: clients/tests/test-client.py:833:test_003()/39 +cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 -stdout: 192 bytes +stdout: 960 bytes >>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected index fd263f55..97be1db4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-040.expected +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -1,13 +1,12 @@ -location: clients/tests/test-client.py:758:test_003()/40 -cmd: $NMCLI -f UUID,TYPE con +location: clients/tests/test-client.py:833:test_003()/40 +cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 -stdout: 192 bytes +stdout: 963 bytes >>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected index f61fb681..1fa2aa6f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-041.expected +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -1,15 +1,12 @@ -location: clients/tests/test-client.py:761:test_003()/41 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:836:test_003()/41 +cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 -stdout: 378 bytes +stdout: 294 bytes >>> -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet +ACTIVE-PATH DEVICE UUID +/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL +/org/freedesktop/NetworkManager/ActiveConnection/2 eth1 UUID-ethernet-REPLACED-REPLACED-REPL <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected index 6ea659e9..df90c8f5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-042.expected +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -1,15 +1,12 @@ -location: clients/tests/test-client.py:761:test_003()/42 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:836:test_003()/42 +cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 -stdout: 378 bytes +stdout: 294 bytes >>> -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet +ACTIVE-PATH DEVICE UUID +/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL +/org/freedesktop/NetworkManager/ActiveConnection/2 eth1 UUID-ethernet-REPLACED-REPLACED-REPL <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected index 8f5aeb70..afbe5ad2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-043.expected +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -1,15 +1,11 @@ -location: clients/tests/test-client.py:764:test_003()/43 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:839:test_003()/43 +cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 -stdout: 186 bytes +stdout: 96 bytes >>> -UUID:UUID-ethernet-REPLACED-REPLACED-REPL -TYPE:802-3-ethernet -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet +UUID NAME +UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected index fbe01dab..260cab53 100644 --- a/clients/tests/test-client.check-on-disk/test_003-044.expected +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -1,15 +1,11 @@ -location: clients/tests/test-client.py:764:test_003()/44 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:839:test_003()/44 +cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 -stdout: 186 bytes +stdout: 96 bytes >>> -UUID:UUID-ethernet-REPLACED-REPLACED-REPL -TYPE:802-3-ethernet -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet +UUID NAME +UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected index 5759e2f4..bd8a8306 100644 --- a/clients/tests/test-client.check-on-disk/test_003-045.expected +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -1,21 +1,88 @@ -location: clients/tests/test-client.py:767:test_003()/45 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:842:test_003()/45 +cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 835 bytes +stdout: 3559 bytes >>> -=============================================================================== - NetworkManager connection profiles -=============================================================================== -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected index d853d487..a5dad008 100644 --- a/clients/tests/test-client.check-on-disk/test_003-046.expected +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -1,21 +1,88 @@ -location: clients/tests/test-client.py:767:test_003()/46 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:842:test_003()/46 +cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 841 bytes +stdout: 3577 bytes >>> -=============================================================================== - Profile połączeń usługi NetworkManager -=============================================================================== -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected index 6522c7b2..0e555c10 100644 --- a/clients/tests/test-client.check-on-disk/test_003-047.expected +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -1,13 +1,12 @@ -location: clients/tests/test-client.py:770:test_003()/47 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:845:test_003()/47 +cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 -stdout: 192 bytes +stdout: 101 bytes >>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +GENERAL.STATE: activated + +GENERAL.STATE: activated <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected index 08d3ae95..60f33d71 100644 --- a/clients/tests/test-client.check-on-disk/test_003-048.expected +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -1,13 +1,12 @@ -location: clients/tests/test-client.py:770:test_003()/48 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:845:test_003()/48 +cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 192 bytes +stdout: 103 bytes >>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +GENERAL.STATE: aktywowano + +GENERAL.STATE: aktywowano <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected index 3f8f3060..30f80a57 100644 --- a/clients/tests/test-client.check-on-disk/test_003-049.expected +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -1,12 +1,113 @@ -location: clients/tests/test-client.py:773:test_003()/49 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:848:test_003()/49 +cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 156 bytes +stdout: 4888 bytes >>> -UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected index dea01fd2..892e7a8b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-050.expected +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -1,12 +1,113 @@ -location: clients/tests/test-client.py:773:test_003()/50 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:848:test_003()/50 +cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 156 bytes +stdout: 4914 bytes >>> -UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index 7e4dd471..2f2e7b11 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -1,20 +1,19 @@ -location: clients/tests/test-client.py:776:test_003()/51 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:851:test_003()/51 +cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 -stdout: 394 bytes +stdout: 1056 bytes >>> -====================================== - NetworkManager connection profiles -====================================== -UUID TYPE --------------------------------------------------------------------------------------- -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index 3d6c2eca..b9c637da 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -1,20 +1,19 @@ -location: clients/tests/test-client.py:776:test_003()/52 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:851:test_003()/52 +cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 414 bytes +stdout: 1061 bytes >>> -========================================== - Profile połączeń usługi NetworkManager -========================================== -UUID TYPE ------------------------------------------------------------------------------------------- -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected index dd92ec68..70ff8521 100644 --- a/clients/tests/test-client.check-on-disk/test_003-053.expected +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -1,112 +1,64 @@ -location: clients/tests/test-client.py:779:test_003()/53 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:854:test_003()/53 +cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 4848 bytes +stdout: 3239 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: deactivating -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected index 7379f872..9faf56e7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-054.expected +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -1,112 +1,64 @@ -location: clients/tests/test-client.py:779:test_003()/54 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:854:test_003()/54 +cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4872 bytes +stdout: 3262 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: deactivating -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +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 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected new file mode 100644 index 00000000..be42aa0c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-055.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:857:test_003()/55 +cmd: $NMCLI -f ALL -t dev show eth0 +lang: C +returncode: 0 +stdout: 2011 bytes +>>> +GENERAL.DEVICE:eth0 +GENERAL.TYPE:ethernet +GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:C0:61:AE:26:4D:D7 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/eth0 +GENERAL.IP-IFACE: +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 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED:unknown +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no +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 +IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]:192.168.213.113 +IP4.DOMAIN[1]:sear4.foo4.bar +IP4.WINS[1]:192.168.156.115 +IP4.WINS[2]:192.168.8.33 +IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]:sear6.fo.x.y +IP6.DOMAIN[2]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected new file mode 100644 index 00000000..021c75c5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-056.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:857:test_003()/56 +cmd: $NMCLI -f ALL -t dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2034 bytes +>>> +GENERAL.DEVICE:eth0 +GENERAL.TYPE:ethernet +GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:C0:61:AE:26:4D:D7 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: +GENERAL.CONNECTION:ethernet +GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED:nieznane +CAPABILITIES.CARRIER-DETECT:nie +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:nie +CAPABILITIES.SRIOV:nie +WIRED-PROPERTIES.CARRIER:wyłączone +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 +IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]:192.168.213.113 +IP4.DOMAIN[1]:sear4.foo4.bar +IP4.WINS[1]:192.168.156.115 +IP4.WINS[2]:192.168.8.33 +IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]:sear6.fo.x.y +IP6.DOMAIN[2]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected new file mode 100644 index 00000000..7b57d8ed --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-057.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:871:test_003()/57 +cmd: $NMCLI -f ALL con +lang: C +returncode: 0 +stdout: 1615 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected new file mode 100644 index 00000000..1b07c9bb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-058.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:871:test_003()/58 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1625 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected new file mode 100644 index 00000000..11cc3843 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-059.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:874:test_003()/59 +cmd: $NMCLI -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected new file mode 100644 index 00000000..aabea1f3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-060.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:874:test_003()/60 +cmd: $NMCLI -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected new file mode 100644 index 00000000..f6d8a47e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-061.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:877:test_003()/61 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: C +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected new file mode 100644 index 00000000..c668227d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-062.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:877:test_003()/62 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected new file mode 100644 index 00000000..5daafcf4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-063.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:880:test_003()/63 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: C +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected new file mode 100644 index 00000000..d5456e0f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-064.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:880:test_003()/64 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected new file mode 100644 index 00000000..e1e20172 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-065.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:883:test_003()/65 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: C +returncode: 0 +stdout: 835 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected new file mode 100644 index 00000000..7855e17d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-066.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:883:test_003()/66 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 841 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected new file mode 100644 index 00000000..3f210bcf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-067.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:886:test_003()/67 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: C +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected new file mode 100644 index 00000000..acc2f178 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-068.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:886:test_003()/68 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected new file mode 100644 index 00000000..f6087390 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-069.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:889:test_003()/69 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: C +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected new file mode 100644 index 00000000..93c8a80b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-070.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:889:test_003()/70 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected new file mode 100644 index 00000000..3fc1750e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-071.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:892:test_003()/71 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: C +returncode: 0 +stdout: 394 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected new file mode 100644 index 00000000..be79082d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-072.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:892:test_003()/72 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 414 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected new file mode 100644 index 00000000..64b9611d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-073.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:895:test_003()/73 +cmd: $NMCLI con s ethernet +lang: C +returncode: 0 +stdout: 4891 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected new file mode 100644 index 00000000..a775fdbd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-074.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:895:test_003()/74 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4918 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: dezaktywowanie +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected new file mode 100644 index 00000000..121cc2cc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-075.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:898:test_003()/75 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 4226 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected new file mode 100644 index 00000000..334ef37c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-076.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:898:test_003()/76 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4249 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: dezaktywowanie +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected new file mode 100644 index 00000000..cf08e7c4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-077.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:901:test_003()/77 +cmd: $NMCLI -f all dev show eth0 +lang: C +returncode: 0 +stdout: 3239 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected new file mode 100644 index 00000000..17ea8000 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-078.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:901:test_003()/78 +cmd: $NMCLI -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3262 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +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 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected new file mode 100644 index 00000000..4a682cd6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-079.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:871:test_003()/79 +cmd: $NMCLI -f ALL con +lang: C +returncode: 0 +stdout: 1615 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-080.expected b/clients/tests/test-client.check-on-disk/test_003-080.expected new file mode 100644 index 00000000..b5b47626 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-080.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:871:test_003()/80 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1625 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-081.expected b/clients/tests/test-client.check-on-disk/test_003-081.expected new file mode 100644 index 00000000..87012066 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-081.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:874:test_003()/81 +cmd: $NMCLI -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 144 bytes +>>> +UUID TYPE +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-082.expected b/clients/tests/test-client.check-on-disk/test_003-082.expected new file mode 100644 index 00000000..1929f72d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-082.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:874:test_003()/82 +cmd: $NMCLI -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 144 bytes +>>> +UUID TYPE +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-083.expected b/clients/tests/test-client.check-on-disk/test_003-083.expected new file mode 100644 index 00000000..ec76badf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-083.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:877:test_003()/83 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: C +returncode: 0 +stdout: 252 bytes +>>> +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-084.expected b/clients/tests/test-client.check-on-disk/test_003-084.expected new file mode 100644 index 00000000..e3c9d78c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-084.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:877:test_003()/84 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 252 bytes +>>> +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-085.expected b/clients/tests/test-client.check-on-disk/test_003-085.expected new file mode 100644 index 00000000..7a02730e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-085.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:880:test_003()/85 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: C +returncode: 0 +stdout: 124 bytes +>>> +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-086.expected b/clients/tests/test-client.check-on-disk/test_003-086.expected new file mode 100644 index 00000000..9f67f6cd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-086.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:880:test_003()/86 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 124 bytes +>>> +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-087.expected b/clients/tests/test-client.check-on-disk/test_003-087.expected new file mode 100644 index 00000000..f9e19176 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-087.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:883:test_003()/87 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: C +returncode: 0 +stdout: 629 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-088.expected b/clients/tests/test-client.check-on-disk/test_003-088.expected new file mode 100644 index 00000000..cf53fad4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-088.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:883:test_003()/88 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 635 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-089.expected b/clients/tests/test-client.check-on-disk/test_003-089.expected new file mode 100644 index 00000000..2ab37338 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-089.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:886:test_003()/89 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: C +returncode: 0 +stdout: 144 bytes +>>> +UUID TYPE +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-090.expected b/clients/tests/test-client.check-on-disk/test_003-090.expected new file mode 100644 index 00000000..ab212221 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-090.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:886:test_003()/90 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 144 bytes +>>> +UUID TYPE +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-091.expected b/clients/tests/test-client.check-on-disk/test_003-091.expected new file mode 100644 index 00000000..27e4804c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-091.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:889:test_003()/91 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: C +returncode: 0 +stdout: 104 bytes +>>> +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-092.expected b/clients/tests/test-client.check-on-disk/test_003-092.expected new file mode 100644 index 00000000..52510ea2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-092.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:889:test_003()/92 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 104 bytes +>>> +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-093.expected b/clients/tests/test-client.check-on-disk/test_003-093.expected new file mode 100644 index 00000000..69377419 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-093.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:892:test_003()/93 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: C +returncode: 0 +stdout: 346 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-094.expected b/clients/tests/test-client.check-on-disk/test_003-094.expected new file mode 100644 index 00000000..231dc84c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-094.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:892:test_003()/94 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 366 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-095.expected b/clients/tests/test-client.check-on-disk/test_003-095.expected new file mode 100644 index 00000000..1f441524 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-095.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:895:test_003()/95 +cmd: $NMCLI con s ethernet +lang: C +returncode: 10 +stdout: 0 bytes +>>> + +<<< +stderr: 46 bytes +>>> +Error: ethernet - no such connection profile. + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-096.expected b/clients/tests/test-client.check-on-disk/test_003-096.expected new file mode 100644 index 00000000..ef53f5c1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-096.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:895:test_003()/96 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 +returncode: 10 +stdout: 0 bytes +>>> + +<<< +stderr: 58 bytes +>>> +Błąd: ethernet — nie ma takiego profilu połączenia. + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-097.expected b/clients/tests/test-client.check-on-disk/test_003-097.expected new file mode 100644 index 00000000..7e47fd36 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-097.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:898:test_003()/97 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 667 bytes +>>> +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-098.expected b/clients/tests/test-client.check-on-disk/test_003-098.expected new file mode 100644 index 00000000..b503ad45 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-098.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:898:test_003()/98 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 672 bytes +>>> +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: dezaktywowanie +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-099.expected b/clients/tests/test-client.check-on-disk/test_003-099.expected new file mode 100644 index 00000000..b6a73bc9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-099.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:901:test_003()/99 +cmd: $NMCLI -f all dev show eth0 +lang: C +returncode: 0 +stdout: 3207 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-100.expected b/clients/tests/test-client.check-on-disk/test_003-100.expected new file mode 100644 index 00000000..2a214da9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-100.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:901:test_003()/100 +cmd: $NMCLI -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3230 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +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 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-001.expected b/clients/tests/test-client.check-on-disk/test_004-001.expected index 0723731d..59406c6a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-001.expected +++ b/clients/tests/test-client.check-on-disk/test_004-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:789:test_004()/1 +location: clients/tests/test-client.py:911:test_004()/1 cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-002.expected b/clients/tests/test-client.check-on-disk/test_004-002.expected index 37c88812..551fbbf3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-002.expected +++ b/clients/tests/test-client.check-on-disk/test_004-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:791:test_004()/2 +location: clients/tests/test-client.py:913:test_004()/2 cmd: $NMCLI connection mod con-xx1 ip.gateway '' lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_004-003.expected b/clients/tests/test-client.check-on-disk/test_004-003.expected index e76bb0bf..b88303a7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-003.expected +++ b/clients/tests/test-client.check-on-disk/test_004-003.expected @@ -1,12 +1,13 @@ -location: clients/tests/test-client.py:792:test_004()/3 +location: clients/tests/test-client.py:914:test_004()/3 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1 -lang: C -returncode: 0 +lang: pl_PL.UTF-8 +returncode: 1 stdout: 0 bytes >>> <<< -stderr: 0 bytes +stderr: 143 bytes >>> +Błąd: zmodyfikowanie połączenia „con-xx1” się nie powiodło: ipv4.gateway: gateway cannot be set if there are no addresses configured <<< diff --git a/clients/tests/test-client.check-on-disk/test_004-004.expected b/clients/tests/test-client.check-on-disk/test_004-004.expected index 17233cd1..786189b4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-004.expected +++ b/clients/tests/test-client.check-on-disk/test_004-004.expected @@ -1,12 +1,13 @@ -location: clients/tests/test-client.py:793:test_004()/4 +location: clients/tests/test-client.py:915:test_004()/4 cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99 lang: C -returncode: 0 +returncode: 1 stdout: 0 bytes >>> <<< -stderr: 0 bytes +stderr: 119 bytes >>> +Error: Failed to modify connection 'con-xx1': ipv6.gateway: gateway cannot be set if there are no addresses configured <<< diff --git a/clients/tests/test-client.check-on-disk/test_004-005.expected b/clients/tests/test-client.check-on-disk/test_004-005.expected index a4b0a592..35ac557c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-005.expected +++ b/clients/tests/test-client.check-on-disk/test_004-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:794:test_004()/5 +location: clients/tests/test-client.py:916:test_004()/5 cmd: $NMCLI connection mod con-xx1 802.abc '' lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_004-006.expected b/clients/tests/test-client.check-on-disk/test_004-006.expected index 9fd5fe42..16d6fbd9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-006.expected +++ b/clients/tests/test-client.check-on-disk/test_004-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:795:test_004()/6 +location: clients/tests/test-client.py:917:test_004()/6 cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-007.expected b/clients/tests/test-client.check-on-disk/test_004-007.expected new file mode 100644 index 00000000..390a5adb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-007.expected @@ -0,0 +1,12 @@ +location: clients/tests/test-client.py:918:test_004()/7 +cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128 +lang: C +returncode: 0 +stdout: 0 bytes +>>> + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-008.expected b/clients/tests/test-client.check-on-disk/test_004-008.expected new file mode 100644 index 00000000..c3a203b3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-008.expected @@ -0,0 +1,94 @@ +location: clients/tests/test-client.py:920:test_004()/8 +cmd: $NMCLI con s con-xx1 +lang: C +returncode: 0 +stdout: 3810 bytes +>>> +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.stable-id: -- +connection.type: 802-11-wireless +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-11-wireless.ssid: foobar +802-11-wireless.mode: infrastructure +802-11-wireless.band: a +802-11-wireless.channel: 0 +802-11-wireless.bssid: -- +802-11-wireless.rate: 0 +802-11-wireless.tx-power: 0 +802-11-wireless.mac-address: -- +802-11-wireless.cloned-mac-address: -- +802-11-wireless.generate-mac-address-mask:-- +802-11-wireless.mac-address-blacklist: -- +802-11-wireless.mac-address-randomization:default +802-11-wireless.mtu: auto +802-11-wireless.seen-bssids: -- +802-11-wireless.hidden: no +802-11-wireless.powersave: 0 (default) +802-11-wireless.wake-on-wlan: 0x1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: 192.168.77.5/24 +ipv4.gateway: -- +ipv4.routes: { ip = 2.3.4.5/32, nh = 192.168.77.1 } +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: 1:2:3:4::6/64 +ipv6.gateway: -- +ipv6.routes: { ip = 1:2:3:4:5:6:0:5/128 } +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-009.expected b/clients/tests/test-client.check-on-disk/test_004-009.expected new file mode 100644 index 00000000..fa5425d5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-009.expected @@ -0,0 +1,94 @@ +location: clients/tests/test-client.py:920:test_004()/9 +cmd: $NMCLI con s con-xx1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3828 bytes +>>> +connection.id: con-xx1 +connection.uuid: UUID-con-xx1-REPLACED-REPLACED-REPLA +connection.stable-id: -- +connection.type: 802-11-wireless +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-11-wireless.ssid: foobar +802-11-wireless.mode: infrastructure +802-11-wireless.band: a +802-11-wireless.channel: 0 +802-11-wireless.bssid: -- +802-11-wireless.rate: 0 +802-11-wireless.tx-power: 0 +802-11-wireless.mac-address: -- +802-11-wireless.cloned-mac-address: -- +802-11-wireless.generate-mac-address-mask:-- +802-11-wireless.mac-address-blacklist: -- +802-11-wireless.mac-address-randomization:default +802-11-wireless.mtu: automatyczne +802-11-wireless.seen-bssids: -- +802-11-wireless.hidden: nie +802-11-wireless.powersave: 0 (default) +802-11-wireless.wake-on-wlan: 0x1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: 192.168.77.5/24 +ipv4.gateway: -- +ipv4.routes: { ip = 2.3.4.5/32, nh = 192.168.77.1 } +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: 1:2:3:4::6/64 +ipv6.gateway: -- +ipv6.routes: { ip = 1:2:3:4:5:6:0:5/128 } +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-010.expected b/clients/tests/test-client.check-on-disk/test_004-010.expected new file mode 100644 index 00000000..67767097 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-010.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:927:test_004()/10 +cmd: $NMCLI connection add type vpn con-name con-vpn-1 ifname '*' vpn-type openvpn vpn.data 'key1 = val1, key2 = val2, key3=val3' +lang: C +returncode: 0 +stdout: 82 bytes +>>> +Connection 'con-vpn-1' (UUID-con-vpn-1-REPLACED-REPLACED-REP) successfully added. + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-011.expected b/clients/tests/test-client.check-on-disk/test_004-011.expected new file mode 100644 index 00000000..e1a02130 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-011.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:930:test_004()/11 +cmd: $NMCLI con s +lang: C +returncode: 0 +stdout: 268 bytes +>>> +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-012.expected b/clients/tests/test-client.check-on-disk/test_004-012.expected new file mode 100644 index 00000000..1cbf8837 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-012.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:930:test_004()/12 +cmd: $NMCLI con s +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 268 bytes +>>> +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-013.expected b/clients/tests/test-client.check-on-disk/test_004-013.expected new file mode 100644 index 00000000..21461acf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-013.expected @@ -0,0 +1,83 @@ +location: clients/tests/test-client.py:932:test_004()/13 +cmd: $NMCLI con s con-vpn-1 +lang: C +returncode: 0 +stdout: 3274 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: no +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-014.expected b/clients/tests/test-client.check-on-disk/test_004-014.expected new file mode 100644 index 00000000..7bf49cc8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-014.expected @@ -0,0 +1,83 @@ +location: clients/tests/test-client.py:932:test_004()/14 +cmd: $NMCLI con s con-vpn-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3284 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: nie +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-015.expected b/clients/tests/test-client.check-on-disk/test_004-015.expected new file mode 100644 index 00000000..58120e7a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-015.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:934:test_004()/15 +cmd: $NMCLI con up con-xx1 +lang: C +returncode: 0 +stdout: 106 bytes +>>> +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/1) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-016.expected b/clients/tests/test-client.check-on-disk/test_004-016.expected new file mode 100644 index 00000000..31e9dd61 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-016.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:936:test_004()/16 +cmd: $NMCLI con s +lang: C +returncode: 0 +stdout: 268 bytes +>>> +NAME UUID TYPE DEVICE +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi wlan0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-017.expected b/clients/tests/test-client.check-on-disk/test_004-017.expected new file mode 100644 index 00000000..9f9df61c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-017.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:936:test_004()/17 +cmd: $NMCLI con s +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 268 bytes +>>> +NAME UUID TYPE DEVICE +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi wlan0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-018.expected b/clients/tests/test-client.check-on-disk/test_004-018.expected new file mode 100644 index 00000000..b023ae6a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-018.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:938:test_004()/18 +cmd: $NMCLI con up con-vpn-1 +lang: C +returncode: 0 +stdout: 106 bytes +>>> +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-019.expected b/clients/tests/test-client.check-on-disk/test_004-019.expected new file mode 100644 index 00000000..23c25b7f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-019.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:940:test_004()/19 +cmd: $NMCLI con s +lang: C +returncode: 0 +stdout: 268 bytes +>>> +NAME UUID TYPE DEVICE +con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn wlan0 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi wlan0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-020.expected b/clients/tests/test-client.check-on-disk/test_004-020.expected new file mode 100644 index 00000000..68c7fad3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-020.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:940:test_004()/20 +cmd: $NMCLI con s +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 268 bytes +>>> +NAME UUID TYPE DEVICE +con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP vpn wlan0 +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA wifi wlan0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-021.expected b/clients/tests/test-client.check-on-disk/test_004-021.expected new file mode 100644 index 00000000..52d951c8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-021.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:942:test_004()/21 +cmd: $NMCLI con s con-vpn-1 +lang: C +returncode: 0 +stdout: 4356 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: no +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: yes +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- +VPN.TYPE: openvpn +VPN.USERNAME: -- +VPN.GATEWAY: -- +VPN.BANNER: *** VPN connection con-vpn-1 *** +VPN.VPN-STATE: 0 - unknown +VPN.CFG[1]: key1 = val1 +VPN.CFG[2]: key2 = val2 +VPN.CFG[3]: key3 = val3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-022.expected b/clients/tests/test-client.check-on-disk/test_004-022.expected new file mode 100644 index 00000000..50647263 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-022.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:942:test_004()/22 +cmd: $NMCLI con s con-vpn-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4370 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: nie +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: tak +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- +VPN.TYPE: openvpn +VPN.USERNAME: -- +VPN.GATEWAY: -- +VPN.BANNER: *** VPN connection con-vpn-1 *** +VPN.VPN-STATE: 0 - nieznane +VPN.CFG[1]: key1 = val1 +VPN.CFG[2]: key2 = val2 +VPN.CFG[3]: key3 = val3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-023.expected b/clients/tests/test-client.check-on-disk/test_004-023.expected new file mode 100644 index 00000000..8e94ab86 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-023.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:951:test_004()/23 +cmd: $NMCLI con s con-vpn-1 +lang: C +returncode: 0 +stdout: 4362 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: no +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: yes +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- +VPN.TYPE: openvpn +VPN.USERNAME: -- +VPN.GATEWAY: -- +VPN.BANNER: *** VPN connection con-vpn-1 *** +VPN.VPN-STATE: 5 - VPN connected +VPN.CFG[1]: key1 = val1 +VPN.CFG[2]: key2 = val2 +VPN.CFG[3]: key3 = val3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-024.expected b/clients/tests/test-client.check-on-disk/test_004-024.expected new file mode 100644 index 00000000..2787f179 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-024.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:951:test_004()/24 +cmd: $NMCLI con s con-vpn-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4380 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: nie +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: tak +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- +VPN.TYPE: openvpn +VPN.USERNAME: -- +VPN.GATEWAY: -- +VPN.BANNER: *** VPN connection con-vpn-1 *** +VPN.VPN-STATE: 5 - Połączono z VPN +VPN.CFG[1]: key1 = val1 +VPN.CFG[2]: key2 = val2 +VPN.CFG[3]: key3 = val3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-025.expected b/clients/tests/test-client.check-on-disk/test_004-025.expected new file mode 100644 index 00000000..e47e58fb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-025.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:953:test_004()/25 +cmd: $NMCLI -t con s con-vpn-1 +lang: C +returncode: 0 +stdout: 2131 bytes +>>> +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: +connection.type:vpn +connection.interface-name: +connection.autoconnect:yes +connection.autoconnect-priority:0 +connection.autoconnect-retries:-1 +connection.auth-retries:-1 +connection.timestamp:0 +connection.read-only:no +connection.permissions: +connection.zone: +connection.master: +connection.slave-type: +connection.autoconnect-slaves:-1 +connection.secondaries: +connection.gateway-ping-timeout:0 +connection.metered:unknown +connection.lldp:default +connection.mdns:-1 +ipv4.method:auto +ipv4.dns: +ipv4.dns-search: +ipv4.dns-options: +ipv4.dns-priority:0 +ipv4.addresses: +ipv4.gateway: +ipv4.routes: +ipv4.route-metric:-1 +ipv4.route-table:0 +ipv4.ignore-auto-routes:no +ipv4.ignore-auto-dns:no +ipv4.dhcp-client-id: +ipv4.dhcp-timeout:0 +ipv4.dhcp-send-hostname:yes +ipv4.dhcp-hostname: +ipv4.dhcp-fqdn: +ipv4.never-default:no +ipv4.may-fail:yes +ipv4.dad-timeout:-1 +ipv6.method:auto +ipv6.dns: +ipv6.dns-search: +ipv6.dns-options: +ipv6.dns-priority:0 +ipv6.addresses: +ipv6.gateway: +ipv6.routes: +ipv6.route-metric:-1 +ipv6.route-table:0 +ipv6.ignore-auto-routes:no +ipv6.ignore-auto-dns:no +ipv6.never-default:no +ipv6.may-fail:yes +ipv6.ip6-privacy:-1 +ipv6.addr-gen-mode:stable-privacy +ipv6.dhcp-duid: +ipv6.dhcp-send-hostname:yes +ipv6.dhcp-hostname: +ipv6.token: +vpn.service-type:org.freedesktop.NetworkManager.openvpn +vpn.user-name: +vpn.data:key1 = val1, key2 = val2, key3 = val3 +vpn.secrets:<hidden> +vpn.persistent:no +vpn.timeout:0 +proxy.method:none +proxy.browser-only:no +proxy.pac-url: +proxy.pac-script: +GENERAL.NAME:con-vpn-1 +GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES:wlan0 +GENERAL.STATE:activated +GENERAL.DEFAULT:no +GENERAL.DEFAULT6:no +GENERAL.SPEC-OBJECT: +GENERAL.VPN:yes +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: +GENERAL.MASTER-PATH: +VPN.TYPE:openvpn +VPN.USERNAME: +VPN.GATEWAY: +VPN.BANNER:*** VPN connection con-vpn-1 *** +VPN.VPN-STATE:5 - VPN connected +VPN.CFG[1]:key1 = val1 +VPN.CFG[2]:key2 = val2 +VPN.CFG[3]:key3 = val3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected new file mode 100644 index 00000000..6fea759f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-026.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:953:test_004()/26 +cmd: $NMCLI -t con s con-vpn-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2136 bytes +>>> +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: +connection.type:vpn +connection.interface-name: +connection.autoconnect:yes +connection.autoconnect-priority:0 +connection.autoconnect-retries:-1 +connection.auth-retries:-1 +connection.timestamp:0 +connection.read-only:no +connection.permissions: +connection.zone: +connection.master: +connection.slave-type: +connection.autoconnect-slaves:-1 +connection.secondaries: +connection.gateway-ping-timeout:0 +connection.metered:unknown +connection.lldp:default +connection.mdns:-1 +ipv4.method:auto +ipv4.dns: +ipv4.dns-search: +ipv4.dns-options: +ipv4.dns-priority:0 +ipv4.addresses: +ipv4.gateway: +ipv4.routes: +ipv4.route-metric:-1 +ipv4.route-table:0 +ipv4.ignore-auto-routes:no +ipv4.ignore-auto-dns:no +ipv4.dhcp-client-id: +ipv4.dhcp-timeout:0 +ipv4.dhcp-send-hostname:yes +ipv4.dhcp-hostname: +ipv4.dhcp-fqdn: +ipv4.never-default:no +ipv4.may-fail:yes +ipv4.dad-timeout:-1 +ipv6.method:auto +ipv6.dns: +ipv6.dns-search: +ipv6.dns-options: +ipv6.dns-priority:0 +ipv6.addresses: +ipv6.gateway: +ipv6.routes: +ipv6.route-metric:-1 +ipv6.route-table:0 +ipv6.ignore-auto-routes:no +ipv6.ignore-auto-dns:no +ipv6.never-default:no +ipv6.may-fail:yes +ipv6.ip6-privacy:-1 +ipv6.addr-gen-mode:stable-privacy +ipv6.dhcp-duid: +ipv6.dhcp-send-hostname:yes +ipv6.dhcp-hostname: +ipv6.token: +vpn.service-type:org.freedesktop.NetworkManager.openvpn +vpn.user-name: +vpn.data:key1 = val1, key2 = val2, key3 = val3 +vpn.secrets:<hidden> +vpn.persistent:no +vpn.timeout:0 +proxy.method:none +proxy.browser-only:no +proxy.pac-url: +proxy.pac-script: +GENERAL.NAME:con-vpn-1 +GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES:wlan0 +GENERAL.STATE:activated +GENERAL.DEFAULT:no +GENERAL.DEFAULT6:no +GENERAL.SPEC-OBJECT: +GENERAL.VPN:yes +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: +GENERAL.MASTER-PATH: +VPN.TYPE:openvpn +VPN.USERNAME: +VPN.GATEWAY: +VPN.BANNER:*** VPN connection con-vpn-1 *** +VPN.VPN-STATE:5 - Połączono z VPN +VPN.CFG[1]:key1 = val1 +VPN.CFG[2]:key2 = val2 +VPN.CFG[3]:key3 = val3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-027.expected b/clients/tests/test-client.check-on-disk/test_004-027.expected new file mode 100644 index 00000000..d91e4064 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-027.expected @@ -0,0 +1,83 @@ +location: clients/tests/test-client.py:956:test_004()/27 +cmd: $NMCLI -f ALL con s con-vpn-1 +lang: C +returncode: 0 +stdout: 3274 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: no +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-028.expected b/clients/tests/test-client.check-on-disk/test_004-028.expected new file mode 100644 index 00000000..41d3c1fd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-028.expected @@ -0,0 +1,83 @@ +location: clients/tests/test-client.py:956:test_004()/28 +cmd: $NMCLI -f ALL con s con-vpn-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3284 bytes +>>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: nie +vpn.timeout: 0 +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-029.expected b/clients/tests/test-client.check-on-disk/test_004-029.expected new file mode 100644 index 00000000..06924df3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-029.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:962:test_004()/29 +cmd: $NMCLI -f VPN con s con-vpn-1 +lang: C +returncode: 0 +stdout: 334 bytes +>>> +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: no +vpn.timeout: 0 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-030.expected b/clients/tests/test-client.check-on-disk/test_004-030.expected new file mode 100644 index 00000000..5c785eae --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-030.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:962:test_004()/30 +cmd: $NMCLI -f VPN con s con-vpn-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 335 bytes +>>> +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: <hidden> +vpn.persistent: nie +vpn.timeout: 0 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-031.expected b/clients/tests/test-client.check-on-disk/test_004-031.expected new file mode 100644 index 00000000..916142dc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-031.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:965:test_004()/31 +cmd: $NMCLI -f GENERAL con s con-vpn-1 +lang: C +returncode: 0 +stdout: 667 bytes +>>> +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: yes +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-032.expected b/clients/tests/test-client.check-on-disk/test_004-032.expected new file mode 100644 index 00000000..1d16a406 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-032.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:965:test_004()/32 +cmd: $NMCLI -f GENERAL con s con-vpn-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 670 bytes +>>> +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: tak +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected new file mode 100644 index 00000000..52f0fcb2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-033.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:968:test_004()/33 +cmd: $NMCLI dev show wlan0 +lang: C +returncode: 0 +stdout: 1363 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected new file mode 100644 index 00000000..d76c2219 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-034.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:968:test_004()/34 +cmd: $NMCLI dev show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1364 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected new file mode 100644 index 00000000..be2917f3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-035.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:971:test_004()/35 +cmd: $NMCLI -f all dev show wlan0 +lang: C +returncode: 0 +stdout: 4600 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected new file mode 100644 index 00000000..7b58b747 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-036.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:971:test_004()/36 +cmd: $NMCLI -f all dev show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4643 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +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 +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-037.expected b/clients/tests/test-client.check-on-disk/test_004-037.expected new file mode 100644 index 00000000..a241b7cc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-037.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:974:test_004()/37 +cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 +lang: C +returncode: 0 +stdout: 1679 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +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-038.expected b/clients/tests/test-client.check-on-disk/test_004-038.expected new file mode 100644 index 00000000..01082f55 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-038.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:974:test_004()/38 +cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1691 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +GENERAL.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 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-039.expected b/clients/tests/test-client.check-on-disk/test_004-039.expected new file mode 100644 index 00000000..a5c17fb5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-039.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:977:test_004()/39 +cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 +lang: C +returncode: 0 +stdout: 931 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: +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 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:unknown +GENERAL.HWADDR:13:E0:74:85:7C:D9 +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-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected new file mode 100644 index 00000000..ce0760f8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-040.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:977: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 +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:nieznane +GENERAL.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 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-041.expected b/clients/tests/test-client.check-on-disk/test_004-041.expected new file mode 100644 index 00000000..6ac14e54 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-041.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:980:test_004()/41 +cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev +lang: C +returncode: 0 +stdout: 366 bytes +>>> +DEVICE TYPE DBUS-PATH +eth0 ethernet /org/freedesktop/NetworkManager/Devices/1 +eth1 ethernet /org/freedesktop/NetworkManager/Devices/2 +wlan1 wifi /org/freedesktop/NetworkManager/Devices/4 +wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 +wlan0 wifi /org/freedesktop/NetworkManager/Devices/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-042.expected b/clients/tests/test-client.check-on-disk/test_004-042.expected new file mode 100644 index 00000000..1d2b2b73 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-042.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:980:test_004()/42 +cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 366 bytes +>>> +DEVICE TYPE DBUS-PATH +eth0 ethernet /org/freedesktop/NetworkManager/Devices/1 +eth1 ethernet /org/freedesktop/NetworkManager/Devices/2 +wlan1 wifi /org/freedesktop/NetworkManager/Devices/4 +wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 +wlan0 wifi /org/freedesktop/NetworkManager/Devices/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-043.expected b/clients/tests/test-client.check-on-disk/test_004-043.expected new file mode 100644 index 00000000..45d5c4f9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-043.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:984:test_004()/43 +cmd: $NMCLI -f ALL device wifi list +lang: C +returncode: 0 +stdout: 1840 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-044.expected b/clients/tests/test-client.check-on-disk/test_004-044.expected new file mode 100644 index 00000000..99e6fd35 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-044.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:984:test_004()/44 +cmd: $NMCLI -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1898 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-045.expected b/clients/tests/test-client.check-on-disk/test_004-045.expected new file mode 100644 index 00000000..94d8765e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-045.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:986:test_004()/45 +cmd: $NMCLI -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 472 bytes +>>> +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2 + +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 + wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2 + wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-046.expected b/clients/tests/test-client.check-on-disk/test_004-046.expected new file mode 100644 index 00000000..2ba69fe2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-046.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:986:test_004()/46 +cmd: $NMCLI -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 522 bytes +>>> +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2 + +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2 + wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2 + wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-047.expected b/clients/tests/test-client.check-on-disk/test_004-047.expected new file mode 100644 index 00000000..a7dc0a80 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-047.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:989:test_004()/47 +cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 1840 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-048.expected b/clients/tests/test-client.check-on-disk/test_004-048.expected new file mode 100644 index 00000000..1f81e9af --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-048.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:989:test_004()/48 +cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1898 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-049.expected b/clients/tests/test-client.check-on-disk/test_004-049.expected new file mode 100644 index 00000000..cd708d86 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-049.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:991:test_004()/49 +cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 568 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-050.expected b/clients/tests/test-client.check-on-disk/test_004-050.expected new file mode 100644 index 00000000..f12bbdeb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-050.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:991:test_004()/50 +cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 586 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-051.expected b/clients/tests/test-client.check-on-disk/test_004-051.expected new file mode 100644 index 00000000..f612088e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-051.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:993:test_004()/51 +cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 138 bytes +>>> +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-052.expected b/clients/tests/test-client.check-on-disk/test_004-052.expected new file mode 100644 index 00000000..9097d6b9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-052.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:993:test_004()/52 +cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 154 bytes +>>> +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-053.expected b/clients/tests/test-client.check-on-disk/test_004-053.expected new file mode 100644 index 00000000..a31c7b51 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-053.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:996:test_004()/53 +cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 568 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-054.expected b/clients/tests/test-client.check-on-disk/test_004-054.expected new file mode 100644 index 00000000..ce17c996 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-054.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:996:test_004()/54 +cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 586 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-055.expected b/clients/tests/test-client.check-on-disk/test_004-055.expected new file mode 100644 index 00000000..4dbf91d9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-055.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:998:test_004()/55 +cmd: $NMCLI -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 4600 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-056.expected b/clients/tests/test-client.check-on-disk/test_004-056.expected new file mode 100644 index 00000000..d106ea7f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-056.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:998:test_004()/56 +cmd: $NMCLI -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4643 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +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 +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-057.expected b/clients/tests/test-client.check-on-disk/test_004-057.expected new file mode 100644 index 00000000..5d1f25a6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-057.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:1000:test_004()/57 +cmd: $NMCLI -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 1363 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-058.expected b/clients/tests/test-client.check-on-disk/test_004-058.expected new file mode 100644 index 00000000..f3dfd3d7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-058.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:1000:test_004()/58 +cmd: $NMCLI -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1364 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-059.expected b/clients/tests/test-client.check-on-disk/test_004-059.expected new file mode 100644 index 00000000..806db142 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-059.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:1002:test_004()/59 +cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 4600 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-060.expected b/clients/tests/test-client.check-on-disk/test_004-060.expected new file mode 100644 index 00000000..e9f76f77 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-060.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:1002:test_004()/60 +cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4643 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +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 +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-061.expected b/clients/tests/test-client.check-on-disk/test_004-061.expected new file mode 100644 index 00000000..dcbd33b2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-061.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:984:test_004()/61 +cmd: $NMCLI --pretty -f ALL device wifi list +lang: C +returncode: 0 +stdout: 2872 bytes +>>> +=========================== + Wi-Fi scan list (wlan1) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +=========================== + Wi-Fi scan list (wlan1) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------- + +=========================== + Wi-Fi scan list (wlan0) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-062.expected b/clients/tests/test-client.check-on-disk/test_004-062.expected new file mode 100644 index 00000000..eb76554b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-062.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:984:test_004()/62 +cmd: $NMCLI --pretty -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3100 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-063.expected b/clients/tests/test-client.check-on-disk/test_004-063.expected new file mode 100644 index 00000000..7117753e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-063.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:986:test_004()/63 +cmd: $NMCLI --pretty -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 996 bytes +>>> +=========================== + Wi-Fi scan list (wlan1) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ + wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2 + +=========================== + Wi-Fi scan list (wlan1) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +----------------------------------------------------------------------------------- + +=========================== + Wi-Fi scan list (wlan0) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ + wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 + wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2 + wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-064.expected b/clients/tests/test-client.check-on-disk/test_004-064.expected new file mode 100644 index 00000000..1854e364 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-064.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:986:test_004()/64 +cmd: $NMCLI --pretty -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1216 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +-------------------------------------------------------------------------------------------------------------------- + wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2 + +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ + +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +-------------------------------------------------------------------------------------------------------------------- + wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2 + wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2 + wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-065.expected b/clients/tests/test-client.check-on-disk/test_004-065.expected new file mode 100644 index 00000000..90d8fcd0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-065.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:989:test_004()/65 +cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 2872 bytes +>>> +=========================== + Wi-Fi scan list (wlan1) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +=========================== + Wi-Fi scan list (wlan1) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------- + +=========================== + Wi-Fi scan list (wlan0) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-066.expected b/clients/tests/test-client.check-on-disk/test_004-066.expected new file mode 100644 index 00000000..a59f00ab --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-066.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:989:test_004()/66 +cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3100 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-067.expected b/clients/tests/test-client.check-on-disk/test_004-067.expected new file mode 100644 index 00000000..280d8da1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-067.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:991:test_004()/67 +cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 962 bytes +>>> +=========================== + Wi-Fi scan list (wlan0) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-068.expected b/clients/tests/test-client.check-on-disk/test_004-068.expected new file mode 100644 index 00000000..a89b9cd3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-068.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:991:test_004()/68 +cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1039 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-069.expected b/clients/tests/test-client.check-on-disk/test_004-069.expected new file mode 100644 index 00000000..04b8e2d7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-069.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:993:test_004()/69 +cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 317 bytes +>>> +=========================== + Wi-Fi scan list (wlan0) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ + wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-070.expected b/clients/tests/test-client.check-on-disk/test_004-070.expected new file mode 100644 index 00000000..35551dae --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-070.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:993:test_004()/70 +cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 392 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +-------------------------------------------------------------------------------------------------------------------- + wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-071.expected b/clients/tests/test-client.check-on-disk/test_004-071.expected new file mode 100644 index 00000000..40bdc2c4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-071.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:996:test_004()/71 +cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 962 bytes +>>> +=========================== + Wi-Fi scan list (wlan0) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-072.expected b/clients/tests/test-client.check-on-disk/test_004-072.expected new file mode 100644 index 00000000..36b40d5c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-072.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:996:test_004()/72 +cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1039 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-073.expected b/clients/tests/test-client.check-on-disk/test_004-073.expected new file mode 100644 index 00000000..2adc6c9d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-073.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:998:test_004()/73 +cmd: $NMCLI --pretty -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 5691 bytes +>>> +=============================================================================== + Device details (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +------------------------------------------------------------------------------- +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +------------------------------------------------------------------------------- +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +------------------------------------------------------------------------------- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-074.expected b/clients/tests/test-client.check-on-disk/test_004-074.expected new file mode 100644 index 00000000..6965edd5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-074.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:998:test_004()/74 +cmd: $NMCLI --pretty -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5741 bytes +>>> +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +------------------------------------------------------------------------------- +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +------------------------------------------------------------------------------- +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 +------------------------------------------------------------------------------- +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +------------------------------------------------------------------------------- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-075.expected b/clients/tests/test-client.check-on-disk/test_004-075.expected new file mode 100644 index 00000000..5830a481 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-075.expected @@ -0,0 +1,48 @@ +location: clients/tests/test-client.py:1000:test_004()/75 +cmd: $NMCLI --pretty -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 2294 bytes +>>> +=============================================================================== + Device details (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +------------------------------------------------------------------------------- +GENERAL.TYPE: wifi +------------------------------------------------------------------------------- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +------------------------------------------------------------------------------- +GENERAL.MTU: 0 +------------------------------------------------------------------------------- +GENERAL.STATE: 20 (unavailable) +------------------------------------------------------------------------------- +GENERAL.CONNECTION: con-vpn-1 +------------------------------------------------------------------------------- +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-076.expected b/clients/tests/test-client.check-on-disk/test_004-076.expected new file mode 100644 index 00000000..37321ce7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-076.expected @@ -0,0 +1,48 @@ +location: clients/tests/test-client.py:1000:test_004()/76 +cmd: $NMCLI --pretty -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2302 bytes +>>> +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +------------------------------------------------------------------------------- +GENERAL.TYPE: wifi +------------------------------------------------------------------------------- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +------------------------------------------------------------------------------- +GENERAL.MTU: 0 +------------------------------------------------------------------------------- +GENERAL.STATE: 20 (niedostępne) +------------------------------------------------------------------------------- +GENERAL.CONNECTION: con-vpn-1 +------------------------------------------------------------------------------- +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-077.expected b/clients/tests/test-client.check-on-disk/test_004-077.expected new file mode 100644 index 00000000..c3ba0db7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-077.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:1002:test_004()/77 +cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 5691 bytes +>>> +=============================================================================== + Device details (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +------------------------------------------------------------------------------- +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +------------------------------------------------------------------------------- +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +------------------------------------------------------------------------------- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-078.expected b/clients/tests/test-client.check-on-disk/test_004-078.expected new file mode 100644 index 00000000..65ff189b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-078.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:1002:test_004()/78 +cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5741 bytes +>>> +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +------------------------------------------------------------------------------- +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +------------------------------------------------------------------------------- +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 +------------------------------------------------------------------------------- +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +------------------------------------------------------------------------------- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-079.expected b/clients/tests/test-client.check-on-disk/test_004-079.expected new file mode 100644 index 00000000..f7dca469 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-079.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:984:test_004()/79 +cmd: $NMCLI --terse -f ALL device wifi list +lang: C +returncode: 0 +stdout: 1022 bytes +>>> +AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4 + + +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2 +AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1 +AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-080.expected b/clients/tests/test-client.check-on-disk/test_004-080.expected new file mode 100644 index 00000000..6efa34b1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-080.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:984:test_004()/80 +cmd: $NMCLI --terse -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1070 bytes +>>> +AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4 + + +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2 +AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1 +AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-081.expected b/clients/tests/test-client.check-on-disk/test_004-081.expected new file mode 100644 index 00000000..f4401bf9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-081.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:986:test_004()/81 +cmd: $NMCLI --terse -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 198 bytes +>>> + :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2 + + + :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 + :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2 + :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-082.expected b/clients/tests/test-client.check-on-disk/test_004-082.expected new file mode 100644 index 00000000..0554165f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-082.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:986:test_004()/82 +cmd: $NMCLI --terse -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 234 bytes +>>> + :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2 + + + :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 + :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 + :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-083.expected b/clients/tests/test-client.check-on-disk/test_004-083.expected new file mode 100644 index 00000000..4d818c03 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-083.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:989:test_004()/83 +cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 1022 bytes +>>> +AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4 + + +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2 +AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1 +AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-084.expected b/clients/tests/test-client.check-on-disk/test_004-084.expected new file mode 100644 index 00000000..73f41c6f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-084.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:989:test_004()/84 +cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1070 bytes +>>> +AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4 + + +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2 +AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1 +AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-085.expected b/clients/tests/test-client.check-on-disk/test_004-085.expected new file mode 100644 index 00000000..b9c3a91c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-085.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:991:test_004()/85 +cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 255 bytes +>>> +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-086.expected b/clients/tests/test-client.check-on-disk/test_004-086.expected new file mode 100644 index 00000000..353001b4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-086.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:991:test_004()/86 +cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 267 bytes +>>> +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-087.expected b/clients/tests/test-client.check-on-disk/test_004-087.expected new file mode 100644 index 00000000..ab8c0fa2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-087.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:993:test_004()/87 +cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 49 bytes +>>> + :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-088.expected b/clients/tests/test-client.check-on-disk/test_004-088.expected new file mode 100644 index 00000000..bb049d20 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-088.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:993:test_004()/88 +cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 58 bytes +>>> + :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-089.expected b/clients/tests/test-client.check-on-disk/test_004-089.expected new file mode 100644 index 00000000..3a365df9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-089.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:996:test_004()/89 +cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 255 bytes +>>> +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-090.expected b/clients/tests/test-client.check-on-disk/test_004-090.expected new file mode 100644 index 00000000..fcd8759a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-090.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:996:test_004()/90 +cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 267 bytes +>>> +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-091.expected b/clients/tests/test-client.check-on-disk/test_004-091.expected new file mode 100644 index 00000000..72d685f4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-091.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:998:test_004()/91 +cmd: $NMCLI --terse -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 2467 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: +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 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:unknown +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no +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:Infra +AP[1].CHAN:1 +AP[1].RATE:54 Mbit/s +AP[1].SIGNAL:92 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-1 +AP[2].MODE:Infra +AP[2].CHAN:1 +AP[2].RATE:54 Mbit/s +AP[2].SIGNAL:81 +AP[2].BARS:**** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-3 +AP[3].MODE:Infra +AP[3].CHAN:1 +AP[3].RATE:54 Mbit/s +AP[3].SIGNAL:55 +AP[3].BARS:** +AP[3].SECURITY:WPA1 WPA2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-092.expected b/clients/tests/test-client.check-on-disk/test_004-092.expected new file mode 100644 index 00000000..6f5fc275 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-092.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:998:test_004()/92 +cmd: $NMCLI --terse -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2510 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:nieznane +CAPABILITIES.CARRIER-DETECT:nie +CAPABILITIES.SPEED:nieznane +CAPABILITIES.IS-SOFTWARE:nie +CAPABILITIES.SRIOV:nie +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 +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-2 +AP[1].MODE:Infrastruktura +AP[1].CHAN:1 +AP[1].RATE:54 Mb/s +AP[1].SIGNAL:92 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-1 +AP[2].MODE:Infrastruktura +AP[2].CHAN:1 +AP[2].RATE:54 Mb/s +AP[2].SIGNAL:81 +AP[2].BARS:**** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-3 +AP[3].MODE:Infrastruktura +AP[3].CHAN:1 +AP[3].RATE:54 Mb/s +AP[3].SIGNAL:55 +AP[3].BARS:** +AP[3].SECURITY:WPA1 WPA2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-093.expected b/clients/tests/test-client.check-on-disk/test_004-093.expected new file mode 100644 index 00000000..4f50347e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-093.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:1000:test_004()/93 +cmd: $NMCLI --terse -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 739 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-094.expected b/clients/tests/test-client.check-on-disk/test_004-094.expected new file mode 100644 index 00000000..19fd92bd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-094.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:1000:test_004()/94 +cmd: $NMCLI --terse -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 740 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-095.expected b/clients/tests/test-client.check-on-disk/test_004-095.expected new file mode 100644 index 00000000..5f49d796 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-095.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:1002:test_004()/95 +cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 2467 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: +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 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:unknown +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no +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:Infra +AP[1].CHAN:1 +AP[1].RATE:54 Mbit/s +AP[1].SIGNAL:92 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-1 +AP[2].MODE:Infra +AP[2].CHAN:1 +AP[2].RATE:54 Mbit/s +AP[2].SIGNAL:81 +AP[2].BARS:**** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-3 +AP[3].MODE:Infra +AP[3].CHAN:1 +AP[3].RATE:54 Mbit/s +AP[3].SIGNAL:55 +AP[3].BARS:** +AP[3].SECURITY:WPA1 WPA2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-096.expected b/clients/tests/test-client.check-on-disk/test_004-096.expected new file mode 100644 index 00000000..2c46d66a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-096.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:1002:test_004()/96 +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 +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:nieznane +CAPABILITIES.CARRIER-DETECT:nie +CAPABILITIES.SPEED:nieznane +CAPABILITIES.IS-SOFTWARE:nie +CAPABILITIES.SRIOV:nie +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 +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-2 +AP[1].MODE:Infrastruktura +AP[1].CHAN:1 +AP[1].RATE:54 Mb/s +AP[1].SIGNAL:92 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-1 +AP[2].MODE:Infrastruktura +AP[2].CHAN:1 +AP[2].RATE:54 Mb/s +AP[2].SIGNAL:81 +AP[2].BARS:**** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-3 +AP[3].MODE:Infrastruktura +AP[3].CHAN:1 +AP[3].RATE:54 Mb/s +AP[3].SIGNAL:55 +AP[3].BARS:** +AP[3].SECURITY:WPA1 WPA2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-097.expected b/clients/tests/test-client.check-on-disk/test_004-097.expected new file mode 100644 index 00000000..780cc132 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-097.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:984:test_004()/97 +cmd: $NMCLI --mode tabular -f ALL device wifi list +lang: C +returncode: 0 +stdout: 1840 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-098.expected b/clients/tests/test-client.check-on-disk/test_004-098.expected new file mode 100644 index 00000000..a73f3c3b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-098.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:984:test_004()/98 +cmd: $NMCLI --mode tabular -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1898 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-099.expected b/clients/tests/test-client.check-on-disk/test_004-099.expected new file mode 100644 index 00000000..556fe66e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-099.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:986:test_004()/99 +cmd: $NMCLI --mode tabular -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 472 bytes +>>> +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2 + +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 + wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2 + wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-100.expected b/clients/tests/test-client.check-on-disk/test_004-100.expected new file mode 100644 index 00000000..ee2333c2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-100.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:986:test_004()/100 +cmd: $NMCLI --mode tabular -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 522 bytes +>>> +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2 + +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2 + wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2 + wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-101.expected b/clients/tests/test-client.check-on-disk/test_004-101.expected new file mode 100644 index 00000000..650df5df --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-101.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:989:test_004()/101 +cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 1840 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-102.expected b/clients/tests/test-client.check-on-disk/test_004-102.expected new file mode 100644 index 00000000..7119e041 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-102.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:989:test_004()/102 +cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1898 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-103.expected b/clients/tests/test-client.check-on-disk/test_004-103.expected new file mode 100644 index 00000000..3192bad6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-103.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:991:test_004()/103 +cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 568 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-104.expected b/clients/tests/test-client.check-on-disk/test_004-104.expected new file mode 100644 index 00000000..ce3e7650 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-104.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:991:test_004()/104 +cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 586 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-105.expected b/clients/tests/test-client.check-on-disk/test_004-105.expected new file mode 100644 index 00000000..1894b9bf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-105.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:993:test_004()/105 +cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 138 bytes +>>> +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-106.expected b/clients/tests/test-client.check-on-disk/test_004-106.expected new file mode 100644 index 00000000..ebcec5a3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-106.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:993:test_004()/106 +cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 154 bytes +>>> +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY + wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-107.expected b/clients/tests/test-client.check-on-disk/test_004-107.expected new file mode 100644 index 00000000..48a961f2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-107.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:996:test_004()/107 +cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 568 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-108.expected b/clients/tests/test-client.check-on-disk/test_004-108.expected new file mode 100644 index 00000000..53080dbf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-108.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:996:test_004()/108 +cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 586 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-109.expected b/clients/tests/test-client.check-on-disk/test_004-109.expected new file mode 100644 index 00000000..32398b7f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-109.expected @@ -0,0 +1,40 @@ +location: clients/tests/test-client.py:998:test_004()/109 +cmd: $NMCLI --mode tabular -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 2760 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES no unknown no no + +NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ +WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown + +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 +AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2 +AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP OPTION +DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-110.expected b/clients/tests/test-client.check-on-disk/test_004-110.expected new file mode 100644 index 00000000..ee54183e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-110.expected @@ -0,0 +1,40 @@ +location: clients/tests/test-client.py:998:test_004()/110 +cmd: $NMCLI --mode tabular -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2813 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES nie nieznane nie nie + +NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ +WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane + +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +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 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP OPTION +DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-111.expected b/clients/tests/test-client.check-on-disk/test_004-111.expected new file mode 100644 index 00000000..3e3a4a09 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-111.expected @@ -0,0 +1,38 @@ +location: clients/tests/test-client.py:1000:test_004()/111 +cmd: $NMCLI --mode tabular -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 980 bytes +>>> +DEVICE +wlan0 + +TYPE +wifi + +HWADDR +13:E0:74:85:7C:D9 + +MTU +0 + +STATE +20 (unavailable) + +CONNECTION +con-vpn-1 + +CON-PATH +/org/freedesktop/NetworkManager/ActiveConnection/2 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-112.expected b/clients/tests/test-client.check-on-disk/test_004-112.expected new file mode 100644 index 00000000..cd8fbc74 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-112.expected @@ -0,0 +1,38 @@ +location: clients/tests/test-client.py:1000:test_004()/112 +cmd: $NMCLI --mode tabular -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 981 bytes +>>> +DEVICE +wlan0 + +TYPE +wifi + +HWADDR +13:E0:74:85:7C:D9 + +MTU +0 + +STATE +20 (niedostępne) + +CONNECTION +con-vpn-1 + +CON-PATH +/org/freedesktop/NetworkManager/ActiveConnection/2 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-113.expected b/clients/tests/test-client.check-on-disk/test_004-113.expected new file mode 100644 index 00000000..ca0d2c76 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-113.expected @@ -0,0 +1,40 @@ +location: clients/tests/test-client.py:1002:test_004()/113 +cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 2760 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES no unknown no no + +NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ +WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown + +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 +AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2 +AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP OPTION +DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-114.expected b/clients/tests/test-client.check-on-disk/test_004-114.expected new file mode 100644 index 00000000..2fe34bc5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-114.expected @@ -0,0 +1,40 @@ +location: clients/tests/test-client.py:1002:test_004()/114 +cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2813 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES nie nieznane nie nie + +NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ +WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane + +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +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 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP OPTION +DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-115.expected b/clients/tests/test-client.check-on-disk/test_004-115.expected new file mode 100644 index 00000000..f35200a7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-115.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:984:test_004()/115 +cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list +lang: C +returncode: 0 +stdout: 2872 bytes +>>> +=========================== + Wi-Fi scan list (wlan1) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +=========================== + Wi-Fi scan list (wlan1) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------- + +=========================== + Wi-Fi scan list (wlan0) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-116.expected b/clients/tests/test-client.check-on-disk/test_004-116.expected new file mode 100644 index 00000000..b5dd6402 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-116.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:984:test_004()/116 +cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3100 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-117.expected b/clients/tests/test-client.check-on-disk/test_004-117.expected new file mode 100644 index 00000000..d4710204 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-117.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:986:test_004()/117 +cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 996 bytes +>>> +=========================== + Wi-Fi scan list (wlan1) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ + wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2 + +=========================== + Wi-Fi scan list (wlan1) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +----------------------------------------------------------------------------------- + +=========================== + Wi-Fi scan list (wlan0) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ + wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 + wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2 + wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-118.expected b/clients/tests/test-client.check-on-disk/test_004-118.expected new file mode 100644 index 00000000..7abe6c47 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-118.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:986:test_004()/118 +cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1216 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +-------------------------------------------------------------------------------------------------------------------- + wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2 + +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ + +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +-------------------------------------------------------------------------------------------------------------------- + wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2 + wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2 + wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-119.expected b/clients/tests/test-client.check-on-disk/test_004-119.expected new file mode 100644 index 00000000..e0adcfcc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-119.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:989:test_004()/119 +cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 2872 bytes +>>> +=========================== + Wi-Fi scan list (wlan1) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +=========================== + Wi-Fi scan list (wlan1) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------- + +=========================== + Wi-Fi scan list (wlan0) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-120.expected b/clients/tests/test-client.check-on-disk/test_004-120.expected new file mode 100644 index 00000000..5e7f5eb1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-120.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:989:test_004()/120 +cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3100 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-121.expected b/clients/tests/test-client.check-on-disk/test_004-121.expected new file mode 100644 index 00000000..70ce9ba9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-121.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:991:test_004()/121 +cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 962 bytes +>>> +=========================== + Wi-Fi scan list (wlan0) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-122.expected b/clients/tests/test-client.check-on-disk/test_004-122.expected new file mode 100644 index 00000000..19ab8aa1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-122.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:991:test_004()/122 +cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1039 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-123.expected b/clients/tests/test-client.check-on-disk/test_004-123.expected new file mode 100644 index 00000000..ab5a4e79 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-123.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:993:test_004()/123 +cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 317 bytes +>>> +=========================== + Wi-Fi scan list (wlan0) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ + wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-124.expected b/clients/tests/test-client.check-on-disk/test_004-124.expected new file mode 100644 index 00000000..6ca1cfce --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-124.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:993:test_004()/124 +cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 392 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +-------------------------------------------------------------------------------------------------------------------- + wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-125.expected b/clients/tests/test-client.check-on-disk/test_004-125.expected new file mode 100644 index 00000000..f412a3d8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-125.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:996:test_004()/125 +cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 962 bytes +>>> +=========================== + Wi-Fi scan list (wlan0) +=========================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-126.expected b/clients/tests/test-client.check-on-disk/test_004-126.expected new file mode 100644 index 00000000..58cb91aa --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-126.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:996:test_004()/126 +cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1039 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-127.expected b/clients/tests/test-client.check-on-disk/test_004-127.expected new file mode 100644 index 00000000..03585d90 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-127.expected @@ -0,0 +1,52 @@ +location: clients/tests/test-client.py:998:test_004()/127 +cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 4148 bytes +>>> +========================== + Device details (wlan0) +========================== +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +----------------------------------------------------------- +CAPABILITIES no unknown no no + +NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ +--------------------------------------------------------------------------- +WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown + +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +---------------------------------------------------------------------------- +AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 +AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2 +AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +GROUP OPTION +------------------------------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +----------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +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 new file mode 100644 index 00000000..be50cc17 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-128.expected @@ -0,0 +1,52 @@ +location: clients/tests/test-client.py:998:test_004()/128 +cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4246 bytes +>>> +=================================== + Informacje o urządzeniu (wlan0) +=================================== +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES nie nieznane nie nie + +NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ +----------------------------------------------------------------------------- +WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane + +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +----------------------------------------------------------------------------------- +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 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +GROUP OPTION +------------------------------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +----------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-129.expected b/clients/tests/test-client.check-on-disk/test_004-129.expected new file mode 100644 index 00000000..a9695c82 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-129.expected @@ -0,0 +1,50 @@ +location: clients/tests/test-client.py:1000:test_004()/129 +cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 1554 bytes +>>> +========================== + Device details (wlan0) +========================== +DEVICE +-------- +wlan0 + +TYPE +------ +wifi + +HWADDR +------------------- +13:E0:74:85:7C:D9 + +MTU +----- +0 + +STATE +------------------ +20 (unavailable) + +CONNECTION +------------ +con-vpn-1 + +CON-PATH +---------------------------------------------------- +/org/freedesktop/NetworkManager/ActiveConnection/2 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-130.expected b/clients/tests/test-client.check-on-disk/test_004-130.expected new file mode 100644 index 00000000..5ded3e2b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-130.expected @@ -0,0 +1,50 @@ +location: clients/tests/test-client.py:1000:test_004()/130 +cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1584 bytes +>>> +=================================== + Informacje o urządzeniu (wlan0) +=================================== +DEVICE +-------- +wlan0 + +TYPE +------ +wifi + +HWADDR +------------------- +13:E0:74:85:7C:D9 + +MTU +----- +0 + +STATE +------------------ +20 (niedostępne) + +CONNECTION +------------ +con-vpn-1 + +CON-PATH +---------------------------------------------------- +/org/freedesktop/NetworkManager/ActiveConnection/2 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-131.expected b/clients/tests/test-client.check-on-disk/test_004-131.expected new file mode 100644 index 00000000..7c7e20c4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-131.expected @@ -0,0 +1,52 @@ +location: clients/tests/test-client.py:1002:test_004()/131 +cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 4148 bytes +>>> +========================== + Device details (wlan0) +========================== +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +----------------------------------------------------------- +CAPABILITIES no unknown no no + +NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ +--------------------------------------------------------------------------- +WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown + +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +---------------------------------------------------------------------------- +AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2 +AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2 +AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +GROUP OPTION +------------------------------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +----------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 00000000..e3f6d262 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-132.expected @@ -0,0 +1,52 @@ +location: clients/tests/test-client.py:1002:test_004()/132 +cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4246 bytes +>>> +=================================== + Informacje o urządzeniu (wlan0) +=================================== +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES nie nieznane nie nie + +NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ +----------------------------------------------------------------------------- +WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane + +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +----------------------------------------------------------------------------------- +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 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79 + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +GROUP OPTION +------------------------------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +----------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-133.expected b/clients/tests/test-client.check-on-disk/test_004-133.expected new file mode 100644 index 00000000..48a5c30f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-133.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:984:test_004()/133 +cmd: $NMCLI --mode tabular --terse -f ALL device wifi list +lang: C +returncode: 0 +stdout: 1022 bytes +>>> +AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4 + + +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2 +AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1 +AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-134.expected b/clients/tests/test-client.check-on-disk/test_004-134.expected new file mode 100644 index 00000000..3d07f6b6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-134.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:984:test_004()/134 +cmd: $NMCLI --mode tabular --terse -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1070 bytes +>>> +AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4 + + +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2 +AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1 +AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-135.expected b/clients/tests/test-client.check-on-disk/test_004-135.expected new file mode 100644 index 00000000..0ca4d340 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-135.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:986:test_004()/135 +cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 198 bytes +>>> + :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2 + + + :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 + :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2 + :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-136.expected b/clients/tests/test-client.check-on-disk/test_004-136.expected new file mode 100644 index 00000000..cebd2975 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-136.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:986:test_004()/136 +cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 234 bytes +>>> + :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2 + + + :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 + :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2 + :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-137.expected b/clients/tests/test-client.check-on-disk/test_004-137.expected new file mode 100644 index 00000000..91db6a46 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-137.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:989:test_004()/137 +cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 1022 bytes +>>> +AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4 + + +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2 +AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1 +AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-138.expected b/clients/tests/test-client.check-on-disk/test_004-138.expected new file mode 100644 index 00000000..e3b0734d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-138.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:989:test_004()/138 +cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1070 bytes +>>> +AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4 + + +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2 +AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1 +AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-139.expected b/clients/tests/test-client.check-on-disk/test_004-139.expected new file mode 100644 index 00000000..0d77bad4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-139.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:991:test_004()/139 +cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 255 bytes +>>> +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-140.expected b/clients/tests/test-client.check-on-disk/test_004-140.expected new file mode 100644 index 00000000..453e4685 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-140.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:991:test_004()/140 +cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 267 bytes +>>> +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-141.expected b/clients/tests/test-client.check-on-disk/test_004-141.expected new file mode 100644 index 00000000..07347eb8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-141.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:993:test_004()/141 +cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 49 bytes +>>> + :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-142.expected b/clients/tests/test-client.check-on-disk/test_004-142.expected new file mode 100644 index 00000000..ea204e7c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-142.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:993:test_004()/142 +cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 58 bytes +>>> + :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-143.expected b/clients/tests/test-client.check-on-disk/test_004-143.expected new file mode 100644 index 00000000..e389a5a9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-143.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:996:test_004()/143 +cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 255 bytes +>>> +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-144.expected b/clients/tests/test-client.check-on-disk/test_004-144.expected new file mode 100644 index 00000000..566be378 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-144.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:996:test_004()/144 +cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 267 bytes +>>> +AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-145.expected b/clients/tests/test-client.check-on-disk/test_004-145.expected new file mode 100644 index 00000000..ff8735b0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-145.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:998:test_004()/145 +cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 1164 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:yes:yes:yes:yes:yes:yes:yes:unknown:unknown +AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 +AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2 +AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 +IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79 +DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 +IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 00000000..4110981f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-146.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:998:test_004()/146 +cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1207 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 +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 +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 +IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79 +DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 +IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-147.expected b/clients/tests/test-client.check-on-disk/test_004-147.expected new file mode 100644 index 00000000..ec43aefb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-147.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:1000:test_004()/147 +cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 446 bytes +>>> +wlan0 +wifi +13\:E0\:74\:85\:7C\:D9 +0 +20 (unavailable) +con-vpn-1 +/org/freedesktop/NetworkManager/ActiveConnection/2 +IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79 +IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-148.expected b/clients/tests/test-client.check-on-disk/test_004-148.expected new file mode 100644 index 00000000..79e266d3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-148.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:1000:test_004()/148 +cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 447 bytes +>>> +wlan0 +wifi +13\:E0\:74\:85\:7C\:D9 +0 +20 (niedostępne) +con-vpn-1 +/org/freedesktop/NetworkManager/ActiveConnection/2 +IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79 +IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-149.expected b/clients/tests/test-client.check-on-disk/test_004-149.expected new file mode 100644 index 00000000..f762f005 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-149.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:1002:test_004()/149 +cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 1164 bytes +>>> +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:yes:yes:yes:yes:yes:yes:yes:unknown:unknown +AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 +AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2 +AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 +IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79 +DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 +IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 00000000..68b97c69 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-150.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:1002:test_004()/150 +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 +>>> +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 +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 +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 +IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79 +DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7 +IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-151.expected b/clients/tests/test-client.check-on-disk/test_004-151.expected new file mode 100644 index 00000000..81040467 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-151.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:984:test_004()/151 +cmd: $NMCLI --mode multiline -f ALL device wifi list +lang: C +returncode: 0 +stdout: 3722 bytes +>>> +NAME: AP[1] +SSID: wlan1-ap-4 +SSID-HEX: 776C616E312D61702D34 +BSSID: 94:2B:E8:F6:D2:86 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan1 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4 + + +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +NAME: AP[2] +SSID: wlan0-ap-1 +SSID-HEX: 776C616E302D61702D31 +BSSID: 61:95:77:AC:1E:4C +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1 +NAME: AP[3] +SSID: wlan0-ap-3 +SSID-HEX: 776C616E302D61702D33 +BSSID: 9B:F6:B7:EC:97:76 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-152.expected b/clients/tests/test-client.check-on-disk/test_004-152.expected new file mode 100644 index 00000000..20fd9957 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-152.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:984:test_004()/152 +cmd: $NMCLI --mode multiline -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3770 bytes +>>> +NAME: AP[1] +SSID: wlan1-ap-4 +SSID-HEX: 776C616E312D61702D34 +BSSID: 94:2B:E8:F6:D2:86 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan1 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4 + + +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +NAME: AP[2] +SSID: wlan0-ap-1 +SSID-HEX: 776C616E302D61702D31 +BSSID: 61:95:77:AC:1E:4C +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1 +NAME: AP[3] +SSID: wlan0-ap-3 +SSID-HEX: 776C616E302D61702D33 +BSSID: 9B:F6:B7:EC:97:76 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-153.expected b/clients/tests/test-client.check-on-disk/test_004-153.expected new file mode 100644 index 00000000..2f536c69 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-153.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:986:test_004()/153 +cmd: $NMCLI --mode multiline -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 1478 bytes +>>> +IN-USE: +SSID: wlan1-ap-4 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 + + +IN-USE: +SSID: wlan0-ap-2 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +IN-USE: +SSID: wlan0-ap-1 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +IN-USE: +SSID: wlan0-ap-3 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-154.expected b/clients/tests/test-client.check-on-disk/test_004-154.expected new file mode 100644 index 00000000..03dd63d2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-154.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:986:test_004()/154 +cmd: $NMCLI --mode multiline -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1514 bytes +>>> +IN-USE: +SSID: wlan1-ap-4 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 + + +IN-USE: +SSID: wlan0-ap-2 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +IN-USE: +SSID: wlan0-ap-1 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +IN-USE: +SSID: wlan0-ap-3 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-155.expected b/clients/tests/test-client.check-on-disk/test_004-155.expected new file mode 100644 index 00000000..2eae8f16 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-155.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:989:test_004()/155 +cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 3722 bytes +>>> +NAME: AP[1] +SSID: wlan1-ap-4 +SSID-HEX: 776C616E312D61702D34 +BSSID: 94:2B:E8:F6:D2:86 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan1 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4 + + +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +NAME: AP[2] +SSID: wlan0-ap-1 +SSID-HEX: 776C616E302D61702D31 +BSSID: 61:95:77:AC:1E:4C +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1 +NAME: AP[3] +SSID: wlan0-ap-3 +SSID-HEX: 776C616E302D61702D33 +BSSID: 9B:F6:B7:EC:97:76 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-156.expected b/clients/tests/test-client.check-on-disk/test_004-156.expected new file mode 100644 index 00000000..3de2d740 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-156.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:989:test_004()/156 +cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3770 bytes +>>> +NAME: AP[1] +SSID: wlan1-ap-4 +SSID-HEX: 776C616E312D61702D34 +BSSID: 94:2B:E8:F6:D2:86 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan1 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4 + + +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +NAME: AP[2] +SSID: wlan0-ap-1 +SSID-HEX: 776C616E302D61702D31 +BSSID: 61:95:77:AC:1E:4C +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1 +NAME: AP[3] +SSID: wlan0-ap-3 +SSID-HEX: 776C616E302D61702D33 +BSSID: 9B:F6:B7:EC:97:76 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-157.expected b/clients/tests/test-client.check-on-disk/test_004-157.expected new file mode 100644 index 00000000..6bde4e05 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-157.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:991:test_004()/157 +cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 930 bytes +>>> +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-158.expected b/clients/tests/test-client.check-on-disk/test_004-158.expected new file mode 100644 index 00000000..4dda764a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-158.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:991:test_004()/158 +cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 942 bytes +>>> +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-159.expected b/clients/tests/test-client.check-on-disk/test_004-159.expected new file mode 100644 index 00000000..ab27a85c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-159.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:993:test_004()/159 +cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 369 bytes +>>> +IN-USE: +SSID: wlan0-ap-2 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-160.expected b/clients/tests/test-client.check-on-disk/test_004-160.expected new file mode 100644 index 00000000..7b86148d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-160.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:993:test_004()/160 +cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 378 bytes +>>> +IN-USE: +SSID: wlan0-ap-2 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-161.expected b/clients/tests/test-client.check-on-disk/test_004-161.expected new file mode 100644 index 00000000..144e13e0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-161.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:996:test_004()/161 +cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 930 bytes +>>> +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-162.expected b/clients/tests/test-client.check-on-disk/test_004-162.expected new file mode 100644 index 00000000..c494d837 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-162.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:996:test_004()/162 +cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 942 bytes +>>> +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-163.expected b/clients/tests/test-client.check-on-disk/test_004-163.expected new file mode 100644 index 00000000..342e916e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-163.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:998:test_004()/163 +cmd: $NMCLI --mode multiline -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 4600 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-164.expected b/clients/tests/test-client.check-on-disk/test_004-164.expected new file mode 100644 index 00000000..bd7da288 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-164.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:998:test_004()/164 +cmd: $NMCLI --mode multiline -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4643 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +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 +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-165.expected b/clients/tests/test-client.check-on-disk/test_004-165.expected new file mode 100644 index 00000000..b1c15fa7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-165.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:1000:test_004()/165 +cmd: $NMCLI --mode multiline -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 1363 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-166.expected b/clients/tests/test-client.check-on-disk/test_004-166.expected new file mode 100644 index 00000000..798a3c72 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-166.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:1000:test_004()/166 +cmd: $NMCLI --mode multiline -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1364 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-167.expected b/clients/tests/test-client.check-on-disk/test_004-167.expected new file mode 100644 index 00000000..47d0a820 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-167.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:1002:test_004()/167 +cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 4600 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-168.expected b/clients/tests/test-client.check-on-disk/test_004-168.expected new file mode 100644 index 00000000..0066041a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-168.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:1002:test_004()/168 +cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4643 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +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 +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-169.expected b/clients/tests/test-client.check-on-disk/test_004-169.expected new file mode 100644 index 00000000..8154f557 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-169.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:984:test_004()/169 +cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list +lang: C +returncode: 0 +stdout: 4678 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== +NAME: AP[1] +SSID: wlan1-ap-4 +SSID-HEX: 776C616E312D61702D34 +BSSID: 94:2B:E8:F6:D2:86 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan1 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4 +------------------------------------------------------------------------------- + +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== + +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +------------------------------------------------------------------------------- +NAME: AP[2] +SSID: wlan0-ap-1 +SSID-HEX: 776C616E302D61702D31 +BSSID: 61:95:77:AC:1E:4C +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1 +------------------------------------------------------------------------------- +NAME: AP[3] +SSID: wlan0-ap-3 +SSID-HEX: 776C616E302D61702D33 +BSSID: 9B:F6:B7:EC:97:76 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-170.expected b/clients/tests/test-client.check-on-disk/test_004-170.expected new file mode 100644 index 00000000..f9e7f80e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-170.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:984:test_004()/170 +cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4744 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== +NAME: AP[1] +SSID: wlan1-ap-4 +SSID-HEX: 776C616E312D61702D34 +BSSID: 94:2B:E8:F6:D2:86 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan1 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4 +------------------------------------------------------------------------------- + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +------------------------------------------------------------------------------- +NAME: AP[2] +SSID: wlan0-ap-1 +SSID-HEX: 776C616E302D61702D31 +BSSID: 61:95:77:AC:1E:4C +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1 +------------------------------------------------------------------------------- +NAME: AP[3] +SSID: wlan0-ap-3 +SSID-HEX: 776C616E302D61702D33 +BSSID: 9B:F6:B7:EC:97:76 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-171.expected b/clients/tests/test-client.check-on-disk/test_004-171.expected new file mode 100644 index 00000000..3f8b9ff3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-171.expected @@ -0,0 +1,59 @@ +location: clients/tests/test-client.py:986:test_004()/171 +cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 2434 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== +IN-USE: +SSID: wlan1-ap-4 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- + +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== + +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +IN-USE: +SSID: wlan0-ap-2 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IN-USE: +SSID: wlan0-ap-1 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IN-USE: +SSID: wlan0-ap-3 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-172.expected b/clients/tests/test-client.check-on-disk/test_004-172.expected new file mode 100644 index 00000000..c4589f47 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-172.expected @@ -0,0 +1,59 @@ +location: clients/tests/test-client.py:986:test_004()/172 +cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2488 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== +IN-USE: +SSID: wlan1-ap-4 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +IN-USE: +SSID: wlan0-ap-2 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IN-USE: +SSID: wlan0-ap-1 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IN-USE: +SSID: wlan0-ap-3 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-173.expected b/clients/tests/test-client.check-on-disk/test_004-173.expected new file mode 100644 index 00000000..d365b536 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-173.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:989:test_004()/173 +cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 4678 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== +NAME: AP[1] +SSID: wlan1-ap-4 +SSID-HEX: 776C616E312D61702D34 +BSSID: 94:2B:E8:F6:D2:86 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan1 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4 +------------------------------------------------------------------------------- + +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== + +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +------------------------------------------------------------------------------- +NAME: AP[2] +SSID: wlan0-ap-1 +SSID-HEX: 776C616E302D61702D31 +BSSID: 61:95:77:AC:1E:4C +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1 +------------------------------------------------------------------------------- +NAME: AP[3] +SSID: wlan0-ap-3 +SSID-HEX: 776C616E302D61702D33 +BSSID: 9B:F6:B7:EC:97:76 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-174.expected b/clients/tests/test-client.check-on-disk/test_004-174.expected new file mode 100644 index 00000000..359d92a6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-174.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:989:test_004()/174 +cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4744 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== +NAME: AP[1] +SSID: wlan1-ap-4 +SSID-HEX: 776C616E312D61702D34 +BSSID: 94:2B:E8:F6:D2:86 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 48 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan1 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4 +------------------------------------------------------------------------------- + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +------------------------------------------------------------------------------- +NAME: AP[2] +SSID: wlan0-ap-1 +SSID-HEX: 776C616E302D61702D31 +BSSID: 61:95:77:AC:1E:4C +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 81 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1 +------------------------------------------------------------------------------- +NAME: AP[3] +SSID: wlan0-ap-3 +SSID-HEX: 776C616E302D61702D33 +BSSID: 9B:F6:B7:EC:97:76 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 55 +BARS: ** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-175.expected b/clients/tests/test-client.check-on-disk/test_004-175.expected new file mode 100644 index 00000000..26f6204e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-175.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:991:test_004()/175 +cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 1222 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-176.expected b/clients/tests/test-client.check-on-disk/test_004-176.expected new file mode 100644 index 00000000..eff16cb8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-176.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:991:test_004()/176 +cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1240 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-177.expected b/clients/tests/test-client.check-on-disk/test_004-177.expected new file mode 100644 index 00000000..7b8b9000 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-177.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:993:test_004()/177 +cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 661 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +IN-USE: +SSID: wlan0-ap-2 +MODE: Infra +CHAN: 1 +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-178.expected b/clients/tests/test-client.check-on-disk/test_004-178.expected new file mode 100644 index 00000000..2597d073 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-178.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:993:test_004()/178 +cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 676 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +IN-USE: +SSID: wlan0-ap-2 +MODE: Infrastruktura +CHAN: 1 +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-179.expected b/clients/tests/test-client.check-on-disk/test_004-179.expected new file mode 100644 index 00000000..26bc0af2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-179.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:996:test_004()/179 +cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 1222 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infra +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mbit/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: no +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-180.expected b/clients/tests/test-client.check-on-disk/test_004-180.expected new file mode 100644 index 00000000..b2a13197 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-180.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:996:test_004()/180 +cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1240 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +NAME: AP[1] +SSID: wlan0-ap-2 +SSID-HEX: 776C616E302D61702D32 +BSSID: C0:E2:BE:E8:EF:B6 +MODE: Infrastruktura +CHAN: 1 +FREQ: 2412 MHz +RATE: 54 Mb/s +SIGNAL: 92 +BARS: **** +SECURITY: WPA1 WPA2 +WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE: wlan0 +ACTIVE: nie +IN-USE: +DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-181.expected b/clients/tests/test-client.check-on-disk/test_004-181.expected new file mode 100644 index 00000000..3b18e5b6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-181.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:998:test_004()/181 +cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 5691 bytes +>>> +=============================================================================== + Device details (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +------------------------------------------------------------------------------- +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +------------------------------------------------------------------------------- +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +------------------------------------------------------------------------------- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-182.expected b/clients/tests/test-client.check-on-disk/test_004-182.expected new file mode 100644 index 00000000..66d96e74 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-182.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:998:test_004()/182 +cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5741 bytes +>>> +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +------------------------------------------------------------------------------- +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +------------------------------------------------------------------------------- +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 +------------------------------------------------------------------------------- +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +------------------------------------------------------------------------------- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-183.expected b/clients/tests/test-client.check-on-disk/test_004-183.expected new file mode 100644 index 00000000..ac5627ed --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-183.expected @@ -0,0 +1,48 @@ +location: clients/tests/test-client.py:1000:test_004()/183 +cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 2294 bytes +>>> +=============================================================================== + Device details (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +------------------------------------------------------------------------------- +GENERAL.TYPE: wifi +------------------------------------------------------------------------------- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +------------------------------------------------------------------------------- +GENERAL.MTU: 0 +------------------------------------------------------------------------------- +GENERAL.STATE: 20 (unavailable) +------------------------------------------------------------------------------- +GENERAL.CONNECTION: con-vpn-1 +------------------------------------------------------------------------------- +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-184.expected b/clients/tests/test-client.check-on-disk/test_004-184.expected new file mode 100644 index 00000000..a7d2dfa2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-184.expected @@ -0,0 +1,48 @@ +location: clients/tests/test-client.py:1000:test_004()/184 +cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2302 bytes +>>> +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +------------------------------------------------------------------------------- +GENERAL.TYPE: wifi +------------------------------------------------------------------------------- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +------------------------------------------------------------------------------- +GENERAL.MTU: 0 +------------------------------------------------------------------------------- +GENERAL.STATE: 20 (niedostępne) +------------------------------------------------------------------------------- +GENERAL.CONNECTION: con-vpn-1 +------------------------------------------------------------------------------- +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-185.expected b/clients/tests/test-client.check-on-disk/test_004-185.expected new file mode 100644 index 00000000..ead7bffe --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-185.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:1002:test_004()/185 +cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 5691 bytes +>>> +=============================================================================== + Device details (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +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 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +------------------------------------------------------------------------------- +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +------------------------------------------------------------------------------- +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: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +------------------------------------------------------------------------------- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-186.expected b/clients/tests/test-client.check-on-disk/test_004-186.expected new file mode 100644 index 00000000..f09d09c6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-186.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:1002:test_004()/186 +cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5741 bytes +>>> +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +------------------------------------------------------------------------------- +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +------------------------------------------------------------------------------- +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 +------------------------------------------------------------------------------- +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-2 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 92 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-1 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 81 +AP[2].BARS: **** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-3 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 55 +AP[3].BARS: ** +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +------------------------------------------------------------------------------- +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +------------------------------------------------------------------------------- +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +------------------------------------------------------------------------------- +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 +------------------------------------------------------------------------------- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-187.expected b/clients/tests/test-client.check-on-disk/test_004-187.expected new file mode 100644 index 00000000..4feaad4f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-187.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:984:test_004()/187 +cmd: $NMCLI --mode multiline --terse -f ALL device wifi list +lang: C +returncode: 0 +stdout: 1470 bytes +>>> +NAME:AP[1] +SSID:wlan1-ap-4 +SSID-HEX:776C616E312D61702D34 +BSSID:94:2B:E8:F6:D2:86 +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:48 +BARS:** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan1 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 + + +NAME:AP[1] +SSID:wlan0-ap-2 +SSID-HEX:776C616E302D61702D32 +BSSID:C0:E2:BE:E8:EF:B6 +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 +NAME:AP[2] +SSID:wlan0-ap-1 +SSID-HEX:776C616E302D61702D31 +BSSID:61:95:77:AC:1E:4C +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:81 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1 +NAME:AP[3] +SSID:wlan0-ap-3 +SSID-HEX:776C616E302D61702D33 +BSSID:9B:F6:B7:EC:97:76 +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:55 +BARS:** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-188.expected b/clients/tests/test-client.check-on-disk/test_004-188.expected new file mode 100644 index 00000000..d4dfac8b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-188.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:984:test_004()/188 +cmd: $NMCLI --mode multiline --terse -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1518 bytes +>>> +NAME:AP[1] +SSID:wlan1-ap-4 +SSID-HEX:776C616E312D61702D34 +BSSID:94:2B:E8:F6:D2:86 +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:48 +BARS:** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan1 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 + + +NAME:AP[1] +SSID:wlan0-ap-2 +SSID-HEX:776C616E302D61702D32 +BSSID:C0:E2:BE:E8:EF:B6 +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 +NAME:AP[2] +SSID:wlan0-ap-1 +SSID-HEX:776C616E302D61702D31 +BSSID:61:95:77:AC:1E:4C +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:81 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1 +NAME:AP[3] +SSID:wlan0-ap-3 +SSID-HEX:776C616E302D61702D33 +BSSID:9B:F6:B7:EC:97:76 +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:55 +BARS:** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-189.expected b/clients/tests/test-client.check-on-disk/test_004-189.expected new file mode 100644 index 00000000..e707c550 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-189.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:986:test_004()/189 +cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 390 bytes +>>> +IN-USE: +SSID:wlan1-ap-4 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:48 +BARS:** +SECURITY:WPA1 WPA2 + + +IN-USE: +SSID:wlan0-ap-2 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +IN-USE: +SSID:wlan0-ap-1 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:81 +BARS:**** +SECURITY:WPA1 WPA2 +IN-USE: +SSID:wlan0-ap-3 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:55 +BARS:** +SECURITY:WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-190.expected b/clients/tests/test-client.check-on-disk/test_004-190.expected new file mode 100644 index 00000000..720cd91d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-190.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:986:test_004()/190 +cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 426 bytes +>>> +IN-USE: +SSID:wlan1-ap-4 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:48 +BARS:** +SECURITY:WPA1 WPA2 + + +IN-USE: +SSID:wlan0-ap-2 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +IN-USE: +SSID:wlan0-ap-1 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:81 +BARS:**** +SECURITY:WPA1 WPA2 +IN-USE: +SSID:wlan0-ap-3 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:55 +BARS:** +SECURITY:WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-191.expected b/clients/tests/test-client.check-on-disk/test_004-191.expected new file mode 100644 index 00000000..ab3f13b5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-191.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:989:test_004()/191 +cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: C +returncode: 0 +stdout: 1470 bytes +>>> +NAME:AP[1] +SSID:wlan1-ap-4 +SSID-HEX:776C616E312D61702D34 +BSSID:94:2B:E8:F6:D2:86 +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:48 +BARS:** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan1 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 + + +NAME:AP[1] +SSID:wlan0-ap-2 +SSID-HEX:776C616E302D61702D32 +BSSID:C0:E2:BE:E8:EF:B6 +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 +NAME:AP[2] +SSID:wlan0-ap-1 +SSID-HEX:776C616E302D61702D31 +BSSID:61:95:77:AC:1E:4C +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:81 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1 +NAME:AP[3] +SSID:wlan0-ap-3 +SSID-HEX:776C616E302D61702D33 +BSSID:9B:F6:B7:EC:97:76 +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:55 +BARS:** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-192.expected b/clients/tests/test-client.check-on-disk/test_004-192.expected new file mode 100644 index 00000000..d0448817 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-192.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:989:test_004()/192 +cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1518 bytes +>>> +NAME:AP[1] +SSID:wlan1-ap-4 +SSID-HEX:776C616E312D61702D34 +BSSID:94:2B:E8:F6:D2:86 +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:48 +BARS:** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan1 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 + + +NAME:AP[1] +SSID:wlan0-ap-2 +SSID-HEX:776C616E302D61702D32 +BSSID:C0:E2:BE:E8:EF:B6 +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 +NAME:AP[2] +SSID:wlan0-ap-1 +SSID-HEX:776C616E302D61702D31 +BSSID:61:95:77:AC:1E:4C +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:81 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1 +NAME:AP[3] +SSID:wlan0-ap-3 +SSID-HEX:776C616E302D61702D33 +BSSID:9B:F6:B7:EC:97:76 +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:55 +BARS:** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-193.expected b/clients/tests/test-client.check-on-disk/test_004-193.expected new file mode 100644 index 00000000..18ace0c5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-193.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:991:test_004()/193 +cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 367 bytes +>>> +NAME:AP[1] +SSID:wlan0-ap-2 +SSID-HEX:776C616E302D61702D32 +BSSID:C0:E2:BE:E8:EF:B6 +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-194.expected b/clients/tests/test-client.check-on-disk/test_004-194.expected new file mode 100644 index 00000000..1604a8bf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-194.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:991:test_004()/194 +cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 379 bytes +>>> +NAME:AP[1] +SSID:wlan0-ap-2 +SSID-HEX:776C616E302D61702D32 +BSSID:C0:E2:BE:E8:EF:B6 +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-195.expected b/clients/tests/test-client.check-on-disk/test_004-195.expected new file mode 100644 index 00000000..89f90be6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-195.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:993:test_004()/195 +cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 97 bytes +>>> +IN-USE: +SSID:wlan0-ap-2 +MODE:Infra +CHAN:1 +RATE:54 Mbit/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-196.expected b/clients/tests/test-client.check-on-disk/test_004-196.expected new file mode 100644 index 00000000..d2f2803c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-196.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:993:test_004()/196 +cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 106 bytes +>>> +IN-USE: +SSID:wlan0-ap-2 +MODE:Infrastruktura +CHAN:1 +RATE:54 Mb/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-197.expected b/clients/tests/test-client.check-on-disk/test_004-197.expected new file mode 100644 index 00000000..2c0e1a2e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-197.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:996:test_004()/197 +cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 367 bytes +>>> +NAME:AP[1] +SSID:wlan0-ap-2 +SSID-HEX:776C616E302D61702D32 +BSSID:C0:E2:BE:E8:EF:B6 +MODE:Infra +CHAN:1 +FREQ:2412 MHz +RATE:54 Mbit/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:no +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-198.expected b/clients/tests/test-client.check-on-disk/test_004-198.expected new file mode 100644 index 00000000..b639cf81 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-198.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:996:test_004()/198 +cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 379 bytes +>>> +NAME:AP[1] +SSID:wlan0-ap-2 +SSID-HEX:776C616E302D61702D32 +BSSID:C0:E2:BE:E8:EF:B6 +MODE:Infrastruktura +CHAN:1 +FREQ:2412 MHz +RATE:54 Mb/s +SIGNAL:92 +BARS:**** +SECURITY:WPA1 WPA2 +WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk +DEVICE:wlan0 +ACTIVE:nie +IN-USE: +DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-199.expected b/clients/tests/test-client.check-on-disk/test_004-199.expected new file mode 100644 index 00000000..01bbbc72 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-199.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:998:test_004()/199 +cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 2467 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: +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 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:unknown +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no +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:Infra +AP[1].CHAN:1 +AP[1].RATE:54 Mbit/s +AP[1].SIGNAL:92 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-1 +AP[2].MODE:Infra +AP[2].CHAN:1 +AP[2].RATE:54 Mbit/s +AP[2].SIGNAL:81 +AP[2].BARS:**** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-3 +AP[3].MODE:Infra +AP[3].CHAN:1 +AP[3].RATE:54 Mbit/s +AP[3].SIGNAL:55 +AP[3].BARS:** +AP[3].SECURITY:WPA1 WPA2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-200.expected b/clients/tests/test-client.check-on-disk/test_004-200.expected new file mode 100644 index 00000000..331d875b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-200.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:998:test_004()/200 +cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2510 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:nieznane +CAPABILITIES.CARRIER-DETECT:nie +CAPABILITIES.SPEED:nieznane +CAPABILITIES.IS-SOFTWARE:nie +CAPABILITIES.SRIOV:nie +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 +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-2 +AP[1].MODE:Infrastruktura +AP[1].CHAN:1 +AP[1].RATE:54 Mb/s +AP[1].SIGNAL:92 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-1 +AP[2].MODE:Infrastruktura +AP[2].CHAN:1 +AP[2].RATE:54 Mb/s +AP[2].SIGNAL:81 +AP[2].BARS:**** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-3 +AP[3].MODE:Infrastruktura +AP[3].CHAN:1 +AP[3].RATE:54 Mb/s +AP[3].SIGNAL:55 +AP[3].BARS:** +AP[3].SECURITY:WPA1 WPA2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-201.expected b/clients/tests/test-client.check-on-disk/test_004-201.expected new file mode 100644 index 00000000..4584e502 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-201.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:1000:test_004()/201 +cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 +lang: C +returncode: 0 +stdout: 739 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-202.expected b/clients/tests/test-client.check-on-disk/test_004-202.expected new file mode 100644 index 00000000..053e07f9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-202.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:1000:test_004()/202 +cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 740 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-203.expected b/clients/tests/test-client.check-on-disk/test_004-203.expected new file mode 100644 index 00000000..1eb72932 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-203.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:1002:test_004()/203 +cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 2467 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: +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 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:unknown +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:unknown +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no +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:Infra +AP[1].CHAN:1 +AP[1].RATE:54 Mbit/s +AP[1].SIGNAL:92 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-1 +AP[2].MODE:Infra +AP[2].CHAN:1 +AP[2].RATE:54 Mbit/s +AP[2].SIGNAL:81 +AP[2].BARS:**** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-3 +AP[3].MODE:Infra +AP[3].CHAN:1 +AP[3].RATE:54 Mbit/s +AP[3].SIGNAL:55 +AP[3].BARS:** +AP[3].SECURITY:WPA1 WPA2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-204.expected b/clients/tests/test-client.check-on-disk/test_004-204.expected new file mode 100644 index 00000000..e062a799 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-204.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:1002:test_004()/204 +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 +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.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.PHYS-PORT-ID: +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:nieznane +CAPABILITIES.CARRIER-DETECT:nie +CAPABILITIES.SPEED:nieznane +CAPABILITIES.IS-SOFTWARE:nie +CAPABILITIES.SRIOV:nie +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 +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-2 +AP[1].MODE:Infrastruktura +AP[1].CHAN:1 +AP[1].RATE:54 Mb/s +AP[1].SIGNAL:92 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-1 +AP[2].MODE:Infrastruktura +AP[2].CHAN:1 +AP[2].RATE:54 Mb/s +AP[2].SIGNAL:81 +AP[2].BARS:**** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-3 +AP[3].MODE:Infrastruktura +AP[3].CHAN:1 +AP[3].RATE:54 Mb/s +AP[3].SIGNAL:55 +AP[3].BARS:** +AP[3].SECURITY:WPA1 WPA2 +IP4.ADDRESS[1]:192.168.228.18/32 +IP4.ADDRESS[2]:192.168.209.179/25 +IP4.GATEWAY:192.168.41.120 +IP4.DOMAIN[1]:sear4.foo2.bar +IP4.DOMAIN[2]:sear4.fo.x.y +IP4.DOMAIN[3]:sear4.foo1.bar +IP4.DOMAIN[4]:sear4.foo4.bar +IP4.DOMAIN[5]:sear4.fo.o.bar +IP4.WINS[1]:192.168.120.79 +DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7 +IP6.GATEWAY: +IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]:sear6.foo2.bar +IP6.DOMAIN[2]:sear6.foo1.bar +IP6.DOMAIN[3]:sear6.fo.x.y +IP6.DOMAIN[4]:sear6.fo.o.bar +IP6.DOMAIN[5]:sear6.foo3.bar +IP6.DOMAIN[6]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index a8e107a0..74225ccf 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -2,6 +2,68 @@ from __future__ import print_function +############################################################################### +# +# This test starts NetworkManager stub service in a user D-Bus session, +# and runs nmcli against it. The output is recorded and compared to a pre-generated +# expected output (clients/tests/test-client.check-on-disk/*.expected) which +# is also commited to git. +# +############################################################################### +# +# HOWTO: Regenerate output +# +# When adjusting the tests, or when making changes to nmcli that intentionally +# change the output, the expected output must be regenerated. +# +# $ make install +# # (step not required every time) +# # The test also compare the translated output, hence, the translation +# # file must be installed at the configured --prefix. +# # You don't need to type `make install` every time, but a suitable version +# # of translations must be installed. In practice, the tests only care about +# # Polish (pl) translations. +# # The important part is that translations work. Test +# # $ LANG=pl_PL.UTF-8 ./clients/cli/nmcli --version +# # also ensure that `locale -a` reports the Polish locale. +# $ rm -rf clients/tests/test-client.check-on-disk/*.expected +# # (step seldomly required) +# # Sometimes, if you want to be sure that the test would generate +# # exactly the same .expected files, purge the previous version first. +# # This is only necessary, when you remove test from this file. +# $ NM_TEST_REGENERATE=1 make check-local-clients-tests-test-client +# # Set NM_TEST_REGENERATE=1 to regenerate all files. +# $ git diff ... ; git add ... +# # (optional step) +# # Inspect what changed, and whether it makes sense. Then commit changes +# # to git. +# +############################################################################### +# +# Environment variables to configure test: + +# (optional) The build dir. Optional, mainly used to find the nmcli binary (in case +# ENV_NM_TEST_CLIENT_NMCLI_PATH is not set. +ENV_NM_TEST_CLIENT_BUILDDIR = 'NM_TEST_CLIENT_BUILDDIR' + +# (optional) Path to nmcli. By default, it looks for nmcli in build dir. +# In particular, you can test also a nmcli binary installed somewhere else. +ENV_NM_TEST_CLIENT_NMCLI_PATH = 'NM_TEST_CLIENT_NMCLI_PATH' + +# (optional) The test also compares tranlsated output (l10n). This requires, +# that you first install the translation in the right place. So, by default, +# if a test for a translation fails, it will mark the test as skipped, and not +# fail the tests. Under the assumption, that the test cannot succeed currently. +# By setting NM_TEST_CLIENT_CHECK_L10N=1, you can force a failure of the test. +ENV_NM_TEST_CLIENT_CHECK_L10N = 'NM_TEST_CLIENT_CHECK_L10N' + +# Regenerate the .expected files. Instead of asserting, rewrite the files +# on disk with the expected output. +ENV_NM_TEST_REGENERATE = 'NM_TEST_REGENERATE' + +# +############################################################################### + import sys try: @@ -27,12 +89,6 @@ import time import dbus.service import dbus.mainloop.glib -# The test can be configured via the following environment variables: -ENV_NM_TEST_CLIENT_BUILDDIR = 'NM_TEST_CLIENT_BUILDDIR' -ENV_NM_TEST_CLIENT_NMCLI_PATH = 'NM_TEST_CLIENT_NMCLI_PATH' -ENV_NM_TEST_CLIENT_CHECK_L10N = 'NM_TEST_CLIENT_CHECK_L10N' -ENV_NM_TEST_REGENERATE = 'NM_TEST_REGENERATE' - ############################################################################### class PathConfiguration: @@ -54,14 +110,18 @@ class PathConfiguration: assert os.path.exists(v), ("Cannot find test server at \"%s\"" % (v)) return v -############################################################################### + @staticmethod + def canonical_script_filename(): + p = 'clients/tests/test-client.py' + assert (PathConfiguration.top_srcdir() + '/' + p) == os.path.abspath(__file__) + return p -os.sys.path.append(os.path.abspath(PathConfiguration.top_srcdir() + '/examples/python')) -import nmex +############################################################################### dbus_session_inited = False _DEFAULT_ARG = object() +_UNSTABLE_OUTPUT = object() ############################################################################### @@ -101,11 +161,11 @@ class Util: return p.wait(timeout) if timeout is None: return p.wait() - start = nmex.nm_boot_time_ns() + start = NM.utils_get_timestamp_msec() while True: if p.poll() is not None: return p.returncode - if start + (timeout * 1000000000) < nmex.nm_boot_time_ns(): + if start + (timeout * 1000) < NM.utils_get_timestamp_msec(): raise Exception("timeout expired") time.sleep(0.05) @@ -162,6 +222,21 @@ class Util: text = text2 return b''.join([(t[0] if isinstance(t, tuple) else t) for t in text]) + @staticmethod + def debug_dbus_interface(): + # this is for printf debugging, not used in actual code. + os.system('busctl --user --verbose call org.freedesktop.NetworkManager /org/freedesktop org.freedesktop.DBus.ObjectManager GetManagedObjects | cat') + + @staticmethod + def iter_nmcli_output_modes(): + for mode in [[], + ['--mode', 'tabular'], + ['--mode', 'multiline']]: + for fmt in [[], + ['--pretty'], + ['--terse']]: + yield mode + fmt + ############################################################################### class Configuration: @@ -219,13 +294,16 @@ class NMStubServer: except: return None - def __init__(self): + def __init__(self, seed): service_path = PathConfiguration.test_networkmanager_service_path() self._conn = dbus.SessionBus() + env = os.environ.copy() + env['NM_TEST_NETWORKMANAGER_SERVICE_SEED'] = seed p = subprocess.Popen([sys.executable, service_path], - stdin = subprocess.PIPE) + stdin = subprocess.PIPE, + env = env) - start = nmex.nm_boot_time_ns() + start = NM.utils_get_timestamp_msec() while True: if p.poll() is not None: p.stdin.close() @@ -235,7 +313,7 @@ class NMStubServer: nmobj = self._conn_get_main_object(self._conn) if nmobj is not None: break - if (nmex.nm_boot_time_ns() - start) / 1000000 >= 2000: + if (NM.utils_get_timestamp_msec() - start) >= 2000: p.stdin.close() p.kill() Util.popen_wait(p, 1000) @@ -280,14 +358,16 @@ class NMStubServer: raise AttributeError(member) return self._MethodProxy(self, member[3:]) - def addConnection(self, connection, verify_connection = True): - return self.op_AddConnection(connection, verify_connection) + def addConnection(self, connection, do_verify_strict = True): + return self.op_AddConnection(connection, do_verify_strict) - def findConnectionUuid(self, con_id): + def findConnectionUuid(self, con_id, required = True): try: u = Util.iter_single(self.op_FindConnections(con_id = con_id))[1] assert u, ("Invalid uuid %s" % (u)) except Exception as e: + if not required: + return None raise AssertionError("Unexpectedly not found connection %s: %s" % (con_id, str(e))) return u @@ -347,6 +427,7 @@ class TestNmcli(NmTestBase): def call_nmcli_l(self, args, check_on_disk = _DEFAULT_ARG, + fatal_warnings = _DEFAULT_ARG, expected_returncode = _DEFAULT_ARG, expected_stdout = _DEFAULT_ARG, expected_stderr = _DEFAULT_ARG, @@ -360,6 +441,7 @@ class TestNmcli(NmTestBase): self._call_nmcli(args, lang, check_on_disk, + fatal_warnings, expected_returncode, expected_stdout, expected_stderr, @@ -376,6 +458,7 @@ class TestNmcli(NmTestBase): langs = None, lang = None, check_on_disk = _DEFAULT_ARG, + fatal_warnings = _DEFAULT_ARG, expected_returncode = _DEFAULT_ARG, expected_stdout = _DEFAULT_ARG, expected_stderr = _DEFAULT_ARG, @@ -401,6 +484,7 @@ class TestNmcli(NmTestBase): self._call_nmcli(args, lang, check_on_disk, + fatal_warnings, expected_returncode, expected_stdout, expected_stderr, @@ -415,6 +499,7 @@ class TestNmcli(NmTestBase): args, lang, check_on_disk, + fatal_warnings, expected_returncode, expected_stdout, expected_stderr, @@ -437,10 +522,9 @@ class TestNmcli(NmTestBase): # we cannot use frame.f_code.co_filename directly, because it might be different depending # on where the file lies and which is CWD. We still want to give the location of # the file, so that the user can easier find the source (when looking at the .expected files) - script_filename = 'clients/tests/test-client.py' - self.assertTrue(os.path.abspath(frame.f_code.co_filename).endswith(script_filename)) + self.assertTrue(os.path.abspath(frame.f_code.co_filename).endswith('/'+PathConfiguration.canonical_script_filename())) - calling_location = '%s:%d:%s()/%d' % (script_filename, frame.f_lineno, frame.f_code.co_name, calling_num) + calling_location = '%s:%d:%s()/%d' % (PathConfiguration.canonical_script_filename(), frame.f_lineno, frame.f_code.co_name, calling_num) if lang is None or lang == 'C': lang = 'C' @@ -468,6 +552,8 @@ class TestNmcli(NmTestBase): env['LIBNM_USE_SESSION_BUS'] = '1' env['LIBNM_USE_NO_UDEV'] = '1' env['TERM'] = 'linux' + if fatal_warnings is _DEFAULT_ARG or fatal_warnings: + env['G_DEBUG'] = 'fatal-warnings' args = [conf.get(ENV_NM_TEST_CLIENT_NMCLI_PATH)] + list(args) @@ -478,8 +564,8 @@ class TestNmcli(NmTestBase): if check_on_disk is _DEFAULT_ARG: check_on_disk = ( expected_returncode is _DEFAULT_ARG - and expected_stdout is _DEFAULT_ARG - and expected_stderr is _DEFAULT_ARG) + and (expected_stdout is _DEFAULT_ARG or expected_stdout is _UNSTABLE_OUTPUT) + and (expected_stderr is _DEFAULT_ARG or expected_stderr is _UNSTABLE_OUTPUT)) if expected_returncode is _DEFAULT_ARG: expected_returncode = None if expected_stdout is _DEFAULT_ARG: @@ -492,8 +578,15 @@ class TestNmcli(NmTestBase): stdout, stderr): - stdout = Util.replace_text(stdout, replace_stdout) - stderr = Util.replace_text(stderr, replace_stderr) + if expected_stdout is _UNSTABLE_OUTPUT: + stdout = '<UNSTABLE OUTPUT>'.encode('utf-8') + else: + stdout = Util.replace_text(stdout, replace_stdout) + + if expected_stderr is _UNSTABLE_OUTPUT: + stderr = '<UNSTABLE OUTPUT>'.encode('utf-8') + else: + stderr = Util.replace_text(stderr, replace_stderr) if sort_lines_stdout: stdout = b'\n'.join(sorted(stdout.split(b'\n'))) @@ -501,13 +594,13 @@ class TestNmcli(NmTestBase): ignore_l10n_diff = ( lang != 'C' and not conf.get(ENV_NM_TEST_CLIENT_CHECK_L10N)) - if expected_stderr is not None: + if expected_stderr is not None and expected_stderr is not _UNSTABLE_OUTPUT: if expected_stderr != stderr: if ignore_l10n_diff: self._skip_test_for_l10n_diff.append(test_name) else: self.assertEqual(expected_stderr, stderr) - if expected_stdout is not None: + if expected_stdout is not None and expected_stdout is not _UNSTABLE_OUTPUT: if expected_stdout != stdout: if ignore_l10n_diff: self._skip_test_for_l10n_diff.append(test_name) @@ -516,6 +609,13 @@ class TestNmcli(NmTestBase): if expected_returncode is not None: self.assertEqual(expected_returncode, returncode) + if fatal_warnings is _DEFAULT_ARG: + if expected_returncode != -5: + self.assertNotEqual(returncode, -5) + elif fatal_warnings: + if expected_returncode is None: + self.assertEqual(returncode, -5) + dirname = PathConfiguration.srcdir() + '/test-client.check-on-disk' basename = test_name + '.expected' filename = os.path.abspath(dirname + '/' + basename) @@ -552,7 +652,8 @@ class TestNmcli(NmTestBase): print("\n\n\nThe file '%s' does not have the expected content:" % (filename)) print("ACTUAL OUTPUT:\n[[%s]]\n" % (content_new)) print("EXPECT OUTPUT:\n[[%s]]\n" % (content_old)) - print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1\n\n") + print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1") + print("See howto in %s for details.\n" % (PathConfiguration.canonical_script_filename())) raise AssertionError("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename)) else: if not w: @@ -579,7 +680,7 @@ class TestNmcli(NmTestBase): def async_start(self): # limit number parallel running jobs - for async_job in self._async_jobs[0:10]: + for async_job in self._async_jobs[0:15]: async_job.start() def async_wait(self): @@ -592,7 +693,7 @@ class TestNmcli(NmTestBase): self.skipTest("Own D-Bus session for testing is not initialized. Do you have dbus-run-session available?") if NM is None: self.skipTest("gi.NM is not available. Did you build with introspection?") - self.srv = NMStubServer() + self.srv = NMStubServer(self._testMethodName) self._calling_num = {} self._skip_test_for_l10n_diff = [] self._async_jobs = [] @@ -656,13 +757,8 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['bogus', 's']) - for mode in [[], - ['--mode', 'tabular'], - ['--mode', 'multiline']]: - for fmt in [[], - ['--pretty'], - ['--terse']]: - self.call_nmcli_l(mode + fmt + ['general', 'permissions']) + for mode in Util.iter_nmcli_output_modes(): + self.call_nmcli_l(mode + ['general', 'permissions']) def test_002(self): self.init_001() @@ -733,9 +829,21 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['-f', 'ALL', 'con'], replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'con', 's', '-a'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'ACTIVE-PATH,DEVICE,UUID', 'con', 's', '-act'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,NAME', 'con', 's', '--active'], + replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'], replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'GENERAL.STATE', 'con', 's', 'ethernet'], + replace_stdout = replace_stdout) + self.call_nmcli_l(['con', 's', 'ethernet'], replace_stdout = replace_stdout) @@ -745,38 +853,52 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', '-t', 'dev', 'show', 'eth0'], + replace_stdout = replace_stdout) + self.async_wait() self.srv.setProperty('/org/freedesktop/NetworkManager/ActiveConnection/1', 'State', dbus.UInt32(NM.ActiveConnectionState.DEACTIVATING)) - self.call_nmcli_l(['-f', 'ALL', 'con'], - replace_stdout = replace_stdout) + for i in [0, 1]: + if i == 1: + self.async_wait() + self.srv.op_ConnectionSetVisible(False, con_id = 'ethernet') - self.call_nmcli_l(['-f', 'UUID,TYPE', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'UUID,TYPE', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--terse', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--pretty', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--terse', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--pretty', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--terse', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--pretty', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--terse', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['con', 's', 'ethernet'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--pretty', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['con', 's', 'ethernet'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['c', 's', '/org/freedesktop/NetworkManager/ActiveConnection/1'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'all', 'dev', 'show', 'eth0'], + replace_stdout = replace_stdout) def test_004(self): self.init_001() @@ -789,10 +911,95 @@ class TestNmcli(NmTestBase): replace_stdout = replace_stdout) self.call_nmcli(['connection', 'mod', 'con-xx1', 'ip.gateway', '']) - self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.gateway', '172.16.0.1']) + self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.gateway', '172.16.0.1'], lang = 'pl') self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv6.gateway', '::99']) self.call_nmcli(['connection', 'mod', 'con-xx1', '802.abc', '']) self.call_nmcli(['connection', 'mod', 'con-xx1', '802-11-wireless.band', 'a']) + self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.addresses', '192.168.77.5/24', 'ipv4.routes', '2.3.4.5/32 192.168.77.1', 'ipv6.addresses', '1:2:3:4::6/64', 'ipv6.routes', '1:2:3:4:5:6::5/128']) + self.call_nmcli_l(['con', 's', 'con-xx1'], + replace_stdout = replace_stdout) + + self.async_wait() + + replace_stdout.append((lambda: self.srv.findConnectionUuid('con-vpn-1'), 'UUID-con-vpn-1-REPLACED-REPLACED-REP')) + + self.call_nmcli(['connection', 'add', 'type', 'vpn', 'con-name', 'con-vpn-1', 'ifname', '*', 'vpn-type', 'openvpn', 'vpn.data', 'key1 = val1, key2 = val2, key3=val3'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['con', 's'], + replace_stdout = replace_stdout) + self.call_nmcli_l(['con', 's', 'con-vpn-1'], + replace_stdout = replace_stdout) + + self.call_nmcli(['con', 'up', 'con-xx1']) + self.call_nmcli_l(['con', 's'], + replace_stdout = replace_stdout) + + self.call_nmcli(['con', 'up', 'con-vpn-1']) + self.call_nmcli_l(['con', 's'], + replace_stdout = replace_stdout) + self.call_nmcli_l(['con', 's', 'con-vpn-1'], + replace_stdout = replace_stdout) + + self.async_wait() + + self.srv.setProperty('/org/freedesktop/NetworkManager/ActiveConnection/2', + 'VpnState', + dbus.UInt32(NM.VpnConnectionState.ACTIVATED)) + + self.call_nmcli_l(['con', 's', 'con-vpn-1'], + replace_stdout = replace_stdout) + self.call_nmcli_l(['-t', 'con', 's', 'con-vpn-1'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'con-vpn-1'], + replace_stdout = replace_stdout) + + # This only filters 'vpn' settings from the connection profile. + # Contrary to '-f GENERAL' below, it does not show the properties of + # the activated VPN connection. This is a nmcli bug. + self.call_nmcli_l(['-f', 'VPN', 'con', 's', 'con-vpn-1'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'GENERAL', 'con', 's', 'con-vpn-1'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['dev', 'show', 'wlan0'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'all', 'dev', 'show', 'wlan0'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', 'dev', 'show', 'wlan0'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', '-t', 'dev', 'show', 'wlan0'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'DEVICE,TYPE,DBUS-PATH', 'dev'], + replace_stdout = replace_stdout) + + for mode in Util.iter_nmcli_output_modes(): + self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'wifi', 'list' ], + replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'wifi', 'list' ], + replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH', + 'device', 'wifi', 'list'], + replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'], + replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'], + replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH', + 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'], + replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'show', 'wlan0' ], + replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'show', 'wlan0' ], + replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS', 'device', 'show', 'wlan0' ], + replace_stdout = replace_stdout) ############################################################################### @@ -841,6 +1048,7 @@ def main(): if conf.get(ENV_NM_TEST_REGENERATE): make_filename = PathConfiguration.srcdir() + '/test-client.check-on-disk/Makefile.am' s_new = '# generated with `NM_TEST_REGENERATE=1 make check`\n' + \ + '# See howto in "' + PathConfiguration.canonical_script_filename() + '"\n' + \ '\n' + \ 'clients_tests_expected_files = \\\n' + \ ''.join([('\tclients/tests/test-client.check-on-disk/%s \\\n' % f) for f in sorted(file_list)]) + \ |