diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-29 18:06:12 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-29 18:06:13 +0200 |
| commit | cbeb34d355b23904f18560fc7b09b86b5fe38fca (patch) | |
| tree | 977f8babbc026dcbdc05d1ae8b72a01b86b4b1cc | |
| parent | 8964dbe8bc9cbe7300a48bffe86faee6b149fbf2 (diff) | |
| parent | 8076a6f00355710f3d0706a981aefdbb25b33e3b (diff) | |
release: bump version to 1.13.1-dev after 1.12.0 release1.13.1-dev
After 1.12.0 is released, merge it back into master so that
1.12.0 is part of the history of master. That means,
$ git log --first-parent master
will also traverse 1.12.0 and 1.12-rc*.
Also bump the micro version to 1.13.1-dev to indicate that this is
after 1.12.0 is out.
949 files changed, 32859 insertions, 6697 deletions
diff --git a/Makefile.am b/Makefile.am index cdb5cfc9d5..53235df7e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -204,6 +204,8 @@ introspection_sources = \ introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \ introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \ introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \ + introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \ + introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \ introspection/org.freedesktop.NetworkManager.Device.Macsec.c \ introspection/org.freedesktop.NetworkManager.Device.Macsec.h \ introspection/org.freedesktop.NetworkManager.Device.Macvlan.c \ @@ -236,6 +238,8 @@ introspection_sources = \ introspection/org.freedesktop.NetworkManager.Device.Wireless.h \ introspection/org.freedesktop.NetworkManager.Device.WiMax.c \ introspection/org.freedesktop.NetworkManager.Device.WiMax.h \ + introspection/org.freedesktop.NetworkManager.Device.Wpan.c \ + introspection/org.freedesktop.NetworkManager.Device.Wpan.h \ introspection/org.freedesktop.NetworkManager.Device.c \ introspection/org.freedesktop.NetworkManager.Device.h \ introspection/org.freedesktop.NetworkManager.DHCP4Config.c \ @@ -289,6 +293,7 @@ DBUS_INTERFACE_DOCS = \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \ docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \ + docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \ @@ -307,7 +312,8 @@ DBUS_INTERFACE_DOCS = \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \ docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \ - docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml + docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \ + docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml introspection/%.c: introspection/%.xml @$(MKDIR_P) introspection/ @@ -340,6 +346,7 @@ dbusinterfaces_DATA = \ introspection/org.freedesktop.NetworkManager.Device.Generic.xml \ introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \ introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \ + introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \ introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \ introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \ introspection/org.freedesktop.NetworkManager.Device.Modem.xml \ @@ -356,6 +363,7 @@ dbusinterfaces_DATA = \ introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \ introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \ introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \ + introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \ introspection/org.freedesktop.NetworkManager.Device.xml \ introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \ introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \ @@ -395,6 +403,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-core-types.h \ libnm-core/nm-dbus-interface.h \ libnm-core/nm-errors.h \ + libnm-core/nm-setting-6lowpan.h \ libnm-core/nm-setting-8021x.h \ libnm-core/nm-setting-adsl.h \ libnm-core/nm-setting-bluetooth.h \ @@ -435,6 +444,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-wired.h \ libnm-core/nm-setting-wireless-security.h \ libnm-core/nm-setting-wireless.h \ + libnm-core/nm-setting-wpan.h \ libnm-core/nm-setting.h \ libnm-core/nm-simple-connection.h \ libnm-core/nm-utils.h \ @@ -463,6 +473,7 @@ libnm_core_lib_h_priv = \ libnm-core/nm-setting-private.h \ libnm-core/nm-utils-private.h libnm_core_lib_c_settings_real = \ + libnm-core/nm-setting-6lowpan.c \ libnm-core/nm-setting-8021x.c \ libnm-core/nm-setting-adsl.c \ libnm-core/nm-setting-bluetooth.c \ @@ -502,7 +513,8 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-wimax.c \ libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ - libnm-core/nm-setting-wireless.c + libnm-core/nm-setting-wireless.c \ + libnm-core/nm-setting-wpan.c libnm_core_lib_c_real = \ $(libnm_core_lib_c_settings_real) \ shared/nm-utils/c-list-util.c \ @@ -773,6 +785,7 @@ libnm_lib_h_pub_real = \ libnm/nm-autoptr.h \ libnm/nm-checkpoint.h \ libnm/nm-client.h \ + libnm/nm-device-6lowpan.h \ libnm/nm-device-adsl.h \ libnm/nm-device-bond.h \ libnm/nm-device-bridge.h \ @@ -796,6 +809,7 @@ libnm_lib_h_pub_real = \ libnm/nm-device-vxlan.h \ libnm/nm-device-wifi.h \ libnm/nm-device-wimax.h \ + libnm/nm-device-wpan.h \ libnm/nm-device.h \ libnm/nm-dhcp-config.h \ libnm/nm-ip-config.h \ @@ -829,6 +843,7 @@ libnm_lib_c_real = \ libnm/nm-checkpoint.c \ libnm/nm-client.c \ libnm/nm-dbus-helpers.c \ + libnm/nm-device-6lowpan.c \ libnm/nm-device-adsl.c \ libnm/nm-device-bond.c \ libnm/nm-device-bridge.c \ @@ -852,6 +867,7 @@ libnm_lib_c_real = \ libnm/nm-device-vxlan.c \ libnm/nm-device-wifi.c \ libnm/nm-device-wimax.c \ + libnm/nm-device-wpan.c \ libnm/nm-device.c \ libnm/nm-dhcp-config.c \ libnm/nm-dhcp4-config.c \ @@ -1482,11 +1498,13 @@ src_libNetworkManagerBase_la_SOURCES = \ src/platform/nm-platform-private.h \ src/platform/nm-linux-platform.c \ src/platform/nm-linux-platform.h \ - src/platform/wifi/wifi-utils-nl80211.c \ - src/platform/wifi/wifi-utils-nl80211.h \ - src/platform/wifi/wifi-utils-private.h \ - src/platform/wifi/wifi-utils.c \ - src/platform/wifi/wifi-utils.h \ + src/platform/wifi/nm-wifi-utils-nl80211.c \ + src/platform/wifi/nm-wifi-utils-nl80211.h \ + src/platform/wifi/nm-wifi-utils-private.h \ + src/platform/wifi/nm-wifi-utils.c \ + src/platform/wifi/nm-wifi-utils.h \ + src/platform/wpan/nm-wpan-utils.c \ + src/platform/wpan/nm-wpan-utils.h \ \ src/ndisc/nm-lndp-ndisc.c \ src/ndisc/nm-lndp-ndisc.h \ @@ -1519,8 +1537,8 @@ src_libNetworkManagerBase_la_SOURCES = \ if WITH_WEXT src_libNetworkManagerBase_la_SOURCES += \ - src/platform/wifi/wifi-utils-wext.c \ - src/platform/wifi/wifi-utils-wext.h + src/platform/wifi/nm-wifi-utils-wext.c \ + src/platform/wifi/nm-wifi-utils-wext.h endif src_libNetworkManagerBase_la_LIBADD = \ @@ -1532,6 +1550,9 @@ src_libNetworkManagerBase_la_LIBADD = \ $(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +EXTRA_DIST += \ + src/platform/linux/nl802154.h + ############################################################################### src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) @@ -1558,6 +1579,8 @@ src_libNetworkManager_la_SOURCES = \ src/devices/nm-device-logging.h \ src/devices/nm-device-private.h \ \ + src/devices/nm-device-6lowpan.c \ + src/devices/nm-device-6lowpan.h \ src/devices/nm-device-bond.c \ src/devices/nm-device-bond.h \ src/devices/nm-device-bridge.c \ @@ -1584,6 +1607,8 @@ src_libNetworkManager_la_SOURCES = \ src/devices/nm-device-vlan.h \ src/devices/nm-device-vxlan.c \ src/devices/nm-device-vxlan.h \ + src/devices/nm-device-wpan.c \ + src/devices/nm-device-wpan.h \ \ src/dhcp/nm-dhcp-dhcpcanon.c \ src/dhcp/nm-dhcp-dhclient.c \ @@ -1,4 +1,11 @@ ============================================= +NetworkManager-1.?? (not released yet) +Overview of changes since NetworkManager-1.12 +============================================= + +* Added support for IEEE 802.15.4 and 6LowPAN devices. + +============================================= NetworkManager-1.12 Overview of changes since NetworkManager-1.10 ============================================= diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 1563178de2..a38ad3c406 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -660,6 +660,8 @@ const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYP NM_SETTING_MACSEC_SETTING_NAME"," \ NM_SETTING_MACVLAN_SETTING_NAME"," \ NM_SETTING_VXLAN_SETTING_NAME"," \ + NM_SETTING_WPAN_SETTING_NAME","\ + NM_SETTING_6LOWPAN_SETTING_NAME","\ NM_SETTING_PROXY_SETTING_NAME"," \ NM_SETTING_TC_CONFIG_SETTING_NAME // NM_SETTING_DUMMY_SETTING_NAME @@ -890,7 +892,11 @@ usage_connection_add (void) " [source-port-min <0-65535>]\n" " [source-port-max <0-65535>]\n" " [destination-port <0-65535>]\n\n" - " dummy: \n\n" + " wpan: [short-addr <0x0000-0xffff>]\n\n" + " [pan-id <0x0000-0xffff>]\n\n" + " [mac <MAC address>]\n\n" + " 6lowpan: dev <parent device (connection UUID, ifname, or MAC)>\n" + " dummy:\n\n" " SLAVE_OPTIONS:\n" " bridge: [priority <0-63>]\n" " [path-cost <1-65535>]\n" @@ -8106,6 +8112,8 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) g_print ("\n\n"); g_print (_("Type 'help' or '?' for available commands.")); g_print ("\n"); + g_print (_("Type 'print' to show all the connection properties.")); + g_print ("\n"); g_print (_("Type 'describe [<setting>.<prop>]' for detailed property description.")); g_print ("\n\n"); diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 6407f50beb..c5e0a03fbd 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -51,6 +51,42 @@ # define NMCLI_VERSION VERSION #endif +#define DEFAULT_PALETTE_INIT \ + [NM_META_COLOR_CONNECTION_ACTIVATED] = "32", \ + [NM_META_COLOR_CONNECTION_ACTIVATING] = "33", \ + [NM_META_COLOR_CONNECTION_DISCONNECTING] = "31", \ + [NM_META_COLOR_CONNECTION_INVISIBLE] = "2", \ + [NM_META_COLOR_CONNECTIVITY_FULL] = "32", \ + [NM_META_COLOR_CONNECTIVITY_LIMITED] = "33", \ + [NM_META_COLOR_CONNECTIVITY_NONE] = "31", \ + [NM_META_COLOR_CONNECTIVITY_PORTAL] = "33", \ + [NM_META_COLOR_DEVICE_ACTIVATED] = "32", \ + [NM_META_COLOR_DEVICE_ACTIVATING] = "33", \ + [NM_META_COLOR_DEVICE_DISCONNECTED] = "31", \ + [NM_META_COLOR_DEVICE_FIRMWARE_MISSING] = "31", \ + [NM_META_COLOR_DEVICE_PLUGIN_MISSING] = "31", \ + [NM_META_COLOR_DEVICE_UNAVAILABLE] = "2", \ + [NM_META_COLOR_MANAGER_RUNNING] = "32", \ + [NM_META_COLOR_MANAGER_STARTING] = "33", \ + [NM_META_COLOR_MANAGER_STOPPED] = "31", \ + [NM_META_COLOR_PERMISSION_AUTH] = "33", \ + [NM_META_COLOR_PERMISSION_NO] = "31", \ + [NM_META_COLOR_PERMISSION_YES] = "32", \ + [NM_META_COLOR_STATE_ASLEEP] = "31", \ + [NM_META_COLOR_STATE_CONNECTED_GLOBAL] = "32", \ + [NM_META_COLOR_STATE_CONNECTED_LOCAL] = "32", \ + [NM_META_COLOR_STATE_CONNECTED_SITE] = "32", \ + [NM_META_COLOR_STATE_CONNECTING] = "33", \ + [NM_META_COLOR_STATE_DISCONNECTED] = "31", \ + [NM_META_COLOR_STATE_DISCONNECTING] = "33", \ + [NM_META_COLOR_WIFI_SIGNAL_EXCELLENT] = "32", \ + [NM_META_COLOR_WIFI_SIGNAL_FAIR] = "35", \ + [NM_META_COLOR_WIFI_SIGNAL_GOOD] = "33", \ + [NM_META_COLOR_WIFI_SIGNAL_POOR] = "36", \ + [NM_META_COLOR_WIFI_SIGNAL_UNKNOWN] = "2", \ + [NM_META_COLOR_ENABLED] = "32", \ + [NM_META_COLOR_DISABLED] = "31", \ + NmCli nm_cli = { .client = NULL, @@ -74,40 +110,7 @@ NmCli nm_cli = { .nmc_config.show_secrets = FALSE, .nmc_config.in_editor = FALSE, .nmc_config.palette = { - [NM_META_COLOR_CONNECTION_ACTIVATED] = "32", - [NM_META_COLOR_CONNECTION_ACTIVATING] = "33", - [NM_META_COLOR_CONNECTION_DISCONNECTING] = "31", - [NM_META_COLOR_CONNECTION_INVISIBLE] = "2", - [NM_META_COLOR_CONNECTIVITY_FULL] = "32", - [NM_META_COLOR_CONNECTIVITY_LIMITED] = "33", - [NM_META_COLOR_CONNECTIVITY_NONE] = "31", - [NM_META_COLOR_CONNECTIVITY_PORTAL] = "33", - [NM_META_COLOR_DEVICE_ACTIVATED] = "32", - [NM_META_COLOR_DEVICE_ACTIVATING] = "33", - [NM_META_COLOR_DEVICE_DISCONNECTED] = "31", - [NM_META_COLOR_DEVICE_FIRMWARE_MISSING] = "31", - [NM_META_COLOR_DEVICE_PLUGIN_MISSING] = "31", - [NM_META_COLOR_DEVICE_UNAVAILABLE] = "2", - [NM_META_COLOR_MANAGER_RUNNING] = "32", - [NM_META_COLOR_MANAGER_STARTING] = "33", - [NM_META_COLOR_MANAGER_STOPPED] = "31", - [NM_META_COLOR_PERMISSION_AUTH] = "33", - [NM_META_COLOR_PERMISSION_NO] = "31", - [NM_META_COLOR_PERMISSION_YES] = "32", - [NM_META_COLOR_STATE_ASLEEP] = "31", - [NM_META_COLOR_STATE_CONNECTED_GLOBAL] = "32", - [NM_META_COLOR_STATE_CONNECTED_LOCAL] = "32", - [NM_META_COLOR_STATE_CONNECTED_SITE] = "32", - [NM_META_COLOR_STATE_CONNECTING] = "33", - [NM_META_COLOR_STATE_DISCONNECTED] = "31", - [NM_META_COLOR_STATE_DISCONNECTING] = "33", - [NM_META_COLOR_WIFI_SIGNAL_EXCELLENT] = "32", - [NM_META_COLOR_WIFI_SIGNAL_FAIR] = "35", - [NM_META_COLOR_WIFI_SIGNAL_GOOD] = "33", - [NM_META_COLOR_WIFI_SIGNAL_POOR] = "36", - [NM_META_COLOR_WIFI_SIGNAL_UNKNOWN] = "2", - [NM_META_COLOR_ENABLED] = "32", - [NM_META_COLOR_DISABLED] = "31", + DEFAULT_PALETTE_INIT }, .editor_status_line = FALSE, .editor_save_confirmation = TRUE, @@ -337,76 +340,162 @@ typedef enum { NMC_USE_COLOR_NO, } NmcColorOption; -/* Checks whether a particular terminal-colors.d(5) file (.enabled, .disabled or .schem) - * exists. If contents is non-NULL, it returns the content. */ -static gboolean -check_colors_file (NmCli *nmc, NmcColorOption *color_option, - const char *base_dir, const char *name, const char *term, const char *type, - char **contents) +static char * +check_colors_construct_filename (const char *base_dir, + const char *name, + const char *term, + const char *type) { - char *filename; - gboolean exists; - - filename = g_strdup_printf ("%s/terminal-colors.d/%s%s%s%s%s", - base_dir, - name ? name : "", - term ? "@" : "", term ? term : "", - (name || term) ? "." : "", - type); - if (contents) - exists = g_file_get_contents (filename, contents, NULL, NULL); - else - exists = g_file_test (filename, G_FILE_TEST_EXISTS); - g_free (filename); + return g_strdup_printf ("%s/terminal-colors.d/%s%s%s%s%s", + base_dir, + name ? name : "", + term ? "@" : "", term ? term : "", + (name || term) ? "." : "", + type); +} + +static NmcColorOption +check_colors_check_enabled_one_file (const char *base_dir, + const char *name, + const char *term) +{ + gs_free char *filename_e = NULL; + gs_free char *filename_d = NULL; + + filename_e = check_colors_construct_filename (base_dir, name, term, "enable"); + if (g_file_test (filename_e, G_FILE_TEST_EXISTS)) + return NMC_USE_COLOR_YES; + + filename_d = check_colors_construct_filename (base_dir, name, term, "disable"); + if (g_file_test (filename_d, G_FILE_TEST_EXISTS)) + return NMC_USE_COLOR_NO; - return exists; + return NMC_USE_COLOR_AUTO; } -static void -check_colors_files_for_term (NmCli *nmc, NmcColorOption *color_option, - const char *base_dir, const char *name, const char *term) +static char * +check_colors_check_palette_one_file (const char *base_dir, + const char *name, + const char *term) { - if ( *color_option == NMC_USE_COLOR_AUTO - && check_colors_file (nmc, color_option, base_dir, name, term, "enable", NULL)) { - *color_option = NMC_USE_COLOR_YES; - } + gs_free char *filename = check_colors_construct_filename (base_dir, name, term, "schem"); + char *contents; - if ( *color_option == NMC_USE_COLOR_AUTO - && check_colors_file (nmc, color_option, base_dir, name, term, "disable", NULL)) { - *color_option = NMC_USE_COLOR_NO; - } + if (g_file_get_contents (filename, &contents, NULL, NULL)) + return contents; + return NULL; +} - if (*color_option == NMC_USE_COLOR_NO) { - /* No need to bother any further. */ - return; - } +static gboolean +check_colors_check_enabled (const char *base_dir_1, const char *base_dir_2, const char *name, const char *term) +{ + int i; + + if (term && strchr (term, '/')) + term = NULL; + +#define CHECK_AND_RETURN(cmd) \ + G_STMT_START { \ + NmcColorOption _color_option; \ + \ + _color_option = (cmd); \ + if (_color_option != NMC_USE_COLOR_AUTO) \ + return _color_option == NMC_USE_COLOR_YES; \ + } G_STMT_END + + for (i = 0; i < 2; i++) { + const char *base_dir = (i == 0 ? base_dir_1 : base_dir_2); - if (nmc->palette_buffer == NULL) - check_colors_file (nmc, color_option, base_dir, name, term, "schem", &nmc->palette_buffer); + if (!base_dir) + continue; + if (name && term) + CHECK_AND_RETURN (check_colors_check_enabled_one_file (base_dir, name, term)); + if (name) + CHECK_AND_RETURN (check_colors_check_enabled_one_file (base_dir, name, NULL)); + if (term) + CHECK_AND_RETURN (check_colors_check_enabled_one_file (base_dir, NULL, term)); + if (TRUE) + CHECK_AND_RETURN (check_colors_check_enabled_one_file (base_dir, NULL, NULL)); + } +#undef CHECK_AND_RETURN + return TRUE; } -static void -check_colors_files_for_name (NmCli *nmc, NmcColorOption *color_option, - const char *base_dir, const char *name) +static char * +check_colors_check_palette (const char *base_dir_1, const char *base_dir_2, const char *name, const char *term) { - const gchar *term; + int i; - /* Take a shortcut if the directory is not there. */ - if (!g_file_test (base_dir, G_FILE_TEST_EXISTS)) - return; + if (term && strchr (term, '/')) + term = NULL; - term = g_getenv ("TERM"); - if (term) - check_colors_files_for_term (nmc, color_option, base_dir, name, term); - check_colors_files_for_term (nmc, color_option, base_dir, name, NULL); +#define CHECK_AND_RETURN(cmd) \ + G_STMT_START { \ + char *_palette; \ + \ + _palette = (cmd); \ + if (_palette) \ + return _palette; \ + } G_STMT_END + + for (i = 0; i < 2; i++) { + const char *base_dir = (i == 0 ? base_dir_1 : base_dir_2); + + if (!base_dir) + continue; + if (name && term) + CHECK_AND_RETURN (check_colors_check_palette_one_file (base_dir, name, term)); + if (name) + CHECK_AND_RETURN (check_colors_check_palette_one_file (base_dir, name, NULL)); + if (term) + CHECK_AND_RETURN (check_colors_check_palette_one_file (base_dir, NULL, term)); + if (TRUE) + CHECK_AND_RETURN (check_colors_check_palette_one_file (base_dir, NULL, NULL)); + } +#undef CHECK_AND_RETURN + return NULL; } -static void -check_colors_files_for_base_dir (NmCli *nmc, NmcColorOption *color_option, - const char *base_dir) +static gboolean +check_colors (NmcColorOption color_option, + char **out_palette_str) { - check_colors_files_for_name (nmc, color_option, base_dir, "nmcli"); - check_colors_files_for_name (nmc, color_option, base_dir, NULL); + const char *base_dir_1, *base_dir_2; + const char *const NAME = "nmcli"; + const char *term; + + *out_palette_str = NULL; + + if (!NM_IN_SET (color_option, NMC_USE_COLOR_AUTO, NMC_USE_COLOR_YES)) { + /* nothing to do. Colors are disabled. */ + return FALSE; + } + + term = g_getenv ("TERM"); + + if (color_option == NMC_USE_COLOR_AUTO) { + if ( nm_streq0 (term, "dumb") + || !isatty (STDOUT_FILENO)) + return FALSE; + } + + base_dir_1 = g_get_user_config_dir (); + base_dir_2 = ""SYSCONFDIR; + + if (base_dir_1) { + if ( nm_streq (base_dir_1, base_dir_2) + || !g_file_test (base_dir_1, G_FILE_TEST_EXISTS)) + base_dir_1 = NULL; + } + if (!g_file_test (base_dir_2, G_FILE_TEST_EXISTS)) + base_dir_2 = NULL; + + if ( color_option == NMC_USE_COLOR_AUTO + && !check_colors_check_enabled (base_dir_1, base_dir_2, NAME, term)) + return FALSE; + + *out_palette_str = check_colors_check_palette (base_dir_1, base_dir_2, NAME, term); + return TRUE; } static const char * @@ -415,7 +504,7 @@ resolve_color_alias (const char *color) static const struct { const char *name; const char *alias; - } aliases[] = { + } const aliases[] = { { "reset", "0" }, { "bold", "1" }, { "white", "1;37" }, @@ -455,12 +544,17 @@ resolve_color_alias (const char *color) } static gboolean -parse_color_scheme (NmCli *nmc, GError **error) +parse_color_scheme (char *palette_buffer, + const char **palette /* _NM_META_COLOR_NUM elements */, + GError **error) { - char *p = nmc->palette_buffer; + char *p = palette_buffer; const char *name; const char *color; - const char *map[_NM_META_COLOR_NUM] = { + const char *tmp_palette[_NM_META_COLOR_NUM] = { + DEFAULT_PALETTE_INIT + }; + static const char *const map[_NM_META_COLOR_NUM] = { [NM_META_COLOR_NONE] = NULL, [NM_META_COLOR_CONNECTION_ACTIVATED] = "connection-activated", [NM_META_COLOR_CONNECTION_ACTIVATING] = "connection-activating", @@ -573,7 +667,7 @@ parse_color_scheme (NmCli *nmc, GError **error) /* All good, set the palette entry. */ for (i = NM_META_COLOR_NONE + 1; i < _NM_META_COLOR_NUM; i++) { if (strcmp (map[i], name) == 0) { - nmc->nmc_config_mutable.palette[i] = resolve_color_alias (color); + tmp_palette[i] = resolve_color_alias (color); break; } } @@ -581,38 +675,30 @@ parse_color_scheme (NmCli *nmc, GError **error) g_debug ("Ignoring an unrecognized color: '%s'\n", name); } + memcpy (palette, tmp_palette, sizeof (tmp_palette)); return TRUE; } static void -set_colors (NmCli *nmc, NmcColorOption color_option) +set_colors (NmcColorOption color_option, + bool *out_use_colors, + char **out_palette_buffer, + const char **palette /* _NM_META_COLOR_NUM elements */) { - GError *error = NULL; - - if (color_option == NMC_USE_COLOR_AUTO) { - if ( g_strcmp0 (g_getenv ("TERM"), "dumb") == 0 - || !isatty (STDOUT_FILENO)) - color_option = NMC_USE_COLOR_NO; - } + gs_free char *palette_str = NULL; + gboolean use_colors; - check_colors_files_for_base_dir (nmc, &color_option, g_get_user_config_dir ()); - check_colors_files_for_base_dir (nmc, &color_option, SYSCONFDIR); + use_colors = check_colors (color_option, &palette_str); - switch (color_option) { - case NMC_USE_COLOR_YES: - case NMC_USE_COLOR_AUTO: - nmc->nmc_config_mutable.use_colors = TRUE; - break; - case NMC_USE_COLOR_NO: - nmc->nmc_config_mutable.use_colors = FALSE; - break; - } + *out_use_colors = use_colors; + if (use_colors && palette_str) { + GError *error = NULL; - if (nmc->nmc_config_mutable.use_colors && nmc->palette_buffer) { - if (!parse_color_scheme (nmc, &error)) { + if (!parse_color_scheme (palette_str, palette, &error)) { g_debug ("Error parsing color scheme: %s", error->message); g_error_free (error); - } + } else + *out_palette_buffer = g_steal_pointer (&palette_str); } } @@ -771,7 +857,10 @@ process_command_line (NmCli *nmc, int argc, char **argv) if (nmc->required_fields) nmc->nmc_config_mutable.overview = FALSE; - set_colors (nmc, colors); + set_colors (colors, + &nmc->nmc_config_mutable.use_colors, + &nmc->palette_buffer, + nmc->nmc_config_mutable.palette); /* Now run the requested command */ nmc_do_cmd (nmc, nmcli_cmds, *argv, argc, argv); diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index bcf1c01b12..d817e09b2b 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -106,7 +106,7 @@ struct _NmcOutputField { typedef struct _NmcConfig { NMCPrintOutput print_output; /* Output mode */ - gboolean use_colors; /* Whether to use colors for output: option '--color' */ + bool use_colors; /* Whether to use colors for output: option '--color' */ bool multiline_output; /* Multiline output instead of default tabular */ bool escape_values; /* Whether to escape ':' and '\' in terse tabular mode */ bool in_editor; /* Whether running the editor - nmcli con edit' */ diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 3e4bd1bb0b..649cbf4ef5 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2010 - 2017 Red Hat, Inc. + * Copyright 2010 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -775,7 +775,9 @@ _get_fcn_gobject_int (ARGS_GET_FCN) GParamSpec *pspec; nm_auto_unset_gvalue GValue gval = G_VALUE_INIT; gint64 v; + guint base = 10; const NMMetaUtilsIntValueInfo *value_infos; + char *return_str; RETURN_UNSUPPORTED_GET_TYPE (); @@ -801,19 +803,38 @@ _get_fcn_gobject_int (ARGS_GET_FCN) break; } + if ( property_info->property_typ_data + && property_info->property_typ_data->subtype.gobject_int.base > 0) { + base = property_info->property_typ_data->subtype.gobject_int.base; + } + + switch (base) { + case 10: + return_str = g_strdup_printf ("%"G_GINT64_FORMAT, v); + break; + case 16: + return_str = g_strdup_printf ("0x%"G_GINT64_MODIFIER"x", v); + break; + default: + return_str = NULL; + g_assert_not_reached (); + } + if ( get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY && property_info->property_typ_data && (value_infos = property_info->property_typ_data->subtype.gobject_int.value_infos)) { for (; value_infos->nick; value_infos++) { if (value_infos->value == v) { - RETURN_STR_TO_FREE (g_strdup_printf ("%lli (%s)", - (long long) v, - value_infos->nick)); + char *old_str = return_str; + + return_str = g_strdup_printf ("%s (%s)", old_str, value_infos->nick); + g_free (old_str); + break; } } } - RETURN_STR_TO_FREE (g_strdup_printf ("%"G_GINT64_FORMAT, v)); + RETURN_STR_TO_FREE (return_str); } static gconstpointer @@ -1179,6 +1200,11 @@ _set_fcn_gobject_mtu (ARGS_SET_FCN) return TRUE; } +/* Ideally we'll be able to get this from a public header. */ +#ifndef IEEE802154_ADDR_LEN +#define IEEE802154_ADDR_LEN 8 +#endif + static gboolean _set_fcn_gobject_mac (ARGS_SET_FCN) { @@ -1190,9 +1216,11 @@ _set_fcn_gobject_mac (ARGS_SET_FCN) else mode = NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT; - if (mode == NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND) + if (mode == NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND) { valid = nm_utils_hwaddr_valid (value, INFINIBAND_ALEN); - else { + } else if (mode == NM_META_PROPERTY_TYPE_MAC_MODE_WPAN) { + valid = nm_utils_hwaddr_valid (value, IEEE802154_ADDR_LEN); + } else { valid = nm_utils_hwaddr_valid (value, ETH_ALEN) || ( mode == NM_META_PROPERTY_TYPE_MAC_MODE_CLONED && NM_CLONED_MAC_IS_SPECIAL (value)); @@ -7414,6 +7442,65 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = { NULL }; +#undef _CURRENT_NM_META_SETTING_TYPE +#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WPAN +static const NMMetaPropertyInfo *const property_infos_WPAN[] = { + PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_MAC_ADDRESS, + .property_type = &_pt_gobject_mac, + .is_cli_option = TRUE, + .property_alias = "mac", + .prompt = N_("MAC [none]"), + .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac, + .mode = NM_META_PROPERTY_TYPE_MAC_MODE_WPAN, + ), + ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_SHORT_ADDRESS, + .is_cli_option = TRUE, + .property_alias = "short-addr", + .prompt = N_("Short address (<0x0000-0xffff>)"), + .property_type = &_pt_gobject_int, + .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \ + .base = 16, + .value_infos = INT_VALUE_INFOS ( + { + .value = G_MAXUINT16, + .nick = "unset", + } + ), + ), + ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_PAN_ID, + .is_cli_option = TRUE, + .inf_flags = NM_META_PROPERTY_INF_FLAG_REQD, + .property_alias = "pan-id", + .prompt = N_("PAN Identifier (<0x0000-0xffff>)"), + .property_type = &_pt_gobject_int, + .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \ + .base = 16, + .value_infos = INT_VALUE_INFOS ( + { + .value = G_MAXUINT16, + .nick = "unset", + } + ), + ), + ), + NULL +}; + +#undef _CURRENT_NM_META_SETTING_TYPE +#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN +static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = { + PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT, + .is_cli_option = TRUE, + .property_alias = "dev", + .inf_flags = NM_META_PROPERTY_INF_FLAG_REQD, + .prompt = N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"), + .property_type = &_pt_gobject_string, + ), + NULL +}; + /*****************************************************************************/ static void @@ -7574,6 +7661,8 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN) #define SETTING_PRETTY_NAME_WIRED N_("Wired Ethernet") #define SETTING_PRETTY_NAME_WIRELESS N_("Wi-Fi connection") #define SETTING_PRETTY_NAME_WIRELESS_SECURITY N_("Wi-Fi security settings") +#define SETTING_PRETTY_NAME_WPAN N_("WPAN settings") +#define SETTING_PRETTY_NAME_6LOWPAN N_("6LOWPAN settings") #define NM_META_SETTING_VALID_PARTS(...) \ ((const NMMetaSettingValidPartItem *const[]) { __VA_ARGS__ NULL }) @@ -7601,6 +7690,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = { .pretty_name = SETTING_PRETTY_NAME_##type, \ __VA_ARGS__ \ } + SETTING_INFO (6LOWPAN, + .valid_parts = NM_META_SETTING_VALID_PARTS ( + NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE), + NM_META_SETTING_VALID_PART_ITEM (6LOWPAN, TRUE), + ), + ), SETTING_INFO (802_1X), SETTING_INFO (ADSL, .valid_parts = NM_META_SETTING_VALID_PARTS ( @@ -7815,6 +7910,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = { SETTING_INFO (WIRELESS_SECURITY, .alias = "wifi-sec", ), + SETTING_INFO (WPAN, + .valid_parts = NM_META_SETTING_VALID_PARTS ( + NM_META_SETTING_VALID_PART_ITEM (CONNECTION, TRUE), + NM_META_SETTING_VALID_PART_ITEM (WPAN, TRUE), + ), + ), }; /*****************************************************************************/ diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index e7ab6e860a..01a823cce2 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -163,6 +163,7 @@ typedef enum { NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT, NM_META_PROPERTY_TYPE_MAC_MODE_CLONED, NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND, + NM_META_PROPERTY_TYPE_MAC_MODE_WPAN, } NMMetaPropertyTypeMacMode; typedef struct _NMMetaEnvironment NMMetaEnvironment; diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index 7ad8c19a6e..bde1d1900a 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -1,5 +1,7 @@ /* Generated file. Do not edit. */ +#define DESCRIBE_DOC_NM_SETTING_6LOWPAN_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_6LOWPAN_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this 6LowPAN interface should be created.") #define DESCRIBE_DOC_NM_SETTING_OLPC_MESH_CHANNEL N_("Channel on which the mesh network to join is located.") #define DESCRIBE_DOC_NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS N_("Anycast DHCP MAC address used when requesting an IP address via DHCP. The specific anycast address used determines which DHCP server class answers the request.") #define DESCRIBE_DOC_NM_SETTING_OLPC_MESH_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\".") @@ -391,3 +393,7 @@ #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1") #define DESCRIBE_DOC_NM_SETTING_WIMAX_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_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1") +#define DESCRIBE_DOC_NM_SETTING_WPAN_MAC_ADDRESS N_("If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) MAC layer device whose permanent MAC address matches.") +#define DESCRIBE_DOC_NM_SETTING_WPAN_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_WPAN_PAN_ID N_("IEEE 802.15.4 Personal Area Network (PAN) identifier.") +#define DESCRIBE_DOC_NM_SETTING_WPAN_SHORT_ADDRESS N_("Short IEEE 802.15.4 address to be used within a restricted environment.") diff --git a/clients/tests/terminal-colors.d/nmcli.enable b/clients/tests/terminal-colors.d/nmcli.enable new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/clients/tests/terminal-colors.d/nmcli.enable diff --git a/clients/tests/terminal-colors.d/nmcli.schem b/clients/tests/terminal-colors.d/nmcli.schem new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/clients/tests/terminal-colors.d/nmcli.schem diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am index 298ca689ef..94d016b84b 100644 --- a/clients/tests/test-client.check-on-disk/Makefile.am +++ b/clients/tests/test-client.check-on-disk/Makefile.am @@ -28,6 +28,24 @@ clients_tests_expected_files = \ clients/tests/test-client.check-on-disk/test_001-024.expected \ clients/tests/test-client.check-on-disk/test_001-025.expected \ clients/tests/test-client.check-on-disk/test_001-026.expected \ + clients/tests/test-client.check-on-disk/test_001-027.expected \ + clients/tests/test-client.check-on-disk/test_001-028.expected \ + clients/tests/test-client.check-on-disk/test_001-029.expected \ + clients/tests/test-client.check-on-disk/test_001-030.expected \ + clients/tests/test-client.check-on-disk/test_001-031.expected \ + clients/tests/test-client.check-on-disk/test_001-032.expected \ + clients/tests/test-client.check-on-disk/test_001-033.expected \ + clients/tests/test-client.check-on-disk/test_001-034.expected \ + clients/tests/test-client.check-on-disk/test_001-035.expected \ + clients/tests/test-client.check-on-disk/test_001-036.expected \ + clients/tests/test-client.check-on-disk/test_001-037.expected \ + clients/tests/test-client.check-on-disk/test_001-038.expected \ + clients/tests/test-client.check-on-disk/test_001-039.expected \ + clients/tests/test-client.check-on-disk/test_001-040.expected \ + clients/tests/test-client.check-on-disk/test_001-041.expected \ + clients/tests/test-client.check-on-disk/test_001-042.expected \ + clients/tests/test-client.check-on-disk/test_001-043.expected \ + clients/tests/test-client.check-on-disk/test_001-044.expected \ clients/tests/test-client.check-on-disk/test_002-001.expected \ clients/tests/test-client.check-on-disk/test_002-002.expected \ clients/tests/test-client.check-on-disk/test_002-003.expected \ @@ -152,6 +170,322 @@ clients_tests_expected_files = \ 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_003-101.expected \ + clients/tests/test-client.check-on-disk/test_003-102.expected \ + clients/tests/test-client.check-on-disk/test_003-103.expected \ + clients/tests/test-client.check-on-disk/test_003-104.expected \ + clients/tests/test-client.check-on-disk/test_003-105.expected \ + clients/tests/test-client.check-on-disk/test_003-106.expected \ + clients/tests/test-client.check-on-disk/test_003-107.expected \ + clients/tests/test-client.check-on-disk/test_003-108.expected \ + clients/tests/test-client.check-on-disk/test_003-109.expected \ + clients/tests/test-client.check-on-disk/test_003-110.expected \ + clients/tests/test-client.check-on-disk/test_003-111.expected \ + clients/tests/test-client.check-on-disk/test_003-112.expected \ + clients/tests/test-client.check-on-disk/test_003-113.expected \ + clients/tests/test-client.check-on-disk/test_003-114.expected \ + clients/tests/test-client.check-on-disk/test_003-115.expected \ + clients/tests/test-client.check-on-disk/test_003-116.expected \ + clients/tests/test-client.check-on-disk/test_003-117.expected \ + clients/tests/test-client.check-on-disk/test_003-118.expected \ + clients/tests/test-client.check-on-disk/test_003-119.expected \ + clients/tests/test-client.check-on-disk/test_003-120.expected \ + clients/tests/test-client.check-on-disk/test_003-121.expected \ + clients/tests/test-client.check-on-disk/test_003-122.expected \ + clients/tests/test-client.check-on-disk/test_003-123.expected \ + clients/tests/test-client.check-on-disk/test_003-124.expected \ + clients/tests/test-client.check-on-disk/test_003-125.expected \ + clients/tests/test-client.check-on-disk/test_003-126.expected \ + clients/tests/test-client.check-on-disk/test_003-127.expected \ + clients/tests/test-client.check-on-disk/test_003-128.expected \ + clients/tests/test-client.check-on-disk/test_003-129.expected \ + clients/tests/test-client.check-on-disk/test_003-130.expected \ + clients/tests/test-client.check-on-disk/test_003-131.expected \ + clients/tests/test-client.check-on-disk/test_003-132.expected \ + clients/tests/test-client.check-on-disk/test_003-133.expected \ + clients/tests/test-client.check-on-disk/test_003-134.expected \ + clients/tests/test-client.check-on-disk/test_003-135.expected \ + clients/tests/test-client.check-on-disk/test_003-136.expected \ + clients/tests/test-client.check-on-disk/test_003-137.expected \ + clients/tests/test-client.check-on-disk/test_003-138.expected \ + clients/tests/test-client.check-on-disk/test_003-139.expected \ + clients/tests/test-client.check-on-disk/test_003-140.expected \ + clients/tests/test-client.check-on-disk/test_003-141.expected \ + clients/tests/test-client.check-on-disk/test_003-142.expected \ + clients/tests/test-client.check-on-disk/test_003-143.expected \ + clients/tests/test-client.check-on-disk/test_003-144.expected \ + clients/tests/test-client.check-on-disk/test_003-145.expected \ + clients/tests/test-client.check-on-disk/test_003-146.expected \ + clients/tests/test-client.check-on-disk/test_003-147.expected \ + clients/tests/test-client.check-on-disk/test_003-148.expected \ + clients/tests/test-client.check-on-disk/test_003-149.expected \ + clients/tests/test-client.check-on-disk/test_003-150.expected \ + clients/tests/test-client.check-on-disk/test_003-151.expected \ + clients/tests/test-client.check-on-disk/test_003-152.expected \ + clients/tests/test-client.check-on-disk/test_003-153.expected \ + clients/tests/test-client.check-on-disk/test_003-154.expected \ + clients/tests/test-client.check-on-disk/test_003-155.expected \ + clients/tests/test-client.check-on-disk/test_003-156.expected \ + clients/tests/test-client.check-on-disk/test_003-157.expected \ + clients/tests/test-client.check-on-disk/test_003-158.expected \ + clients/tests/test-client.check-on-disk/test_003-159.expected \ + clients/tests/test-client.check-on-disk/test_003-160.expected \ + clients/tests/test-client.check-on-disk/test_003-161.expected \ + clients/tests/test-client.check-on-disk/test_003-162.expected \ + clients/tests/test-client.check-on-disk/test_003-163.expected \ + clients/tests/test-client.check-on-disk/test_003-164.expected \ + clients/tests/test-client.check-on-disk/test_003-165.expected \ + clients/tests/test-client.check-on-disk/test_003-166.expected \ + clients/tests/test-client.check-on-disk/test_003-167.expected \ + clients/tests/test-client.check-on-disk/test_003-168.expected \ + clients/tests/test-client.check-on-disk/test_003-169.expected \ + clients/tests/test-client.check-on-disk/test_003-170.expected \ + clients/tests/test-client.check-on-disk/test_003-171.expected \ + clients/tests/test-client.check-on-disk/test_003-172.expected \ + clients/tests/test-client.check-on-disk/test_003-173.expected \ + clients/tests/test-client.check-on-disk/test_003-174.expected \ + clients/tests/test-client.check-on-disk/test_003-175.expected \ + clients/tests/test-client.check-on-disk/test_003-176.expected \ + clients/tests/test-client.check-on-disk/test_003-177.expected \ + clients/tests/test-client.check-on-disk/test_003-178.expected \ + clients/tests/test-client.check-on-disk/test_003-179.expected \ + clients/tests/test-client.check-on-disk/test_003-180.expected \ + clients/tests/test-client.check-on-disk/test_003-181.expected \ + clients/tests/test-client.check-on-disk/test_003-182.expected \ + clients/tests/test-client.check-on-disk/test_003-183.expected \ + clients/tests/test-client.check-on-disk/test_003-184.expected \ + clients/tests/test-client.check-on-disk/test_003-185.expected \ + clients/tests/test-client.check-on-disk/test_003-186.expected \ + clients/tests/test-client.check-on-disk/test_003-187.expected \ + clients/tests/test-client.check-on-disk/test_003-188.expected \ + clients/tests/test-client.check-on-disk/test_003-189.expected \ + clients/tests/test-client.check-on-disk/test_003-190.expected \ + clients/tests/test-client.check-on-disk/test_003-191.expected \ + clients/tests/test-client.check-on-disk/test_003-192.expected \ + clients/tests/test-client.check-on-disk/test_003-193.expected \ + clients/tests/test-client.check-on-disk/test_003-194.expected \ + clients/tests/test-client.check-on-disk/test_003-195.expected \ + clients/tests/test-client.check-on-disk/test_003-196.expected \ + clients/tests/test-client.check-on-disk/test_003-197.expected \ + clients/tests/test-client.check-on-disk/test_003-198.expected \ + clients/tests/test-client.check-on-disk/test_003-199.expected \ + clients/tests/test-client.check-on-disk/test_003-200.expected \ + clients/tests/test-client.check-on-disk/test_003-201.expected \ + clients/tests/test-client.check-on-disk/test_003-202.expected \ + clients/tests/test-client.check-on-disk/test_003-203.expected \ + clients/tests/test-client.check-on-disk/test_003-204.expected \ + clients/tests/test-client.check-on-disk/test_003-205.expected \ + clients/tests/test-client.check-on-disk/test_003-206.expected \ + clients/tests/test-client.check-on-disk/test_003-207.expected \ + clients/tests/test-client.check-on-disk/test_003-208.expected \ + clients/tests/test-client.check-on-disk/test_003-209.expected \ + clients/tests/test-client.check-on-disk/test_003-210.expected \ + clients/tests/test-client.check-on-disk/test_003-211.expected \ + clients/tests/test-client.check-on-disk/test_003-212.expected \ + clients/tests/test-client.check-on-disk/test_003-213.expected \ + clients/tests/test-client.check-on-disk/test_003-214.expected \ + clients/tests/test-client.check-on-disk/test_003-215.expected \ + clients/tests/test-client.check-on-disk/test_003-216.expected \ + clients/tests/test-client.check-on-disk/test_003-217.expected \ + clients/tests/test-client.check-on-disk/test_003-218.expected \ + clients/tests/test-client.check-on-disk/test_003-219.expected \ + clients/tests/test-client.check-on-disk/test_003-220.expected \ + clients/tests/test-client.check-on-disk/test_003-221.expected \ + clients/tests/test-client.check-on-disk/test_003-222.expected \ + clients/tests/test-client.check-on-disk/test_003-223.expected \ + clients/tests/test-client.check-on-disk/test_003-224.expected \ + clients/tests/test-client.check-on-disk/test_003-225.expected \ + clients/tests/test-client.check-on-disk/test_003-226.expected \ + clients/tests/test-client.check-on-disk/test_003-227.expected \ + clients/tests/test-client.check-on-disk/test_003-228.expected \ + clients/tests/test-client.check-on-disk/test_003-229.expected \ + clients/tests/test-client.check-on-disk/test_003-230.expected \ + clients/tests/test-client.check-on-disk/test_003-231.expected \ + clients/tests/test-client.check-on-disk/test_003-232.expected \ + clients/tests/test-client.check-on-disk/test_003-233.expected \ + clients/tests/test-client.check-on-disk/test_003-234.expected \ + clients/tests/test-client.check-on-disk/test_003-235.expected \ + clients/tests/test-client.check-on-disk/test_003-236.expected \ + clients/tests/test-client.check-on-disk/test_003-237.expected \ + clients/tests/test-client.check-on-disk/test_003-238.expected \ + clients/tests/test-client.check-on-disk/test_003-239.expected \ + clients/tests/test-client.check-on-disk/test_003-240.expected \ + clients/tests/test-client.check-on-disk/test_003-241.expected \ + clients/tests/test-client.check-on-disk/test_003-242.expected \ + clients/tests/test-client.check-on-disk/test_003-243.expected \ + clients/tests/test-client.check-on-disk/test_003-244.expected \ + clients/tests/test-client.check-on-disk/test_003-245.expected \ + clients/tests/test-client.check-on-disk/test_003-246.expected \ + clients/tests/test-client.check-on-disk/test_003-247.expected \ + clients/tests/test-client.check-on-disk/test_003-248.expected \ + clients/tests/test-client.check-on-disk/test_003-249.expected \ + clients/tests/test-client.check-on-disk/test_003-250.expected \ + clients/tests/test-client.check-on-disk/test_003-251.expected \ + clients/tests/test-client.check-on-disk/test_003-252.expected \ + clients/tests/test-client.check-on-disk/test_003-253.expected \ + clients/tests/test-client.check-on-disk/test_003-254.expected \ + clients/tests/test-client.check-on-disk/test_003-255.expected \ + clients/tests/test-client.check-on-disk/test_003-256.expected \ + clients/tests/test-client.check-on-disk/test_003-257.expected \ + clients/tests/test-client.check-on-disk/test_003-258.expected \ + clients/tests/test-client.check-on-disk/test_003-259.expected \ + clients/tests/test-client.check-on-disk/test_003-260.expected \ + clients/tests/test-client.check-on-disk/test_003-261.expected \ + clients/tests/test-client.check-on-disk/test_003-262.expected \ + clients/tests/test-client.check-on-disk/test_003-263.expected \ + clients/tests/test-client.check-on-disk/test_003-264.expected \ + clients/tests/test-client.check-on-disk/test_003-265.expected \ + clients/tests/test-client.check-on-disk/test_003-266.expected \ + clients/tests/test-client.check-on-disk/test_003-267.expected \ + clients/tests/test-client.check-on-disk/test_003-268.expected \ + clients/tests/test-client.check-on-disk/test_003-269.expected \ + clients/tests/test-client.check-on-disk/test_003-270.expected \ + clients/tests/test-client.check-on-disk/test_003-271.expected \ + clients/tests/test-client.check-on-disk/test_003-272.expected \ + clients/tests/test-client.check-on-disk/test_003-273.expected \ + clients/tests/test-client.check-on-disk/test_003-274.expected \ + clients/tests/test-client.check-on-disk/test_003-275.expected \ + clients/tests/test-client.check-on-disk/test_003-276.expected \ + clients/tests/test-client.check-on-disk/test_003-277.expected \ + clients/tests/test-client.check-on-disk/test_003-278.expected \ + clients/tests/test-client.check-on-disk/test_003-279.expected \ + clients/tests/test-client.check-on-disk/test_003-280.expected \ + clients/tests/test-client.check-on-disk/test_003-281.expected \ + clients/tests/test-client.check-on-disk/test_003-282.expected \ + clients/tests/test-client.check-on-disk/test_003-283.expected \ + clients/tests/test-client.check-on-disk/test_003-284.expected \ + clients/tests/test-client.check-on-disk/test_003-285.expected \ + clients/tests/test-client.check-on-disk/test_003-286.expected \ + clients/tests/test-client.check-on-disk/test_003-287.expected \ + clients/tests/test-client.check-on-disk/test_003-288.expected \ + clients/tests/test-client.check-on-disk/test_003-289.expected \ + clients/tests/test-client.check-on-disk/test_003-290.expected \ + clients/tests/test-client.check-on-disk/test_003-291.expected \ + clients/tests/test-client.check-on-disk/test_003-292.expected \ + clients/tests/test-client.check-on-disk/test_003-293.expected \ + clients/tests/test-client.check-on-disk/test_003-294.expected \ + clients/tests/test-client.check-on-disk/test_003-295.expected \ + clients/tests/test-client.check-on-disk/test_003-296.expected \ + clients/tests/test-client.check-on-disk/test_003-297.expected \ + clients/tests/test-client.check-on-disk/test_003-298.expected \ + clients/tests/test-client.check-on-disk/test_003-299.expected \ + clients/tests/test-client.check-on-disk/test_003-300.expected \ + clients/tests/test-client.check-on-disk/test_003-301.expected \ + clients/tests/test-client.check-on-disk/test_003-302.expected \ + clients/tests/test-client.check-on-disk/test_003-303.expected \ + clients/tests/test-client.check-on-disk/test_003-304.expected \ + clients/tests/test-client.check-on-disk/test_003-305.expected \ + clients/tests/test-client.check-on-disk/test_003-306.expected \ + clients/tests/test-client.check-on-disk/test_003-307.expected \ + clients/tests/test-client.check-on-disk/test_003-308.expected \ + clients/tests/test-client.check-on-disk/test_003-309.expected \ + clients/tests/test-client.check-on-disk/test_003-310.expected \ + clients/tests/test-client.check-on-disk/test_003-311.expected \ + clients/tests/test-client.check-on-disk/test_003-312.expected \ + clients/tests/test-client.check-on-disk/test_003-313.expected \ + clients/tests/test-client.check-on-disk/test_003-314.expected \ + clients/tests/test-client.check-on-disk/test_003-315.expected \ + clients/tests/test-client.check-on-disk/test_003-316.expected \ + clients/tests/test-client.check-on-disk/test_003-317.expected \ + clients/tests/test-client.check-on-disk/test_003-318.expected \ + clients/tests/test-client.check-on-disk/test_003-319.expected \ + clients/tests/test-client.check-on-disk/test_003-320.expected \ + clients/tests/test-client.check-on-disk/test_003-321.expected \ + clients/tests/test-client.check-on-disk/test_003-322.expected \ + clients/tests/test-client.check-on-disk/test_003-323.expected \ + clients/tests/test-client.check-on-disk/test_003-324.expected \ + clients/tests/test-client.check-on-disk/test_003-325.expected \ + clients/tests/test-client.check-on-disk/test_003-326.expected \ + clients/tests/test-client.check-on-disk/test_003-327.expected \ + clients/tests/test-client.check-on-disk/test_003-328.expected \ + clients/tests/test-client.check-on-disk/test_003-329.expected \ + clients/tests/test-client.check-on-disk/test_003-330.expected \ + clients/tests/test-client.check-on-disk/test_003-331.expected \ + clients/tests/test-client.check-on-disk/test_003-332.expected \ + clients/tests/test-client.check-on-disk/test_003-333.expected \ + clients/tests/test-client.check-on-disk/test_003-334.expected \ + clients/tests/test-client.check-on-disk/test_003-335.expected \ + clients/tests/test-client.check-on-disk/test_003-336.expected \ + clients/tests/test-client.check-on-disk/test_003-337.expected \ + clients/tests/test-client.check-on-disk/test_003-338.expected \ + clients/tests/test-client.check-on-disk/test_003-339.expected \ + clients/tests/test-client.check-on-disk/test_003-340.expected \ + clients/tests/test-client.check-on-disk/test_003-341.expected \ + clients/tests/test-client.check-on-disk/test_003-342.expected \ + clients/tests/test-client.check-on-disk/test_003-343.expected \ + clients/tests/test-client.check-on-disk/test_003-344.expected \ + clients/tests/test-client.check-on-disk/test_003-345.expected \ + clients/tests/test-client.check-on-disk/test_003-346.expected \ + clients/tests/test-client.check-on-disk/test_003-347.expected \ + clients/tests/test-client.check-on-disk/test_003-348.expected \ + clients/tests/test-client.check-on-disk/test_003-349.expected \ + clients/tests/test-client.check-on-disk/test_003-350.expected \ + clients/tests/test-client.check-on-disk/test_003-351.expected \ + clients/tests/test-client.check-on-disk/test_003-352.expected \ + clients/tests/test-client.check-on-disk/test_003-353.expected \ + clients/tests/test-client.check-on-disk/test_003-354.expected \ + clients/tests/test-client.check-on-disk/test_003-355.expected \ + clients/tests/test-client.check-on-disk/test_003-356.expected \ + clients/tests/test-client.check-on-disk/test_003-357.expected \ + clients/tests/test-client.check-on-disk/test_003-358.expected \ + clients/tests/test-client.check-on-disk/test_003-359.expected \ + clients/tests/test-client.check-on-disk/test_003-360.expected \ + clients/tests/test-client.check-on-disk/test_003-361.expected \ + clients/tests/test-client.check-on-disk/test_003-362.expected \ + clients/tests/test-client.check-on-disk/test_003-363.expected \ + clients/tests/test-client.check-on-disk/test_003-364.expected \ + clients/tests/test-client.check-on-disk/test_003-365.expected \ + clients/tests/test-client.check-on-disk/test_003-366.expected \ + clients/tests/test-client.check-on-disk/test_003-367.expected \ + clients/tests/test-client.check-on-disk/test_003-368.expected \ + clients/tests/test-client.check-on-disk/test_003-369.expected \ + clients/tests/test-client.check-on-disk/test_003-370.expected \ + clients/tests/test-client.check-on-disk/test_003-371.expected \ + clients/tests/test-client.check-on-disk/test_003-372.expected \ + clients/tests/test-client.check-on-disk/test_003-373.expected \ + clients/tests/test-client.check-on-disk/test_003-374.expected \ + clients/tests/test-client.check-on-disk/test_003-375.expected \ + clients/tests/test-client.check-on-disk/test_003-376.expected \ + clients/tests/test-client.check-on-disk/test_003-377.expected \ + clients/tests/test-client.check-on-disk/test_003-378.expected \ + clients/tests/test-client.check-on-disk/test_003-379.expected \ + clients/tests/test-client.check-on-disk/test_003-380.expected \ + clients/tests/test-client.check-on-disk/test_003-381.expected \ + clients/tests/test-client.check-on-disk/test_003-382.expected \ + clients/tests/test-client.check-on-disk/test_003-383.expected \ + clients/tests/test-client.check-on-disk/test_003-384.expected \ + clients/tests/test-client.check-on-disk/test_003-385.expected \ + clients/tests/test-client.check-on-disk/test_003-386.expected \ + clients/tests/test-client.check-on-disk/test_003-387.expected \ + clients/tests/test-client.check-on-disk/test_003-388.expected \ + clients/tests/test-client.check-on-disk/test_003-389.expected \ + clients/tests/test-client.check-on-disk/test_003-390.expected \ + clients/tests/test-client.check-on-disk/test_003-391.expected \ + clients/tests/test-client.check-on-disk/test_003-392.expected \ + clients/tests/test-client.check-on-disk/test_003-393.expected \ + clients/tests/test-client.check-on-disk/test_003-394.expected \ + clients/tests/test-client.check-on-disk/test_003-395.expected \ + clients/tests/test-client.check-on-disk/test_003-396.expected \ + clients/tests/test-client.check-on-disk/test_003-397.expected \ + clients/tests/test-client.check-on-disk/test_003-398.expected \ + clients/tests/test-client.check-on-disk/test_003-399.expected \ + clients/tests/test-client.check-on-disk/test_003-400.expected \ + clients/tests/test-client.check-on-disk/test_003-401.expected \ + clients/tests/test-client.check-on-disk/test_003-402.expected \ + clients/tests/test-client.check-on-disk/test_003-403.expected \ + clients/tests/test-client.check-on-disk/test_003-404.expected \ + clients/tests/test-client.check-on-disk/test_003-405.expected \ + clients/tests/test-client.check-on-disk/test_003-406.expected \ + clients/tests/test-client.check-on-disk/test_003-407.expected \ + clients/tests/test-client.check-on-disk/test_003-408.expected \ + clients/tests/test-client.check-on-disk/test_003-409.expected \ + clients/tests/test-client.check-on-disk/test_003-410.expected \ + clients/tests/test-client.check-on-disk/test_003-411.expected \ + clients/tests/test-client.check-on-disk/test_003-412.expected \ + clients/tests/test-client.check-on-disk/test_003-413.expected \ + clients/tests/test-client.check-on-disk/test_003-414.expected \ + clients/tests/test-client.check-on-disk/test_003-415.expected \ + clients/tests/test-client.check-on-disk/test_003-416.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 \ @@ -356,4 +690,166 @@ clients_tests_expected_files = \ 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 \ + clients/tests/test-client.check-on-disk/test_004-205.expected \ + clients/tests/test-client.check-on-disk/test_004-206.expected \ + clients/tests/test-client.check-on-disk/test_004-207.expected \ + clients/tests/test-client.check-on-disk/test_004-208.expected \ + clients/tests/test-client.check-on-disk/test_004-209.expected \ + clients/tests/test-client.check-on-disk/test_004-210.expected \ + clients/tests/test-client.check-on-disk/test_004-211.expected \ + clients/tests/test-client.check-on-disk/test_004-212.expected \ + clients/tests/test-client.check-on-disk/test_004-213.expected \ + clients/tests/test-client.check-on-disk/test_004-214.expected \ + clients/tests/test-client.check-on-disk/test_004-215.expected \ + clients/tests/test-client.check-on-disk/test_004-216.expected \ + clients/tests/test-client.check-on-disk/test_004-217.expected \ + clients/tests/test-client.check-on-disk/test_004-218.expected \ + clients/tests/test-client.check-on-disk/test_004-219.expected \ + clients/tests/test-client.check-on-disk/test_004-220.expected \ + clients/tests/test-client.check-on-disk/test_004-221.expected \ + clients/tests/test-client.check-on-disk/test_004-222.expected \ + clients/tests/test-client.check-on-disk/test_004-223.expected \ + clients/tests/test-client.check-on-disk/test_004-224.expected \ + clients/tests/test-client.check-on-disk/test_004-225.expected \ + clients/tests/test-client.check-on-disk/test_004-226.expected \ + clients/tests/test-client.check-on-disk/test_004-227.expected \ + clients/tests/test-client.check-on-disk/test_004-228.expected \ + clients/tests/test-client.check-on-disk/test_004-229.expected \ + clients/tests/test-client.check-on-disk/test_004-230.expected \ + clients/tests/test-client.check-on-disk/test_004-231.expected \ + clients/tests/test-client.check-on-disk/test_004-232.expected \ + clients/tests/test-client.check-on-disk/test_004-233.expected \ + clients/tests/test-client.check-on-disk/test_004-234.expected \ + clients/tests/test-client.check-on-disk/test_004-235.expected \ + clients/tests/test-client.check-on-disk/test_004-236.expected \ + clients/tests/test-client.check-on-disk/test_004-237.expected \ + clients/tests/test-client.check-on-disk/test_004-238.expected \ + clients/tests/test-client.check-on-disk/test_004-239.expected \ + clients/tests/test-client.check-on-disk/test_004-240.expected \ + clients/tests/test-client.check-on-disk/test_004-241.expected \ + clients/tests/test-client.check-on-disk/test_004-242.expected \ + clients/tests/test-client.check-on-disk/test_004-243.expected \ + clients/tests/test-client.check-on-disk/test_004-244.expected \ + clients/tests/test-client.check-on-disk/test_004-245.expected \ + clients/tests/test-client.check-on-disk/test_004-246.expected \ + clients/tests/test-client.check-on-disk/test_004-247.expected \ + clients/tests/test-client.check-on-disk/test_004-248.expected \ + clients/tests/test-client.check-on-disk/test_004-249.expected \ + clients/tests/test-client.check-on-disk/test_004-250.expected \ + clients/tests/test-client.check-on-disk/test_004-251.expected \ + clients/tests/test-client.check-on-disk/test_004-252.expected \ + clients/tests/test-client.check-on-disk/test_004-253.expected \ + clients/tests/test-client.check-on-disk/test_004-254.expected \ + clients/tests/test-client.check-on-disk/test_004-255.expected \ + clients/tests/test-client.check-on-disk/test_004-256.expected \ + clients/tests/test-client.check-on-disk/test_004-257.expected \ + clients/tests/test-client.check-on-disk/test_004-258.expected \ + clients/tests/test-client.check-on-disk/test_004-259.expected \ + clients/tests/test-client.check-on-disk/test_004-260.expected \ + clients/tests/test-client.check-on-disk/test_004-261.expected \ + clients/tests/test-client.check-on-disk/test_004-262.expected \ + clients/tests/test-client.check-on-disk/test_004-263.expected \ + clients/tests/test-client.check-on-disk/test_004-264.expected \ + clients/tests/test-client.check-on-disk/test_004-265.expected \ + clients/tests/test-client.check-on-disk/test_004-266.expected \ + clients/tests/test-client.check-on-disk/test_004-267.expected \ + clients/tests/test-client.check-on-disk/test_004-268.expected \ + clients/tests/test-client.check-on-disk/test_004-269.expected \ + clients/tests/test-client.check-on-disk/test_004-270.expected \ + clients/tests/test-client.check-on-disk/test_004-271.expected \ + clients/tests/test-client.check-on-disk/test_004-272.expected \ + clients/tests/test-client.check-on-disk/test_004-273.expected \ + clients/tests/test-client.check-on-disk/test_004-274.expected \ + clients/tests/test-client.check-on-disk/test_004-275.expected \ + clients/tests/test-client.check-on-disk/test_004-276.expected \ + clients/tests/test-client.check-on-disk/test_004-277.expected \ + clients/tests/test-client.check-on-disk/test_004-278.expected \ + clients/tests/test-client.check-on-disk/test_004-279.expected \ + clients/tests/test-client.check-on-disk/test_004-280.expected \ + clients/tests/test-client.check-on-disk/test_004-281.expected \ + clients/tests/test-client.check-on-disk/test_004-282.expected \ + clients/tests/test-client.check-on-disk/test_004-283.expected \ + clients/tests/test-client.check-on-disk/test_004-284.expected \ + clients/tests/test-client.check-on-disk/test_004-285.expected \ + clients/tests/test-client.check-on-disk/test_004-286.expected \ + clients/tests/test-client.check-on-disk/test_004-287.expected \ + clients/tests/test-client.check-on-disk/test_004-288.expected \ + clients/tests/test-client.check-on-disk/test_004-289.expected \ + clients/tests/test-client.check-on-disk/test_004-290.expected \ + clients/tests/test-client.check-on-disk/test_004-291.expected \ + clients/tests/test-client.check-on-disk/test_004-292.expected \ + clients/tests/test-client.check-on-disk/test_004-293.expected \ + clients/tests/test-client.check-on-disk/test_004-294.expected \ + clients/tests/test-client.check-on-disk/test_004-295.expected \ + clients/tests/test-client.check-on-disk/test_004-296.expected \ + clients/tests/test-client.check-on-disk/test_004-297.expected \ + clients/tests/test-client.check-on-disk/test_004-298.expected \ + clients/tests/test-client.check-on-disk/test_004-299.expected \ + clients/tests/test-client.check-on-disk/test_004-300.expected \ + clients/tests/test-client.check-on-disk/test_004-301.expected \ + clients/tests/test-client.check-on-disk/test_004-302.expected \ + clients/tests/test-client.check-on-disk/test_004-303.expected \ + clients/tests/test-client.check-on-disk/test_004-304.expected \ + clients/tests/test-client.check-on-disk/test_004-305.expected \ + clients/tests/test-client.check-on-disk/test_004-306.expected \ + clients/tests/test-client.check-on-disk/test_004-307.expected \ + clients/tests/test-client.check-on-disk/test_004-308.expected \ + clients/tests/test-client.check-on-disk/test_004-309.expected \ + clients/tests/test-client.check-on-disk/test_004-310.expected \ + clients/tests/test-client.check-on-disk/test_004-311.expected \ + clients/tests/test-client.check-on-disk/test_004-312.expected \ + clients/tests/test-client.check-on-disk/test_004-313.expected \ + clients/tests/test-client.check-on-disk/test_004-314.expected \ + clients/tests/test-client.check-on-disk/test_004-315.expected \ + clients/tests/test-client.check-on-disk/test_004-316.expected \ + clients/tests/test-client.check-on-disk/test_004-317.expected \ + clients/tests/test-client.check-on-disk/test_004-318.expected \ + clients/tests/test-client.check-on-disk/test_004-319.expected \ + clients/tests/test-client.check-on-disk/test_004-320.expected \ + clients/tests/test-client.check-on-disk/test_004-321.expected \ + clients/tests/test-client.check-on-disk/test_004-322.expected \ + clients/tests/test-client.check-on-disk/test_004-323.expected \ + clients/tests/test-client.check-on-disk/test_004-324.expected \ + clients/tests/test-client.check-on-disk/test_004-325.expected \ + clients/tests/test-client.check-on-disk/test_004-326.expected \ + clients/tests/test-client.check-on-disk/test_004-327.expected \ + clients/tests/test-client.check-on-disk/test_004-328.expected \ + clients/tests/test-client.check-on-disk/test_004-329.expected \ + clients/tests/test-client.check-on-disk/test_004-330.expected \ + clients/tests/test-client.check-on-disk/test_004-331.expected \ + clients/tests/test-client.check-on-disk/test_004-332.expected \ + clients/tests/test-client.check-on-disk/test_004-333.expected \ + clients/tests/test-client.check-on-disk/test_004-334.expected \ + clients/tests/test-client.check-on-disk/test_004-335.expected \ + clients/tests/test-client.check-on-disk/test_004-336.expected \ + clients/tests/test-client.check-on-disk/test_004-337.expected \ + clients/tests/test-client.check-on-disk/test_004-338.expected \ + clients/tests/test-client.check-on-disk/test_004-339.expected \ + clients/tests/test-client.check-on-disk/test_004-340.expected \ + clients/tests/test-client.check-on-disk/test_004-341.expected \ + clients/tests/test-client.check-on-disk/test_004-342.expected \ + clients/tests/test-client.check-on-disk/test_004-343.expected \ + clients/tests/test-client.check-on-disk/test_004-344.expected \ + clients/tests/test-client.check-on-disk/test_004-345.expected \ + clients/tests/test-client.check-on-disk/test_004-346.expected \ + clients/tests/test-client.check-on-disk/test_004-347.expected \ + clients/tests/test-client.check-on-disk/test_004-348.expected \ + clients/tests/test-client.check-on-disk/test_004-349.expected \ + clients/tests/test-client.check-on-disk/test_004-350.expected \ + clients/tests/test-client.check-on-disk/test_004-351.expected \ + clients/tests/test-client.check-on-disk/test_004-352.expected \ + clients/tests/test-client.check-on-disk/test_004-353.expected \ + clients/tests/test-client.check-on-disk/test_004-354.expected \ + clients/tests/test-client.check-on-disk/test_004-355.expected \ + clients/tests/test-client.check-on-disk/test_004-356.expected \ + clients/tests/test-client.check-on-disk/test_004-357.expected \ + clients/tests/test-client.check-on-disk/test_004-358.expected \ + clients/tests/test-client.check-on-disk/test_004-359.expected \ + clients/tests/test-client.check-on-disk/test_004-360.expected \ + clients/tests/test-client.check-on-disk/test_004-361.expected \ + clients/tests/test-client.check-on-disk/test_004-362.expected \ + clients/tests/test-client.check-on-disk/test_004-363.expected \ + clients/tests/test-client.check-on-disk/test_004-364.expected \ + clients/tests/test-client.check-on-disk/test_004-365.expected \ + clients/tests/test-client.check-on-disk/test_004-366.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 8762038812..05483ea931 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:752:test_001()/1 +location: clients/tests/test-client.py:755: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 7d995122be..9b0c896fc4 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:752:test_001()/2 +location: clients/tests/test-client.py:755: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 1378170e26..9a74222ee4 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:754:test_001()/3 +location: clients/tests/test-client.py:757: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 3826df4538..850155c564 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:754:test_001()/4 +location: clients/tests/test-client.py:757: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 0ce8a62646..ae15bcc331 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:756:test_001()/5 +location: clients/tests/test-client.py:759: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 52665c266d..dc09ff75f1 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:756:test_001()/6 +location: clients/tests/test-client.py:759: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 c5b269f0db..75436478ef 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:758:test_001()/7 +location: clients/tests/test-client.py:761: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 b7f5f04d76..8bdb38b7c9 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:758:test_001()/8 +location: clients/tests/test-client.py:761: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 c762e51c2b..df3baaa13a 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:761:test_001()/9 +location: clients/tests/test-client.py:764: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 677d7429b5..1772ba8130 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:761:test_001()/10 +location: clients/tests/test-client.py:764: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 757a19cb1f..90de83d05d 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,27 +1,23 @@ -location: clients/tests/test-client.py:761:test_001()/11 -cmd: $NMCLI --pretty general permissions +location: clients/tests/test-client.py:764:test_001()/11 +cmd: $NMCLI --color yes general permissions lang: C returncode: 0 -stdout: 1472 bytes +stdout: 1392 bytes >>> -============================== - NetworkManager permissions -============================== PERMISSION VALUE ---------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.enable-disable-network [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wifi [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wwan [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wimax [32myes[0m +org.freedesktop.NetworkManager.sleep-wake [31mno[0m +org.freedesktop.NetworkManager.network-control [32myes[0m +org.freedesktop.NetworkManager.wifi.share.protected [32myes[0m +org.freedesktop.NetworkManager.wifi.share.open [32myes[0m +org.freedesktop.NetworkManager.settings.modify.system [32myes[0m +org.freedesktop.NetworkManager.settings.modify.own [32myes[0m +org.freedesktop.NetworkManager.settings.modify.hostname [32myes[0m +org.freedesktop.NetworkManager.settings.modify.global-dns [31mno[0m +org.freedesktop.NetworkManager.reload [31mno[0m org.freedesktop.NetworkManager.checkpoint-rollback unknown org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown 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 6cca955c70..c3121b0b51 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,27 +1,23 @@ -location: clients/tests/test-client.py:761:test_001()/12 -cmd: $NMCLI --pretty general permissions +location: clients/tests/test-client.py:764:test_001()/12 +cmd: $NMCLI --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 1519 bytes +stdout: 1409 bytes >>> -===================================== - Uprawnienia usługi NetworkManager -===================================== PERMISSION VALUE ------------------------------------------------------------------------------------------------------------------ -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.enable-disable-network [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wifi [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wwan [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wimax [32mtak[0m +org.freedesktop.NetworkManager.sleep-wake [31mnie[0m +org.freedesktop.NetworkManager.network-control [32mtak[0m +org.freedesktop.NetworkManager.wifi.share.protected [32mtak[0m +org.freedesktop.NetworkManager.wifi.share.open [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.system [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.own [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.hostname [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.global-dns [31mnie[0m +org.freedesktop.NetworkManager.reload [31mnie[0m org.freedesktop.NetworkManager.checkpoint-rollback nieznane org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane 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 82241f0e69..293e90fb03 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,25 +1,30 @@ -location: clients/tests/test-client.py:761:test_001()/13 -cmd: $NMCLI --terse general permissions +location: clients/tests/test-client.py:764:test_001()/13 +cmd: $NMCLI --pretty general permissions lang: C returncode: 0 -stdout: 899 bytes +stdout: 1472 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no -org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown -org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +============================== + NetworkManager permissions +============================== +PERMISSION VALUE +--------------------------------------------------------------------------------------------------------- +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.sleep-wake no +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.wifi.share.protected yes +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.checkpoint-rollback unknown +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< stderr: 0 bytes 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 f77108c97a..e667026886 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,25 +1,30 @@ -location: clients/tests/test-client.py:761:test_001()/14 -cmd: $NMCLI --terse general permissions +location: clients/tests/test-client.py:764:test_001()/14 +cmd: $NMCLI --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 899 bytes +stdout: 1519 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no -org.freedesktop.NetworkManager.checkpoint-rollback:unknown -org.freedesktop.NetworkManager.enable-disable-statistics:unknown -org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown +===================================== + Uprawnienia usługi NetworkManager +===================================== +PERMISSION VALUE +----------------------------------------------------------------------------------------------------------------- +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.sleep-wake nie +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.wifi.share.protected tak +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.checkpoint-rollback nieznane +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< stderr: 0 bytes 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 a7dc531619..9a4736013c 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,23 +1,27 @@ -location: clients/tests/test-client.py:761:test_001()/15 -cmd: $NMCLI --mode tabular general permissions +location: clients/tests/test-client.py:764:test_001()/15 +cmd: $NMCLI --pretty --color yes general permissions lang: C returncode: 0 -stdout: 1275 bytes +stdout: 1589 bytes >>> +============================== + NetworkManager permissions +============================== PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no +--------------------------------------------------------------------------------------------------------- +org.freedesktop.NetworkManager.enable-disable-network [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wifi [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wwan [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wimax [32myes[0m +org.freedesktop.NetworkManager.sleep-wake [31mno[0m +org.freedesktop.NetworkManager.network-control [32myes[0m +org.freedesktop.NetworkManager.wifi.share.protected [32myes[0m +org.freedesktop.NetworkManager.wifi.share.open [32myes[0m +org.freedesktop.NetworkManager.settings.modify.system [32myes[0m +org.freedesktop.NetworkManager.settings.modify.own [32myes[0m +org.freedesktop.NetworkManager.settings.modify.hostname [32myes[0m +org.freedesktop.NetworkManager.settings.modify.global-dns [31mno[0m +org.freedesktop.NetworkManager.reload [31mno[0m org.freedesktop.NetworkManager.checkpoint-rollback unknown org.freedesktop.NetworkManager.enable-disable-statistics unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown 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 4bb5a26707..3346ee5d7a 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,23 +1,27 @@ -location: clients/tests/test-client.py:761:test_001()/16 -cmd: $NMCLI --mode tabular general permissions +location: clients/tests/test-client.py:764:test_001()/16 +cmd: $NMCLI --pretty --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 1292 bytes +stdout: 1636 bytes >>> +===================================== + Uprawnienia usługi NetworkManager +===================================== PERMISSION VALUE -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie +----------------------------------------------------------------------------------------------------------------- +org.freedesktop.NetworkManager.enable-disable-network [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wifi [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wwan [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wimax [32mtak[0m +org.freedesktop.NetworkManager.sleep-wake [31mnie[0m +org.freedesktop.NetworkManager.network-control [32mtak[0m +org.freedesktop.NetworkManager.wifi.share.protected [32mtak[0m +org.freedesktop.NetworkManager.wifi.share.open [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.system [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.own [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.hostname [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.global-dns [31mnie[0m +org.freedesktop.NetworkManager.reload [31mnie[0m org.freedesktop.NetworkManager.checkpoint-rollback nieznane org.freedesktop.NetworkManager.enable-disable-statistics nieznane org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane 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 c6010f4d8d..fed310f0ec 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,30 +1,25 @@ -location: clients/tests/test-client.py:761:test_001()/17 -cmd: $NMCLI --mode tabular --pretty general permissions +location: clients/tests/test-client.py:764:test_001()/17 +cmd: $NMCLI --terse general permissions lang: C returncode: 0 -stdout: 1472 bytes +stdout: 899 bytes >>> -============================== - NetworkManager permissions -============================== -PERMISSION VALUE ---------------------------------------------------------------------------------------------------------- -org.freedesktop.NetworkManager.enable-disable-network yes -org.freedesktop.NetworkManager.enable-disable-wifi yes -org.freedesktop.NetworkManager.enable-disable-wwan yes -org.freedesktop.NetworkManager.enable-disable-wimax yes -org.freedesktop.NetworkManager.sleep-wake no -org.freedesktop.NetworkManager.network-control yes -org.freedesktop.NetworkManager.wifi.share.protected yes -org.freedesktop.NetworkManager.wifi.share.open yes -org.freedesktop.NetworkManager.settings.modify.system yes -org.freedesktop.NetworkManager.settings.modify.own yes -org.freedesktop.NetworkManager.settings.modify.hostname yes -org.freedesktop.NetworkManager.settings.modify.global-dns no -org.freedesktop.NetworkManager.reload no -org.freedesktop.NetworkManager.checkpoint-rollback unknown -org.freedesktop.NetworkManager.enable-disable-statistics unknown -org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.sleep-wake:no +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.checkpoint-rollback:unknown +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< stderr: 0 bytes 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 6d594751aa..60488802d7 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,30 +1,25 @@ -location: clients/tests/test-client.py:761:test_001()/18 -cmd: $NMCLI --mode tabular --pretty general permissions +location: clients/tests/test-client.py:764:test_001()/18 +cmd: $NMCLI --terse general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 1519 bytes +stdout: 899 bytes >>> -===================================== - Uprawnienia usługi NetworkManager -===================================== -PERMISSION VALUE ------------------------------------------------------------------------------------------------------------------ -org.freedesktop.NetworkManager.enable-disable-network tak -org.freedesktop.NetworkManager.enable-disable-wifi tak -org.freedesktop.NetworkManager.enable-disable-wwan tak -org.freedesktop.NetworkManager.enable-disable-wimax tak -org.freedesktop.NetworkManager.sleep-wake nie -org.freedesktop.NetworkManager.network-control tak -org.freedesktop.NetworkManager.wifi.share.protected tak -org.freedesktop.NetworkManager.wifi.share.open tak -org.freedesktop.NetworkManager.settings.modify.system tak -org.freedesktop.NetworkManager.settings.modify.own tak -org.freedesktop.NetworkManager.settings.modify.hostname tak -org.freedesktop.NetworkManager.settings.modify.global-dns nie -org.freedesktop.NetworkManager.reload nie -org.freedesktop.NetworkManager.checkpoint-rollback nieznane -org.freedesktop.NetworkManager.enable-disable-statistics nieznane -org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.sleep-wake:no +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.checkpoint-rollback:unknown +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown <<< stderr: 0 bytes 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 c2d8fa0ec7..920728bb40 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,22 +1,22 @@ -location: clients/tests/test-client.py:761:test_001()/19 -cmd: $NMCLI --mode tabular --terse general permissions +location: clients/tests/test-client.py:764:test_001()/19 +cmd: $NMCLI --terse --color yes general permissions lang: C returncode: 0 -stdout: 899 bytes +stdout: 1016 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.enable-disable-network:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wifi:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wwan:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wimax:[32myes[0m +org.freedesktop.NetworkManager.sleep-wake:[31mno[0m +org.freedesktop.NetworkManager.network-control:[32myes[0m +org.freedesktop.NetworkManager.wifi.share.protected:[32myes[0m +org.freedesktop.NetworkManager.wifi.share.open:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.system:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.own:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.hostname:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.global-dns:[31mno[0m +org.freedesktop.NetworkManager.reload:[31mno[0m org.freedesktop.NetworkManager.checkpoint-rollback:unknown org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown 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 b64e923378..365b36ab56 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,22 +1,22 @@ -location: clients/tests/test-client.py:761:test_001()/20 -cmd: $NMCLI --mode tabular --terse general permissions +location: clients/tests/test-client.py:764:test_001()/20 +cmd: $NMCLI --terse --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 899 bytes +stdout: 1016 bytes >>> -org.freedesktop.NetworkManager.enable-disable-network:yes -org.freedesktop.NetworkManager.enable-disable-wifi:yes -org.freedesktop.NetworkManager.enable-disable-wwan:yes -org.freedesktop.NetworkManager.enable-disable-wimax:yes -org.freedesktop.NetworkManager.sleep-wake:no -org.freedesktop.NetworkManager.network-control:yes -org.freedesktop.NetworkManager.wifi.share.protected:yes -org.freedesktop.NetworkManager.wifi.share.open:yes -org.freedesktop.NetworkManager.settings.modify.system:yes -org.freedesktop.NetworkManager.settings.modify.own:yes -org.freedesktop.NetworkManager.settings.modify.hostname:yes -org.freedesktop.NetworkManager.settings.modify.global-dns:no -org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.enable-disable-network:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wifi:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wwan:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wimax:[32myes[0m +org.freedesktop.NetworkManager.sleep-wake:[31mno[0m +org.freedesktop.NetworkManager.network-control:[32myes[0m +org.freedesktop.NetworkManager.wifi.share.protected:[32myes[0m +org.freedesktop.NetworkManager.wifi.share.open:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.system:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.own:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.hostname:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.global-dns:[31mno[0m +org.freedesktop.NetworkManager.reload:[31mno[0m org.freedesktop.NetworkManager.checkpoint-rollback:unknown org.freedesktop.NetworkManager.enable-disable-statistics:unknown org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown 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 5320e86506..f8c8ffa19f 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,41 +1,26 @@ -location: clients/tests/test-client.py:761:test_001()/21 -cmd: $NMCLI --mode multiline general permissions +location: clients/tests/test-client.py:764:test_001()/21 +cmd: $NMCLI --mode tabular general permissions lang: C returncode: 0 -stdout: 2179 bytes +stdout: 1275 bytes >>> -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: no -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: yes -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: no -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: no -PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback -VALUE: unknown -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: unknown -PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check -VALUE: unknown +PERMISSION VALUE +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.sleep-wake no +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.wifi.share.protected yes +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.checkpoint-rollback unknown +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< stderr: 0 bytes 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 ba9c8e4d99..03f5ceffad 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,41 +1,26 @@ -location: clients/tests/test-client.py:761:test_001()/22 -cmd: $NMCLI --mode multiline general permissions +location: clients/tests/test-client.py:764:test_001()/22 +cmd: $NMCLI --mode tabular general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 2185 bytes +stdout: 1292 bytes >>> -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: nie -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: tak -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: nie -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: nie -PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback -VALUE: nieznane -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: nieznane -PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check -VALUE: nieznane +PERMISSION VALUE +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.sleep-wake nie +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.wifi.share.protected tak +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.checkpoint-rollback nieznane +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< stderr: 0 bytes 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 ffcc9cb8e2..426831d171 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,60 +1,26 @@ -location: clients/tests/test-client.py:761:test_001()/23 -cmd: $NMCLI --mode multiline --pretty general permissions +location: clients/tests/test-client.py:764:test_001()/23 +cmd: $NMCLI --mode tabular --color yes general permissions lang: C returncode: 0 -stdout: 3672 bytes +stdout: 1392 bytes >>> -=============================================================================== - NetworkManager permissions -=============================================================================== -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: no -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: yes -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: no -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: no -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback -VALUE: unknown -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: unknown -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check -VALUE: unknown -------------------------------------------------------------------------------- +PERMISSION VALUE +org.freedesktop.NetworkManager.enable-disable-network [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wifi [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wwan [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wimax [32myes[0m +org.freedesktop.NetworkManager.sleep-wake [31mno[0m +org.freedesktop.NetworkManager.network-control [32myes[0m +org.freedesktop.NetworkManager.wifi.share.protected [32myes[0m +org.freedesktop.NetworkManager.wifi.share.open [32myes[0m +org.freedesktop.NetworkManager.settings.modify.system [32myes[0m +org.freedesktop.NetworkManager.settings.modify.own [32myes[0m +org.freedesktop.NetworkManager.settings.modify.hostname [32myes[0m +org.freedesktop.NetworkManager.settings.modify.global-dns [31mno[0m +org.freedesktop.NetworkManager.reload [31mno[0m +org.freedesktop.NetworkManager.checkpoint-rollback unknown +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< stderr: 0 bytes 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 a14523d8ea..eae545cea8 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,60 +1,26 @@ -location: clients/tests/test-client.py:761:test_001()/24 -cmd: $NMCLI --mode multiline --pretty general permissions +location: clients/tests/test-client.py:764:test_001()/24 +cmd: $NMCLI --mode tabular --color yes general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 3683 bytes +stdout: 1409 bytes >>> -=============================================================================== - Uprawnienia usługi NetworkManager -=============================================================================== -PERMISSION: org.freedesktop.NetworkManager.enable-disable-network -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.sleep-wake -VALUE: nie -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.network-control -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.wifi.share.open -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.system -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.own -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname -VALUE: tak -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE: nie -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.reload -VALUE: nie -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback -VALUE: nieznane -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics -VALUE: nieznane -------------------------------------------------------------------------------- -PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check -VALUE: nieznane -------------------------------------------------------------------------------- +PERMISSION VALUE +org.freedesktop.NetworkManager.enable-disable-network [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wifi [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wwan [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wimax [32mtak[0m +org.freedesktop.NetworkManager.sleep-wake [31mnie[0m +org.freedesktop.NetworkManager.network-control [32mtak[0m +org.freedesktop.NetworkManager.wifi.share.protected [32mtak[0m +org.freedesktop.NetworkManager.wifi.share.open [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.system [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.own [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.hostname [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.global-dns [31mnie[0m +org.freedesktop.NetworkManager.reload [31mnie[0m +org.freedesktop.NetworkManager.checkpoint-rollback nieznane +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< stderr: 0 bytes 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 1c8ee11f35..870db04e29 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,41 +1,30 @@ -location: clients/tests/test-client.py:761:test_001()/25 -cmd: $NMCLI --mode multiline --terse general permissions +location: clients/tests/test-client.py:764:test_001()/25 +cmd: $NMCLI --mode tabular --pretty general permissions lang: C returncode: 0 -stdout: 1171 bytes +stdout: 1472 bytes >>> -PERMISSION:org.freedesktop.NetworkManager.enable-disable-network -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.sleep-wake -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.network-control -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.open -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.system -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.own -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.reload -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback -VALUE:unknown -PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics -VALUE:unknown -PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check -VALUE:unknown +============================== + NetworkManager permissions +============================== +PERMISSION VALUE +--------------------------------------------------------------------------------------------------------- +org.freedesktop.NetworkManager.enable-disable-network yes +org.freedesktop.NetworkManager.enable-disable-wifi yes +org.freedesktop.NetworkManager.enable-disable-wwan yes +org.freedesktop.NetworkManager.enable-disable-wimax yes +org.freedesktop.NetworkManager.sleep-wake no +org.freedesktop.NetworkManager.network-control yes +org.freedesktop.NetworkManager.wifi.share.protected yes +org.freedesktop.NetworkManager.wifi.share.open yes +org.freedesktop.NetworkManager.settings.modify.system yes +org.freedesktop.NetworkManager.settings.modify.own yes +org.freedesktop.NetworkManager.settings.modify.hostname yes +org.freedesktop.NetworkManager.settings.modify.global-dns no +org.freedesktop.NetworkManager.reload no +org.freedesktop.NetworkManager.checkpoint-rollback unknown +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< stderr: 0 bytes 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 2c11a85db7..16c94f48ca 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,41 +1,30 @@ -location: clients/tests/test-client.py:761:test_001()/26 -cmd: $NMCLI --mode multiline --terse general permissions +location: clients/tests/test-client.py:764:test_001()/26 +cmd: $NMCLI --mode tabular --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 1171 bytes +stdout: 1519 bytes >>> -PERMISSION:org.freedesktop.NetworkManager.enable-disable-network -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.sleep-wake -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.network-control -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.wifi.share.open -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.system -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.own -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname -VALUE:yes -PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.reload -VALUE:no -PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback -VALUE:unknown -PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics -VALUE:unknown -PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check -VALUE:unknown +===================================== + Uprawnienia usługi NetworkManager +===================================== +PERMISSION VALUE +----------------------------------------------------------------------------------------------------------------- +org.freedesktop.NetworkManager.enable-disable-network tak +org.freedesktop.NetworkManager.enable-disable-wifi tak +org.freedesktop.NetworkManager.enable-disable-wwan tak +org.freedesktop.NetworkManager.enable-disable-wimax tak +org.freedesktop.NetworkManager.sleep-wake nie +org.freedesktop.NetworkManager.network-control tak +org.freedesktop.NetworkManager.wifi.share.protected tak +org.freedesktop.NetworkManager.wifi.share.open tak +org.freedesktop.NetworkManager.settings.modify.system tak +org.freedesktop.NetworkManager.settings.modify.own tak +org.freedesktop.NetworkManager.settings.modify.hostname tak +org.freedesktop.NetworkManager.settings.modify.global-dns nie +org.freedesktop.NetworkManager.reload nie +org.freedesktop.NetworkManager.checkpoint-rollback nieznane +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_001-027.expected b/clients/tests/test-client.check-on-disk/test_001-027.expected new file mode 100644 index 0000000000..1685734141 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-027.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:764:test_001()/27 +cmd: $NMCLI --mode tabular --pretty --color yes general permissions +lang: C +returncode: 0 +stdout: 1589 bytes +>>> +============================== + NetworkManager permissions +============================== +PERMISSION VALUE +--------------------------------------------------------------------------------------------------------- +org.freedesktop.NetworkManager.enable-disable-network [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wifi [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wwan [32myes[0m +org.freedesktop.NetworkManager.enable-disable-wimax [32myes[0m +org.freedesktop.NetworkManager.sleep-wake [31mno[0m +org.freedesktop.NetworkManager.network-control [32myes[0m +org.freedesktop.NetworkManager.wifi.share.protected [32myes[0m +org.freedesktop.NetworkManager.wifi.share.open [32myes[0m +org.freedesktop.NetworkManager.settings.modify.system [32myes[0m +org.freedesktop.NetworkManager.settings.modify.own [32myes[0m +org.freedesktop.NetworkManager.settings.modify.hostname [32myes[0m +org.freedesktop.NetworkManager.settings.modify.global-dns [31mno[0m +org.freedesktop.NetworkManager.reload [31mno[0m +org.freedesktop.NetworkManager.checkpoint-rollback unknown +org.freedesktop.NetworkManager.enable-disable-statistics unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-028.expected b/clients/tests/test-client.check-on-disk/test_001-028.expected new file mode 100644 index 0000000000..ab59498636 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-028.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:764:test_001()/28 +cmd: $NMCLI --mode tabular --pretty --color yes general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1636 bytes +>>> +===================================== + Uprawnienia usługi NetworkManager +===================================== +PERMISSION VALUE +----------------------------------------------------------------------------------------------------------------- +org.freedesktop.NetworkManager.enable-disable-network [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wifi [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wwan [32mtak[0m +org.freedesktop.NetworkManager.enable-disable-wimax [32mtak[0m +org.freedesktop.NetworkManager.sleep-wake [31mnie[0m +org.freedesktop.NetworkManager.network-control [32mtak[0m +org.freedesktop.NetworkManager.wifi.share.protected [32mtak[0m +org.freedesktop.NetworkManager.wifi.share.open [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.system [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.own [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.hostname [32mtak[0m +org.freedesktop.NetworkManager.settings.modify.global-dns [31mnie[0m +org.freedesktop.NetworkManager.reload [31mnie[0m +org.freedesktop.NetworkManager.checkpoint-rollback nieznane +org.freedesktop.NetworkManager.enable-disable-statistics nieznane +org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-029.expected b/clients/tests/test-client.check-on-disk/test_001-029.expected new file mode 100644 index 0000000000..67c1cee618 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-029.expected @@ -0,0 +1,28 @@ +location: clients/tests/test-client.py:764:test_001()/29 +cmd: $NMCLI --mode tabular --terse general permissions +lang: C +returncode: 0 +stdout: 899 bytes +>>> +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.sleep-wake:no +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.checkpoint-rollback:unknown +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-030.expected b/clients/tests/test-client.check-on-disk/test_001-030.expected new file mode 100644 index 0000000000..e05db135f7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-030.expected @@ -0,0 +1,28 @@ +location: clients/tests/test-client.py:764:test_001()/30 +cmd: $NMCLI --mode tabular --terse general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 899 bytes +>>> +org.freedesktop.NetworkManager.enable-disable-network:yes +org.freedesktop.NetworkManager.enable-disable-wifi:yes +org.freedesktop.NetworkManager.enable-disable-wwan:yes +org.freedesktop.NetworkManager.enable-disable-wimax:yes +org.freedesktop.NetworkManager.sleep-wake:no +org.freedesktop.NetworkManager.network-control:yes +org.freedesktop.NetworkManager.wifi.share.protected:yes +org.freedesktop.NetworkManager.wifi.share.open:yes +org.freedesktop.NetworkManager.settings.modify.system:yes +org.freedesktop.NetworkManager.settings.modify.own:yes +org.freedesktop.NetworkManager.settings.modify.hostname:yes +org.freedesktop.NetworkManager.settings.modify.global-dns:no +org.freedesktop.NetworkManager.reload:no +org.freedesktop.NetworkManager.checkpoint-rollback:unknown +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-031.expected b/clients/tests/test-client.check-on-disk/test_001-031.expected new file mode 100644 index 0000000000..11e9ff21a6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-031.expected @@ -0,0 +1,28 @@ +location: clients/tests/test-client.py:764:test_001()/31 +cmd: $NMCLI --mode tabular --terse --color yes general permissions +lang: C +returncode: 0 +stdout: 1016 bytes +>>> +org.freedesktop.NetworkManager.enable-disable-network:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wifi:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wwan:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wimax:[32myes[0m +org.freedesktop.NetworkManager.sleep-wake:[31mno[0m +org.freedesktop.NetworkManager.network-control:[32myes[0m +org.freedesktop.NetworkManager.wifi.share.protected:[32myes[0m +org.freedesktop.NetworkManager.wifi.share.open:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.system:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.own:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.hostname:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.global-dns:[31mno[0m +org.freedesktop.NetworkManager.reload:[31mno[0m +org.freedesktop.NetworkManager.checkpoint-rollback:unknown +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-032.expected b/clients/tests/test-client.check-on-disk/test_001-032.expected new file mode 100644 index 0000000000..f3cd99743a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-032.expected @@ -0,0 +1,28 @@ +location: clients/tests/test-client.py:764:test_001()/32 +cmd: $NMCLI --mode tabular --terse --color yes general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1016 bytes +>>> +org.freedesktop.NetworkManager.enable-disable-network:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wifi:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wwan:[32myes[0m +org.freedesktop.NetworkManager.enable-disable-wimax:[32myes[0m +org.freedesktop.NetworkManager.sleep-wake:[31mno[0m +org.freedesktop.NetworkManager.network-control:[32myes[0m +org.freedesktop.NetworkManager.wifi.share.protected:[32myes[0m +org.freedesktop.NetworkManager.wifi.share.open:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.system:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.own:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.hostname:[32myes[0m +org.freedesktop.NetworkManager.settings.modify.global-dns:[31mno[0m +org.freedesktop.NetworkManager.reload:[31mno[0m +org.freedesktop.NetworkManager.checkpoint-rollback:unknown +org.freedesktop.NetworkManager.enable-disable-statistics:unknown +org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-033.expected b/clients/tests/test-client.check-on-disk/test_001-033.expected new file mode 100644 index 0000000000..3a92b4777d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-033.expected @@ -0,0 +1,44 @@ +location: clients/tests/test-client.py:764:test_001()/33 +cmd: $NMCLI --mode multiline general permissions +lang: C +returncode: 0 +stdout: 2179 bytes +>>> +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: no +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: yes +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: no +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: no +PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback +VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE: unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-034.expected b/clients/tests/test-client.check-on-disk/test_001-034.expected new file mode 100644 index 0000000000..993dcebed7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-034.expected @@ -0,0 +1,44 @@ +location: clients/tests/test-client.py:764:test_001()/34 +cmd: $NMCLI --mode multiline general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2185 bytes +>>> +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: nie +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: tak +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: nie +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: nie +PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback +VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE: nieznane + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-035.expected b/clients/tests/test-client.check-on-disk/test_001-035.expected new file mode 100644 index 0000000000..4e904a1980 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-035.expected @@ -0,0 +1,44 @@ +location: clients/tests/test-client.py:764:test_001()/35 +cmd: $NMCLI --mode multiline --color yes general permissions +lang: C +returncode: 0 +stdout: 2296 bytes +>>> +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: [31mno[0m +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: [32myes[0m +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: [31mno[0m +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: [31mno[0m +PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback +VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: unknown +PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE: unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-036.expected b/clients/tests/test-client.check-on-disk/test_001-036.expected new file mode 100644 index 0000000000..65a781e182 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-036.expected @@ -0,0 +1,44 @@ +location: clients/tests/test-client.py:764:test_001()/36 +cmd: $NMCLI --mode multiline --color yes general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2302 bytes +>>> +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: [31mnie[0m +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: [32mtak[0m +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: [31mnie[0m +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: [31mnie[0m +PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback +VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: nieznane +PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE: nieznane + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-037.expected b/clients/tests/test-client.check-on-disk/test_001-037.expected new file mode 100644 index 0000000000..c47d2ffc14 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-037.expected @@ -0,0 +1,63 @@ +location: clients/tests/test-client.py:764:test_001()/37 +cmd: $NMCLI --mode multiline --pretty general permissions +lang: C +returncode: 0 +stdout: 3672 bytes +>>> +=============================================================================== + NetworkManager permissions +=============================================================================== +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: no +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: yes +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: no +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: no +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback +VALUE: unknown +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: unknown +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE: unknown +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-038.expected b/clients/tests/test-client.check-on-disk/test_001-038.expected new file mode 100644 index 0000000000..f45ac7f4bd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-038.expected @@ -0,0 +1,63 @@ +location: clients/tests/test-client.py:764:test_001()/38 +cmd: $NMCLI --mode multiline --pretty general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3683 bytes +>>> +=============================================================================== + Uprawnienia usługi NetworkManager +=============================================================================== +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: nie +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: tak +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: nie +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: nie +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback +VALUE: nieznane +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: nieznane +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE: nieznane +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-039.expected b/clients/tests/test-client.check-on-disk/test_001-039.expected new file mode 100644 index 0000000000..3a0c35db8b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-039.expected @@ -0,0 +1,63 @@ +location: clients/tests/test-client.py:764:test_001()/39 +cmd: $NMCLI --mode multiline --pretty --color yes general permissions +lang: C +returncode: 0 +stdout: 3789 bytes +>>> +=============================================================================== + NetworkManager permissions +=============================================================================== +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: [31mno[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: [32myes[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: [31mno[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: [31mno[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback +VALUE: unknown +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: unknown +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE: unknown +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-040.expected b/clients/tests/test-client.check-on-disk/test_001-040.expected new file mode 100644 index 0000000000..057d27232f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-040.expected @@ -0,0 +1,63 @@ +location: clients/tests/test-client.py:764:test_001()/40 +cmd: $NMCLI --mode multiline --pretty --color yes general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3800 bytes +>>> +=============================================================================== + Uprawnienia usługi NetworkManager +=============================================================================== +PERMISSION: org.freedesktop.NetworkManager.enable-disable-network +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.sleep-wake +VALUE: [31mnie[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.network-control +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.wifi.share.open +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.system +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.own +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname +VALUE: [32mtak[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE: [31mnie[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.reload +VALUE: [31mnie[0m +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback +VALUE: nieznane +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics +VALUE: nieznane +------------------------------------------------------------------------------- +PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE: nieznane +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-041.expected b/clients/tests/test-client.check-on-disk/test_001-041.expected new file mode 100644 index 0000000000..99fd6fc947 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-041.expected @@ -0,0 +1,44 @@ +location: clients/tests/test-client.py:764:test_001()/41 +cmd: $NMCLI --mode multiline --terse general permissions +lang: C +returncode: 0 +stdout: 1171 bytes +>>> +PERMISSION:org.freedesktop.NetworkManager.enable-disable-network +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.sleep-wake +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.network-control +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.wifi.share.open +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.system +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.own +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.reload +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE:unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-042.expected b/clients/tests/test-client.check-on-disk/test_001-042.expected new file mode 100644 index 0000000000..40e9170784 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-042.expected @@ -0,0 +1,44 @@ +location: clients/tests/test-client.py:764:test_001()/42 +cmd: $NMCLI --mode multiline --terse general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1171 bytes +>>> +PERMISSION:org.freedesktop.NetworkManager.enable-disable-network +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.sleep-wake +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.network-control +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.wifi.share.open +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.system +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.own +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname +VALUE:yes +PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.reload +VALUE:no +PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE:unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-043.expected b/clients/tests/test-client.check-on-disk/test_001-043.expected new file mode 100644 index 0000000000..a51f357d60 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-043.expected @@ -0,0 +1,44 @@ +location: clients/tests/test-client.py:764:test_001()/43 +cmd: $NMCLI --mode multiline --terse --color yes general permissions +lang: C +returncode: 0 +stdout: 1288 bytes +>>> +PERMISSION:org.freedesktop.NetworkManager.enable-disable-network +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.sleep-wake +VALUE:[31mno[0m +PERMISSION:org.freedesktop.NetworkManager.network-control +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.wifi.share.open +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.settings.modify.system +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.settings.modify.own +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE:[31mno[0m +PERMISSION:org.freedesktop.NetworkManager.reload +VALUE:[31mno[0m +PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE:unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-044.expected b/clients/tests/test-client.check-on-disk/test_001-044.expected new file mode 100644 index 0000000000..a6f79c9d47 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-044.expected @@ -0,0 +1,44 @@ +location: clients/tests/test-client.py:764:test_001()/44 +cmd: $NMCLI --mode multiline --terse --color yes general permissions +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1288 bytes +>>> +PERMISSION:org.freedesktop.NetworkManager.enable-disable-network +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.sleep-wake +VALUE:[31mno[0m +PERMISSION:org.freedesktop.NetworkManager.network-control +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.wifi.share.open +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.settings.modify.system +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.settings.modify.own +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname +VALUE:[32myes[0m +PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns +VALUE:[31mno[0m +PERMISSION:org.freedesktop.NetworkManager.reload +VALUE:[31mno[0m +PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics +VALUE:unknown +PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check +VALUE:unknown + +<<< +stderr: 0 bytes +>>> + +<<< 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 c952c9c992..70fe6961ba 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:766:test_002()/1 +location: clients/tests/test-client.py:769: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 6b244d5eac..3177caf7c7 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:766:test_002()/2 +location: clients/tests/test-client.py:769: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 f406aa70ae..7dd5531201 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:768:test_002()/3 +location: clients/tests/test-client.py:771: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 b1cfa7ae84..b33ab8c3d7 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:768:test_002()/4 +location: clients/tests/test-client.py:771: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 144b39089c..75eddf5993 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:770:test_002()/5 +location: clients/tests/test-client.py:773:test_002()/5 cmd: $NMCLI lang: C returncode: 0 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 f1a229bac6..3e31a151f2 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:770:test_002()/6 +location: clients/tests/test-client.py:773:test_002()/6 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 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 e522a6bce4..54d7fda02f 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:772:test_002()/7 +location: clients/tests/test-client.py:775:test_002()/7 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 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 9fb89b1a83..e1cf26e130 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:772:test_002()/8 +location: clients/tests/test-client.py:775:test_002()/8 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 6db902aac6..749e484cfa 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:773:test_002()/9 +location: clients/tests/test-client.py:776:test_002()/9 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 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 fac540eace..1ca08eac07 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:773:test_002()/10 +location: clients/tests/test-client.py:776:test_002()/10 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 1e7952d4fd..d5d5097011 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:774:test_002()/11 +location: clients/tests/test-client.py:777:test_002()/11 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 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 8476e6934c..79f68f1c67 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:774:test_002()/12 +location: clients/tests/test-client.py:777:test_002()/12 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 58e2204883..ad49477ccd 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,4 +1,4 @@ -location: clients/tests/test-client.py:775:test_002()/13 +location: clients/tests/test-client.py:778:test_002()/13 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 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 6d8126d6f2..14af8ed750 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,4 +1,4 @@ -location: clients/tests/test-client.py:775:test_002()/14 +location: clients/tests/test-client.py:778:test_002()/14 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 3806f6b373..423ea2c6a3 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:776:test_002()/15 +location: clients/tests/test-client.py:779:test_002()/15 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 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 8eab14576e..27a0d4a642 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:776:test_002()/16 +location: clients/tests/test-client.py:779:test_002()/16 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 f0119718ea..dc1dd2a527 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,4 +1,4 @@ -location: clients/tests/test-client.py:777:test_002()/17 +location: clients/tests/test-client.py:780:test_002()/17 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 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 61528cb9c9..6308ae39dc 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,4 +1,4 @@ -location: clients/tests/test-client.py:777:test_002()/18 +location: clients/tests/test-client.py:780:test_002()/18 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 a45f657ac0..ecc50f9f18 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,4 +1,4 @@ -location: clients/tests/test-client.py:779:test_002()/19 +location: clients/tests/test-client.py:782:test_002()/19 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 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 cabc853dae..81164f55d2 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,4 +1,4 @@ -location: clients/tests/test-client.py:779:test_002()/20 +location: clients/tests/test-client.py:782:test_002()/20 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 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 fd5c1542c8..85a6262629 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:781:test_002()/21 +location: clients/tests/test-client.py:784: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 cea22e1d26..f0de2a1ae8 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:781:test_002()/22 +location: clients/tests/test-client.py:784: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 60b138d338..7eefdc183a 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:783:test_002()/23 +location: clients/tests/test-client.py:786: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 2527453fd2..576f00a9c3 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:783:test_002()/24 +location: clients/tests/test-client.py:786: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 a83e8adf18..220608dac4 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:793:test_003()/1 +location: clients/tests/test-client.py:796: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 fe5b3d79f1..ba2a858b4f 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:796:test_003()/2 +location: clients/tests/test-client.py:799: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 ef70c51625..a6f1a6c9f3 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:796:test_003()/3 +location: clients/tests/test-client.py:799: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 74844be802..714ce08268 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:801:test_003()/4 +location: clients/tests/test-client.py:804: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 1a116f0eac..1efd225f6b 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:804:test_003()/5 +location: clients/tests/test-client.py:807: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 592b92e3a3..6c03d44359 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:804:test_003()/6 +location: clients/tests/test-client.py:807: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 44ad709740..0bc3568ea4 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,4 +1,4 @@ -location: clients/tests/test-client.py:807:test_003()/7 +location: clients/tests/test-client.py:810:test_003()/7 cmd: $NMCLI -f ALL c s lang: C returncode: 0 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 d9933f37e7..2e2bdf0493 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,4 +1,4 @@ -location: clients/tests/test-client.py:807:test_003()/8 +location: clients/tests/test-client.py:810:test_003()/8 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 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 5eb0bcaefc..213a84081a 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,4 +1,4 @@ -location: clients/tests/test-client.py:811:test_003()/9 +location: clients/tests/test-client.py:814:test_003()/9 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 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 97792be69c..5aec69901e 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,4 +1,4 @@ -location: clients/tests/test-client.py:811:test_003()/10 +location: clients/tests/test-client.py:814:test_003()/10 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 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 2e7928755b..5435fc2eff 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:824:test_003()/11 +location: clients/tests/test-client.py:827: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 0902837e0c..84f6d3e386 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:827:test_003()/12 +location: clients/tests/test-client.py:830: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 458cfde515..20d5fddff3 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:827:test_003()/13 +location: clients/tests/test-client.py:830: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 10a90feea1..3ec9c97257 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,4 +1,4 @@ -location: clients/tests/test-client.py:830:test_003()/14 +location: clients/tests/test-client.py:833:test_003()/14 cmd: $NMCLI -f ALL con lang: C returncode: 0 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 ea80926ddb..1305e41ffa 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,4 +1,4 @@ -location: clients/tests/test-client.py:830:test_003()/15 +location: clients/tests/test-client.py:833:test_003()/15 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 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 b68edc98d8..0d876a40a7 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,4 +1,4 @@ -location: clients/tests/test-client.py:833:test_003()/16 +location: clients/tests/test-client.py:836:test_003()/16 cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 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 aa621f28ba..ebbecb7740 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,4 +1,4 @@ -location: clients/tests/test-client.py:833:test_003()/17 +location: clients/tests/test-client.py:836:test_003()/17 cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 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 3d99a00051..e67910bfbb 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,4 +1,4 @@ -location: clients/tests/test-client.py:836:test_003()/18 +location: clients/tests/test-client.py:839:test_003()/18 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 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 aabab1546c..aad5005ad7 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,4 +1,4 @@ -location: clients/tests/test-client.py:836:test_003()/19 +location: clients/tests/test-client.py:839:test_003()/19 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 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 5575cca52e..2aef21dd9f 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,4 +1,4 @@ -location: clients/tests/test-client.py:839:test_003()/20 +location: clients/tests/test-client.py:842:test_003()/20 cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 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 4ff536cc96..66a16f8f80 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,4 +1,4 @@ -location: clients/tests/test-client.py:839:test_003()/21 +location: clients/tests/test-client.py:842:test_003()/21 cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 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 18c83c0a88..66d220c02a 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,4 +1,4 @@ -location: clients/tests/test-client.py:842:test_003()/22 +location: clients/tests/test-client.py:845:test_003()/22 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 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 9479645049..e1c17a655f 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,4 +1,4 @@ -location: clients/tests/test-client.py:842:test_003()/23 +location: clients/tests/test-client.py:845:test_003()/23 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 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 cf69887490..04040f2fa2 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,4 +1,4 @@ -location: clients/tests/test-client.py:845:test_003()/24 +location: clients/tests/test-client.py:848:test_003()/24 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 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 8e0eef21a1..4ac2a3e362 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,4 +1,4 @@ -location: clients/tests/test-client.py:845:test_003()/25 +location: clients/tests/test-client.py:848:test_003()/25 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: pl_PL.UTF-8 returncode: 0 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 c6639a345d..3889b24c15 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,4 +1,4 @@ -location: clients/tests/test-client.py:848:test_003()/26 +location: clients/tests/test-client.py:851:test_003()/26 cmd: $NMCLI con s ethernet lang: C returncode: 0 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 ad84cdb1fe..cb93f0084d 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,4 +1,4 @@ -location: clients/tests/test-client.py:848:test_003()/27 +location: clients/tests/test-client.py:851:test_003()/27 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 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 c3f04638d2..fabf145379 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,4 +1,4 @@ -location: clients/tests/test-client.py:851:test_003()/28 +location: clients/tests/test-client.py:854:test_003()/28 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 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 106886304c..8fb46e9ab4 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,4 +1,4 @@ -location: clients/tests/test-client.py:851:test_003()/29 +location: clients/tests/test-client.py:854:test_003()/29 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 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 b9b9ad23f1..f1cbde6948 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,4 +1,4 @@ -location: clients/tests/test-client.py:854:test_003()/30 +location: clients/tests/test-client.py:857:test_003()/30 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 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 29485ead13..1b72213135 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,4 +1,4 @@ -location: clients/tests/test-client.py:854:test_003()/31 +location: clients/tests/test-client.py:857:test_003()/31 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 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 8ce56ad7eb..7d48972fc4 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,4 +1,4 @@ -location: clients/tests/test-client.py:857:test_003()/32 +location: clients/tests/test-client.py:860:test_003()/32 cmd: $NMCLI -f ALL -t dev show eth0 lang: C returncode: 0 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 9b9ca5e1ea..9097c18898 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,4 +1,4 @@ -location: clients/tests/test-client.py:857:test_003()/33 +location: clients/tests/test-client.py:860:test_003()/33 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 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 ab807e0d4a..90ddd7950e 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,4 +1,4 @@ -location: clients/tests/test-client.py:824:test_003()/34 +location: clients/tests/test-client.py:827:test_003()/34 cmd: $NMCLI con up ethernet ifname eth1 lang: C returncode: 0 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 b1b6093256..9bbb7bc86a 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,4 +1,4 @@ -location: clients/tests/test-client.py:827:test_003()/35 +location: clients/tests/test-client.py:830:test_003()/35 cmd: $NMCLI con lang: C returncode: 0 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 8cf42cf9bb..a986a2f3cc 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,4 +1,4 @@ -location: clients/tests/test-client.py:827:test_003()/36 +location: clients/tests/test-client.py:830:test_003()/36 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 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 2eebd4a442..f1c9665df9 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,4 +1,4 @@ -location: clients/tests/test-client.py:830:test_003()/37 +location: clients/tests/test-client.py:833:test_003()/37 cmd: $NMCLI -f ALL con lang: C returncode: 0 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 a6b4b45987..252dd6c7d4 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,4 +1,4 @@ -location: clients/tests/test-client.py:830:test_003()/38 +location: clients/tests/test-client.py:833:test_003()/38 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 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 337735b1f1..faa26ee053 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,4 +1,4 @@ -location: clients/tests/test-client.py:833:test_003()/39 +location: clients/tests/test-client.py:836:test_003()/39 cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 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 97be1db4c8..e0e0403745 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,4 +1,4 @@ -location: clients/tests/test-client.py:833:test_003()/40 +location: clients/tests/test-client.py:836:test_003()/40 cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 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 1fa2aa6f1f..3ddd18659b 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,4 +1,4 @@ -location: clients/tests/test-client.py:836:test_003()/41 +location: clients/tests/test-client.py:839:test_003()/41 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 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 df90c8f530..0a3bb7fca1 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,4 +1,4 @@ -location: clients/tests/test-client.py:836:test_003()/42 +location: clients/tests/test-client.py:839:test_003()/42 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 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 afbe5ad28c..d11eefe4a7 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,4 +1,4 @@ -location: clients/tests/test-client.py:839:test_003()/43 +location: clients/tests/test-client.py:842:test_003()/43 cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 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 260cab5394..6d57c4499d 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,4 +1,4 @@ -location: clients/tests/test-client.py:839:test_003()/44 +location: clients/tests/test-client.py:842:test_003()/44 cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 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 bd8a830650..436284d526 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,4 +1,4 @@ -location: clients/tests/test-client.py:842:test_003()/45 +location: clients/tests/test-client.py:845:test_003()/45 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 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 a5dad0081b..8f0dcfa75a 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,4 +1,4 @@ -location: clients/tests/test-client.py:842:test_003()/46 +location: clients/tests/test-client.py:845:test_003()/46 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 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 0e555c1023..1b80990c94 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,4 +1,4 @@ -location: clients/tests/test-client.py:845:test_003()/47 +location: clients/tests/test-client.py:848:test_003()/47 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 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 60f33d7172..3eda98c648 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,4 +1,4 @@ -location: clients/tests/test-client.py:845:test_003()/48 +location: clients/tests/test-client.py:848:test_003()/48 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: pl_PL.UTF-8 returncode: 0 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 30f80a576e..3cd73e5a9d 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,4 +1,4 @@ -location: clients/tests/test-client.py:848:test_003()/49 +location: clients/tests/test-client.py:851:test_003()/49 cmd: $NMCLI con s ethernet lang: C returncode: 0 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 892e7a8bb0..187ff13fc3 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,4 +1,4 @@ -location: clients/tests/test-client.py:848:test_003()/50 +location: clients/tests/test-client.py:851:test_003()/50 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 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 2f2e7b11b8..af822fb88b 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,4 +1,4 @@ -location: clients/tests/test-client.py:851:test_003()/51 +location: clients/tests/test-client.py:854:test_003()/51 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 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 b9c637da5a..118e15dd09 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,4 +1,4 @@ -location: clients/tests/test-client.py:851:test_003()/52 +location: clients/tests/test-client.py:854:test_003()/52 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 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 70ff8521a8..57563e1343 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,4 +1,4 @@ -location: clients/tests/test-client.py:854:test_003()/53 +location: clients/tests/test-client.py:857:test_003()/53 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 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 9faf56e719..219d57f719 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,4 +1,4 @@ -location: clients/tests/test-client.py:854:test_003()/54 +location: clients/tests/test-client.py:857:test_003()/54 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected index be42aa0c86..5518745d2e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-055.expected +++ b/clients/tests/test-client.check-on-disk/test_003-055.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:857:test_003()/55 +location: clients/tests/test-client.py:860:test_003()/55 cmd: $NMCLI -f ALL -t dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected index 021c75c59b..6d761c8ad0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-056.expected +++ b/clients/tests/test-client.check-on-disk/test_003-056.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:857:test_003()/56 +location: clients/tests/test-client.py:860:test_003()/56 cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 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 index 7b57d8edf6..d5a8f3b385 100644 --- a/clients/tests/test-client.check-on-disk/test_003-057.expected +++ b/clients/tests/test-client.check-on-disk/test_003-057.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:871:test_003()/57 +location: clients/tests/test-client.py:875:test_003()/57 cmd: $NMCLI -f ALL con lang: C returncode: 0 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 index 1b07c9bb11..4afb9a3528 100644 --- a/clients/tests/test-client.check-on-disk/test_003-058.expected +++ b/clients/tests/test-client.check-on-disk/test_003-058.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:871:test_003()/58 +location: clients/tests/test-client.py:875:test_003()/58 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 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 index 11cc3843b7..5c1d16475d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-059.expected +++ b/clients/tests/test-client.check-on-disk/test_003-059.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:874:test_003()/59 +location: clients/tests/test-client.py:878:test_003()/59 cmd: $NMCLI -f UUID,TYPE con lang: C returncode: 0 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 index aabea1f3da..c5b5f0e27b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-060.expected +++ b/clients/tests/test-client.check-on-disk/test_003-060.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:874:test_003()/60 +location: clients/tests/test-client.py:878:test_003()/60 cmd: $NMCLI -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 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 index f6d8a47e26..23d1cd4bd1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-061.expected +++ b/clients/tests/test-client.check-on-disk/test_003-061.expected @@ -1,15 +1,113 @@ -location: clients/tests/test-client.py:877:test_003()/61 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:881:test_003()/61 +cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 378 bytes +stdout: 4891 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 +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-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected index c668227dae..89e7675033 100644 --- a/clients/tests/test-client.check-on-disk/test_003-062.expected +++ b/clients/tests/test-client.check-on-disk/test_003-062.expected @@ -1,15 +1,113 @@ -location: clients/tests/test-client.py:877:test_003()/62 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:881:test_003()/62 +cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 378 bytes +stdout: 4918 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 +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-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected index 5daafcf4f0..08adb3e5e8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-063.expected +++ b/clients/tests/test-client.check-on-disk/test_003-063.expected @@ -1,15 +1,100 @@ -location: clients/tests/test-client.py:880:test_003()/63 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:884:test_003()/63 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 186 bytes +stdout: 4226 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 +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-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected index d5456e0fb2..d9ac9561f3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-064.expected +++ b/clients/tests/test-client.check-on-disk/test_003-064.expected @@ -1,15 +1,100 @@ -location: clients/tests/test-client.py:880:test_003()/64 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:884:test_003()/64 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 186 bytes +stdout: 4249 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 +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-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected index e1e201727e..a796f5d27f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-065.expected +++ b/clients/tests/test-client.check-on-disk/test_003-065.expected @@ -1,21 +1,64 @@ -location: clients/tests/test-client.py:883:test_003()/65 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:887:test_003()/65 +cmd: $NMCLI -f all dev show eth0 lang: C returncode: 0 -stdout: 835 bytes +stdout: 3239 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 -------------------------------------------------------------------------------- +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-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected index 7855e17d4e..ecd1d5b5c9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-066.expected +++ b/clients/tests/test-client.check-on-disk/test_003-066.expected @@ -1,21 +1,64 @@ -location: clients/tests/test-client.py:883:test_003()/66 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:887:test_003()/66 +cmd: $NMCLI -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 841 bytes +stdout: 3262 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 -------------------------------------------------------------------------------- +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-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected index 3f210bcfd5..7e3fb82926 100644 --- a/clients/tests/test-client.check-on-disk/test_003-067.expected +++ b/clients/tests/test-client.check-on-disk/test_003-067.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:886:test_003()/67 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:875:test_003()/67 +cmd: $NMCLI --color yes -f ALL con lang: C returncode: 0 -stdout: 192 bytes +stdout: 1885 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 +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m0[0m [32mnever[0m [32myes[0m [32m0[0m [32mno[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32myes[0m [32meth1[0m [32mactivated[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m0[0m [31mnever[0m [31myes[0m [31m0[0m [31mno[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31myes[0m [31meth0[0m [31mdeactivating[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected index acc2f1783b..78f2bbc534 100644 --- a/clients/tests/test-client.check-on-disk/test_003-068.expected +++ b/clients/tests/test-client.check-on-disk/test_003-068.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:886:test_003()/68 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:875:test_003()/68 +cmd: $NMCLI --color yes -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 192 bytes +stdout: 1895 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 +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m0[0m [32mnigdy[0m [32mtak[0m [32m0[0m [32mnie[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32mtak[0m [32meth1[0m [32maktywowano[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m0[0m [31mnigdy[0m [31mtak[0m [31m0[0m [31mnie[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31mtak[0m [31meth0[0m [31mdezaktywowanie[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected index f60873908a..5914803aaa 100644 --- a/clients/tests/test-client.check-on-disk/test_003-069.expected +++ b/clients/tests/test-client.check-on-disk/test_003-069.expected @@ -1,12 +1,13 @@ -location: clients/tests/test-client.py:889:test_003()/69 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:878:test_003()/69 +cmd: $NMCLI --color yes -f UUID,TYPE con lang: C returncode: 0 -stdout: 156 bytes +stdout: 210 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 +UUID TYPE +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m +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-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected index 93c8a80b45..c9f40d36a9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-070.expected +++ b/clients/tests/test-client.check-on-disk/test_003-070.expected @@ -1,12 +1,13 @@ -location: clients/tests/test-client.py:889:test_003()/70 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:878:test_003()/70 +cmd: $NMCLI --color yes -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 -stdout: 156 bytes +stdout: 210 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 +UUID TYPE +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m +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-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected index 3fc1750ec1..2470b37243 100644 --- a/clients/tests/test-client.check-on-disk/test_003-071.expected +++ b/clients/tests/test-client.check-on-disk/test_003-071.expected @@ -1,17 +1,113 @@ -location: clients/tests/test-client.py:892:test_003()/71 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:881:test_003()/71 +cmd: $NMCLI --color yes con s ethernet lang: C returncode: 0 -stdout: 394 bytes +stdout: 4891 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 +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-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected index be79082d15..5c643aeafd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-072.expected +++ b/clients/tests/test-client.check-on-disk/test_003-072.expected @@ -1,17 +1,113 @@ -location: clients/tests/test-client.py:892:test_003()/72 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:881:test_003()/72 +cmd: $NMCLI --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 414 bytes +stdout: 4918 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 +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-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected index 64b9611d11..1fed6802aa 100644 --- a/clients/tests/test-client.check-on-disk/test_003-073.expected +++ b/clients/tests/test-client.check-on-disk/test_003-073.expected @@ -1,8 +1,8 @@ -location: clients/tests/test-client.py:895:test_003()/73 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:884:test_003()/73 +cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 4891 bytes +stdout: 4226 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -85,19 +85,6 @@ 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 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 index a775fdbde9..49416603ad 100644 --- a/clients/tests/test-client.check-on-disk/test_003-074.expected +++ b/clients/tests/test-client.check-on-disk/test_003-074.expected @@ -1,8 +1,8 @@ -location: clients/tests/test-client.py:895:test_003()/74 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:884:test_003()/74 +cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4918 bytes +stdout: 4249 bytes >>> connection.id: ethernet connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL @@ -85,19 +85,6 @@ 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 diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected index 121cc2cc00..716b49f5ae 100644 --- a/clients/tests/test-client.check-on-disk/test_003-075.expected +++ b/clients/tests/test-client.check-on-disk/test_003-075.expected @@ -1,100 +1,64 @@ -location: clients/tests/test-client.py:898:test_003()/75 -cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +location: clients/tests/test-client.py:887:test_003()/75 +cmd: $NMCLI --color yes -f all dev show eth0 lang: C returncode: 0 -stdout: 4226 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-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: -- +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-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected index 334ef37cc7..e6d504e3ff 100644 --- a/clients/tests/test-client.check-on-disk/test_003-076.expected +++ b/clients/tests/test-client.check-on-disk/test_003-076.expected @@ -1,100 +1,64 @@ -location: clients/tests/test-client.py:898:test_003()/76 -cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +location: clients/tests/test-client.py:887:test_003()/76 +cmd: $NMCLI --color yes -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4249 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-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: -- +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-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected index cf08e7c414..d88f390202 100644 --- a/clients/tests/test-client.check-on-disk/test_003-077.expected +++ b/clients/tests/test-client.check-on-disk/test_003-077.expected @@ -1,64 +1,18 @@ -location: clients/tests/test-client.py:901:test_003()/77 -cmd: $NMCLI -f all dev show eth0 +location: clients/tests/test-client.py:875:test_003()/77 +cmd: $NMCLI --pretty -f ALL con lang: C returncode: 0 -stdout: 3239 bytes +stdout: 2092 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 +====================================== + NetworkManager connection profiles +====================================== +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-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected index 17ea80001a..a0f5d5ecd1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-078.expected +++ b/clients/tests/test-client.check-on-disk/test_003-078.expected @@ -1,64 +1,18 @@ -location: clients/tests/test-client.py:901:test_003()/78 -cmd: $NMCLI -f all dev show eth0 +location: clients/tests/test-client.py:875:test_003()/78 +cmd: $NMCLI --pretty -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 3262 bytes +stdout: 2124 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 +========================================== + Profile połączeń usługi NetworkManager +========================================== +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-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected index 4a682cd6e4..99ac8bc5e9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-079.expected +++ b/clients/tests/test-client.check-on-disk/test_003-079.expected @@ -1,14 +1,17 @@ -location: clients/tests/test-client.py:871:test_003()/79 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:878:test_003()/79 +cmd: $NMCLI --pretty -f UUID,TYPE con lang: C returncode: 0 -stdout: 1615 bytes +stdout: 394 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 +====================================== + 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-080.expected b/clients/tests/test-client.check-on-disk/test_003-080.expected index b5b4762610..129b66831d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-080.expected +++ b/clients/tests/test-client.check-on-disk/test_003-080.expected @@ -1,14 +1,17 @@ -location: clients/tests/test-client.py:871:test_003()/80 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:878:test_003()/80 +cmd: $NMCLI --pretty -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 -stdout: 1625 bytes +stdout: 414 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 +========================================== + 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-081.expected b/clients/tests/test-client.check-on-disk/test_003-081.expected index 8701206631..4d85a894b9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-081.expected +++ b/clients/tests/test-client.check-on-disk/test_003-081.expected @@ -1,12 +1,129 @@ -location: clients/tests/test-client.py:874:test_003()/81 -cmd: $NMCLI -f UUID,TYPE con +location: clients/tests/test-client.py:881:test_003()/81 +cmd: $NMCLI --pretty con s ethernet lang: C returncode: 0 -stdout: 144 bytes +stdout: 6136 bytes >>> -UUID TYPE -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +=============================================================================== + Connection profile details (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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: -- +------------------------------------------------------------------------------- + +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-082.expected b/clients/tests/test-client.check-on-disk/test_003-082.expected index 1929f72dcc..508c7b2e63 100644 --- a/clients/tests/test-client.check-on-disk/test_003-082.expected +++ b/clients/tests/test-client.check-on-disk/test_003-082.expected @@ -1,12 +1,129 @@ -location: clients/tests/test-client.py:874:test_003()/82 -cmd: $NMCLI -f UUID,TYPE con +location: clients/tests/test-client.py:881:test_003()/82 +cmd: $NMCLI --pretty con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 144 bytes +stdout: 6182 bytes >>> -UUID TYPE -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +=============================================================================== + Szczegóły profilu połączenia (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-083.expected b/clients/tests/test-client.check-on-disk/test_003-083.expected index ec76badfad..5253939cca 100644 --- a/clients/tests/test-client.check-on-disk/test_003-083.expected +++ b/clients/tests/test-client.check-on-disk/test_003-083.expected @@ -1,13 +1,112 @@ -location: clients/tests/test-client.py:877:test_003()/83 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:884:test_003()/83 +cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 252 bytes +stdout: 5158 bytes >>> -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet +=============================================================================== + Connection profile details (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-084.expected b/clients/tests/test-client.check-on-disk/test_003-084.expected index e3c9d78cee..1698a80a9c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-084.expected +++ b/clients/tests/test-client.check-on-disk/test_003-084.expected @@ -1,13 +1,112 @@ -location: clients/tests/test-client.py:877:test_003()/84 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:884:test_003()/84 +cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 252 bytes +stdout: 5193 bytes >>> -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet +=============================================================================== + Szczegóły profilu połączenia (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-085.expected b/clients/tests/test-client.check-on-disk/test_003-085.expected index 7a02730ee7..d1d072e91d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-085.expected +++ b/clients/tests/test-client.check-on-disk/test_003-085.expected @@ -1,13 +1,75 @@ -location: clients/tests/test-client.py:880:test_003()/85 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:887:test_003()/85 +cmd: $NMCLI --pretty -f all dev show eth0 lang: C returncode: 0 -stdout: 124 bytes +stdout: 4090 bytes >>> -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet +=============================================================================== + Device details (eth0) +=============================================================================== +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-086.expected b/clients/tests/test-client.check-on-disk/test_003-086.expected index 9f67f6cd49..4bc2628ce1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-086.expected +++ b/clients/tests/test-client.check-on-disk/test_003-086.expected @@ -1,13 +1,75 @@ -location: clients/tests/test-client.py:880:test_003()/86 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:887:test_003()/86 +cmd: $NMCLI --pretty -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 124 bytes +stdout: 4119 bytes >>> -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet +=============================================================================== + Informacje o urządzeniu (eth0) +=============================================================================== +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-087.expected b/clients/tests/test-client.check-on-disk/test_003-087.expected index f9e19176a6..e3a141ad27 100644 --- a/clients/tests/test-client.check-on-disk/test_003-087.expected +++ b/clients/tests/test-client.check-on-disk/test_003-087.expected @@ -1,18 +1,18 @@ -location: clients/tests/test-client.py:883:test_003()/87 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:875:test_003()/87 +cmd: $NMCLI --pretty --color yes -f ALL con lang: C returncode: 0 -stdout: 629 bytes +stdout: 2362 bytes >>> -=============================================================================== - NetworkManager connection profiles -=============================================================================== -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- +====================================== + NetworkManager connection profiles +====================================== +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m0[0m [32mnever[0m [32myes[0m [32m0[0m [32mno[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32myes[0m [32meth1[0m [32mactivated[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m0[0m [31mnever[0m [31myes[0m [31m0[0m [31mno[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31myes[0m [31meth0[0m [31mdeactivating[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-088.expected b/clients/tests/test-client.check-on-disk/test_003-088.expected index cf53fad4a2..51318418d6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-088.expected +++ b/clients/tests/test-client.check-on-disk/test_003-088.expected @@ -1,18 +1,18 @@ -location: clients/tests/test-client.py:883:test_003()/88 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:875:test_003()/88 +cmd: $NMCLI --pretty --color yes -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 635 bytes +stdout: 2394 bytes >>> -=============================================================================== - Profile połączeń usługi NetworkManager -=============================================================================== -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- +========================================== + Profile połączeń usługi NetworkManager +========================================== +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m0[0m [32mnigdy[0m [32mtak[0m [32m0[0m [32mnie[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32mtak[0m [32meth1[0m [32maktywowano[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m0[0m [31mnigdy[0m [31mtak[0m [31m0[0m [31mnie[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31mtak[0m [31meth0[0m [31mdezaktywowanie[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-089.expected b/clients/tests/test-client.check-on-disk/test_003-089.expected index 2ab37338d5..a586c1c6ea 100644 --- a/clients/tests/test-client.check-on-disk/test_003-089.expected +++ b/clients/tests/test-client.check-on-disk/test_003-089.expected @@ -1,10 +1,15 @@ -location: clients/tests/test-client.py:886:test_003()/89 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:878:test_003()/89 +cmd: $NMCLI --pretty --color yes -f UUID,TYPE con lang: C returncode: 0 -stdout: 144 bytes +stdout: 412 bytes >>> +====================================== + NetworkManager connection profiles +====================================== UUID TYPE +-------------------------------------------------------------------------------------- +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 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 index ab2122212d..e8a4d55ae7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-090.expected +++ b/clients/tests/test-client.check-on-disk/test_003-090.expected @@ -1,10 +1,15 @@ -location: clients/tests/test-client.py:886:test_003()/90 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:878:test_003()/90 +cmd: $NMCLI --pretty --color yes -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 -stdout: 144 bytes +stdout: 432 bytes >>> +========================================== + Profile połączeń usługi NetworkManager +========================================== UUID TYPE +------------------------------------------------------------------------------------------ +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 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 index 27e4804c32..8d30d708f4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-091.expected +++ b/clients/tests/test-client.check-on-disk/test_003-091.expected @@ -1,11 +1,129 @@ -location: clients/tests/test-client.py:889:test_003()/91 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:881:test_003()/91 +cmd: $NMCLI --pretty --color yes con s ethernet lang: C returncode: 0 -stdout: 104 bytes +stdout: 6136 bytes >>> -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet +=============================================================================== + Connection profile details (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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: -- +------------------------------------------------------------------------------- + +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-092.expected b/clients/tests/test-client.check-on-disk/test_003-092.expected index 52510ea2bd..d4d378edf1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-092.expected +++ b/clients/tests/test-client.check-on-disk/test_003-092.expected @@ -1,11 +1,129 @@ -location: clients/tests/test-client.py:889:test_003()/92 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:881:test_003()/92 +cmd: $NMCLI --pretty --color yes con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 104 bytes +stdout: 6182 bytes >>> -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet +=============================================================================== + Szczegóły profilu połączenia (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-093.expected b/clients/tests/test-client.check-on-disk/test_003-093.expected index 6937741979..ae68f2d12b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-093.expected +++ b/clients/tests/test-client.check-on-disk/test_003-093.expected @@ -1,16 +1,112 @@ -location: clients/tests/test-client.py:892:test_003()/93 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:884:test_003()/93 +cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 346 bytes +stdout: 5158 bytes >>> -====================================== - NetworkManager connection profiles -====================================== -UUID TYPE --------------------------------------------------------------------------------------- -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +=============================================================================== + Connection profile details (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-094.expected b/clients/tests/test-client.check-on-disk/test_003-094.expected index 231dc84c30..4f8b5bebc0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-094.expected +++ b/clients/tests/test-client.check-on-disk/test_003-094.expected @@ -1,16 +1,112 @@ -location: clients/tests/test-client.py:892:test_003()/94 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:884:test_003()/94 +cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 366 bytes +stdout: 5193 bytes >>> -========================================== - Profile połączeń usługi NetworkManager -========================================== -UUID TYPE ------------------------------------------------------------------------------------------- -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +=============================================================================== + Szczegóły profilu połączenia (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-095.expected b/clients/tests/test-client.check-on-disk/test_003-095.expected index 1f441524aa..cb96535c53 100644 --- a/clients/tests/test-client.check-on-disk/test_003-095.expected +++ b/clients/tests/test-client.check-on-disk/test_003-095.expected @@ -1,13 +1,78 @@ -location: clients/tests/test-client.py:895:test_003()/95 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:887:test_003()/95 +cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: C -returncode: 10 -stdout: 0 bytes +returncode: 0 +stdout: 4090 bytes >>> +=============================================================================== + Device details (eth0) +=============================================================================== +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: 46 bytes +stderr: 0 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 index ef53f5c188..ce71e0ee0b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-096.expected +++ b/clients/tests/test-client.check-on-disk/test_003-096.expected @@ -1,13 +1,78 @@ -location: clients/tests/test-client.py:895:test_003()/96 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:887:test_003()/96 +cmd: $NMCLI --pretty --color yes -f all dev show eth0 lang: pl_PL.UTF-8 -returncode: 10 -stdout: 0 bytes +returncode: 0 +stdout: 4119 bytes >>> +=============================================================================== + Informacje o urządzeniu (eth0) +=============================================================================== +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: 58 bytes +stderr: 0 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 index 7e47fd3690..c826579019 100644 --- a/clients/tests/test-client.check-on-disk/test_003-097.expected +++ b/clients/tests/test-client.check-on-disk/test_003-097.expected @@ -1,21 +1,13 @@ -location: clients/tests/test-client.py:898:test_003()/97 -cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +location: clients/tests/test-client.py:875:test_003()/97 +cmd: $NMCLI --terse -f ALL con lang: C returncode: 0 -stdout: 667 bytes +stdout: 871 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: -- +ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-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:802-3-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:802-3-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:802-3-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-098.expected b/clients/tests/test-client.check-on-disk/test_003-098.expected index b503ad4502..da3adcdb38 100644 --- a/clients/tests/test-client.check-on-disk/test_003-098.expected +++ b/clients/tests/test-client.check-on-disk/test_003-098.expected @@ -1,21 +1,13 @@ -location: clients/tests/test-client.py:898:test_003()/98 -cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +location: clients/tests/test-client.py:875:test_003()/98 +cmd: $NMCLI --terse -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 672 bytes +stdout: 871 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: -- +ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-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:802-3-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:802-3-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:802-3-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-099.expected b/clients/tests/test-client.check-on-disk/test_003-099.expected index b6a73bc9c1..e4d739acc5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-099.expected +++ b/clients/tests/test-client.check-on-disk/test_003-099.expected @@ -1,64 +1,12 @@ -location: clients/tests/test-client.py:901:test_003()/99 -cmd: $NMCLI -f all dev show eth0 +location: clients/tests/test-client.py:878:test_003()/99 +cmd: $NMCLI --terse -f UUID,TYPE con lang: C returncode: 0 -stdout: 3207 bytes +stdout: 156 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) +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-100.expected b/clients/tests/test-client.check-on-disk/test_003-100.expected index 2a214da9d4..078d9b067f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-100.expected +++ b/clients/tests/test-client.check-on-disk/test_003-100.expected @@ -1,64 +1,12 @@ -location: clients/tests/test-client.py:901:test_003()/100 -cmd: $NMCLI -f all dev show eth0 +location: clients/tests/test-client.py:878:test_003()/100 +cmd: $NMCLI --terse -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 -stdout: 3230 bytes +stdout: 156 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) +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-101.expected b/clients/tests/test-client.check-on-disk/test_003-101.expected new file mode 100644 index 0000000000..aba8bc96a1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-101.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/101 +cmd: $NMCLI --terse con s ethernet +lang: C +returncode: 0 +stdout: 2579 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 +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 +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 +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: +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-102.expected b/clients/tests/test-client.check-on-disk/test_003-102.expected new file mode 100644 index 0000000000..9e320bf408 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-102.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/102 +cmd: $NMCLI --terse con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2579 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 +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 +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 +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: +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-103.expected b/clients/tests/test-client.check-on-disk/test_003-103.expected new file mode 100644 index 0000000000..62adea53d5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-103.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/103 +cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 2211 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 +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 +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 +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: +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-104.expected b/clients/tests/test-client.check-on-disk/test_003-104.expected new file mode 100644 index 0000000000..0ed93275d4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-104.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/104 +cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2211 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 +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 +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 +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: +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-105.expected b/clients/tests/test-client.check-on-disk/test_003-105.expected new file mode 100644 index 0000000000..0584ee5bfd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-105.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/105 +cmd: $NMCLI --terse -f all dev show eth0 +lang: C +returncode: 0 +stdout: 2011 bytes +>>> +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-106.expected b/clients/tests/test-client.check-on-disk/test_003-106.expected new file mode 100644 index 0000000000..64c73ef297 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-106.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/106 +cmd: $NMCLI --terse -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2034 bytes +>>> +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-107.expected b/clients/tests/test-client.check-on-disk/test_003-107.expected new file mode 100644 index 0000000000..3058213a78 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-107.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/107 +cmd: $NMCLI --terse --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1141 bytes +>>> +[32methernet[0m:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m:[32m0[0m:[32mnever[0m:[32myes[0m:[32m0[0m:[32mno[0m:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[32myes[0m:[32meth1[0m:[32mactivated[0m:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m:[32m[0m:[32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[31m802-3-ethernet[0m:[31m0[0m:[31mnever[0m:[31myes[0m:[31m0[0m:[31mno[0m:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[31myes[0m:[31meth0[0m:[31mdeactivating[0m:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m:[31m[0m:[31m/etc/NetworkManager/system-connections/ethernet[0m +con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-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:802-3-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-108.expected b/clients/tests/test-client.check-on-disk/test_003-108.expected new file mode 100644 index 0000000000..3cfc2117fb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-108.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/108 +cmd: $NMCLI --terse --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1141 bytes +>>> +[32methernet[0m:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m:[32m0[0m:[32mnever[0m:[32myes[0m:[32m0[0m:[32mno[0m:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[32myes[0m:[32meth1[0m:[32mactivated[0m:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m:[32m[0m:[32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[31m802-3-ethernet[0m:[31m0[0m:[31mnever[0m:[31myes[0m:[31m0[0m:[31mno[0m:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[31myes[0m:[31meth0[0m:[31mdeactivating[0m:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m:[31m[0m:[31m/etc/NetworkManager/system-connections/ethernet[0m +con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-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:802-3-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-109.expected b/clients/tests/test-client.check-on-disk/test_003-109.expected new file mode 100644 index 0000000000..c839194025 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-109.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/109 +cmd: $NMCLI --terse --color yes -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 174 bytes +>>> +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m +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-110.expected b/clients/tests/test-client.check-on-disk/test_003-110.expected new file mode 100644 index 0000000000..5e560eb7b5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-110.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/110 +cmd: $NMCLI --terse --color yes -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 174 bytes +>>> +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m +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-111.expected b/clients/tests/test-client.check-on-disk/test_003-111.expected new file mode 100644 index 0000000000..62e7697255 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-111.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/111 +cmd: $NMCLI --terse --color yes con s ethernet +lang: C +returncode: 0 +stdout: 2579 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 +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 +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 +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: +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-112.expected b/clients/tests/test-client.check-on-disk/test_003-112.expected new file mode 100644 index 0000000000..965f4ae568 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-112.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/112 +cmd: $NMCLI --terse --color yes con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2579 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 +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 +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 +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: +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-113.expected b/clients/tests/test-client.check-on-disk/test_003-113.expected new file mode 100644 index 0000000000..ec84b26ea6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-113.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/113 +cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 2211 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 +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 +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 +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: +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-114.expected b/clients/tests/test-client.check-on-disk/test_003-114.expected new file mode 100644 index 0000000000..38957fab86 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-114.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/114 +cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2211 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 +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 +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 +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: +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-115.expected b/clients/tests/test-client.check-on-disk/test_003-115.expected new file mode 100644 index 0000000000..6959b62a98 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-115.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/115 +cmd: $NMCLI --terse --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 2011 bytes +>>> +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-116.expected b/clients/tests/test-client.check-on-disk/test_003-116.expected new file mode 100644 index 0000000000..0616d5e1e7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-116.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/116 +cmd: $NMCLI --terse --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2034 bytes +>>> +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-117.expected b/clients/tests/test-client.check-on-disk/test_003-117.expected new file mode 100644 index 0000000000..5b306f06c6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-117.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/117 +cmd: $NMCLI --mode tabular -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-118.expected b/clients/tests/test-client.check-on-disk/test_003-118.expected new file mode 100644 index 0000000000..a25d9f378c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-118.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/118 +cmd: $NMCLI --mode tabular -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-119.expected b/clients/tests/test-client.check-on-disk/test_003-119.expected new file mode 100644 index 0000000000..e813b48c69 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-119.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/119 +cmd: $NMCLI --mode tabular -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-120.expected b/clients/tests/test-client.check-on-disk/test_003-120.expected new file mode 100644 index 0000000000..ea96e0a1e2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-120.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/120 +cmd: $NMCLI --mode tabular -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-121.expected b/clients/tests/test-client.check-on-disk/test_003-121.expected new file mode 100644 index 0000000000..f32beef4f3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-121.expected @@ -0,0 +1,34 @@ +location: clients/tests/test-client.py:881:test_003()/121 +cmd: $NMCLI --mode tabular con s ethernet +lang: C +returncode: 0 +stdout: 3208 bytes +>>> +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- -- + +name method browser-only pac-url pac-script +proxy none no -- -- + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-122.expected b/clients/tests/test-client.check-on-disk/test_003-122.expected new file mode 100644 index 0000000000..c4210e154c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-122.expected @@ -0,0 +1,34 @@ +location: clients/tests/test-client.py:881:test_003()/122 +cmd: $NMCLI --mode tabular con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3232 bytes +>>> +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- -- + +name method browser-only pac-url pac-script +proxy none nie -- -- + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-123.expected b/clients/tests/test-client.check-on-disk/test_003-123.expected new file mode 100644 index 0000000000..107b1f74e4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-123.expected @@ -0,0 +1,30 @@ +location: clients/tests/test-client.py:884:test_003()/123 +cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 2726 bytes +>>> +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- -- + +name method browser-only pac-url pac-script +proxy none no -- -- + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-124.expected b/clients/tests/test-client.check-on-disk/test_003-124.expected new file mode 100644 index 0000000000..6d8f43442d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-124.expected @@ -0,0 +1,30 @@ +location: clients/tests/test-client.py:884:test_003()/124 +cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2748 bytes +>>> +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- -- + +name method browser-only pac-url pac-script +proxy none nie -- -- + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-125.expected b/clients/tests/test-client.check-on-disk/test_003-125.expected new file mode 100644 index 0000000000..37cf783f9b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-125.expected @@ -0,0 +1,35 @@ +location: clients/tests/test-client.py:887:test_003()/125 +cmd: $NMCLI --mode tabular -f all dev show eth0 +lang: C +returncode: 0 +stdout: 2721 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES no 100 Mb/s no no + +NAME CARRIER S390-SUBCHANNELS +WIRED-PROPERTIES off -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-126.expected b/clients/tests/test-client.check-on-disk/test_003-126.expected new file mode 100644 index 0000000000..272334357e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-126.expected @@ -0,0 +1,35 @@ +location: clients/tests/test-client.py:887:test_003()/126 +cmd: $NMCLI --mode tabular -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2742 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES nie 100 Mb/s nie nie + +NAME CARRIER S390-SUBCHANNELS +WIRED-PROPERTIES wyłączone -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-127.expected b/clients/tests/test-client.check-on-disk/test_003-127.expected new file mode 100644 index 0000000000..37df8e2f02 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-127.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/127 +cmd: $NMCLI --mode tabular --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1885 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m0[0m [32mnever[0m [32myes[0m [32m0[0m [32mno[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32myes[0m [32meth1[0m [32mactivated[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m0[0m [31mnever[0m [31myes[0m [31m0[0m [31mno[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31myes[0m [31meth0[0m [31mdeactivating[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-128.expected b/clients/tests/test-client.check-on-disk/test_003-128.expected new file mode 100644 index 0000000000..30cc27e6e8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-128.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/128 +cmd: $NMCLI --mode tabular --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1895 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m0[0m [32mnigdy[0m [32mtak[0m [32m0[0m [32mnie[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32mtak[0m [32meth1[0m [32maktywowano[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m0[0m [31mnigdy[0m [31mtak[0m [31m0[0m [31mnie[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31mtak[0m [31meth0[0m [31mdezaktywowanie[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-129.expected b/clients/tests/test-client.check-on-disk/test_003-129.expected new file mode 100644 index 0000000000..982851e912 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-129.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/129 +cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 210 bytes +>>> +UUID TYPE +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m +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-130.expected b/clients/tests/test-client.check-on-disk/test_003-130.expected new file mode 100644 index 0000000000..75ecc15a3d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-130.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/130 +cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 210 bytes +>>> +UUID TYPE +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m +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-131.expected b/clients/tests/test-client.check-on-disk/test_003-131.expected new file mode 100644 index 0000000000..96211927e5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-131.expected @@ -0,0 +1,34 @@ +location: clients/tests/test-client.py:881:test_003()/131 +cmd: $NMCLI --mode tabular --color yes con s ethernet +lang: C +returncode: 0 +stdout: 3208 bytes +>>> +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- -- + +name method browser-only pac-url pac-script +proxy none no -- -- + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-132.expected b/clients/tests/test-client.check-on-disk/test_003-132.expected new file mode 100644 index 0000000000..0142761944 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-132.expected @@ -0,0 +1,34 @@ +location: clients/tests/test-client.py:881:test_003()/132 +cmd: $NMCLI --mode tabular --color yes con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3232 bytes +>>> +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- -- + +name method browser-only pac-url pac-script +proxy none nie -- -- + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-133.expected b/clients/tests/test-client.check-on-disk/test_003-133.expected new file mode 100644 index 0000000000..d4c31a75ca --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-133.expected @@ -0,0 +1,30 @@ +location: clients/tests/test-client.py:884:test_003()/133 +cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 2726 bytes +>>> +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- -- + +name method browser-only pac-url pac-script +proxy none no -- -- + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-134.expected b/clients/tests/test-client.check-on-disk/test_003-134.expected new file mode 100644 index 0000000000..548070d635 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-134.expected @@ -0,0 +1,30 @@ +location: clients/tests/test-client.py:884:test_003()/134 +cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2748 bytes +>>> +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- -- + +name method browser-only pac-url pac-script +proxy none nie -- -- + +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-135.expected b/clients/tests/test-client.check-on-disk/test_003-135.expected new file mode 100644 index 0000000000..a38dc41882 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-135.expected @@ -0,0 +1,35 @@ +location: clients/tests/test-client.py:887:test_003()/135 +cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 2721 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES no 100 Mb/s no no + +NAME CARRIER S390-SUBCHANNELS +WIRED-PROPERTIES off -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-136.expected b/clients/tests/test-client.check-on-disk/test_003-136.expected new file mode 100644 index 0000000000..ca80f4b2e2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-136.expected @@ -0,0 +1,35 @@ +location: clients/tests/test-client.py:887:test_003()/136 +cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2742 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES nie 100 Mb/s nie nie + +NAME CARRIER S390-SUBCHANNELS +WIRED-PROPERTIES wyłączone -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-137.expected b/clients/tests/test-client.check-on-disk/test_003-137.expected new file mode 100644 index 0000000000..e99d50fa89 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-137.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/137 +cmd: $NMCLI --mode tabular --pretty -f ALL con +lang: C +returncode: 0 +stdout: 2092 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +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-138.expected b/clients/tests/test-client.check-on-disk/test_003-138.expected new file mode 100644 index 0000000000..c8a1b722de --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-138.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/138 +cmd: $NMCLI --mode tabular --pretty -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2124 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +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-139.expected b/clients/tests/test-client.check-on-disk/test_003-139.expected new file mode 100644 index 0000000000..97d1ee310a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-139.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:878:test_003()/139 +cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE 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-140.expected b/clients/tests/test-client.check-on-disk/test_003-140.expected new file mode 100644 index 0000000000..227ec2ee55 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-140.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:878:test_003()/140 +cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE 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-141.expected b/clients/tests/test-client.check-on-disk/test_003-141.expected new file mode 100644 index 0000000000..7e0a63bf60 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-141.expected @@ -0,0 +1,50 @@ +location: clients/tests/test-client.py:881:test_003()/141 +cmd: $NMCLI --mode tabular --pretty con s ethernet +lang: C +returncode: 0 +stdout: 5361 bytes +>>> +========================================= + Connection profile details (ethernet) +========================================= +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- -- + +name method browser-only pac-url pac-script +-------------------------------------------------- +proxy none no -- -- + +====================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +====================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +====================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +====================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-142.expected b/clients/tests/test-client.check-on-disk/test_003-142.expected new file mode 100644 index 0000000000..5c7c80a787 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-142.expected @@ -0,0 +1,50 @@ +location: clients/tests/test-client.py:881:test_003()/142 +cmd: $NMCLI --mode tabular --pretty con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5445 bytes +>>> +=========================================== + Szczegóły profilu połączenia (ethernet) +=========================================== +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- -- + +name method browser-only pac-url pac-script +-------------------------------------------------- +proxy none nie -- -- + +=========================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=========================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +=========================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=========================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-143.expected b/clients/tests/test-client.check-on-disk/test_003-143.expected new file mode 100644 index 0000000000..9ab4909743 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-143.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:884:test_003()/143 +cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 4427 bytes +>>> +========================================= + Connection profile details (ethernet) +========================================= +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- -- + +name method browser-only pac-url pac-script +-------------------------------------------------- +proxy none no -- -- + +====================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +====================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-144.expected b/clients/tests/test-client.check-on-disk/test_003-144.expected new file mode 100644 index 0000000000..d296f42504 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-144.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:884:test_003()/144 +cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4489 bytes +>>> +=========================================== + Szczegóły profilu połączenia (ethernet) +=========================================== +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- -- + +name method browser-only pac-url pac-script +-------------------------------------------------- +proxy none nie -- -- + +=========================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=========================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-145.expected b/clients/tests/test-client.check-on-disk/test_003-145.expected new file mode 100644 index 0000000000..261b4e4291 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-145.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:887:test_003()/145 +cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4162 bytes +>>> +========================= + Device details (eth0) +========================= +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES no 100 Mb/s no no + +NAME CARRIER S390-SUBCHANNELS +--------------------------------------------- +WIRED-PROPERTIES off -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +--------------- +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-146.expected b/clients/tests/test-client.check-on-disk/test_003-146.expected new file mode 100644 index 0000000000..907f56bd7f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-146.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:887:test_003()/146 +cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4220 bytes +>>> +================================== + Informacje o urządzeniu (eth0) +================================== +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES nie 100 Mb/s nie nie + +NAME CARRIER S390-SUBCHANNELS +----------------------------------------------- +WIRED-PROPERTIES wyłączone -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +--------------- +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-147.expected b/clients/tests/test-client.check-on-disk/test_003-147.expected new file mode 100644 index 0000000000..4adc1c4f7e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-147.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/147 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con +lang: C +returncode: 0 +stdout: 2362 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m0[0m [32mnever[0m [32myes[0m [32m0[0m [32mno[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32myes[0m [32meth1[0m [32mactivated[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m0[0m [31mnever[0m [31myes[0m [31m0[0m [31mno[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31myes[0m [31meth0[0m [31mdeactivating[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-148.expected b/clients/tests/test-client.check-on-disk/test_003-148.expected new file mode 100644 index 0000000000..34f871a136 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-148.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/148 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2394 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m0[0m [32mnigdy[0m [32mtak[0m [32m0[0m [32mnie[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32mtak[0m [32meth1[0m [32maktywowano[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m0[0m [31mnigdy[0m [31mtak[0m [31m0[0m [31mnie[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31mtak[0m [31meth0[0m [31mdezaktywowanie[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-149.expected b/clients/tests/test-client.check-on-disk/test_003-149.expected new file mode 100644 index 0000000000..66a05249de --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-149.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:878:test_003()/149 +cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 412 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m +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-150.expected b/clients/tests/test-client.check-on-disk/test_003-150.expected new file mode 100644 index 0000000000..317d2b20ab --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-150.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:878:test_003()/150 +cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 432 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m +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-151.expected b/clients/tests/test-client.check-on-disk/test_003-151.expected new file mode 100644 index 0000000000..9d3beb1440 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-151.expected @@ -0,0 +1,50 @@ +location: clients/tests/test-client.py:881:test_003()/151 +cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet +lang: C +returncode: 0 +stdout: 5361 bytes +>>> +========================================= + Connection profile details (ethernet) +========================================= +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- -- + +name method browser-only pac-url pac-script +-------------------------------------------------- +proxy none no -- -- + +====================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +====================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +====================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +====================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-152.expected b/clients/tests/test-client.check-on-disk/test_003-152.expected new file mode 100644 index 0000000000..fe51c88f8d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-152.expected @@ -0,0 +1,50 @@ +location: clients/tests/test-client.py:881:test_003()/152 +cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5445 bytes +>>> +=========================================== + Szczegóły profilu połączenia (ethernet) +=========================================== +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- -- + +name method browser-only pac-url pac-script +-------------------------------------------------- +proxy none nie -- -- + +=========================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=========================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +=========================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=========================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-153.expected b/clients/tests/test-client.check-on-disk/test_003-153.expected new file mode 100644 index 0000000000..3f4517799d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-153.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:884:test_003()/153 +cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 4427 bytes +>>> +========================================= + Connection profile details (ethernet) +========================================= +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- -- + +name method browser-only pac-url pac-script +-------------------------------------------------- +proxy none no -- -- + +====================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +====================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-154.expected b/clients/tests/test-client.check-on-disk/test_003-154.expected new file mode 100644 index 0000000000..ae7c6dce2d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-154.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:884:test_003()/154 +cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4489 bytes +>>> +=========================================== + Szczegóły profilu połączenia (ethernet) +=========================================== +name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default) + +name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default -- + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default) + +name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- -- + +name method browser-only pac-url pac-script +-------------------------------------------------- +proxy none nie -- -- + +=========================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=========================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-155.expected b/clients/tests/test-client.check-on-disk/test_003-155.expected new file mode 100644 index 0000000000..3d5acebafb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-155.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:887:test_003()/155 +cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4162 bytes +>>> +========================= + Device details (eth0) +========================= +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES no 100 Mb/s no no + +NAME CARRIER S390-SUBCHANNELS +--------------------------------------------- +WIRED-PROPERTIES off -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +--------------- +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-156.expected b/clients/tests/test-client.check-on-disk/test_003-156.expected new file mode 100644 index 0000000000..a7008caee1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-156.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:887:test_003()/156 +cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4220 bytes +>>> +================================== + Informacje o urządzeniu (eth0) +================================== +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES nie 100 Mb/s nie nie + +NAME CARRIER S390-SUBCHANNELS +----------------------------------------------- +WIRED-PROPERTIES wyłączone -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +--------------- +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-157.expected b/clients/tests/test-client.check-on-disk/test_003-157.expected new file mode 100644 index 0000000000..15ecd16d99 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-157.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/157 +cmd: $NMCLI --mode tabular --terse -f ALL con +lang: C +returncode: 0 +stdout: 871 bytes +>>> +ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-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:802-3-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:802-3-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:802-3-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-158.expected b/clients/tests/test-client.check-on-disk/test_003-158.expected new file mode 100644 index 0000000000..e258523aa1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-158.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/158 +cmd: $NMCLI --mode tabular --terse -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 871 bytes +>>> +ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-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:802-3-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:802-3-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:802-3-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-159.expected b/clients/tests/test-client.check-on-disk/test_003-159.expected new file mode 100644 index 0000000000..28778674a8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-159.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/159 +cmd: $NMCLI --mode tabular --terse -f UUID,TYPE 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-160.expected b/clients/tests/test-client.check-on-disk/test_003-160.expected new file mode 100644 index 0000000000..38d25f5497 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-160.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/160 +cmd: $NMCLI --mode tabular --terse -f UUID,TYPE 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-161.expected b/clients/tests/test-client.check-on-disk/test_003-161.expected new file mode 100644 index 0000000000..dc835d0bac --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-161.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:881:test_003()/161 +cmd: $NMCLI --mode tabular --terse con s ethernet +lang: C +returncode: 0 +stdout: 666 bytes +>>> +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1 +802-3-ethernet::0::no:::::auto::::default: +ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 +ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: +proxy:none:no:: +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-162.expected b/clients/tests/test-client.check-on-disk/test_003-162.expected new file mode 100644 index 0000000000..f15ac75d76 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-162.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:881:test_003()/162 +cmd: $NMCLI --mode tabular --terse con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 666 bytes +>>> +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1 +802-3-ethernet::0::no:::::auto::::default: +ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 +ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: +proxy:none:no:: +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-163.expected b/clients/tests/test-client.check-on-disk/test_003-163.expected new file mode 100644 index 0000000000..e637173bc3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-163.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:884:test_003()/163 +cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 479 bytes +>>> +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1 +802-3-ethernet::0::no:::::auto::::default: +ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 +ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: +proxy:none:no:: +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-164.expected b/clients/tests/test-client.check-on-disk/test_003-164.expected new file mode 100644 index 0000000000..dc9875cae5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-164.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:884:test_003()/164 +cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 479 bytes +>>> +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1 +802-3-ethernet::0::no:::::auto::::default: +ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 +ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: +proxy:none:no:: +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-165.expected b/clients/tests/test-client.check-on-disk/test_003-165.expected new file mode 100644 index 0000000000..dad2481920 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-165.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:887:test_003()/165 +cmd: $NMCLI --mode tabular --terse -f all dev show eth0 +lang: C +returncode: 0 +stdout: 1176 bytes +>>> +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +CAPABILITIES:no:100 Mb/s:no:no +WIRED-PROPERTIES:off: +IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 +DHCP4: +IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-166.expected b/clients/tests/test-client.check-on-disk/test_003-166.expected new file mode 100644 index 0000000000..d48062d5db --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-166.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:887:test_003()/166 +cmd: $NMCLI --mode tabular --terse -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1199 bytes +>>> +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +CAPABILITIES:nie:100 Mb/s:nie:nie +WIRED-PROPERTIES:wyłączone: +IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 +DHCP4: +IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-167.expected b/clients/tests/test-client.check-on-disk/test_003-167.expected new file mode 100644 index 0000000000..8dad4f6546 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-167.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/167 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1141 bytes +>>> +[32methernet[0m:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m:[32m0[0m:[32mnever[0m:[32myes[0m:[32m0[0m:[32mno[0m:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[32myes[0m:[32meth1[0m:[32mactivated[0m:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m:[32m[0m:[32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[31m802-3-ethernet[0m:[31m0[0m:[31mnever[0m:[31myes[0m:[31m0[0m:[31mno[0m:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[31myes[0m:[31meth0[0m:[31mdeactivating[0m:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m:[31m[0m:[31m/etc/NetworkManager/system-connections/ethernet[0m +con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-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:802-3-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-168.expected b/clients/tests/test-client.check-on-disk/test_003-168.expected new file mode 100644 index 0000000000..f1c4e1edbd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-168.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/168 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1141 bytes +>>> +[32methernet[0m:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m:[32m0[0m:[32mnever[0m:[32myes[0m:[32m0[0m:[32mno[0m:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[32myes[0m:[32meth1[0m:[32mactivated[0m:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m:[32m[0m:[32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[31m802-3-ethernet[0m:[31m0[0m:[31mnever[0m:[31myes[0m:[31m0[0m:[31mno[0m:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[31myes[0m:[31meth0[0m:[31mdeactivating[0m:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m:[31m[0m:[31m/etc/NetworkManager/system-connections/ethernet[0m +con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-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:802-3-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-169.expected b/clients/tests/test-client.check-on-disk/test_003-169.expected new file mode 100644 index 0000000000..98d489e486 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-169.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/169 +cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 174 bytes +>>> +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m +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-170.expected b/clients/tests/test-client.check-on-disk/test_003-170.expected new file mode 100644 index 0000000000..33e0867536 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-170.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/170 +cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 174 bytes +>>> +[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m +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-171.expected b/clients/tests/test-client.check-on-disk/test_003-171.expected new file mode 100644 index 0000000000..983733377d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-171.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:881:test_003()/171 +cmd: $NMCLI --mode tabular --terse --color yes con s ethernet +lang: C +returncode: 0 +stdout: 666 bytes +>>> +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1 +802-3-ethernet::0::no:::::auto::::default: +ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 +ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: +proxy:none:no:: +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-172.expected b/clients/tests/test-client.check-on-disk/test_003-172.expected new file mode 100644 index 0000000000..d78af4fbf4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-172.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:881:test_003()/172 +cmd: $NMCLI --mode tabular --terse --color yes con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 666 bytes +>>> +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1 +802-3-ethernet::0::no:::::auto::::default: +ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 +ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: +proxy:none:no:: +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-173.expected b/clients/tests/test-client.check-on-disk/test_003-173.expected new file mode 100644 index 0000000000..152f89ac6c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-173.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:884:test_003()/173 +cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 479 bytes +>>> +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1 +802-3-ethernet::0::no:::::auto::::default: +ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 +ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: +proxy:none:no:: +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-174.expected b/clients/tests/test-client.check-on-disk/test_003-174.expected new file mode 100644 index 0000000000..a8fb33e192 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-174.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:884:test_003()/174 +cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 479 bytes +>>> +connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1 +802-3-ethernet::0::no:::::auto::::default: +ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1 +ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes:: +proxy:none:no:: +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-175.expected b/clients/tests/test-client.check-on-disk/test_003-175.expected new file mode 100644 index 0000000000..2489ec8b44 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-175.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:887:test_003()/175 +cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 1176 bytes +>>> +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +CAPABILITIES:no:100 Mb/s:no:no +WIRED-PROPERTIES:off: +IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 +DHCP4: +IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-176.expected b/clients/tests/test-client.check-on-disk/test_003-176.expected new file mode 100644 index 0000000000..c15224d5ce --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-176.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:887:test_003()/176 +cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1199 bytes +>>> +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +CAPABILITIES:nie:100 Mb/s:nie:nie +WIRED-PROPERTIES:wyłączone: +IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 +DHCP4: +IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-177.expected b/clients/tests/test-client.check-on-disk/test_003-177.expected new file mode 100644 index 0000000000..291903cffe --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-177.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/177 +cmd: $NMCLI --mode multiline -f ALL con +lang: C +returncode: 0 +stdout: 3267 bytes +>>> +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: yes +DEVICE: eth1 +STATE: activated +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: yes +DEVICE: eth0 +STATE: deactivating +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-178.expected b/clients/tests/test-client.check-on-disk/test_003-178.expected new file mode 100644 index 0000000000..42268e646a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-178.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/178 +cmd: $NMCLI --mode multiline -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3276 bytes +>>> +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: tak +DEVICE: eth1 +STATE: aktywowano +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: tak +DEVICE: eth0 +STATE: dezaktywowanie +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-179.expected b/clients/tests/test-client.check-on-disk/test_003-179.expected new file mode 100644 index 0000000000..a32f4a80f2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-179.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:878:test_003()/179 +cmd: $NMCLI --mode multiline -f UUID,TYPE 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-180.expected b/clients/tests/test-client.check-on-disk/test_003-180.expected new file mode 100644 index 0000000000..aad4fa32f5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-180.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:878:test_003()/180 +cmd: $NMCLI --mode multiline -f UUID,TYPE 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-181.expected b/clients/tests/test-client.check-on-disk/test_003-181.expected new file mode 100644 index 0000000000..b3291074cf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-181.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/181 +cmd: $NMCLI --mode multiline 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-182.expected b/clients/tests/test-client.check-on-disk/test_003-182.expected new file mode 100644 index 0000000000..12ee0ad7ca --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-182.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/182 +cmd: $NMCLI --mode multiline 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-183.expected b/clients/tests/test-client.check-on-disk/test_003-183.expected new file mode 100644 index 0000000000..c1277be437 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-183.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/183 +cmd: $NMCLI --mode multiline 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-184.expected b/clients/tests/test-client.check-on-disk/test_003-184.expected new file mode 100644 index 0000000000..826ae9718b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-184.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/184 +cmd: $NMCLI --mode multiline 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-185.expected b/clients/tests/test-client.check-on-disk/test_003-185.expected new file mode 100644 index 0000000000..fc9874f9ce --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-185.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/185 +cmd: $NMCLI --mode multiline -f all dev show eth0 +lang: C +returncode: 0 +stdout: 3239 bytes +>>> +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-186.expected b/clients/tests/test-client.check-on-disk/test_003-186.expected new file mode 100644 index 0000000000..5a52f7ebb9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-186.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/186 +cmd: $NMCLI --mode multiline -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3262 bytes +>>> +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-187.expected b/clients/tests/test-client.check-on-disk/test_003-187.expected new file mode 100644 index 0000000000..481c243224 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-187.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/187 +cmd: $NMCLI --mode multiline --color yes -f ALL con +lang: C +returncode: 0 +stdout: 3537 bytes +>>> +NAME: [32methernet[0m +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +TIMESTAMP: [32m0[0m +TIMESTAMP-REAL: [32mnever[0m +AUTOCONNECT: [32myes[0m +AUTOCONNECT-PRIORITY: [32m0[0m +READONLY: [32mno[0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [32myes[0m +DEVICE: [32meth1[0m +STATE: [32mactivated[0m +ACTIVE-PATH: [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE: [32m--[0m +FILENAME: [32m/etc/NetworkManager/system-connections/ethernet[0m +NAME: [31methernet[0m +UUID: [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [31methernet[0m +TIMESTAMP: [31m0[0m +TIMESTAMP-REAL: [31mnever[0m +AUTOCONNECT: [31myes[0m +AUTOCONNECT-PRIORITY: [31m0[0m +READONLY: [31mno[0m +DBUS-PATH: [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [31myes[0m +DEVICE: [31meth0[0m +STATE: [31mdeactivating[0m +ACTIVE-PATH: [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE: [31m--[0m +FILENAME: [31m/etc/NetworkManager/system-connections/ethernet[0m +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-188.expected b/clients/tests/test-client.check-on-disk/test_003-188.expected new file mode 100644 index 0000000000..2a694a063a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-188.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/188 +cmd: $NMCLI --mode multiline --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3546 bytes +>>> +NAME: [32methernet[0m +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +TIMESTAMP: [32m0[0m +TIMESTAMP-REAL: [32mnigdy[0m +AUTOCONNECT: [32mtak[0m +AUTOCONNECT-PRIORITY: [32m0[0m +READONLY: [32mnie[0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [32mtak[0m +DEVICE: [32meth1[0m +STATE: [32maktywowano[0m +ACTIVE-PATH: [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE: [32m--[0m +FILENAME: [32m/etc/NetworkManager/system-connections/ethernet[0m +NAME: [31methernet[0m +UUID: [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [31methernet[0m +TIMESTAMP: [31m0[0m +TIMESTAMP-REAL: [31mnigdy[0m +AUTOCONNECT: [31mtak[0m +AUTOCONNECT-PRIORITY: [31m0[0m +READONLY: [31mnie[0m +DBUS-PATH: [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [31mtak[0m +DEVICE: [31meth0[0m +STATE: [31mdezaktywowanie[0m +ACTIVE-PATH: [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE: [31m--[0m +FILENAME: [31m/etc/NetworkManager/system-connections/ethernet[0m +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-189.expected b/clients/tests/test-client.check-on-disk/test_003-189.expected new file mode 100644 index 0000000000..57c837289b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-189.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:878:test_003()/189 +cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 396 bytes +>>> +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +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-190.expected b/clients/tests/test-client.check-on-disk/test_003-190.expected new file mode 100644 index 0000000000..ebd1f87e02 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-190.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:878:test_003()/190 +cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 396 bytes +>>> +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +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-191.expected b/clients/tests/test-client.check-on-disk/test_003-191.expected new file mode 100644 index 0000000000..be63812f8a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-191.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/191 +cmd: $NMCLI --mode multiline --color yes 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-192.expected b/clients/tests/test-client.check-on-disk/test_003-192.expected new file mode 100644 index 0000000000..18ab8457f1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-192.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/192 +cmd: $NMCLI --mode multiline --color yes 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-193.expected b/clients/tests/test-client.check-on-disk/test_003-193.expected new file mode 100644 index 0000000000..6a170a473b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-193.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/193 +cmd: $NMCLI --mode multiline --color yes 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-194.expected b/clients/tests/test-client.check-on-disk/test_003-194.expected new file mode 100644 index 0000000000..4606264bbc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-194.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/194 +cmd: $NMCLI --mode multiline --color yes 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-195.expected b/clients/tests/test-client.check-on-disk/test_003-195.expected new file mode 100644 index 0000000000..26ef687866 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-195.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/195 +cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 3239 bytes +>>> +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-196.expected b/clients/tests/test-client.check-on-disk/test_003-196.expected new file mode 100644 index 0000000000..ebc6f5750b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-196.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/196 +cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3262 bytes +>>> +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-197.expected b/clients/tests/test-client.check-on-disk/test_003-197.expected new file mode 100644 index 0000000000..ddae8a7a13 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-197.expected @@ -0,0 +1,79 @@ +location: clients/tests/test-client.py:875:test_003()/197 +cmd: $NMCLI --mode multiline --pretty -f ALL con +lang: C +returncode: 0 +stdout: 3804 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: yes +DEVICE: eth1 +STATE: activated +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +------------------------------------------------------------------------------- +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: yes +DEVICE: eth0 +STATE: deactivating +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +------------------------------------------------------------------------------- +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +------------------------------------------------------------------------------- +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-198.expected b/clients/tests/test-client.check-on-disk/test_003-198.expected new file mode 100644 index 0000000000..a71813f5a2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-198.expected @@ -0,0 +1,79 @@ +location: clients/tests/test-client.py:875:test_003()/198 +cmd: $NMCLI --mode multiline --pretty -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3819 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: tak +DEVICE: eth1 +STATE: aktywowano +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +------------------------------------------------------------------------------- +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: tak +DEVICE: eth0 +STATE: dezaktywowanie +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +------------------------------------------------------------------------------- +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +------------------------------------------------------------------------------- +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-199.expected b/clients/tests/test-client.check-on-disk/test_003-199.expected new file mode 100644 index 0000000000..09a813707d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-199.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:878:test_003()/199 +cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE 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-200.expected b/clients/tests/test-client.check-on-disk/test_003-200.expected new file mode 100644 index 0000000000..39b145cf9e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-200.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:878:test_003()/200 +cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE 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-201.expected b/clients/tests/test-client.check-on-disk/test_003-201.expected new file mode 100644 index 0000000000..d596acaa24 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-201.expected @@ -0,0 +1,132 @@ +location: clients/tests/test-client.py:881:test_003()/201 +cmd: $NMCLI --mode multiline --pretty con s ethernet +lang: C +returncode: 0 +stdout: 6136 bytes +>>> +=============================================================================== + Connection profile details (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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: -- +------------------------------------------------------------------------------- + +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-202.expected b/clients/tests/test-client.check-on-disk/test_003-202.expected new file mode 100644 index 0000000000..07ca7e85c4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-202.expected @@ -0,0 +1,132 @@ +location: clients/tests/test-client.py:881:test_003()/202 +cmd: $NMCLI --mode multiline --pretty con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 6182 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-203.expected b/clients/tests/test-client.check-on-disk/test_003-203.expected new file mode 100644 index 0000000000..ba6dc9680c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-203.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:884:test_003()/203 +cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 5158 bytes +>>> +=============================================================================== + Connection profile details (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-204.expected b/clients/tests/test-client.check-on-disk/test_003-204.expected new file mode 100644 index 0000000000..cf4c819a86 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-204.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:884:test_003()/204 +cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5193 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-205.expected b/clients/tests/test-client.check-on-disk/test_003-205.expected new file mode 100644 index 0000000000..1747f10795 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-205.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/205 +cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4090 bytes +>>> +=============================================================================== + Device details (eth0) +=============================================================================== +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-206.expected b/clients/tests/test-client.check-on-disk/test_003-206.expected new file mode 100644 index 0000000000..46588a495e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-206.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/206 +cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4119 bytes +>>> +=============================================================================== + Informacje o urządzeniu (eth0) +=============================================================================== +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-207.expected b/clients/tests/test-client.check-on-disk/test_003-207.expected new file mode 100644 index 0000000000..1d510e8ae1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-207.expected @@ -0,0 +1,79 @@ +location: clients/tests/test-client.py:875:test_003()/207 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con +lang: C +returncode: 0 +stdout: 4074 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +NAME: [32methernet[0m +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +TIMESTAMP: [32m0[0m +TIMESTAMP-REAL: [32mnever[0m +AUTOCONNECT: [32myes[0m +AUTOCONNECT-PRIORITY: [32m0[0m +READONLY: [32mno[0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [32myes[0m +DEVICE: [32meth1[0m +STATE: [32mactivated[0m +ACTIVE-PATH: [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE: [32m--[0m +FILENAME: [32m/etc/NetworkManager/system-connections/ethernet[0m +------------------------------------------------------------------------------- +NAME: [31methernet[0m +UUID: [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [31methernet[0m +TIMESTAMP: [31m0[0m +TIMESTAMP-REAL: [31mnever[0m +AUTOCONNECT: [31myes[0m +AUTOCONNECT-PRIORITY: [31m0[0m +READONLY: [31mno[0m +DBUS-PATH: [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [31myes[0m +DEVICE: [31meth0[0m +STATE: [31mdeactivating[0m +ACTIVE-PATH: [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE: [31m--[0m +FILENAME: [31m/etc/NetworkManager/system-connections/ethernet[0m +------------------------------------------------------------------------------- +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +------------------------------------------------------------------------------- +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-208.expected b/clients/tests/test-client.check-on-disk/test_003-208.expected new file mode 100644 index 0000000000..173c833090 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-208.expected @@ -0,0 +1,79 @@ +location: clients/tests/test-client.py:875:test_003()/208 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4089 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +NAME: [32methernet[0m +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +TIMESTAMP: [32m0[0m +TIMESTAMP-REAL: [32mnigdy[0m +AUTOCONNECT: [32mtak[0m +AUTOCONNECT-PRIORITY: [32m0[0m +READONLY: [32mnie[0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [32mtak[0m +DEVICE: [32meth1[0m +STATE: [32maktywowano[0m +ACTIVE-PATH: [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE: [32m--[0m +FILENAME: [32m/etc/NetworkManager/system-connections/ethernet[0m +------------------------------------------------------------------------------- +NAME: [31methernet[0m +UUID: [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [31methernet[0m +TIMESTAMP: [31m0[0m +TIMESTAMP-REAL: [31mnigdy[0m +AUTOCONNECT: [31mtak[0m +AUTOCONNECT-PRIORITY: [31m0[0m +READONLY: [31mnie[0m +DBUS-PATH: [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [31mtak[0m +DEVICE: [31meth0[0m +STATE: [31mdezaktywowanie[0m +ACTIVE-PATH: [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE: [31m--[0m +FILENAME: [31m/etc/NetworkManager/system-connections/ethernet[0m +------------------------------------------------------------------------------- +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +------------------------------------------------------------------------------- +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-209.expected b/clients/tests/test-client.check-on-disk/test_003-209.expected new file mode 100644 index 0000000000..aefd61cece --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-209.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:878:test_003()/209 +cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 853 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +------------------------------------------------------------------------------- +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-210.expected b/clients/tests/test-client.check-on-disk/test_003-210.expected new file mode 100644 index 0000000000..c6247f738c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-210.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:878:test_003()/210 +cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 859 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +------------------------------------------------------------------------------- +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-211.expected b/clients/tests/test-client.check-on-disk/test_003-211.expected new file mode 100644 index 0000000000..6e5b5fcdba --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-211.expected @@ -0,0 +1,132 @@ +location: clients/tests/test-client.py:881:test_003()/211 +cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet +lang: C +returncode: 0 +stdout: 6136 bytes +>>> +=============================================================================== + Connection profile details (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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: -- +------------------------------------------------------------------------------- + +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-212.expected b/clients/tests/test-client.check-on-disk/test_003-212.expected new file mode 100644 index 0000000000..bbc9cab404 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-212.expected @@ -0,0 +1,132 @@ +location: clients/tests/test-client.py:881:test_003()/212 +cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 6182 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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: -- +------------------------------------------------------------------------------- + +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-213.expected b/clients/tests/test-client.check-on-disk/test_003-213.expected new file mode 100644 index 0000000000..ecf56685c6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-213.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:884:test_003()/213 +cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 5158 bytes +>>> +=============================================================================== + Connection profile details (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-214.expected b/clients/tests/test-client.check-on-disk/test_003-214.expected new file mode 100644 index 0000000000..a1b706f32d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-214.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:884:test_003()/214 +cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5193 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia (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: -- +------------------------------------------------------------------------------- +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-215.expected b/clients/tests/test-client.check-on-disk/test_003-215.expected new file mode 100644 index 0000000000..5a469be289 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-215.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/215 +cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4090 bytes +>>> +=============================================================================== + Device details (eth0) +=============================================================================== +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-216.expected b/clients/tests/test-client.check-on-disk/test_003-216.expected new file mode 100644 index 0000000000..f55025a65f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-216.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/216 +cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4119 bytes +>>> +=============================================================================== + Informacje o urządzeniu (eth0) +=============================================================================== +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-217.expected b/clients/tests/test-client.check-on-disk/test_003-217.expected new file mode 100644 index 0000000000..fd597f6233 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-217.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/217 +cmd: $NMCLI --mode multiline --terse -f ALL con +lang: C +returncode: 0 +stdout: 1427 bytes +>>> +NAME:ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE:yes +DEVICE:eth1 +STATE:activated +ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/ethernet +NAME:ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE:yes +DEVICE:eth0 +STATE:deactivating +ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/ethernet +NAME:con-1 +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-1 +NAME:con-xx1 +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-218.expected b/clients/tests/test-client.check-on-disk/test_003-218.expected new file mode 100644 index 0000000000..7de9301182 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-218.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/218 +cmd: $NMCLI --mode multiline --terse -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1427 bytes +>>> +NAME:ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE:yes +DEVICE:eth1 +STATE:activated +ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/ethernet +NAME:ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE:yes +DEVICE:eth0 +STATE:deactivating +ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/ethernet +NAME:con-1 +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-1 +NAME:con-xx1 +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-219.expected b/clients/tests/test-client.check-on-disk/test_003-219.expected new file mode 100644 index 0000000000..fc347073d0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-219.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:878:test_003()/219 +cmd: $NMCLI --mode multiline --terse -f UUID,TYPE 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-220.expected b/clients/tests/test-client.check-on-disk/test_003-220.expected new file mode 100644 index 0000000000..5607ac7f6f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-220.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:878:test_003()/220 +cmd: $NMCLI --mode multiline --terse -f UUID,TYPE 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-221.expected b/clients/tests/test-client.check-on-disk/test_003-221.expected new file mode 100644 index 0000000000..1cb0d97509 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-221.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/221 +cmd: $NMCLI --mode multiline --terse con s ethernet +lang: C +returncode: 0 +stdout: 2579 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 +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 +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 +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: +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-222.expected b/clients/tests/test-client.check-on-disk/test_003-222.expected new file mode 100644 index 0000000000..6b809f04cb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-222.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/222 +cmd: $NMCLI --mode multiline --terse con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2579 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 +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 +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 +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: +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-223.expected b/clients/tests/test-client.check-on-disk/test_003-223.expected new file mode 100644 index 0000000000..8dfdb88a49 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-223.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/223 +cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 2211 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 +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 +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 +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: +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-224.expected b/clients/tests/test-client.check-on-disk/test_003-224.expected new file mode 100644 index 0000000000..6aa7c90088 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-224.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/224 +cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2211 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 +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 +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 +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: +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-225.expected b/clients/tests/test-client.check-on-disk/test_003-225.expected new file mode 100644 index 0000000000..e06086509f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-225.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/225 +cmd: $NMCLI --mode multiline --terse -f all dev show eth0 +lang: C +returncode: 0 +stdout: 2011 bytes +>>> +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-226.expected b/clients/tests/test-client.check-on-disk/test_003-226.expected new file mode 100644 index 0000000000..2ac0c19f66 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-226.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/226 +cmd: $NMCLI --mode multiline --terse -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2034 bytes +>>> +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-227.expected b/clients/tests/test-client.check-on-disk/test_003-227.expected new file mode 100644 index 0000000000..4737a26d41 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-227.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/227 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1697 bytes +>>> +NAME:[32methernet[0m +UUID:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[32m802-3-ethernet[0m +TIMESTAMP:[32m0[0m +TIMESTAMP-REAL:[32mnever[0m +AUTOCONNECT:[32myes[0m +AUTOCONNECT-PRIORITY:[32m0[0m +READONLY:[32mno[0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE:[32myes[0m +DEVICE:[32meth1[0m +STATE:[32mactivated[0m +ACTIVE-PATH:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE:[32m[0m +FILENAME:[32m/etc/NetworkManager/system-connections/ethernet[0m +NAME:[31methernet[0m +UUID:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[31m802-3-ethernet[0m +TIMESTAMP:[31m0[0m +TIMESTAMP-REAL:[31mnever[0m +AUTOCONNECT:[31myes[0m +AUTOCONNECT-PRIORITY:[31m0[0m +READONLY:[31mno[0m +DBUS-PATH:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE:[31myes[0m +DEVICE:[31meth0[0m +STATE:[31mdeactivating[0m +ACTIVE-PATH:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE:[31m[0m +FILENAME:[31m/etc/NetworkManager/system-connections/ethernet[0m +NAME:con-1 +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-1 +NAME:con-xx1 +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-228.expected b/clients/tests/test-client.check-on-disk/test_003-228.expected new file mode 100644 index 0000000000..fbc5fc73d1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-228.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/228 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1697 bytes +>>> +NAME:[32methernet[0m +UUID:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[32m802-3-ethernet[0m +TIMESTAMP:[32m0[0m +TIMESTAMP-REAL:[32mnever[0m +AUTOCONNECT:[32myes[0m +AUTOCONNECT-PRIORITY:[32m0[0m +READONLY:[32mno[0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE:[32myes[0m +DEVICE:[32meth1[0m +STATE:[32mactivated[0m +ACTIVE-PATH:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE:[32m[0m +FILENAME:[32m/etc/NetworkManager/system-connections/ethernet[0m +NAME:[31methernet[0m +UUID:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[31m802-3-ethernet[0m +TIMESTAMP:[31m0[0m +TIMESTAMP-REAL:[31mnever[0m +AUTOCONNECT:[31myes[0m +AUTOCONNECT-PRIORITY:[31m0[0m +READONLY:[31mno[0m +DBUS-PATH:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE:[31myes[0m +DEVICE:[31meth0[0m +STATE:[31mdeactivating[0m +ACTIVE-PATH:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE:[31m[0m +FILENAME:[31m/etc/NetworkManager/system-connections/ethernet[0m +NAME:con-1 +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-1 +NAME:con-xx1 +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-229.expected b/clients/tests/test-client.check-on-disk/test_003-229.expected new file mode 100644 index 0000000000..4c53bbb3d5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-229.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:878:test_003()/229 +cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 204 bytes +>>> +UUID:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[32m802-3-ethernet[0m +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-230.expected b/clients/tests/test-client.check-on-disk/test_003-230.expected new file mode 100644 index 0000000000..6f5043671a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-230.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:878:test_003()/230 +cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 204 bytes +>>> +UUID:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[32m802-3-ethernet[0m +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-231.expected b/clients/tests/test-client.check-on-disk/test_003-231.expected new file mode 100644 index 0000000000..f95fed1a03 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-231.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/231 +cmd: $NMCLI --mode multiline --terse --color yes con s ethernet +lang: C +returncode: 0 +stdout: 2579 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 +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 +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 +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: +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-232.expected b/clients/tests/test-client.check-on-disk/test_003-232.expected new file mode 100644 index 0000000000..7cd88f78d2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-232.expected @@ -0,0 +1,116 @@ +location: clients/tests/test-client.py:881:test_003()/232 +cmd: $NMCLI --mode multiline --terse --color yes con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2579 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 +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 +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 +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: +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-233.expected b/clients/tests/test-client.check-on-disk/test_003-233.expected new file mode 100644 index 0000000000..876e0bd09b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-233.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/233 +cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 2211 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 +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 +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 +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: +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-234.expected b/clients/tests/test-client.check-on-disk/test_003-234.expected new file mode 100644 index 0000000000..d3b7410cb4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-234.expected @@ -0,0 +1,103 @@ +location: clients/tests/test-client.py:884:test_003()/234 +cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2211 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 +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 +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 +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: +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-235.expected b/clients/tests/test-client.check-on-disk/test_003-235.expected new file mode 100644 index 0000000000..883d38021e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-235.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/235 +cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 2011 bytes +>>> +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-236.expected b/clients/tests/test-client.check-on-disk/test_003-236.expected new file mode 100644 index 0000000000..cbe7107064 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-236.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/236 +cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2034 bytes +>>> +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-237.expected b/clients/tests/test-client.check-on-disk/test_003-237.expected new file mode 100644 index 0000000000..29c092cd7e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-237.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/237 +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-238.expected b/clients/tests/test-client.check-on-disk/test_003-238.expected new file mode 100644 index 0000000000..1a2ddcecd9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-238.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/238 +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-239.expected b/clients/tests/test-client.check-on-disk/test_003-239.expected new file mode 100644 index 0000000000..0427f9ae28 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-239.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/239 +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-240.expected b/clients/tests/test-client.check-on-disk/test_003-240.expected new file mode 100644 index 0000000000..4e840b6d31 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-240.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/240 +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-241.expected b/clients/tests/test-client.check-on-disk/test_003-241.expected new file mode 100644 index 0000000000..74e19b9700 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-241.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/241 +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-242.expected b/clients/tests/test-client.check-on-disk/test_003-242.expected new file mode 100644 index 0000000000..bad43aec38 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-242.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/242 +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-243.expected b/clients/tests/test-client.check-on-disk/test_003-243.expected new file mode 100644 index 0000000000..cdc41a9539 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-243.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/243 +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-244.expected b/clients/tests/test-client.check-on-disk/test_003-244.expected new file mode 100644 index 0000000000..12e7dd3583 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-244.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/244 +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-245.expected b/clients/tests/test-client.check-on-disk/test_003-245.expected new file mode 100644 index 0000000000..431da8d800 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-245.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/245 +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-246.expected b/clients/tests/test-client.check-on-disk/test_003-246.expected new file mode 100644 index 0000000000..869ac95e40 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-246.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/246 +cmd: $NMCLI -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3230 bytes +>>> +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_003-247.expected b/clients/tests/test-client.check-on-disk/test_003-247.expected new file mode 100644 index 0000000000..61bbc1b031 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-247.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/247 +cmd: $NMCLI --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1885 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32myes[0m [32meth1[0m [32mactivated[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31myes[0m [31meth0[0m [31mdeactivating[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-248.expected b/clients/tests/test-client.check-on-disk/test_003-248.expected new file mode 100644 index 0000000000..2705775614 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-248.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/248 +cmd: $NMCLI --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1895 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32mtak[0m [32meth1[0m [32maktywowano[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31mtak[0m [31meth0[0m [31mdezaktywowanie[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-249.expected b/clients/tests/test-client.check-on-disk/test_003-249.expected new file mode 100644 index 0000000000..4dfc56ab36 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-249.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/249 +cmd: $NMCLI --color yes -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-250.expected b/clients/tests/test-client.check-on-disk/test_003-250.expected new file mode 100644 index 0000000000..6aeb3e18da --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-250.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/250 +cmd: $NMCLI --color yes -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-251.expected b/clients/tests/test-client.check-on-disk/test_003-251.expected new file mode 100644 index 0000000000..013a29efd1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-251.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/251 +cmd: $NMCLI --color yes 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-252.expected b/clients/tests/test-client.check-on-disk/test_003-252.expected new file mode 100644 index 0000000000..19837cec02 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-252.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/252 +cmd: $NMCLI --color yes 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-253.expected b/clients/tests/test-client.check-on-disk/test_003-253.expected new file mode 100644 index 0000000000..e8c6c503f8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-253.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/253 +cmd: $NMCLI --color yes 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-254.expected b/clients/tests/test-client.check-on-disk/test_003-254.expected new file mode 100644 index 0000000000..449d868fe8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-254.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/254 +cmd: $NMCLI --color yes 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-255.expected b/clients/tests/test-client.check-on-disk/test_003-255.expected new file mode 100644 index 0000000000..e0f60685ed --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-255.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/255 +cmd: $NMCLI --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 3207 bytes +>>> +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-256.expected b/clients/tests/test-client.check-on-disk/test_003-256.expected new file mode 100644 index 0000000000..edc0a18a19 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-256.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/256 +cmd: $NMCLI --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3230 bytes +>>> +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_003-257.expected b/clients/tests/test-client.check-on-disk/test_003-257.expected new file mode 100644 index 0000000000..b003b7db7a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-257.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/257 +cmd: $NMCLI --pretty -f ALL con +lang: C +returncode: 0 +stdout: 2092 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +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-258.expected b/clients/tests/test-client.check-on-disk/test_003-258.expected new file mode 100644 index 0000000000..c99b63e087 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-258.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/258 +cmd: $NMCLI --pretty -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2124 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +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-259.expected b/clients/tests/test-client.check-on-disk/test_003-259.expected new file mode 100644 index 0000000000..0893c18ebb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-259.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:878:test_003()/259 +cmd: $NMCLI --pretty -f UUID,TYPE 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-260.expected b/clients/tests/test-client.check-on-disk/test_003-260.expected new file mode 100644 index 0000000000..2f9e0bfd83 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-260.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:878:test_003()/260 +cmd: $NMCLI --pretty -f UUID,TYPE 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-261.expected b/clients/tests/test-client.check-on-disk/test_003-261.expected new file mode 100644 index 0000000000..2ce2a3e3c1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-261.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/261 +cmd: $NMCLI --pretty 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-262.expected b/clients/tests/test-client.check-on-disk/test_003-262.expected new file mode 100644 index 0000000000..8e5a437c8a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-262.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/262 +cmd: $NMCLI --pretty 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-263.expected b/clients/tests/test-client.check-on-disk/test_003-263.expected new file mode 100644 index 0000000000..8ab9c0e2a8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-263.expected @@ -0,0 +1,31 @@ +location: clients/tests/test-client.py:884:test_003()/263 +cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 1193 bytes +>>> +=============================================================================== + Connection profile details +=============================================================================== +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-264.expected b/clients/tests/test-client.check-on-disk/test_003-264.expected new file mode 100644 index 0000000000..b0b037081e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-264.expected @@ -0,0 +1,31 @@ +location: clients/tests/test-client.py:884:test_003()/264 +cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1210 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia +=============================================================================== +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-265.expected b/clients/tests/test-client.check-on-disk/test_003-265.expected new file mode 100644 index 0000000000..01a2b6681e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-265.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/265 +cmd: $NMCLI --pretty -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4058 bytes +>>> +=============================================================================== + Device details (eth0) +=============================================================================== +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-266.expected b/clients/tests/test-client.check-on-disk/test_003-266.expected new file mode 100644 index 0000000000..1568ca81e2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-266.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/266 +cmd: $NMCLI --pretty -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4087 bytes +>>> +=============================================================================== + Informacje o urządzeniu (eth0) +=============================================================================== +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_003-267.expected b/clients/tests/test-client.check-on-disk/test_003-267.expected new file mode 100644 index 0000000000..d9198157da --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-267.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/267 +cmd: $NMCLI --pretty --color yes -f ALL con +lang: C +returncode: 0 +stdout: 2362 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32myes[0m [32meth1[0m [32mactivated[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31myes[0m [31meth0[0m [31mdeactivating[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-268.expected b/clients/tests/test-client.check-on-disk/test_003-268.expected new file mode 100644 index 0000000000..c3ee616b9a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-268.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/268 +cmd: $NMCLI --pretty --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2394 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32mtak[0m [32meth1[0m [32maktywowano[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31mtak[0m [31meth0[0m [31mdezaktywowanie[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-269.expected b/clients/tests/test-client.check-on-disk/test_003-269.expected new file mode 100644 index 0000000000..b762b55d2f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-269.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:878:test_003()/269 +cmd: $NMCLI --pretty --color yes -f UUID,TYPE 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-270.expected b/clients/tests/test-client.check-on-disk/test_003-270.expected new file mode 100644 index 0000000000..edaee3a0fe --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-270.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:878:test_003()/270 +cmd: $NMCLI --pretty --color yes -f UUID,TYPE 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-271.expected b/clients/tests/test-client.check-on-disk/test_003-271.expected new file mode 100644 index 0000000000..c15bfe3014 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-271.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/271 +cmd: $NMCLI --pretty --color yes 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-272.expected b/clients/tests/test-client.check-on-disk/test_003-272.expected new file mode 100644 index 0000000000..a1e1fecf4c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-272.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/272 +cmd: $NMCLI --pretty --color yes 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-273.expected b/clients/tests/test-client.check-on-disk/test_003-273.expected new file mode 100644 index 0000000000..66c73067b9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-273.expected @@ -0,0 +1,31 @@ +location: clients/tests/test-client.py:884:test_003()/273 +cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 1193 bytes +>>> +=============================================================================== + Connection profile details +=============================================================================== +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-274.expected b/clients/tests/test-client.check-on-disk/test_003-274.expected new file mode 100644 index 0000000000..a41d0c6f81 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-274.expected @@ -0,0 +1,31 @@ +location: clients/tests/test-client.py:884:test_003()/274 +cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1210 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia +=============================================================================== +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-275.expected b/clients/tests/test-client.check-on-disk/test_003-275.expected new file mode 100644 index 0000000000..519ade4c37 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-275.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/275 +cmd: $NMCLI --pretty --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4058 bytes +>>> +=============================================================================== + Device details (eth0) +=============================================================================== +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-276.expected b/clients/tests/test-client.check-on-disk/test_003-276.expected new file mode 100644 index 0000000000..f86ede56d0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-276.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/276 +cmd: $NMCLI --pretty --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4087 bytes +>>> +=============================================================================== + Informacje o urządzeniu (eth0) +=============================================================================== +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_003-277.expected b/clients/tests/test-client.check-on-disk/test_003-277.expected new file mode 100644 index 0000000000..af96de0ef9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-277.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/277 +cmd: $NMCLI --terse -f ALL con +lang: C +returncode: 0 +stdout: 847 bytes +>>> +ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-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:802-3-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:802-3-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:802-3-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-278.expected b/clients/tests/test-client.check-on-disk/test_003-278.expected new file mode 100644 index 0000000000..711c4b5cc0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-278.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/278 +cmd: $NMCLI --terse -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 847 bytes +>>> +ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-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:802-3-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:802-3-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:802-3-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-279.expected b/clients/tests/test-client.check-on-disk/test_003-279.expected new file mode 100644 index 0000000000..ad501747d6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-279.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:878:test_003()/279 +cmd: $NMCLI --terse -f UUID,TYPE 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-280.expected b/clients/tests/test-client.check-on-disk/test_003-280.expected new file mode 100644 index 0000000000..24702a787a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-280.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:878:test_003()/280 +cmd: $NMCLI --terse -f UUID,TYPE 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-281.expected b/clients/tests/test-client.check-on-disk/test_003-281.expected new file mode 100644 index 0000000000..1cf3c51409 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-281.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/281 +cmd: $NMCLI --terse 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-282.expected b/clients/tests/test-client.check-on-disk/test_003-282.expected new file mode 100644 index 0000000000..4f86fbb5d6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-282.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/282 +cmd: $NMCLI --terse 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-283.expected b/clients/tests/test-client.check-on-disk/test_003-283.expected new file mode 100644 index 0000000000..e6e3d4a9d3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-283.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/283 +cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 370 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-284.expected b/clients/tests/test-client.check-on-disk/test_003-284.expected new file mode 100644 index 0000000000..0ee8a9dffc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-284.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/284 +cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 370 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-285.expected b/clients/tests/test-client.check-on-disk/test_003-285.expected new file mode 100644 index 0000000000..5ecbf8c785 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-285.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/285 +cmd: $NMCLI --terse -f all dev show eth0 +lang: C +returncode: 0 +stdout: 1979 bytes +>>> +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-286.expected b/clients/tests/test-client.check-on-disk/test_003-286.expected new file mode 100644 index 0000000000..5a82b745dc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-286.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/286 +cmd: $NMCLI --terse -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2002 bytes +>>> +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_003-287.expected b/clients/tests/test-client.check-on-disk/test_003-287.expected new file mode 100644 index 0000000000..b5795c9851 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-287.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/287 +cmd: $NMCLI --terse --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1117 bytes +>>> +[32methernet[0m:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m:[32m[0m:[32m[0m:[32m[0m:[32m[0m:[32m[0m:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[32myes[0m:[32meth1[0m:[32mactivated[0m:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m:[32m[0m:[32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[31m802-3-ethernet[0m:[31m[0m:[31m[0m:[31m[0m:[31m[0m:[31m[0m:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[31myes[0m:[31meth0[0m:[31mdeactivating[0m:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m:[31m[0m:[31m/etc/NetworkManager/system-connections/ethernet[0m +con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-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:802-3-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-288.expected b/clients/tests/test-client.check-on-disk/test_003-288.expected new file mode 100644 index 0000000000..b4aef5aeee --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-288.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/288 +cmd: $NMCLI --terse --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1117 bytes +>>> +[32methernet[0m:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m:[32m[0m:[32m[0m:[32m[0m:[32m[0m:[32m[0m:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[32myes[0m:[32meth1[0m:[32mactivated[0m:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m:[32m[0m:[32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[31m802-3-ethernet[0m:[31m[0m:[31m[0m:[31m[0m:[31m[0m:[31m[0m:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[31myes[0m:[31meth0[0m:[31mdeactivating[0m:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m:[31m[0m:[31m/etc/NetworkManager/system-connections/ethernet[0m +con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-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:802-3-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-289.expected b/clients/tests/test-client.check-on-disk/test_003-289.expected new file mode 100644 index 0000000000..97ede147d1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-289.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:878:test_003()/289 +cmd: $NMCLI --terse --color yes -f UUID,TYPE 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-290.expected b/clients/tests/test-client.check-on-disk/test_003-290.expected new file mode 100644 index 0000000000..93758e4014 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-290.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:878:test_003()/290 +cmd: $NMCLI --terse --color yes -f UUID,TYPE 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-291.expected b/clients/tests/test-client.check-on-disk/test_003-291.expected new file mode 100644 index 0000000000..f38f5f6db1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-291.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/291 +cmd: $NMCLI --terse --color yes 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-292.expected b/clients/tests/test-client.check-on-disk/test_003-292.expected new file mode 100644 index 0000000000..a468ca160f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-292.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/292 +cmd: $NMCLI --terse --color yes 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-293.expected b/clients/tests/test-client.check-on-disk/test_003-293.expected new file mode 100644 index 0000000000..0f9b435172 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-293.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/293 +cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 370 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-294.expected b/clients/tests/test-client.check-on-disk/test_003-294.expected new file mode 100644 index 0000000000..e3ad77fcb6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-294.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/294 +cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 370 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-295.expected b/clients/tests/test-client.check-on-disk/test_003-295.expected new file mode 100644 index 0000000000..0280d7bf08 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-295.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/295 +cmd: $NMCLI --terse --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 1979 bytes +>>> +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-296.expected b/clients/tests/test-client.check-on-disk/test_003-296.expected new file mode 100644 index 0000000000..92c01051ad --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-296.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/296 +cmd: $NMCLI --terse --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2002 bytes +>>> +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_003-297.expected b/clients/tests/test-client.check-on-disk/test_003-297.expected new file mode 100644 index 0000000000..135e708a1f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-297.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/297 +cmd: $NMCLI --mode tabular -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-298.expected b/clients/tests/test-client.check-on-disk/test_003-298.expected new file mode 100644 index 0000000000..4a7a9ae0bb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-298.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/298 +cmd: $NMCLI --mode tabular -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-299.expected b/clients/tests/test-client.check-on-disk/test_003-299.expected new file mode 100644 index 0000000000..c5e53ed873 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-299.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/299 +cmd: $NMCLI --mode tabular -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-300.expected b/clients/tests/test-client.check-on-disk/test_003-300.expected new file mode 100644 index 0000000000..b3d0a4119f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-300.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/300 +cmd: $NMCLI --mode tabular -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-301.expected b/clients/tests/test-client.check-on-disk/test_003-301.expected new file mode 100644 index 0000000000..67e12683d6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-301.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/301 +cmd: $NMCLI --mode tabular 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-302.expected b/clients/tests/test-client.check-on-disk/test_003-302.expected new file mode 100644 index 0000000000..ae44d5a07e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-302.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/302 +cmd: $NMCLI --mode tabular 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-303.expected b/clients/tests/test-client.check-on-disk/test_003-303.expected new file mode 100644 index 0000000000..5f6f37ad7f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-303.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:884:test_003()/303 +cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 487 bytes +>>> +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-304.expected b/clients/tests/test-client.check-on-disk/test_003-304.expected new file mode 100644 index 0000000000..0b285ae4e8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-304.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:884:test_003()/304 +cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 491 bytes +>>> +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-305.expected b/clients/tests/test-client.check-on-disk/test_003-305.expected new file mode 100644 index 0000000000..58655007c9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-305.expected @@ -0,0 +1,35 @@ +location: clients/tests/test-client.py:887:test_003()/305 +cmd: $NMCLI --mode tabular -f all dev show eth0 +lang: C +returncode: 0 +stdout: 2657 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES no 100 Mb/s no no + +NAME CARRIER S390-SUBCHANNELS +WIRED-PROPERTIES off -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-306.expected b/clients/tests/test-client.check-on-disk/test_003-306.expected new file mode 100644 index 0000000000..8019429636 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-306.expected @@ -0,0 +1,35 @@ +location: clients/tests/test-client.py:887:test_003()/306 +cmd: $NMCLI --mode tabular -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2678 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES nie 100 Mb/s nie nie + +NAME CARRIER S390-SUBCHANNELS +WIRED-PROPERTIES wyłączone -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-307.expected b/clients/tests/test-client.check-on-disk/test_003-307.expected new file mode 100644 index 0000000000..e5feba686f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-307.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/307 +cmd: $NMCLI --mode tabular --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1885 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32myes[0m [32meth1[0m [32mactivated[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31myes[0m [31meth0[0m [31mdeactivating[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-308.expected b/clients/tests/test-client.check-on-disk/test_003-308.expected new file mode 100644 index 0000000000..0c0f6407f0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-308.expected @@ -0,0 +1,17 @@ +location: clients/tests/test-client.py:875:test_003()/308 +cmd: $NMCLI --mode tabular --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1895 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32mtak[0m [32meth1[0m [32maktywowano[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31mtak[0m [31meth0[0m [31mdezaktywowanie[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-309.expected b/clients/tests/test-client.check-on-disk/test_003-309.expected new file mode 100644 index 0000000000..0a3a011590 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-309.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/309 +cmd: $NMCLI --mode tabular --color yes -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-310.expected b/clients/tests/test-client.check-on-disk/test_003-310.expected new file mode 100644 index 0000000000..c0a3c43d24 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-310.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:878:test_003()/310 +cmd: $NMCLI --mode tabular --color yes -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-311.expected b/clients/tests/test-client.check-on-disk/test_003-311.expected new file mode 100644 index 0000000000..3428378afe --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-311.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/311 +cmd: $NMCLI --mode tabular --color yes 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-312.expected b/clients/tests/test-client.check-on-disk/test_003-312.expected new file mode 100644 index 0000000000..6f257369ef --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-312.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/312 +cmd: $NMCLI --mode tabular --color yes 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-313.expected b/clients/tests/test-client.check-on-disk/test_003-313.expected new file mode 100644 index 0000000000..c2e486820b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-313.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:884:test_003()/313 +cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 487 bytes +>>> +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-314.expected b/clients/tests/test-client.check-on-disk/test_003-314.expected new file mode 100644 index 0000000000..620e672eb2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-314.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:884:test_003()/314 +cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 491 bytes +>>> +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-315.expected b/clients/tests/test-client.check-on-disk/test_003-315.expected new file mode 100644 index 0000000000..4e9ba3a5d2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-315.expected @@ -0,0 +1,35 @@ +location: clients/tests/test-client.py:887:test_003()/315 +cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 2657 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES no 100 Mb/s no no + +NAME CARRIER S390-SUBCHANNELS +WIRED-PROPERTIES off -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-316.expected b/clients/tests/test-client.check-on-disk/test_003-316.expected new file mode 100644 index 0000000000..4ae92c6ebc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-316.expected @@ -0,0 +1,35 @@ +location: clients/tests/test-client.py:887:test_003()/316 +cmd: $NMCLI --mode tabular --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2678 bytes +>>> +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +CAPABILITIES nie 100 Mb/s nie nie + +NAME CARRIER S390-SUBCHANNELS +WIRED-PROPERTIES wyłączone -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-317.expected b/clients/tests/test-client.check-on-disk/test_003-317.expected new file mode 100644 index 0000000000..697bbea4d9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-317.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/317 +cmd: $NMCLI --mode tabular --pretty -f ALL con +lang: C +returncode: 0 +stdout: 2092 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +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-318.expected b/clients/tests/test-client.check-on-disk/test_003-318.expected new file mode 100644 index 0000000000..ead0ecaddf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-318.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/318 +cmd: $NMCLI --mode tabular --pretty -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2124 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +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-319.expected b/clients/tests/test-client.check-on-disk/test_003-319.expected new file mode 100644 index 0000000000..be9c4821d6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-319.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:878:test_003()/319 +cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE 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-320.expected b/clients/tests/test-client.check-on-disk/test_003-320.expected new file mode 100644 index 0000000000..b2a134764f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-320.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:878:test_003()/320 +cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE 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-321.expected b/clients/tests/test-client.check-on-disk/test_003-321.expected new file mode 100644 index 0000000000..b73696ce61 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-321.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/321 +cmd: $NMCLI --mode tabular --pretty 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-322.expected b/clients/tests/test-client.check-on-disk/test_003-322.expected new file mode 100644 index 0000000000..42cce251d1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-322.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/322 +cmd: $NMCLI --mode tabular --pretty 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-323.expected b/clients/tests/test-client.check-on-disk/test_003-323.expected new file mode 100644 index 0000000000..cf0e9c907d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-323.expected @@ -0,0 +1,22 @@ +location: clients/tests/test-client.py:884:test_003()/323 +cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 1033 bytes +>>> +============================== + Connection profile details +============================== +====================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +====================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-324.expected b/clients/tests/test-client.check-on-disk/test_003-324.expected new file mode 100644 index 0000000000..605ce53666 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-324.expected @@ -0,0 +1,22 @@ +location: clients/tests/test-client.py:884:test_003()/324 +cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1068 bytes +>>> +================================ + Szczegóły profilu połączenia +================================ +=========================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=========================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-325.expected b/clients/tests/test-client.check-on-disk/test_003-325.expected new file mode 100644 index 0000000000..5863691c76 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-325.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:887:test_003()/325 +cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4066 bytes +>>> +========================= + Device details (eth0) +========================= +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES no 100 Mb/s no no + +NAME CARRIER S390-SUBCHANNELS +--------------------------------------------- +WIRED-PROPERTIES off -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +--------------- +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-326.expected b/clients/tests/test-client.check-on-disk/test_003-326.expected new file mode 100644 index 0000000000..110b7429d4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-326.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:887:test_003()/326 +cmd: $NMCLI --mode tabular --pretty -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4124 bytes +>>> +================================== + Informacje o urządzeniu (eth0) +================================== +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES nie 100 Mb/s nie nie + +NAME CARRIER S390-SUBCHANNELS +----------------------------------------------- +WIRED-PROPERTIES wyłączone -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +--------------- +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-327.expected b/clients/tests/test-client.check-on-disk/test_003-327.expected new file mode 100644 index 0000000000..b968b81d9e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-327.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/327 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con +lang: C +returncode: 0 +stdout: 2362 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32myes[0m [32meth1[0m [32mactivated[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31myes[0m [31meth0[0m [31mdeactivating[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-328.expected b/clients/tests/test-client.check-on-disk/test_003-328.expected new file mode 100644 index 0000000000..40b72f9ef6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-328.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:875:test_003()/328 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2394 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32methernet[0m [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m [32methernet[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m--[0m [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [32mtak[0m [32meth1[0m [32maktywowano[0m [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m [32m--[0m [32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m [31methernet[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m--[0m [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m [31mtak[0m [31meth0[0m [31mdezaktywowanie[0m [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m [31m--[0m [31m/etc/NetworkManager/system-connections/ethernet[0m +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-329.expected b/clients/tests/test-client.check-on-disk/test_003-329.expected new file mode 100644 index 0000000000..3b861c87e3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-329.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:878:test_003()/329 +cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE 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-330.expected b/clients/tests/test-client.check-on-disk/test_003-330.expected new file mode 100644 index 0000000000..0967998636 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-330.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:878:test_003()/330 +cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE 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-331.expected b/clients/tests/test-client.check-on-disk/test_003-331.expected new file mode 100644 index 0000000000..e4eaa39c08 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-331.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/331 +cmd: $NMCLI --mode tabular --pretty --color yes 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-332.expected b/clients/tests/test-client.check-on-disk/test_003-332.expected new file mode 100644 index 0000000000..eaaa384d33 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-332.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/332 +cmd: $NMCLI --mode tabular --pretty --color yes 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-333.expected b/clients/tests/test-client.check-on-disk/test_003-333.expected new file mode 100644 index 0000000000..a600fd729c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-333.expected @@ -0,0 +1,22 @@ +location: clients/tests/test-client.py:884:test_003()/333 +cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 1033 bytes +>>> +============================== + Connection profile details +============================== +====================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +====================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-334.expected b/clients/tests/test-client.check-on-disk/test_003-334.expected new file mode 100644 index 0000000000..da8f678122 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-334.expected @@ -0,0 +1,22 @@ +location: clients/tests/test-client.py:884:test_003()/334 +cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1068 bytes +>>> +================================ + Szczegóły profilu połączenia +================================ +=========================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=========================================================================== +GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- -- + + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-335.expected b/clients/tests/test-client.check-on-disk/test_003-335.expected new file mode 100644 index 0000000000..6abbde8435 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-335.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:887:test_003()/335 +cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4066 bytes +>>> +========================= + Device details (eth0) +========================= +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES no 100 Mb/s no no + +NAME CARRIER S390-SUBCHANNELS +--------------------------------------------- +WIRED-PROPERTIES off -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +--------------- +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-336.expected b/clients/tests/test-client.check-on-disk/test_003-336.expected new file mode 100644 index 0000000000..b350f3f1be --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-336.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:887:test_003()/336 +cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4124 bytes +>>> +================================== + Informacje o urządzeniu (eth0) +================================== +NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED +--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane + +NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV +------------------------------------------------------------ +CAPABILITIES nie 100 Mb/s nie nie + +NAME CARRIER S390-SUBCHANNELS +----------------------------------------------- +WIRED-PROPERTIES wyłączone -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33 + +GROUP OPTION +--------------- +DHCP4 -- + +GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar + +GROUP OPTION +-------------------------------------------------------------------------------------------------- +DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 + +NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-337.expected b/clients/tests/test-client.check-on-disk/test_003-337.expected new file mode 100644 index 0000000000..cb804c7635 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-337.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/337 +cmd: $NMCLI --mode tabular --terse -f ALL con +lang: C +returncode: 0 +stdout: 847 bytes +>>> +ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-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:802-3-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:802-3-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:802-3-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-338.expected b/clients/tests/test-client.check-on-disk/test_003-338.expected new file mode 100644 index 0000000000..cc663815a5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-338.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/338 +cmd: $NMCLI --mode tabular --terse -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 847 bytes +>>> +ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-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:802-3-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:802-3-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:802-3-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-339.expected b/clients/tests/test-client.check-on-disk/test_003-339.expected new file mode 100644 index 0000000000..175606adad --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-339.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:878:test_003()/339 +cmd: $NMCLI --mode tabular --terse -f UUID,TYPE 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-340.expected b/clients/tests/test-client.check-on-disk/test_003-340.expected new file mode 100644 index 0000000000..5a7c658ed9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-340.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:878:test_003()/340 +cmd: $NMCLI --mode tabular --terse -f UUID,TYPE 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-341.expected b/clients/tests/test-client.check-on-disk/test_003-341.expected new file mode 100644 index 0000000000..c78b913a54 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-341.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/341 +cmd: $NMCLI --mode tabular --terse 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-342.expected b/clients/tests/test-client.check-on-disk/test_003-342.expected new file mode 100644 index 0000000000..aafc8e8acc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-342.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/342 +cmd: $NMCLI --mode tabular --terse 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-343.expected b/clients/tests/test-client.check-on-disk/test_003-343.expected new file mode 100644 index 0000000000..4acd969ef8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-343.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:884:test_003()/343 +cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 189 bytes +>>> +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-344.expected b/clients/tests/test-client.check-on-disk/test_003-344.expected new file mode 100644 index 0000000000..536bb69873 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-344.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:884:test_003()/344 +cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 189 bytes +>>> +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-345.expected b/clients/tests/test-client.check-on-disk/test_003-345.expected new file mode 100644 index 0000000000..3179e3c798 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-345.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:887:test_003()/345 +cmd: $NMCLI --mode tabular --terse -f all dev show eth0 +lang: C +returncode: 0 +stdout: 1144 bytes +>>> +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +CAPABILITIES:no:100 Mb/s:no:no +WIRED-PROPERTIES:off: +IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 +DHCP4: +IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-346.expected b/clients/tests/test-client.check-on-disk/test_003-346.expected new file mode 100644 index 0000000000..2917822846 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-346.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:887:test_003()/346 +cmd: $NMCLI --mode tabular --terse -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1167 bytes +>>> +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +CAPABILITIES:nie:100 Mb/s:nie:nie +WIRED-PROPERTIES:wyłączone: +IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 +DHCP4: +IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-347.expected b/clients/tests/test-client.check-on-disk/test_003-347.expected new file mode 100644 index 0000000000..752a077153 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-347.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/347 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1117 bytes +>>> +[32methernet[0m:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m:[32m[0m:[32m[0m:[32m[0m:[32m[0m:[32m[0m:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[32myes[0m:[32meth1[0m:[32mactivated[0m:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m:[32m[0m:[32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[31m802-3-ethernet[0m:[31m[0m:[31m[0m:[31m[0m:[31m[0m:[31m[0m:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[31myes[0m:[31meth0[0m:[31mdeactivating[0m:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m:[31m[0m:[31m/etc/NetworkManager/system-connections/ethernet[0m +con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-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:802-3-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-348.expected b/clients/tests/test-client.check-on-disk/test_003-348.expected new file mode 100644 index 0000000000..0be108db3d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-348.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:875:test_003()/348 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1117 bytes +>>> +[32methernet[0m:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[32m802-3-ethernet[0m:[32m[0m:[32m[0m:[32m[0m:[32m[0m:[32m[0m:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[32myes[0m:[32meth1[0m:[32mactivated[0m:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m:[32m[0m:[32m/etc/NetworkManager/system-connections/ethernet[0m +[31methernet[0m:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m:[31m802-3-ethernet[0m:[31m[0m:[31m[0m:[31m[0m:[31m[0m:[31m[0m:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m:[31myes[0m:[31meth0[0m:[31mdeactivating[0m:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m:[31m[0m:[31m/etc/NetworkManager/system-connections/ethernet[0m +con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-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:802-3-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-349.expected b/clients/tests/test-client.check-on-disk/test_003-349.expected new file mode 100644 index 0000000000..c512ca105d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-349.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:878:test_003()/349 +cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE 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-350.expected b/clients/tests/test-client.check-on-disk/test_003-350.expected new file mode 100644 index 0000000000..ea06d37f61 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-350.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:878:test_003()/350 +cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE 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-351.expected b/clients/tests/test-client.check-on-disk/test_003-351.expected new file mode 100644 index 0000000000..0bb8650463 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-351.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/351 +cmd: $NMCLI --mode tabular --terse --color yes 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-352.expected b/clients/tests/test-client.check-on-disk/test_003-352.expected new file mode 100644 index 0000000000..122a0400f2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-352.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/352 +cmd: $NMCLI --mode tabular --terse --color yes 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-353.expected b/clients/tests/test-client.check-on-disk/test_003-353.expected new file mode 100644 index 0000000000..64777d72ff --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-353.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:884:test_003()/353 +cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 189 bytes +>>> +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-354.expected b/clients/tests/test-client.check-on-disk/test_003-354.expected new file mode 100644 index 0000000000..e38160d00b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-354.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:884:test_003()/354 +cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 189 bytes +>>> +GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3:: + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-355.expected b/clients/tests/test-client.check-on-disk/test_003-355.expected new file mode 100644 index 0000000000..7efc5263c8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-355.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:887:test_003()/355 +cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 1144 bytes +>>> +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown +CAPABILITIES:no:100 Mb/s:no:no +WIRED-PROPERTIES:off: +IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 +DHCP4: +IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-356.expected b/clients/tests/test-client.check-on-disk/test_003-356.expected new file mode 100644 index 0000000000..261cb8706c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-356.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:887:test_003()/356 +cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1167 bytes +>>> +GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane +CAPABILITIES:nie:100 Mb/s:nie:nie +WIRED-PROPERTIES:wyłączone: +IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33 +DHCP4: +IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar +DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 +CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-357.expected b/clients/tests/test-client.check-on-disk/test_003-357.expected new file mode 100644 index 0000000000..c78080acac --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-357.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/357 +cmd: $NMCLI --mode multiline -f ALL con +lang: C +returncode: 0 +stdout: 3263 bytes +>>> +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: -- +TIMESTAMP-REAL: -- +AUTOCONNECT: -- +AUTOCONNECT-PRIORITY: -- +READONLY: -- +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: yes +DEVICE: eth1 +STATE: activated +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: -- +TIMESTAMP-REAL: -- +AUTOCONNECT: -- +AUTOCONNECT-PRIORITY: -- +READONLY: -- +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: yes +DEVICE: eth0 +STATE: deactivating +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-358.expected b/clients/tests/test-client.check-on-disk/test_003-358.expected new file mode 100644 index 0000000000..f1f8b8739c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-358.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/358 +cmd: $NMCLI --mode multiline -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3270 bytes +>>> +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: -- +TIMESTAMP-REAL: -- +AUTOCONNECT: -- +AUTOCONNECT-PRIORITY: -- +READONLY: -- +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: tak +DEVICE: eth1 +STATE: aktywowano +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: -- +TIMESTAMP-REAL: -- +AUTOCONNECT: -- +AUTOCONNECT-PRIORITY: -- +READONLY: -- +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: tak +DEVICE: eth0 +STATE: dezaktywowanie +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-359.expected b/clients/tests/test-client.check-on-disk/test_003-359.expected new file mode 100644 index 0000000000..0acf144a29 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-359.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/359 +cmd: $NMCLI --mode multiline -f UUID,TYPE 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-360.expected b/clients/tests/test-client.check-on-disk/test_003-360.expected new file mode 100644 index 0000000000..39e8a2934e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-360.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/360 +cmd: $NMCLI --mode multiline -f UUID,TYPE 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-361.expected b/clients/tests/test-client.check-on-disk/test_003-361.expected new file mode 100644 index 0000000000..1b3f78af1f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-361.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/361 +cmd: $NMCLI --mode multiline 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-362.expected b/clients/tests/test-client.check-on-disk/test_003-362.expected new file mode 100644 index 0000000000..7b285c3731 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-362.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/362 +cmd: $NMCLI --mode multiline 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-363.expected b/clients/tests/test-client.check-on-disk/test_003-363.expected new file mode 100644 index 0000000000..cd7413c487 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-363.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/363 +cmd: $NMCLI --mode multiline 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-364.expected b/clients/tests/test-client.check-on-disk/test_003-364.expected new file mode 100644 index 0000000000..52eb417e92 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-364.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/364 +cmd: $NMCLI --mode multiline 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-365.expected b/clients/tests/test-client.check-on-disk/test_003-365.expected new file mode 100644 index 0000000000..1da0887e2c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-365.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/365 +cmd: $NMCLI --mode multiline -f all dev show eth0 +lang: C +returncode: 0 +stdout: 3207 bytes +>>> +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-366.expected b/clients/tests/test-client.check-on-disk/test_003-366.expected new file mode 100644 index 0000000000..be1f19bb7c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-366.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/366 +cmd: $NMCLI --mode multiline -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3230 bytes +>>> +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_003-367.expected b/clients/tests/test-client.check-on-disk/test_003-367.expected new file mode 100644 index 0000000000..06e256aa1b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-367.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/367 +cmd: $NMCLI --mode multiline --color yes -f ALL con +lang: C +returncode: 0 +stdout: 3533 bytes +>>> +NAME: [32methernet[0m +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +TIMESTAMP: [32m--[0m +TIMESTAMP-REAL: [32m--[0m +AUTOCONNECT: [32m--[0m +AUTOCONNECT-PRIORITY: [32m--[0m +READONLY: [32m--[0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [32myes[0m +DEVICE: [32meth1[0m +STATE: [32mactivated[0m +ACTIVE-PATH: [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE: [32m--[0m +FILENAME: [32m/etc/NetworkManager/system-connections/ethernet[0m +NAME: [31methernet[0m +UUID: [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [31methernet[0m +TIMESTAMP: [31m--[0m +TIMESTAMP-REAL: [31m--[0m +AUTOCONNECT: [31m--[0m +AUTOCONNECT-PRIORITY: [31m--[0m +READONLY: [31m--[0m +DBUS-PATH: [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [31myes[0m +DEVICE: [31meth0[0m +STATE: [31mdeactivating[0m +ACTIVE-PATH: [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE: [31m--[0m +FILENAME: [31m/etc/NetworkManager/system-connections/ethernet[0m +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-368.expected b/clients/tests/test-client.check-on-disk/test_003-368.expected new file mode 100644 index 0000000000..72597cb7dd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-368.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/368 +cmd: $NMCLI --mode multiline --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3540 bytes +>>> +NAME: [32methernet[0m +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +TIMESTAMP: [32m--[0m +TIMESTAMP-REAL: [32m--[0m +AUTOCONNECT: [32m--[0m +AUTOCONNECT-PRIORITY: [32m--[0m +READONLY: [32m--[0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [32mtak[0m +DEVICE: [32meth1[0m +STATE: [32maktywowano[0m +ACTIVE-PATH: [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE: [32m--[0m +FILENAME: [32m/etc/NetworkManager/system-connections/ethernet[0m +NAME: [31methernet[0m +UUID: [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [31methernet[0m +TIMESTAMP: [31m--[0m +TIMESTAMP-REAL: [31m--[0m +AUTOCONNECT: [31m--[0m +AUTOCONNECT-PRIORITY: [31m--[0m +READONLY: [31m--[0m +DBUS-PATH: [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [31mtak[0m +DEVICE: [31meth0[0m +STATE: [31mdezaktywowanie[0m +ACTIVE-PATH: [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE: [31m--[0m +FILENAME: [31m/etc/NetworkManager/system-connections/ethernet[0m +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-369.expected b/clients/tests/test-client.check-on-disk/test_003-369.expected new file mode 100644 index 0000000000..578101ada8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-369.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/369 +cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE 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-370.expected b/clients/tests/test-client.check-on-disk/test_003-370.expected new file mode 100644 index 0000000000..bd7f18ae36 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-370.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/370 +cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE 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-371.expected b/clients/tests/test-client.check-on-disk/test_003-371.expected new file mode 100644 index 0000000000..3c7a482507 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-371.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/371 +cmd: $NMCLI --mode multiline --color yes 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-372.expected b/clients/tests/test-client.check-on-disk/test_003-372.expected new file mode 100644 index 0000000000..aacc502e9f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-372.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/372 +cmd: $NMCLI --mode multiline --color yes 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-373.expected b/clients/tests/test-client.check-on-disk/test_003-373.expected new file mode 100644 index 0000000000..6967e0258a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-373.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/373 +cmd: $NMCLI --mode multiline --color yes 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-374.expected b/clients/tests/test-client.check-on-disk/test_003-374.expected new file mode 100644 index 0000000000..83bf924a92 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-374.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/374 +cmd: $NMCLI --mode multiline --color yes 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-375.expected b/clients/tests/test-client.check-on-disk/test_003-375.expected new file mode 100644 index 0000000000..016cebed4e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-375.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/375 +cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 3207 bytes +>>> +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-376.expected b/clients/tests/test-client.check-on-disk/test_003-376.expected new file mode 100644 index 0000000000..83e59a9346 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-376.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/376 +cmd: $NMCLI --mode multiline --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3230 bytes +>>> +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_003-377.expected b/clients/tests/test-client.check-on-disk/test_003-377.expected new file mode 100644 index 0000000000..a264b886fc --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-377.expected @@ -0,0 +1,79 @@ +location: clients/tests/test-client.py:875:test_003()/377 +cmd: $NMCLI --mode multiline --pretty -f ALL con +lang: C +returncode: 0 +stdout: 3800 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: -- +TIMESTAMP-REAL: -- +AUTOCONNECT: -- +AUTOCONNECT-PRIORITY: -- +READONLY: -- +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: yes +DEVICE: eth1 +STATE: activated +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +------------------------------------------------------------------------------- +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: -- +TIMESTAMP-REAL: -- +AUTOCONNECT: -- +AUTOCONNECT-PRIORITY: -- +READONLY: -- +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: yes +DEVICE: eth0 +STATE: deactivating +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +------------------------------------------------------------------------------- +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +------------------------------------------------------------------------------- +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-378.expected b/clients/tests/test-client.check-on-disk/test_003-378.expected new file mode 100644 index 0000000000..a57ee8bd94 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-378.expected @@ -0,0 +1,79 @@ +location: clients/tests/test-client.py:875:test_003()/378 +cmd: $NMCLI --mode multiline --pretty -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3813 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: -- +TIMESTAMP-REAL: -- +AUTOCONNECT: -- +AUTOCONNECT-PRIORITY: -- +READONLY: -- +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: tak +DEVICE: eth1 +STATE: aktywowano +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +------------------------------------------------------------------------------- +NAME: ethernet +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +TIMESTAMP: -- +TIMESTAMP-REAL: -- +AUTOCONNECT: -- +AUTOCONNECT-PRIORITY: -- +READONLY: -- +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE: tak +DEVICE: eth0 +STATE: dezaktywowanie +ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/ethernet +------------------------------------------------------------------------------- +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +------------------------------------------------------------------------------- +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-379.expected b/clients/tests/test-client.check-on-disk/test_003-379.expected new file mode 100644 index 0000000000..004591aa4e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-379.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:878:test_003()/379 +cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE 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-380.expected b/clients/tests/test-client.check-on-disk/test_003-380.expected new file mode 100644 index 0000000000..134d48cdef --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-380.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:878:test_003()/380 +cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE 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-381.expected b/clients/tests/test-client.check-on-disk/test_003-381.expected new file mode 100644 index 0000000000..9c9d073e37 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-381.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/381 +cmd: $NMCLI --mode multiline --pretty 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-382.expected b/clients/tests/test-client.check-on-disk/test_003-382.expected new file mode 100644 index 0000000000..dd3e55416f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-382.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/382 +cmd: $NMCLI --mode multiline --pretty 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-383.expected b/clients/tests/test-client.check-on-disk/test_003-383.expected new file mode 100644 index 0000000000..9819c2edbf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-383.expected @@ -0,0 +1,31 @@ +location: clients/tests/test-client.py:884:test_003()/383 +cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 1193 bytes +>>> +=============================================================================== + Connection profile details +=============================================================================== +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-384.expected b/clients/tests/test-client.check-on-disk/test_003-384.expected new file mode 100644 index 0000000000..9ca2abf2f5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-384.expected @@ -0,0 +1,31 @@ +location: clients/tests/test-client.py:884:test_003()/384 +cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1210 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia +=============================================================================== +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-385.expected b/clients/tests/test-client.check-on-disk/test_003-385.expected new file mode 100644 index 0000000000..0377a0c65f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-385.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/385 +cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4058 bytes +>>> +=============================================================================== + Device details (eth0) +=============================================================================== +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-386.expected b/clients/tests/test-client.check-on-disk/test_003-386.expected new file mode 100644 index 0000000000..5b4c432d7a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-386.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/386 +cmd: $NMCLI --mode multiline --pretty -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4087 bytes +>>> +=============================================================================== + Informacje o urządzeniu (eth0) +=============================================================================== +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_003-387.expected b/clients/tests/test-client.check-on-disk/test_003-387.expected new file mode 100644 index 0000000000..ab5c1b575a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-387.expected @@ -0,0 +1,79 @@ +location: clients/tests/test-client.py:875:test_003()/387 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con +lang: C +returncode: 0 +stdout: 4070 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +NAME: [32methernet[0m +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +TIMESTAMP: [32m--[0m +TIMESTAMP-REAL: [32m--[0m +AUTOCONNECT: [32m--[0m +AUTOCONNECT-PRIORITY: [32m--[0m +READONLY: [32m--[0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [32myes[0m +DEVICE: [32meth1[0m +STATE: [32mactivated[0m +ACTIVE-PATH: [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE: [32m--[0m +FILENAME: [32m/etc/NetworkManager/system-connections/ethernet[0m +------------------------------------------------------------------------------- +NAME: [31methernet[0m +UUID: [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [31methernet[0m +TIMESTAMP: [31m--[0m +TIMESTAMP-REAL: [31m--[0m +AUTOCONNECT: [31m--[0m +AUTOCONNECT-PRIORITY: [31m--[0m +READONLY: [31m--[0m +DBUS-PATH: [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [31myes[0m +DEVICE: [31meth0[0m +STATE: [31mdeactivating[0m +ACTIVE-PATH: [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE: [31m--[0m +FILENAME: [31m/etc/NetworkManager/system-connections/ethernet[0m +------------------------------------------------------------------------------- +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +------------------------------------------------------------------------------- +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: never +AUTOCONNECT: yes +AUTOCONNECT-PRIORITY: 0 +READONLY: no +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: no +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-388.expected b/clients/tests/test-client.check-on-disk/test_003-388.expected new file mode 100644 index 0000000000..eb7f691e1e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-388.expected @@ -0,0 +1,79 @@ +location: clients/tests/test-client.py:875:test_003()/388 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4083 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +NAME: [32methernet[0m +UUID: [32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [32methernet[0m +TIMESTAMP: [32m--[0m +TIMESTAMP-REAL: [32m--[0m +AUTOCONNECT: [32m--[0m +AUTOCONNECT-PRIORITY: [32m--[0m +READONLY: [32m--[0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [32mtak[0m +DEVICE: [32meth1[0m +STATE: [32maktywowano[0m +ACTIVE-PATH: [32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE: [32m--[0m +FILENAME: [32m/etc/NetworkManager/system-connections/ethernet[0m +------------------------------------------------------------------------------- +NAME: [31methernet[0m +UUID: [31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE: [31methernet[0m +TIMESTAMP: [31m--[0m +TIMESTAMP-REAL: [31m--[0m +AUTOCONNECT: [31m--[0m +AUTOCONNECT-PRIORITY: [31m--[0m +READONLY: [31m--[0m +DBUS-PATH: [31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE: [31mtak[0m +DEVICE: [31meth0[0m +STATE: [31mdezaktywowanie[0m +ACTIVE-PATH: [31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE: [31m--[0m +FILENAME: [31m/etc/NetworkManager/system-connections/ethernet[0m +------------------------------------------------------------------------------- +NAME: con-1 +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-1 +------------------------------------------------------------------------------- +NAME: con-xx1 +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +TIMESTAMP: 0 +TIMESTAMP-REAL: nigdy +AUTOCONNECT: tak +AUTOCONNECT-PRIORITY: 0 +READONLY: nie +DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE: nie +DEVICE: -- +STATE: -- +ACTIVE-PATH: -- +SLAVE: -- +FILENAME: /etc/NetworkManager/system-connections/con-xx1 +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-389.expected b/clients/tests/test-client.check-on-disk/test_003-389.expected new file mode 100644 index 0000000000..e81b9df3f9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-389.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:878:test_003()/389 +cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE 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-390.expected b/clients/tests/test-client.check-on-disk/test_003-390.expected new file mode 100644 index 0000000000..c8881e3fe7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-390.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:878:test_003()/390 +cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE 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-391.expected b/clients/tests/test-client.check-on-disk/test_003-391.expected new file mode 100644 index 0000000000..670038c4f3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-391.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/391 +cmd: $NMCLI --mode multiline --pretty --color yes 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-392.expected b/clients/tests/test-client.check-on-disk/test_003-392.expected new file mode 100644 index 0000000000..39ddcb227f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-392.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/392 +cmd: $NMCLI --mode multiline --pretty --color yes 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-393.expected b/clients/tests/test-client.check-on-disk/test_003-393.expected new file mode 100644 index 0000000000..871662b61f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-393.expected @@ -0,0 +1,31 @@ +location: clients/tests/test-client.py:884:test_003()/393 +cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 1193 bytes +>>> +=============================================================================== + Connection profile details +=============================================================================== +=============================================================================== + Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-394.expected b/clients/tests/test-client.check-on-disk/test_003-394.expected new file mode 100644 index 0000000000..a3e04da28c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-394.expected @@ -0,0 +1,31 @@ +location: clients/tests/test-client.py:884:test_003()/394 +cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1210 bytes +>>> +=============================================================================== + Szczegóły profilu połączenia +=============================================================================== +=============================================================================== + Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL) +=============================================================================== +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-395.expected b/clients/tests/test-client.check-on-disk/test_003-395.expected new file mode 100644 index 0000000000..eb7dcad0c9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-395.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/395 +cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 4058 bytes +>>> +=============================================================================== + Device details (eth0) +=============================================================================== +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-396.expected b/clients/tests/test-client.check-on-disk/test_003-396.expected new file mode 100644 index 0000000000..db99bda746 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-396.expected @@ -0,0 +1,78 @@ +location: clients/tests/test-client.py:887:test_003()/396 +cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4087 bytes +>>> +=============================================================================== + Informacje o urządzeniu (eth0) +=============================================================================== +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_003-397.expected b/clients/tests/test-client.check-on-disk/test_003-397.expected new file mode 100644 index 0000000000..16ab1f4bc6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-397.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/397 +cmd: $NMCLI --mode multiline --terse -f ALL con +lang: C +returncode: 0 +stdout: 1403 bytes +>>> +NAME:ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +TIMESTAMP: +TIMESTAMP-REAL: +AUTOCONNECT: +AUTOCONNECT-PRIORITY: +READONLY: +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE:yes +DEVICE:eth1 +STATE:activated +ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/ethernet +NAME:ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +TIMESTAMP: +TIMESTAMP-REAL: +AUTOCONNECT: +AUTOCONNECT-PRIORITY: +READONLY: +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE:yes +DEVICE:eth0 +STATE:deactivating +ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/ethernet +NAME:con-1 +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-1 +NAME:con-xx1 +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-398.expected b/clients/tests/test-client.check-on-disk/test_003-398.expected new file mode 100644 index 0000000000..f650ec3a62 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-398.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/398 +cmd: $NMCLI --mode multiline --terse -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1403 bytes +>>> +NAME:ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +TIMESTAMP: +TIMESTAMP-REAL: +AUTOCONNECT: +AUTOCONNECT-PRIORITY: +READONLY: +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE:yes +DEVICE:eth1 +STATE:activated +ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/ethernet +NAME:ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +TIMESTAMP: +TIMESTAMP-REAL: +AUTOCONNECT: +AUTOCONNECT-PRIORITY: +READONLY: +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +ACTIVE:yes +DEVICE:eth0 +STATE:deactivating +ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/ethernet +NAME:con-1 +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-1 +NAME:con-xx1 +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-399.expected b/clients/tests/test-client.check-on-disk/test_003-399.expected new file mode 100644 index 0000000000..f0e34e826f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-399.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/399 +cmd: $NMCLI --mode multiline --terse -f UUID,TYPE 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-400.expected b/clients/tests/test-client.check-on-disk/test_003-400.expected new file mode 100644 index 0000000000..9d9af6632c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-400.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/400 +cmd: $NMCLI --mode multiline --terse -f UUID,TYPE 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-401.expected b/clients/tests/test-client.check-on-disk/test_003-401.expected new file mode 100644 index 0000000000..166ae05992 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-401.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/401 +cmd: $NMCLI --mode multiline --terse 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-402.expected b/clients/tests/test-client.check-on-disk/test_003-402.expected new file mode 100644 index 0000000000..d79b187e31 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-402.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/402 +cmd: $NMCLI --mode multiline --terse 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-403.expected b/clients/tests/test-client.check-on-disk/test_003-403.expected new file mode 100644 index 0000000000..bfb8d7809f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-403.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/403 +cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 370 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-404.expected b/clients/tests/test-client.check-on-disk/test_003-404.expected new file mode 100644 index 0000000000..d15587245e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-404.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/404 +cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 370 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-405.expected b/clients/tests/test-client.check-on-disk/test_003-405.expected new file mode 100644 index 0000000000..db889b0d6b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-405.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/405 +cmd: $NMCLI --mode multiline --terse -f all dev show eth0 +lang: C +returncode: 0 +stdout: 1979 bytes +>>> +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-406.expected b/clients/tests/test-client.check-on-disk/test_003-406.expected new file mode 100644 index 0000000000..22ac9ce7c8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-406.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/406 +cmd: $NMCLI --mode multiline --terse -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2002 bytes +>>> +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_003-407.expected b/clients/tests/test-client.check-on-disk/test_003-407.expected new file mode 100644 index 0000000000..7fe7e580c7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-407.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/407 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL con +lang: C +returncode: 0 +stdout: 1673 bytes +>>> +NAME:[32methernet[0m +UUID:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[32m802-3-ethernet[0m +TIMESTAMP:[32m[0m +TIMESTAMP-REAL:[32m[0m +AUTOCONNECT:[32m[0m +AUTOCONNECT-PRIORITY:[32m[0m +READONLY:[32m[0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE:[32myes[0m +DEVICE:[32meth1[0m +STATE:[32mactivated[0m +ACTIVE-PATH:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE:[32m[0m +FILENAME:[32m/etc/NetworkManager/system-connections/ethernet[0m +NAME:[31methernet[0m +UUID:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[31m802-3-ethernet[0m +TIMESTAMP:[31m[0m +TIMESTAMP-REAL:[31m[0m +AUTOCONNECT:[31m[0m +AUTOCONNECT-PRIORITY:[31m[0m +READONLY:[31m[0m +DBUS-PATH:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE:[31myes[0m +DEVICE:[31meth0[0m +STATE:[31mdeactivating[0m +ACTIVE-PATH:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE:[31m[0m +FILENAME:[31m/etc/NetworkManager/system-connections/ethernet[0m +NAME:con-1 +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-1 +NAME:con-xx1 +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-408.expected b/clients/tests/test-client.check-on-disk/test_003-408.expected new file mode 100644 index 0000000000..e650e3c995 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-408.expected @@ -0,0 +1,72 @@ +location: clients/tests/test-client.py:875:test_003()/408 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1673 bytes +>>> +NAME:[32methernet[0m +UUID:[32mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[32m802-3-ethernet[0m +TIMESTAMP:[32m[0m +TIMESTAMP-REAL:[32m[0m +AUTOCONNECT:[32m[0m +AUTOCONNECT-PRIORITY:[32m[0m +READONLY:[32m[0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE:[32myes[0m +DEVICE:[32meth1[0m +STATE:[32mactivated[0m +ACTIVE-PATH:[32m/org/freedesktop/NetworkManager/ActiveConnection/2[0m +SLAVE:[32m[0m +FILENAME:[32m/etc/NetworkManager/system-connections/ethernet[0m +NAME:[31methernet[0m +UUID:[31mUUID-ethernet-REPLACED-REPLACED-REPL[0m +TYPE:[31m802-3-ethernet[0m +TIMESTAMP:[31m[0m +TIMESTAMP-REAL:[31m[0m +AUTOCONNECT:[31m[0m +AUTOCONNECT-PRIORITY:[31m[0m +READONLY:[31m[0m +DBUS-PATH:[31m/org/freedesktop/NetworkManager/Settings/Connection/3[0m +ACTIVE:[31myes[0m +DEVICE:[31meth0[0m +STATE:[31mdeactivating[0m +ACTIVE-PATH:[31m/org/freedesktop/NetworkManager/ActiveConnection/1[0m +SLAVE:[31m[0m +FILENAME:[31m/etc/NetworkManager/system-connections/ethernet[0m +NAME:con-1 +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-1 +NAME:con-xx1 +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet +TIMESTAMP:0 +TIMESTAMP-REAL:never +AUTOCONNECT:yes +AUTOCONNECT-PRIORITY:0 +READONLY:no +DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2 +ACTIVE:no +DEVICE: +STATE: +ACTIVE-PATH: +SLAVE: +FILENAME:/etc/NetworkManager/system-connections/con-xx1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-409.expected b/clients/tests/test-client.check-on-disk/test_003-409.expected new file mode 100644 index 0000000000..cbf8591218 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-409.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/409 +cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE 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-410.expected b/clients/tests/test-client.check-on-disk/test_003-410.expected new file mode 100644 index 0000000000..c62afd807e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-410.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:878:test_003()/410 +cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE 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-411.expected b/clients/tests/test-client.check-on-disk/test_003-411.expected new file mode 100644 index 0000000000..0e320948c6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-411.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/411 +cmd: $NMCLI --mode multiline --terse --color yes 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-412.expected b/clients/tests/test-client.check-on-disk/test_003-412.expected new file mode 100644 index 0000000000..9e7c3967db --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-412.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:881:test_003()/412 +cmd: $NMCLI --mode multiline --terse --color yes 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-413.expected b/clients/tests/test-client.check-on-disk/test_003-413.expected new file mode 100644 index 0000000000..afef1e43ea --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-413.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/413 +cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 370 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-414.expected b/clients/tests/test-client.check-on-disk/test_003-414.expected new file mode 100644 index 0000000000..abe85d73b8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-414.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:884:test_003()/414 +cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 370 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-415.expected b/clients/tests/test-client.check-on-disk/test_003-415.expected new file mode 100644 index 0000000000..737a2c0df9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-415.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/415 +cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 +lang: C +returncode: 0 +stdout: 1979 bytes +>>> +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-416.expected b/clients/tests/test-client.check-on-disk/test_003-416.expected new file mode 100644 index 0000000000..f7a0b5cf6d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-416.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:887:test_003()/416 +cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2002 bytes +>>> +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 59406c6a50..9c56b52ef3 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:911:test_004()/1 +location: clients/tests/test-client.py:897: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 551fbbf379..e302ad2c11 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:913:test_004()/2 +location: clients/tests/test-client.py:899: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 b88303a740..fa74b7bc12 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,4 +1,4 @@ -location: clients/tests/test-client.py:914:test_004()/3 +location: clients/tests/test-client.py:900:test_004()/3 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1 lang: pl_PL.UTF-8 returncode: 1 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 786189b45b..0ff6deabfb 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,4 +1,4 @@ -location: clients/tests/test-client.py:915:test_004()/4 +location: clients/tests/test-client.py:901:test_004()/4 cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99 lang: C returncode: 1 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 35ac557cd0..e16c063432 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:916:test_004()/5 +location: clients/tests/test-client.py:902: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 16d6fbd967..1950fc137d 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:917:test_004()/6 +location: clients/tests/test-client.py:903: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 index 390a5adb00..c2987c7ad1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-007.expected +++ b/clients/tests/test-client.check-on-disk/test_004-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:918:test_004()/7 +location: clients/tests/test-client.py:904: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 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 index c3a203b327..4b7ab20400 100644 --- a/clients/tests/test-client.check-on-disk/test_004-008.expected +++ b/clients/tests/test-client.check-on-disk/test_004-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:920:test_004()/8 +location: clients/tests/test-client.py:906:test_004()/8 cmd: $NMCLI con s con-xx1 lang: C returncode: 0 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 index fa5425d5eb..d480d96232 100644 --- a/clients/tests/test-client.check-on-disk/test_004-009.expected +++ b/clients/tests/test-client.check-on-disk/test_004-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:920:test_004()/9 +location: clients/tests/test-client.py:906:test_004()/9 cmd: $NMCLI con s con-xx1 lang: pl_PL.UTF-8 returncode: 0 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 index 67767097d7..f8f929d903 100644 --- a/clients/tests/test-client.check-on-disk/test_004-010.expected +++ b/clients/tests/test-client.check-on-disk/test_004-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:927:test_004()/10 +location: clients/tests/test-client.py:913: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 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 index e1a021301f..d0bb5e3ce6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-011.expected +++ b/clients/tests/test-client.check-on-disk/test_004-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:930:test_004()/11 +location: clients/tests/test-client.py:916:test_004()/11 cmd: $NMCLI con s lang: C returncode: 0 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 index 1cbf883772..5696ffac90 100644 --- a/clients/tests/test-client.check-on-disk/test_004-012.expected +++ b/clients/tests/test-client.check-on-disk/test_004-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:930:test_004()/12 +location: clients/tests/test-client.py:916:test_004()/12 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 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 index 21461acf4a..858d7e8c52 100644 --- a/clients/tests/test-client.check-on-disk/test_004-013.expected +++ b/clients/tests/test-client.check-on-disk/test_004-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:932:test_004()/13 +location: clients/tests/test-client.py:918:test_004()/13 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 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 index 7bf49cc8fb..c8a3477379 100644 --- a/clients/tests/test-client.check-on-disk/test_004-014.expected +++ b/clients/tests/test-client.check-on-disk/test_004-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:932:test_004()/14 +location: clients/tests/test-client.py:918:test_004()/14 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 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 index 58120e7ad1..f6145b8919 100644 --- a/clients/tests/test-client.check-on-disk/test_004-015.expected +++ b/clients/tests/test-client.check-on-disk/test_004-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:934:test_004()/15 +location: clients/tests/test-client.py:920:test_004()/15 cmd: $NMCLI con up con-xx1 lang: C returncode: 0 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 index 31e9dd6192..1282ea012a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-016.expected +++ b/clients/tests/test-client.check-on-disk/test_004-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:936:test_004()/16 +location: clients/tests/test-client.py:922:test_004()/16 cmd: $NMCLI con s lang: C returncode: 0 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 index 9f9df61ca6..5d3d68eccc 100644 --- a/clients/tests/test-client.check-on-disk/test_004-017.expected +++ b/clients/tests/test-client.check-on-disk/test_004-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:936:test_004()/17 +location: clients/tests/test-client.py:922:test_004()/17 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 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 index b023ae6aa9..9dd7c29d28 100644 --- a/clients/tests/test-client.check-on-disk/test_004-018.expected +++ b/clients/tests/test-client.check-on-disk/test_004-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:938:test_004()/18 +location: clients/tests/test-client.py:924:test_004()/18 cmd: $NMCLI con up con-vpn-1 lang: C returncode: 0 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 index 23c25b7f67..1c146176c4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-019.expected +++ b/clients/tests/test-client.check-on-disk/test_004-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:940:test_004()/19 +location: clients/tests/test-client.py:926:test_004()/19 cmd: $NMCLI con s lang: C returncode: 0 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 index 68c7fad3e9..4fc4918d9e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-020.expected +++ b/clients/tests/test-client.check-on-disk/test_004-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:940:test_004()/20 +location: clients/tests/test-client.py:926:test_004()/20 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 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 index 52d951c806..d16c6815b1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-021.expected +++ b/clients/tests/test-client.check-on-disk/test_004-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:942:test_004()/21 +location: clients/tests/test-client.py:928:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 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 index 5064726320..2cc8464de3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-022.expected +++ b/clients/tests/test-client.check-on-disk/test_004-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:942:test_004()/22 +location: clients/tests/test-client.py:928:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 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 index 8e94ab86e3..117a8838e3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-023.expected +++ b/clients/tests/test-client.check-on-disk/test_004-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:951:test_004()/23 +location: clients/tests/test-client.py:937:test_004()/23 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 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 index 2787f17997..f7cbbadbaf 100644 --- a/clients/tests/test-client.check-on-disk/test_004-024.expected +++ b/clients/tests/test-client.check-on-disk/test_004-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:951:test_004()/24 +location: clients/tests/test-client.py:937:test_004()/24 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 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 index e47e58fb46..c8f3bf2649 100644 --- a/clients/tests/test-client.check-on-disk/test_004-025.expected +++ b/clients/tests/test-client.check-on-disk/test_004-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:953:test_004()/25 +location: clients/tests/test-client.py:939:test_004()/25 cmd: $NMCLI -t con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected index 6fea759fd7..e80c54cfbc 100644 --- a/clients/tests/test-client.check-on-disk/test_004-026.expected +++ b/clients/tests/test-client.check-on-disk/test_004-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:953:test_004()/26 +location: clients/tests/test-client.py:939:test_004()/26 cmd: $NMCLI -t con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 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 index d91e406486..d828b6d613 100644 --- a/clients/tests/test-client.check-on-disk/test_004-027.expected +++ b/clients/tests/test-client.check-on-disk/test_004-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:956:test_004()/27 +location: clients/tests/test-client.py:942:test_004()/27 cmd: $NMCLI -f ALL con s con-vpn-1 lang: C returncode: 0 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 index 41d3c1fdbd..7e53d435d8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-028.expected +++ b/clients/tests/test-client.check-on-disk/test_004-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:956:test_004()/28 +location: clients/tests/test-client.py:942:test_004()/28 cmd: $NMCLI -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 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 index 06924df3d4..3faec240a7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-029.expected +++ b/clients/tests/test-client.check-on-disk/test_004-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:962:test_004()/29 +location: clients/tests/test-client.py:948:test_004()/29 cmd: $NMCLI -f VPN con s con-vpn-1 lang: C returncode: 0 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 index 5c785eae18..7e23cc9d93 100644 --- a/clients/tests/test-client.check-on-disk/test_004-030.expected +++ b/clients/tests/test-client.check-on-disk/test_004-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:962:test_004()/30 +location: clients/tests/test-client.py:948:test_004()/30 cmd: $NMCLI -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 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 index 916142dc55..f7b1d5ccd4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-031.expected +++ b/clients/tests/test-client.check-on-disk/test_004-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:965:test_004()/31 +location: clients/tests/test-client.py:951:test_004()/31 cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: C returncode: 0 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 index 1d16a406f0..5471514d21 100644 --- a/clients/tests/test-client.check-on-disk/test_004-032.expected +++ b/clients/tests/test-client.check-on-disk/test_004-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:965:test_004()/32 +location: clients/tests/test-client.py:951:test_004()/32 cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 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 index 52f0fcb293..ccf0d3c25b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-033.expected +++ b/clients/tests/test-client.check-on-disk/test_004-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:968:test_004()/33 +location: clients/tests/test-client.py:954:test_004()/33 cmd: $NMCLI dev show wlan0 lang: C returncode: 0 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 index d76c2219de..aa79cf7308 100644 --- a/clients/tests/test-client.check-on-disk/test_004-034.expected +++ b/clients/tests/test-client.check-on-disk/test_004-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:968:test_004()/34 +location: clients/tests/test-client.py:954:test_004()/34 cmd: $NMCLI dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected index be2917f33e..e593159708 100644 --- a/clients/tests/test-client.check-on-disk/test_004-035.expected +++ b/clients/tests/test-client.check-on-disk/test_004-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:971:test_004()/35 +location: clients/tests/test-client.py:957:test_004()/35 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected index 7b58b747a0..1209fa2c07 100644 --- a/clients/tests/test-client.check-on-disk/test_004-036.expected +++ b/clients/tests/test-client.check-on-disk/test_004-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:971:test_004()/36 +location: clients/tests/test-client.py:957:test_004()/36 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index a241b7cc7c..b139a24bf2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-037.expected +++ b/clients/tests/test-client.check-on-disk/test_004-037.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:974:test_004()/37 +location: clients/tests/test-client.py:960:test_004()/37 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 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 index 01082f554d..abcf5d9df6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-038.expected +++ b/clients/tests/test-client.check-on-disk/test_004-038.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:974:test_004()/38 +location: clients/tests/test-client.py:960:test_004()/38 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index a5c17fb508..6b5fd74c32 100644 --- a/clients/tests/test-client.check-on-disk/test_004-039.expected +++ b/clients/tests/test-client.check-on-disk/test_004-039.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:977:test_004()/39 +location: clients/tests/test-client.py:963:test_004()/39 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected index ce0760f8a5..bbaef46ff8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-040.expected +++ b/clients/tests/test-client.check-on-disk/test_004-040.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:977:test_004()/40 +location: clients/tests/test-client.py:963:test_004()/40 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index 6ac14e5443..d04f9583cf 100644 --- a/clients/tests/test-client.check-on-disk/test_004-041.expected +++ b/clients/tests/test-client.check-on-disk/test_004-041.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:980:test_004()/41 +location: clients/tests/test-client.py:966:test_004()/41 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 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 index 1d2b2b7310..ea56d46728 100644 --- a/clients/tests/test-client.check-on-disk/test_004-042.expected +++ b/clients/tests/test-client.check-on-disk/test_004-042.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:980:test_004()/42 +location: clients/tests/test-client.py:966:test_004()/42 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 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 index 45d5c4f98b..6eb562bfb4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-043.expected +++ b/clients/tests/test-client.check-on-disk/test_004-043.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:984:test_004()/43 +location: clients/tests/test-client.py:970:test_004()/43 cmd: $NMCLI -f ALL device wifi list lang: C returncode: 0 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 index 99e6fd3555..5b3d96134c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-044.expected +++ b/clients/tests/test-client.check-on-disk/test_004-044.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:984:test_004()/44 +location: clients/tests/test-client.py:970:test_004()/44 cmd: $NMCLI -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 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 index 94d8765e35..148fb51ee9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-045.expected +++ b/clients/tests/test-client.check-on-disk/test_004-045.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:986:test_004()/45 +location: clients/tests/test-client.py:972:test_004()/45 cmd: $NMCLI -f COMMON device wifi list lang: C returncode: 0 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 index 2ba69fe2a1..8a2a6f5f90 100644 --- a/clients/tests/test-client.check-on-disk/test_004-046.expected +++ b/clients/tests/test-client.check-on-disk/test_004-046.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:986:test_004()/46 +location: clients/tests/test-client.py:972:test_004()/46 cmd: $NMCLI -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 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 index a7dc0a8091..383f84a50e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-047.expected +++ b/clients/tests/test-client.check-on-disk/test_004-047.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:989:test_004()/47 +location: clients/tests/test-client.py:975: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 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 index 1f81e9af44..89fd0fb773 100644 --- a/clients/tests/test-client.check-on-disk/test_004-048.expected +++ b/clients/tests/test-client.check-on-disk/test_004-048.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:989:test_004()/48 +location: clients/tests/test-client.py:975: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 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 index cd708d86a3..1c9fa87a41 100644 --- a/clients/tests/test-client.check-on-disk/test_004-049.expected +++ b/clients/tests/test-client.check-on-disk/test_004-049.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:991:test_004()/49 +location: clients/tests/test-client.py:977:test_004()/49 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 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 index f12bbdeb3c..a95397e1e4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-050.expected +++ b/clients/tests/test-client.check-on-disk/test_004-050.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:991:test_004()/50 +location: clients/tests/test-client.py:977:test_004()/50 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 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 index f612088ea3..0c78a50fc0 100644 --- a/clients/tests/test-client.check-on-disk/test_004-051.expected +++ b/clients/tests/test-client.check-on-disk/test_004-051.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:993:test_004()/51 +location: clients/tests/test-client.py:979:test_004()/51 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 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 index 9097d6b9d5..05b4441179 100644 --- a/clients/tests/test-client.check-on-disk/test_004-052.expected +++ b/clients/tests/test-client.check-on-disk/test_004-052.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:993:test_004()/52 +location: clients/tests/test-client.py:979:test_004()/52 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 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 index a31c7b513a..a4cc29910d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-053.expected +++ b/clients/tests/test-client.check-on-disk/test_004-053.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:996:test_004()/53 +location: clients/tests/test-client.py:982: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 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 index ce17c99640..29e429e4aa 100644 --- a/clients/tests/test-client.check-on-disk/test_004-054.expected +++ b/clients/tests/test-client.check-on-disk/test_004-054.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:996:test_004()/54 +location: clients/tests/test-client.py:982: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 diff --git a/clients/tests/test-client.check-on-disk/test_004-055.expected b/clients/tests/test-client.check-on-disk/test_004-055.expected index 4dbf91d9b5..eddb0fb690 100644 --- a/clients/tests/test-client.check-on-disk/test_004-055.expected +++ b/clients/tests/test-client.check-on-disk/test_004-055.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:998:test_004()/55 +location: clients/tests/test-client.py:984:test_004()/55 cmd: $NMCLI -f ALL device show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-056.expected b/clients/tests/test-client.check-on-disk/test_004-056.expected index d106ea7ff0..f0ba9e9ea1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-056.expected +++ b/clients/tests/test-client.check-on-disk/test_004-056.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:998:test_004()/56 +location: clients/tests/test-client.py:984:test_004()/56 cmd: $NMCLI -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index 5d1f25a6bd..c12ca19e5b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-057.expected +++ b/clients/tests/test-client.check-on-disk/test_004-057.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:1000:test_004()/57 +location: clients/tests/test-client.py:986:test_004()/57 cmd: $NMCLI -f COMMON device show wlan0 lang: C returncode: 0 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 index f3dfd3d75d..9334acc50f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-058.expected +++ b/clients/tests/test-client.check-on-disk/test_004-058.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:1000:test_004()/58 +location: clients/tests/test-client.py:986:test_004()/58 cmd: $NMCLI -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-059.expected b/clients/tests/test-client.check-on-disk/test_004-059.expected index 806db142a1..f526639b6c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-059.expected +++ b/clients/tests/test-client.check-on-disk/test_004-059.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:1002:test_004()/59 +location: clients/tests/test-client.py:988:test_004()/59 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-060.expected b/clients/tests/test-client.check-on-disk/test_004-060.expected index e9f76f7743..c94837b5ec 100644 --- a/clients/tests/test-client.check-on-disk/test_004-060.expected +++ b/clients/tests/test-client.check-on-disk/test_004-060.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:1002:test_004()/60 +location: clients/tests/test-client.py:988:test_004()/60 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index dcbd33b252..50b552ebab 100644 --- a/clients/tests/test-client.check-on-disk/test_004-061.expected +++ b/clients/tests/test-client.check-on-disk/test_004-061.expected @@ -1,30 +1,18 @@ -location: clients/tests/test-client.py:984:test_004()/61 -cmd: $NMCLI --pretty -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/61 +cmd: $NMCLI --color yes -f ALL device wifi list lang: C returncode: 0 -stdout: 2872 bytes +stdout: 2452 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 +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -=========================== - 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 +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index eb76554b09..70da59ed73 100644 --- a/clients/tests/test-client.check-on-disk/test_004-062.expected +++ b/clients/tests/test-client.check-on-disk/test_004-062.expected @@ -1,30 +1,18 @@ -location: clients/tests/test-client.py:984:test_004()/62 -cmd: $NMCLI --pretty -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/62 +cmd: $NMCLI --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 3100 bytes +stdout: 2510 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 +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -======================================== - 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 +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 7117753e00..b3fd5deb62 100644 --- a/clients/tests/test-client.check-on-disk/test_004-063.expected +++ b/clients/tests/test-client.check-on-disk/test_004-063.expected @@ -1,30 +1,18 @@ -location: clients/tests/test-client.py:986:test_004()/63 -cmd: $NMCLI --pretty -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/63 +cmd: $NMCLI --color yes -f COMMON device wifi list lang: C returncode: 0 -stdout: 996 bytes +stdout: 760 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 +[35m [0m [35mwlan1-ap-4[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m -=========================== - 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 +[32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32m [0m [32mwlan0-ap-1[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35m [0m [35mwlan0-ap-3[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m <<< 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 index 1854e36460..ac26e85263 100644 --- a/clients/tests/test-client.check-on-disk/test_004-064.expected +++ b/clients/tests/test-client.check-on-disk/test_004-064.expected @@ -1,30 +1,18 @@ -location: clients/tests/test-client.py:986:test_004()/64 -cmd: $NMCLI --pretty -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/64 +cmd: $NMCLI --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 1216 bytes +stdout: 810 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 +[35m [0m [35mwlan1-ap-4[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m -======================================== - 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 +[32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32m [0m [32mwlan0-ap-1[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35m [0m [35mwlan0-ap-3[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m <<< 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 index 90d8fcd0d9..c984ad076d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-065.expected +++ b/clients/tests/test-client.check-on-disk/test_004-065.expected @@ -1,30 +1,18 @@ -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 +location: clients/tests/test-client.py:975:test_004()/65 +cmd: $NMCLI --color yes -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 +stdout: 2452 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 +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -=========================== - 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 +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index a59f00ab77..8b6e26882a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-066.expected +++ b/clients/tests/test-client.check-on-disk/test_004-066.expected @@ -1,30 +1,18 @@ -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 +location: clients/tests/test-client.py:975:test_004()/66 +cmd: $NMCLI --color yes -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 +stdout: 2510 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 +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -======================================== - 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 +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 280d8da116..1face72907 100644 --- a/clients/tests/test-client.check-on-disk/test_004-067.expected +++ b/clients/tests/test-client.check-on-disk/test_004-067.expected @@ -1,15 +1,11 @@ -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 +location: clients/tests/test-client.py:977:test_004()/67 +cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 962 bytes +stdout: 721 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 +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index a89b9cd3e9..40a2eaac5b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-068.expected +++ b/clients/tests/test-client.check-on-disk/test_004-068.expected @@ -1,15 +1,11 @@ -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 +location: clients/tests/test-client.py:977:test_004()/68 +cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1039 bytes +stdout: 739 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 +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 04b8e2d75e..d1e507d2f4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-069.expected +++ b/clients/tests/test-client.check-on-disk/test_004-069.expected @@ -1,15 +1,11 @@ -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 +location: clients/tests/test-client.py:979:test_004()/69 +cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 317 bytes +stdout: 210 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 +[32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m <<< 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 index 35551dae89..a329db45e1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-070.expected +++ b/clients/tests/test-client.check-on-disk/test_004-070.expected @@ -1,15 +1,11 @@ -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 +location: clients/tests/test-client.py:979:test_004()/70 +cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 392 bytes +stdout: 226 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 +[32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m <<< 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 index 40bdc2c4cb..d84e26ee8b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-071.expected +++ b/clients/tests/test-client.check-on-disk/test_004-071.expected @@ -1,15 +1,11 @@ -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 +location: clients/tests/test-client.py:982:test_004()/71 +cmd: $NMCLI --color yes -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 +stdout: 721 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 +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 36b40d5c04..71445a1812 100644 --- a/clients/tests/test-client.check-on-disk/test_004-072.expected +++ b/clients/tests/test-client.check-on-disk/test_004-072.expected @@ -1,15 +1,11 @@ -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 +location: clients/tests/test-client.py:982:test_004()/72 +cmd: $NMCLI --color yes -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 +stdout: 739 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 +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 2adc6c9d8a..9d753439b2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-073.expected +++ b/clients/tests/test-client.check-on-disk/test_004-073.expected @@ -1,12 +1,9 @@ -location: clients/tests/test-client.py:998:test_004()/73 -cmd: $NMCLI --pretty -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/73 +cmd: $NMCLI --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5691 bytes +stdout: 4816 bytes >>> -=============================================================================== - Device details (wlan0) -=============================================================================== GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi @@ -31,12 +28,10 @@ GENERAL.CONNECTION: con-vpn-1 GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED: unknown -------------------------------------------------------------------------------- CAPABILITIES.CARRIER-DETECT: no CAPABILITIES.SPEED: unknown CAPABILITIES.IS-SOFTWARE: no CAPABILITIES.SRIOV: no -------------------------------------------------------------------------------- WIFI-PROPERTIES.WEP: yes WIFI-PROPERTIES.WPA: yes WIFI-PROPERTIES.WPA2: yes @@ -46,34 +41,30 @@ 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 -------------------------------------------------------------------------------- +AP[1].IN-USE: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfra[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mbit/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfra[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mbit/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfra[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mbit/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 @@ -83,12 +74,10 @@ 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 @@ -97,16 +86,13 @@ 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 index 6965edd576..1a8fc281c1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-074.expected +++ b/clients/tests/test-client.check-on-disk/test_004-074.expected @@ -1,12 +1,9 @@ -location: clients/tests/test-client.py:998:test_004()/74 -cmd: $NMCLI --pretty -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/74 +cmd: $NMCLI --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5741 bytes +stdout: 4859 bytes >>> -=============================================================================== - Informacje o urządzeniu (wlan0) -=============================================================================== GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi @@ -31,12 +28,10 @@ GENERAL.CONNECTION: con-vpn-1 GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED: 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 @@ -46,34 +41,30 @@ 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 -------------------------------------------------------------------------------- +AP[1].IN-USE: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfrastruktura[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mb/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfrastruktura[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mb/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfrastruktura[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mb/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 @@ -83,12 +74,10 @@ 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 @@ -97,16 +86,13 @@ 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 index 5830a48188..bde9184114 100644 --- a/clients/tests/test-client.check-on-disk/test_004-075.expected +++ b/clients/tests/test-client.check-on-disk/test_004-075.expected @@ -1,26 +1,16 @@ -location: clients/tests/test-client.py:1000:test_004()/75 -cmd: $NMCLI --pretty -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/75 +cmd: $NMCLI --color yes -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 2294 bytes +stdout: 1363 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 @@ -30,7 +20,6 @@ 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 @@ -39,7 +28,6 @@ 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 index 37321ce751..3e939e234d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-076.expected +++ b/clients/tests/test-client.check-on-disk/test_004-076.expected @@ -1,26 +1,16 @@ -location: clients/tests/test-client.py:1000:test_004()/76 -cmd: $NMCLI --pretty -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/76 +cmd: $NMCLI --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2302 bytes +stdout: 1364 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 @@ -30,7 +20,6 @@ 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 @@ -39,7 +28,6 @@ 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 index c3ba0db717..178e8631d5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-077.expected +++ b/clients/tests/test-client.check-on-disk/test_004-077.expected @@ -1,12 +1,9 @@ -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 +location: clients/tests/test-client.py:988:test_004()/77 +cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5691 bytes +stdout: 4816 bytes >>> -=============================================================================== - Device details (wlan0) -=============================================================================== GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi @@ -31,12 +28,10 @@ GENERAL.CONNECTION: con-vpn-1 GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED: unknown -------------------------------------------------------------------------------- CAPABILITIES.CARRIER-DETECT: no CAPABILITIES.SPEED: unknown CAPABILITIES.IS-SOFTWARE: no CAPABILITIES.SRIOV: no -------------------------------------------------------------------------------- WIFI-PROPERTIES.WEP: yes WIFI-PROPERTIES.WPA: yes WIFI-PROPERTIES.WPA2: yes @@ -46,34 +41,30 @@ 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 -------------------------------------------------------------------------------- +AP[1].IN-USE: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfra[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mbit/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfra[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mbit/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfra[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mbit/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 @@ -83,12 +74,10 @@ 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 @@ -97,16 +86,13 @@ 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 index 65ff189b76..7c9ea637f1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-078.expected +++ b/clients/tests/test-client.check-on-disk/test_004-078.expected @@ -1,12 +1,9 @@ -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 +location: clients/tests/test-client.py:988:test_004()/78 +cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5741 bytes +stdout: 4859 bytes >>> -=============================================================================== - Informacje o urządzeniu (wlan0) -=============================================================================== GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi GENERAL.NM-TYPE: NMDeviceWifi @@ -31,12 +28,10 @@ GENERAL.CONNECTION: con-vpn-1 GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 GENERAL.METERED: 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 @@ -46,34 +41,30 @@ 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 -------------------------------------------------------------------------------- +AP[1].IN-USE: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfrastruktura[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mb/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfrastruktura[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mb/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfrastruktura[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mb/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 @@ -83,12 +74,10 @@ 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 @@ -97,16 +86,13 @@ 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 index f7dca46917..b42851abbd 100644 --- a/clients/tests/test-client.check-on-disk/test_004-079.expected +++ b/clients/tests/test-client.check-on-disk/test_004-079.expected @@ -1,15 +1,30 @@ -location: clients/tests/test-client.py:984:test_004()/79 -cmd: $NMCLI --terse -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/79 +cmd: $NMCLI --pretty -f ALL device wifi list lang: C returncode: 0 -stdout: 1022 bytes +stdout: 2872 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 +=========================== + 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------- -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 +=========================== + 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-080.expected b/clients/tests/test-client.check-on-disk/test_004-080.expected index 6efa34b1c3..299d571e2c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-080.expected +++ b/clients/tests/test-client.check-on-disk/test_004-080.expected @@ -1,15 +1,30 @@ -location: clients/tests/test-client.py:984:test_004()/80 -cmd: $NMCLI --terse -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/80 +cmd: $NMCLI --pretty -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 1070 bytes +stdout: 3100 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 +======================================== + 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -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 +======================================== + 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-081.expected b/clients/tests/test-client.check-on-disk/test_004-081.expected index f4401bf99c..1414932bd4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-081.expected +++ b/clients/tests/test-client.check-on-disk/test_004-081.expected @@ -1,15 +1,30 @@ -location: clients/tests/test-client.py:986:test_004()/81 -cmd: $NMCLI --terse -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/81 +cmd: $NMCLI --pretty -f COMMON device wifi list lang: C returncode: 0 -stdout: 198 bytes +stdout: 996 bytes >>> - :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 +------------------------------------------------------------------------------------------------ + 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 +----------------------------------------------------------------------------------- - :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 +=========================== + 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-082.expected b/clients/tests/test-client.check-on-disk/test_004-082.expected index 0554165f3a..92a8141d21 100644 --- a/clients/tests/test-client.check-on-disk/test_004-082.expected +++ b/clients/tests/test-client.check-on-disk/test_004-082.expected @@ -1,15 +1,30 @@ -location: clients/tests/test-client.py:986:test_004()/82 -cmd: $NMCLI --terse -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/82 +cmd: $NMCLI --pretty -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 234 bytes +stdout: 1216 bytes >>> - :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 +-------------------------------------------------------------------------------------------------------------------- + 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 +------------------------------------------------------------------------------------------------ - :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 +======================================== + 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-083.expected b/clients/tests/test-client.check-on-disk/test_004-083.expected index 4d818c0377..af4ab12546 100644 --- a/clients/tests/test-client.check-on-disk/test_004-083.expected +++ b/clients/tests/test-client.check-on-disk/test_004-083.expected @@ -1,15 +1,30 @@ -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 +location: clients/tests/test-client.py:975:test_004()/83 +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: 1022 bytes +stdout: 2872 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 +=========================== + 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------- -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 +=========================== + 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-084.expected b/clients/tests/test-client.check-on-disk/test_004-084.expected index 73f41c6f1a..ff634a16d5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-084.expected +++ b/clients/tests/test-client.check-on-disk/test_004-084.expected @@ -1,15 +1,30 @@ -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 +location: clients/tests/test-client.py:975:test_004()/84 +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: 1070 bytes +stdout: 3100 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 +======================================== + 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -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 +======================================== + 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-085.expected b/clients/tests/test-client.check-on-disk/test_004-085.expected index b9c3a91cf3..5a9a74f572 100644 --- a/clients/tests/test-client.check-on-disk/test_004-085.expected +++ b/clients/tests/test-client.check-on-disk/test_004-085.expected @@ -1,10 +1,15 @@ -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 +location: clients/tests/test-client.py:977:test_004()/85 +cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 255 bytes +stdout: 962 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 +=========================== + 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-086.expected b/clients/tests/test-client.check-on-disk/test_004-086.expected index 353001b41b..fea9522c80 100644 --- a/clients/tests/test-client.check-on-disk/test_004-086.expected +++ b/clients/tests/test-client.check-on-disk/test_004-086.expected @@ -1,10 +1,15 @@ -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 +location: clients/tests/test-client.py:977:test_004()/86 +cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 267 bytes +stdout: 1039 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 +======================================== + 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-087.expected b/clients/tests/test-client.check-on-disk/test_004-087.expected index ab8c0fa230..6d47d52e1e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-087.expected +++ b/clients/tests/test-client.check-on-disk/test_004-087.expected @@ -1,10 +1,15 @@ -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 +location: clients/tests/test-client.py:979:test_004()/87 +cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 49 bytes +stdout: 317 bytes >>> - :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 +=========================== + 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-088.expected b/clients/tests/test-client.check-on-disk/test_004-088.expected index bb049d20a1..bb9d1dedfe 100644 --- a/clients/tests/test-client.check-on-disk/test_004-088.expected +++ b/clients/tests/test-client.check-on-disk/test_004-088.expected @@ -1,10 +1,15 @@ -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 +location: clients/tests/test-client.py:979:test_004()/88 +cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 58 bytes +stdout: 392 bytes >>> - :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 +======================================== + 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-089.expected b/clients/tests/test-client.check-on-disk/test_004-089.expected index 3a365df96a..82f3494039 100644 --- a/clients/tests/test-client.check-on-disk/test_004-089.expected +++ b/clients/tests/test-client.check-on-disk/test_004-089.expected @@ -1,10 +1,15 @@ -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 +location: clients/tests/test-client.py:982:test_004()/89 +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: 255 bytes +stdout: 962 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 +=========================== + 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-090.expected b/clients/tests/test-client.check-on-disk/test_004-090.expected index fcd8759a72..233a528e04 100644 --- a/clients/tests/test-client.check-on-disk/test_004-090.expected +++ b/clients/tests/test-client.check-on-disk/test_004-090.expected @@ -1,10 +1,15 @@ -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 +location: clients/tests/test-client.py:982:test_004()/90 +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: 267 bytes +stdout: 1039 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 +======================================== + 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-091.expected b/clients/tests/test-client.check-on-disk/test_004-091.expected index 72d685f471..06a213fc4f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-091.expected +++ b/clients/tests/test-client.check-on-disk/test_004-091.expected @@ -1,98 +1,112 @@ -location: clients/tests/test-client.py:998:test_004()/91 -cmd: $NMCLI --terse -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/91 +cmd: $NMCLI --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2467 bytes +stdout: 5691 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 +=============================================================================== + 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-092.expected b/clients/tests/test-client.check-on-disk/test_004-092.expected index 6f5fc2758a..e76c6e0f66 100644 --- a/clients/tests/test-client.check-on-disk/test_004-092.expected +++ b/clients/tests/test-client.check-on-disk/test_004-092.expected @@ -1,98 +1,112 @@ -location: clients/tests/test-client.py:998:test_004()/92 -cmd: $NMCLI --terse -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/92 +cmd: $NMCLI --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2510 bytes +stdout: 5741 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 +=============================================================================== + 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-093.expected b/clients/tests/test-client.check-on-disk/test_004-093.expected index 4f50347ed5..10540bee2c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-093.expected +++ b/clients/tests/test-client.check-on-disk/test_004-093.expected @@ -1,33 +1,45 @@ -location: clients/tests/test-client.py:1000:test_004()/93 -cmd: $NMCLI --terse -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/93 +cmd: $NMCLI --pretty -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 739 bytes +stdout: 2294 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 +=============================================================================== + 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-094.expected b/clients/tests/test-client.check-on-disk/test_004-094.expected index 19fd92bd00..22f4a47370 100644 --- a/clients/tests/test-client.check-on-disk/test_004-094.expected +++ b/clients/tests/test-client.check-on-disk/test_004-094.expected @@ -1,33 +1,45 @@ -location: clients/tests/test-client.py:1000:test_004()/94 -cmd: $NMCLI --terse -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/94 +cmd: $NMCLI --pretty -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 740 bytes +stdout: 2302 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 +=============================================================================== + 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-095.expected b/clients/tests/test-client.check-on-disk/test_004-095.expected index 5f49d79649..946d555579 100644 --- a/clients/tests/test-client.check-on-disk/test_004-095.expected +++ b/clients/tests/test-client.check-on-disk/test_004-095.expected @@ -1,98 +1,112 @@ -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 +location: clients/tests/test-client.py:988:test_004()/95 +cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2467 bytes +stdout: 5691 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 +=============================================================================== + 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-096.expected b/clients/tests/test-client.check-on-disk/test_004-096.expected index 2c46d66a39..dae7174bd3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-096.expected +++ b/clients/tests/test-client.check-on-disk/test_004-096.expected @@ -1,98 +1,112 @@ -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 +location: clients/tests/test-client.py:988:test_004()/96 +cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2510 bytes +stdout: 5741 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 +=============================================================================== + 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-097.expected b/clients/tests/test-client.check-on-disk/test_004-097.expected index 780cc13207..dd1044ac1b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-097.expected +++ b/clients/tests/test-client.check-on-disk/test_004-097.expected @@ -1,18 +1,30 @@ -location: clients/tests/test-client.py:984:test_004()/97 -cmd: $NMCLI --mode tabular -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/97 +cmd: $NMCLI --pretty --color yes -f ALL device wifi list lang: C returncode: 0 -stdout: 1840 bytes +stdout: 3484 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m +=========================== + 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index a73f3c3b04..5b67a97f0a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-098.expected +++ b/clients/tests/test-client.check-on-disk/test_004-098.expected @@ -1,18 +1,30 @@ -location: clients/tests/test-client.py:984:test_004()/98 -cmd: $NMCLI --mode tabular -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/98 +cmd: $NMCLI --pretty --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 1898 bytes +stdout: 3712 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m +======================================== + 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 556fe66e30..bd39afa3b0 100644 --- a/clients/tests/test-client.check-on-disk/test_004-099.expected +++ b/clients/tests/test-client.check-on-disk/test_004-099.expected @@ -1,18 +1,30 @@ -location: clients/tests/test-client.py:986:test_004()/99 -cmd: $NMCLI --mode tabular -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/99 +cmd: $NMCLI --pretty --color yes -f COMMON device wifi list lang: C returncode: 0 -stdout: 472 bytes +stdout: 1284 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 +------------------------------------------------------------------------------------------------ +[35m [0m [35mwlan1-ap-4[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m +=========================== + 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 +------------------------------------------------------------------------------------------------ +[32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32m [0m [32mwlan0-ap-1[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35m [0m [35mwlan0-ap-3[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m <<< 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 index ee2333c2dc..942ae56ba1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-100.expected +++ b/clients/tests/test-client.check-on-disk/test_004-100.expected @@ -1,18 +1,30 @@ -location: clients/tests/test-client.py:986:test_004()/100 -cmd: $NMCLI --mode tabular -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/100 +cmd: $NMCLI --pretty --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 522 bytes +stdout: 1504 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 +-------------------------------------------------------------------------------------------------------------------- +[35m [0m [35mwlan1-ap-4[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m +======================================== + 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 +-------------------------------------------------------------------------------------------------------------------- +[32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32m [0m [32mwlan0-ap-1[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35m [0m [35mwlan0-ap-3[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m <<< 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 index 650df5dfed..7ad4bed52a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-101.expected +++ b/clients/tests/test-client.check-on-disk/test_004-101.expected @@ -1,18 +1,30 @@ -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 +location: clients/tests/test-client.py:975:test_004()/101 +cmd: $NMCLI --pretty --color yes -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 +stdout: 3484 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m +=========================== + 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 7119e041b3..202688ffc8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-102.expected +++ b/clients/tests/test-client.check-on-disk/test_004-102.expected @@ -1,18 +1,30 @@ -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 +location: clients/tests/test-client.py:975:test_004()/102 +cmd: $NMCLI --pretty --color yes -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 +stdout: 3712 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m +======================================== + 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 3192bad607..c15b438f84 100644 --- a/clients/tests/test-client.check-on-disk/test_004-103.expected +++ b/clients/tests/test-client.check-on-disk/test_004-103.expected @@ -1,11 +1,15 @@ -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 +location: clients/tests/test-client.py:977:test_004()/103 +cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 568 bytes +stdout: 1115 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index ce3e7650d3..7e5585eb40 100644 --- a/clients/tests/test-client.check-on-disk/test_004-104.expected +++ b/clients/tests/test-client.check-on-disk/test_004-104.expected @@ -1,11 +1,15 @@ -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 +location: clients/tests/test-client.py:977:test_004()/104 +cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 586 bytes +stdout: 1192 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 1894b9bf41..644f830f59 100644 --- a/clients/tests/test-client.check-on-disk/test_004-105.expected +++ b/clients/tests/test-client.check-on-disk/test_004-105.expected @@ -1,11 +1,15 @@ -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 +location: clients/tests/test-client.py:979:test_004()/105 +cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 138 bytes +stdout: 389 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 +------------------------------------------------------------------------------------------------ +[32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m <<< 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 index ebcec5a361..28714aad47 100644 --- a/clients/tests/test-client.check-on-disk/test_004-106.expected +++ b/clients/tests/test-client.check-on-disk/test_004-106.expected @@ -1,11 +1,15 @@ -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 +location: clients/tests/test-client.py:979:test_004()/106 +cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 154 bytes +stdout: 464 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 +-------------------------------------------------------------------------------------------------------------------- +[32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m <<< 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 index 48a961f240..ce3bddf473 100644 --- a/clients/tests/test-client.check-on-disk/test_004-107.expected +++ b/clients/tests/test-client.check-on-disk/test_004-107.expected @@ -1,11 +1,15 @@ -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 +location: clients/tests/test-client.py:982:test_004()/107 +cmd: $NMCLI --pretty --color yes -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 +stdout: 1115 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 53080dbfc2..49d1211f25 100644 --- a/clients/tests/test-client.check-on-disk/test_004-108.expected +++ b/clients/tests/test-client.check-on-disk/test_004-108.expected @@ -1,11 +1,15 @@ -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 +location: clients/tests/test-client.py:982:test_004()/108 +cmd: $NMCLI --pretty --color yes -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 +stdout: 1192 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 32398b7fc3..0ab277a61d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-109.expected +++ b/clients/tests/test-client.check-on-disk/test_004-109.expected @@ -1,37 +1,112 @@ -location: clients/tests/test-client.py:998:test_004()/109 -cmd: $NMCLI --mode tabular -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/109 +cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2760 bytes +stdout: 5907 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 +=============================================================================== + 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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfra[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mbit/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfra[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mbit/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfra[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mbit/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- +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-110.expected b/clients/tests/test-client.check-on-disk/test_004-110.expected index ee54183e06..9a4e97e63f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-110.expected +++ b/clients/tests/test-client.check-on-disk/test_004-110.expected @@ -1,37 +1,112 @@ -location: clients/tests/test-client.py:998:test_004()/110 -cmd: $NMCLI --mode tabular -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/110 +cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2813 bytes +stdout: 5957 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 +=============================================================================== + 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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfrastruktura[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mb/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfrastruktura[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mb/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfrastruktura[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mb/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- +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-111.expected b/clients/tests/test-client.check-on-disk/test_004-111.expected index 3e3a4a0948..9118283ce0 100644 --- a/clients/tests/test-client.check-on-disk/test_004-111.expected +++ b/clients/tests/test-client.check-on-disk/test_004-111.expected @@ -1,35 +1,45 @@ -location: clients/tests/test-client.py:1000:test_004()/111 -cmd: $NMCLI --mode tabular -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/111 +cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 980 bytes +stdout: 2294 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 +=============================================================================== + 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-112.expected b/clients/tests/test-client.check-on-disk/test_004-112.expected index cd8fbc74f0..5e9826b93f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-112.expected +++ b/clients/tests/test-client.check-on-disk/test_004-112.expected @@ -1,35 +1,45 @@ -location: clients/tests/test-client.py:1000:test_004()/112 -cmd: $NMCLI --mode tabular -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/112 +cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 981 bytes +stdout: 2302 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 +=============================================================================== + 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-113.expected b/clients/tests/test-client.check-on-disk/test_004-113.expected index ca0d2c76cf..fdef3f97a3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-113.expected +++ b/clients/tests/test-client.check-on-disk/test_004-113.expected @@ -1,37 +1,112 @@ -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 +location: clients/tests/test-client.py:988:test_004()/113 +cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2760 bytes +stdout: 5907 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 +=============================================================================== + 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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfra[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mbit/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfra[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mbit/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfra[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mbit/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- +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-114.expected b/clients/tests/test-client.check-on-disk/test_004-114.expected index 2fe34bc51a..d179fca04c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-114.expected +++ b/clients/tests/test-client.check-on-disk/test_004-114.expected @@ -1,37 +1,112 @@ -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 +location: clients/tests/test-client.py:988:test_004()/114 +cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2813 bytes +stdout: 5957 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 +=============================================================================== + 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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfrastruktura[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mb/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfrastruktura[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mb/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfrastruktura[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mb/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- +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-115.expected b/clients/tests/test-client.check-on-disk/test_004-115.expected index f35200a7fe..b1ea5ea5e8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-115.expected +++ b/clients/tests/test-client.check-on-disk/test_004-115.expected @@ -1,30 +1,15 @@ -location: clients/tests/test-client.py:984:test_004()/115 -cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/115 +cmd: $NMCLI --terse -f ALL device wifi list lang: C returncode: 0 -stdout: 2872 bytes +stdout: 1022 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 +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 +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 index b5dd64029e..c0a2211dbd 100644 --- a/clients/tests/test-client.check-on-disk/test_004-116.expected +++ b/clients/tests/test-client.check-on-disk/test_004-116.expected @@ -1,30 +1,15 @@ -location: clients/tests/test-client.py:984:test_004()/116 -cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/116 +cmd: $NMCLI --terse -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 3100 bytes +stdout: 1070 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 +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 +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 index d47102041f..6b15ce6504 100644 --- a/clients/tests/test-client.check-on-disk/test_004-117.expected +++ b/clients/tests/test-client.check-on-disk/test_004-117.expected @@ -1,30 +1,15 @@ -location: clients/tests/test-client.py:986:test_004()/117 -cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/117 +cmd: $NMCLI --terse -f COMMON device wifi list lang: C returncode: 0 -stdout: 996 bytes +stdout: 198 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 + :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 + :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 index 7abe6c4760..fb90f54ef5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-118.expected +++ b/clients/tests/test-client.check-on-disk/test_004-118.expected @@ -1,30 +1,15 @@ -location: clients/tests/test-client.py:986:test_004()/118 -cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/118 +cmd: $NMCLI --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 1216 bytes +stdout: 234 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 + :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 + :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 index e0adcfccbd..caa83ca35b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-119.expected +++ b/clients/tests/test-client.check-on-disk/test_004-119.expected @@ -1,30 +1,15 @@ -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 +location: clients/tests/test-client.py:975:test_004()/119 +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: 2872 bytes +stdout: 1022 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 +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 +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 index 5e7f5eb1a4..2ee418393b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-120.expected +++ b/clients/tests/test-client.check-on-disk/test_004-120.expected @@ -1,30 +1,15 @@ -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 +location: clients/tests/test-client.py:975:test_004()/120 +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: 3100 bytes +stdout: 1070 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 +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 +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 index 70ce9ba9b7..5eda89425a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-121.expected +++ b/clients/tests/test-client.check-on-disk/test_004-121.expected @@ -1,15 +1,10 @@ -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 +location: clients/tests/test-client.py:977:test_004()/121 +cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 962 bytes +stdout: 255 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 +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 index 19ab8aa1fe..5aeba42918 100644 --- a/clients/tests/test-client.check-on-disk/test_004-122.expected +++ b/clients/tests/test-client.check-on-disk/test_004-122.expected @@ -1,15 +1,10 @@ -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 +location: clients/tests/test-client.py:977:test_004()/122 +cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1039 bytes +stdout: 267 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 +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 index ab5a4e7971..4a2433fa63 100644 --- a/clients/tests/test-client.check-on-disk/test_004-123.expected +++ b/clients/tests/test-client.check-on-disk/test_004-123.expected @@ -1,15 +1,10 @@ -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 +location: clients/tests/test-client.py:979:test_004()/123 +cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 317 bytes +stdout: 49 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 + :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 index 6ca1cfce31..810a20e31a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-124.expected +++ b/clients/tests/test-client.check-on-disk/test_004-124.expected @@ -1,15 +1,10 @@ -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 +location: clients/tests/test-client.py:979:test_004()/124 +cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 392 bytes +stdout: 58 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 + :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 index f412a3d875..d8997b8de8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-125.expected +++ b/clients/tests/test-client.check-on-disk/test_004-125.expected @@ -1,15 +1,10 @@ -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 +location: clients/tests/test-client.py:982:test_004()/125 +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: 962 bytes +stdout: 255 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 +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 index 58cb91aa49..21cafa7b4d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-126.expected +++ b/clients/tests/test-client.check-on-disk/test_004-126.expected @@ -1,15 +1,10 @@ -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 +location: clients/tests/test-client.py:982:test_004()/126 +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: 1039 bytes +stdout: 267 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 +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 index 03585d9013..968ce10477 100644 --- a/clients/tests/test-client.check-on-disk/test_004-127.expected +++ b/clients/tests/test-client.check-on-disk/test_004-127.expected @@ -1,49 +1,98 @@ -location: clients/tests/test-client.py:998:test_004()/127 -cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/127 +cmd: $NMCLI --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4148 bytes +stdout: 2467 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 +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-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected index be50cc17b6..2317cd91ad 100644 --- a/clients/tests/test-client.check-on-disk/test_004-128.expected +++ b/clients/tests/test-client.check-on-disk/test_004-128.expected @@ -1,49 +1,98 @@ -location: clients/tests/test-client.py:998:test_004()/128 -cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/128 +cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4246 bytes +stdout: 2510 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 +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-129.expected b/clients/tests/test-client.check-on-disk/test_004-129.expected index a9695c823a..04c7366184 100644 --- a/clients/tests/test-client.check-on-disk/test_004-129.expected +++ b/clients/tests/test-client.check-on-disk/test_004-129.expected @@ -1,47 +1,33 @@ -location: clients/tests/test-client.py:1000:test_004()/129 -cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/129 +cmd: $NMCLI --terse -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 1554 bytes +stdout: 739 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 +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-130.expected b/clients/tests/test-client.check-on-disk/test_004-130.expected index 5ded3e2b1d..a15eeb5fc1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-130.expected +++ b/clients/tests/test-client.check-on-disk/test_004-130.expected @@ -1,47 +1,33 @@ -location: clients/tests/test-client.py:1000:test_004()/130 -cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/130 +cmd: $NMCLI --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1584 bytes +stdout: 740 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 +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-131.expected b/clients/tests/test-client.check-on-disk/test_004-131.expected index 7c7e20c4c5..27ceb9d5d6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-131.expected +++ b/clients/tests/test-client.check-on-disk/test_004-131.expected @@ -1,49 +1,98 @@ -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 +location: clients/tests/test-client.py:988:test_004()/131 +cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4148 bytes +stdout: 2467 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 +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-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected index e3f6d26250..bae7620978 100644 --- a/clients/tests/test-client.check-on-disk/test_004-132.expected +++ b/clients/tests/test-client.check-on-disk/test_004-132.expected @@ -1,49 +1,98 @@ -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 +location: clients/tests/test-client.py:988:test_004()/132 +cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4246 bytes +stdout: 2510 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 +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-133.expected b/clients/tests/test-client.check-on-disk/test_004-133.expected index 48a5c30f0b..86360e536b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-133.expected +++ b/clients/tests/test-client.check-on-disk/test_004-133.expected @@ -1,15 +1,15 @@ -location: clients/tests/test-client.py:984:test_004()/133 -cmd: $NMCLI --mode tabular --terse -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/133 +cmd: $NMCLI --terse --color yes -f ALL device wifi list lang: C returncode: 0 -stdout: 1022 bytes +stdout: 1634 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 +[35mAP[1][0m:[35mwlan1-ap-4[0m:[35m776C616E312D61702D34[0m:[35m94\:2B\:E8\:F6\:D2\:86[0m:[35mInfra[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mbit/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan1[0m:[35mno[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -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 +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m:[32mwlan0-ap-1[0m:[32m776C616E302D61702D31[0m:[32m61\:95\:77\:AC\:1E\:4C[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m:[35mwlan0-ap-3[0m:[35m776C616E302D61702D33[0m:[35m9B\:F6\:B7\:EC\:97\:76[0m:[35mInfra[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mbit/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan0[0m:[35mno[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 3d07f6b682..ea348d3d9e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-134.expected +++ b/clients/tests/test-client.check-on-disk/test_004-134.expected @@ -1,15 +1,15 @@ -location: clients/tests/test-client.py:984:test_004()/134 -cmd: $NMCLI --mode tabular --terse -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/134 +cmd: $NMCLI --terse --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 1070 bytes +stdout: 1682 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 +[35mAP[1][0m:[35mwlan1-ap-4[0m:[35m776C616E312D61702D34[0m:[35m94\:2B\:E8\:F6\:D2\:86[0m:[35mInfrastruktura[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mb/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan1[0m:[35mnie[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -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 +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m:[32mwlan0-ap-1[0m:[32m776C616E302D61702D31[0m:[32m61\:95\:77\:AC\:1E\:4C[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m:[35mwlan0-ap-3[0m:[35m776C616E302D61702D33[0m:[35m9B\:F6\:B7\:EC\:97\:76[0m:[35mInfrastruktura[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mb/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan0[0m:[35mnie[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 0ca4d34038..1f1338fd69 100644 --- a/clients/tests/test-client.check-on-disk/test_004-135.expected +++ b/clients/tests/test-client.check-on-disk/test_004-135.expected @@ -1,15 +1,15 @@ -location: clients/tests/test-client.py:986:test_004()/135 -cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/135 +cmd: $NMCLI --terse --color yes -f COMMON device wifi list lang: C returncode: 0 -stdout: 198 bytes +stdout: 486 bytes >>> - :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2 +[35m [0m:[35mwlan1-ap-4[0m:[35mInfra[0m:[35m1[0m:[35m54 Mbit/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m - :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 +[32m [0m:[32mwlan0-ap-2[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m +[32m [0m:[32mwlan0-ap-1[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m +[35m [0m:[35mwlan0-ap-3[0m:[35mInfra[0m:[35m1[0m:[35m54 Mbit/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m <<< 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 index cebd2975e7..c81ff81252 100644 --- a/clients/tests/test-client.check-on-disk/test_004-136.expected +++ b/clients/tests/test-client.check-on-disk/test_004-136.expected @@ -1,15 +1,15 @@ -location: clients/tests/test-client.py:986:test_004()/136 -cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/136 +cmd: $NMCLI --terse --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 234 bytes +stdout: 522 bytes >>> - :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2 +[35m [0m:[35mwlan1-ap-4[0m:[35mInfrastruktura[0m:[35m1[0m:[35m54 Mb/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m - :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 +[32m [0m:[32mwlan0-ap-2[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m +[32m [0m:[32mwlan0-ap-1[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m +[35m [0m:[35mwlan0-ap-3[0m:[35mInfrastruktura[0m:[35m1[0m:[35m54 Mb/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m <<< 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 index 91db6a4690..0b319bd9e5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-137.expected +++ b/clients/tests/test-client.check-on-disk/test_004-137.expected @@ -1,15 +1,15 @@ -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 +location: clients/tests/test-client.py:975:test_004()/137 +cmd: $NMCLI --terse --color yes -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 +stdout: 1634 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 +[35mAP[1][0m:[35mwlan1-ap-4[0m:[35m776C616E312D61702D34[0m:[35m94\:2B\:E8\:F6\:D2\:86[0m:[35mInfra[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mbit/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan1[0m:[35mno[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -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 +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m:[32mwlan0-ap-1[0m:[32m776C616E302D61702D31[0m:[32m61\:95\:77\:AC\:1E\:4C[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m:[35mwlan0-ap-3[0m:[35m776C616E302D61702D33[0m:[35m9B\:F6\:B7\:EC\:97\:76[0m:[35mInfra[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mbit/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan0[0m:[35mno[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index e3b0734d4b..5cd27af96d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-138.expected +++ b/clients/tests/test-client.check-on-disk/test_004-138.expected @@ -1,15 +1,15 @@ -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 +location: clients/tests/test-client.py:975:test_004()/138 +cmd: $NMCLI --terse --color yes -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 +stdout: 1682 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 +[35mAP[1][0m:[35mwlan1-ap-4[0m:[35m776C616E312D61702D34[0m:[35m94\:2B\:E8\:F6\:D2\:86[0m:[35mInfrastruktura[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mb/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan1[0m:[35mnie[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -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 +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m:[32mwlan0-ap-1[0m:[32m776C616E302D61702D31[0m:[32m61\:95\:77\:AC\:1E\:4C[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m:[35mwlan0-ap-3[0m:[35m776C616E302D61702D33[0m:[35m9B\:F6\:B7\:EC\:97\:76[0m:[35mInfrastruktura[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mb/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan0[0m:[35mnie[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 0d77bad4fb..17300d13a9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-139.expected +++ b/clients/tests/test-client.check-on-disk/test_004-139.expected @@ -1,10 +1,10 @@ -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 +location: clients/tests/test-client.py:977:test_004()/139 +cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 255 bytes +stdout: 408 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 +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 453e468549..c7bcf149d5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-140.expected +++ b/clients/tests/test-client.check-on-disk/test_004-140.expected @@ -1,10 +1,10 @@ -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 +location: clients/tests/test-client.py:977:test_004()/140 +cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 267 bytes +stdout: 420 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 +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 07347eb883..2862b632ae 100644 --- a/clients/tests/test-client.check-on-disk/test_004-141.expected +++ b/clients/tests/test-client.check-on-disk/test_004-141.expected @@ -1,10 +1,10 @@ -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 +location: clients/tests/test-client.py:979:test_004()/141 +cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 49 bytes +stdout: 121 bytes >>> - :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2 +[32m [0m:[32mwlan0-ap-2[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m <<< 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 index ea204e7cbf..6ebeec56de 100644 --- a/clients/tests/test-client.check-on-disk/test_004-142.expected +++ b/clients/tests/test-client.check-on-disk/test_004-142.expected @@ -1,10 +1,10 @@ -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 +location: clients/tests/test-client.py:979:test_004()/142 +cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 58 bytes +stdout: 130 bytes >>> - :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2 +[32m [0m:[32mwlan0-ap-2[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m <<< 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 index e389a5a9d6..5908715058 100644 --- a/clients/tests/test-client.check-on-disk/test_004-143.expected +++ b/clients/tests/test-client.check-on-disk/test_004-143.expected @@ -1,10 +1,10 @@ -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 +location: clients/tests/test-client.py:982:test_004()/143 +cmd: $NMCLI --terse --color yes -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 +stdout: 408 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 +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 566be37829..27114dfc3d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-144.expected +++ b/clients/tests/test-client.check-on-disk/test_004-144.expected @@ -1,10 +1,10 @@ -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 +location: clients/tests/test-client.py:982:test_004()/144 +cmd: $NMCLI --terse --color yes -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 +stdout: 420 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 +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index ff8735b098..e6632d5bd4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-145.expected +++ b/clients/tests/test-client.check-on-disk/test_004-145.expected @@ -1,20 +1,98 @@ -location: clients/tests/test-client.py:998:test_004()/145 -cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/145 +cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 1164 bytes +stdout: 2683 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 +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:[32m [0m +AP[1].SSID:[32mwlan0-ap-2[0m +AP[1].MODE:[32mInfra[0m +AP[1].CHAN:[32m1[0m +AP[1].RATE:[32m54 Mbit/s[0m +AP[1].SIGNAL:[32m92[0m +AP[1].BARS:[32m****[0m +AP[1].SECURITY:[32mWPA1 WPA2[0m +AP[2].IN-USE:[32m [0m +AP[2].SSID:[32mwlan0-ap-1[0m +AP[2].MODE:[32mInfra[0m +AP[2].CHAN:[32m1[0m +AP[2].RATE:[32m54 Mbit/s[0m +AP[2].SIGNAL:[32m81[0m +AP[2].BARS:[32m****[0m +AP[2].SECURITY:[32mWPA1 WPA2[0m +AP[3].IN-USE:[35m [0m +AP[3].SSID:[35mwlan0-ap-3[0m +AP[3].MODE:[35mInfra[0m +AP[3].CHAN:[35m1[0m +AP[3].RATE:[35m54 Mbit/s[0m +AP[3].SIGNAL:[35m55[0m +AP[3].BARS:[35m** [0m +AP[3].SECURITY:[35mWPA1 WPA2[0m +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-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected index 4110981fa3..4ea1fb9b36 100644 --- a/clients/tests/test-client.check-on-disk/test_004-146.expected +++ b/clients/tests/test-client.check-on-disk/test_004-146.expected @@ -1,20 +1,98 @@ -location: clients/tests/test-client.py:998:test_004()/146 -cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/146 +cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1207 bytes +stdout: 2726 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 +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:[32m [0m +AP[1].SSID:[32mwlan0-ap-2[0m +AP[1].MODE:[32mInfrastruktura[0m +AP[1].CHAN:[32m1[0m +AP[1].RATE:[32m54 Mb/s[0m +AP[1].SIGNAL:[32m92[0m +AP[1].BARS:[32m****[0m +AP[1].SECURITY:[32mWPA1 WPA2[0m +AP[2].IN-USE:[32m [0m +AP[2].SSID:[32mwlan0-ap-1[0m +AP[2].MODE:[32mInfrastruktura[0m +AP[2].CHAN:[32m1[0m +AP[2].RATE:[32m54 Mb/s[0m +AP[2].SIGNAL:[32m81[0m +AP[2].BARS:[32m****[0m +AP[2].SECURITY:[32mWPA1 WPA2[0m +AP[3].IN-USE:[35m [0m +AP[3].SSID:[35mwlan0-ap-3[0m +AP[3].MODE:[35mInfrastruktura[0m +AP[3].CHAN:[35m1[0m +AP[3].RATE:[35m54 Mb/s[0m +AP[3].SIGNAL:[35m55[0m +AP[3].BARS:[35m** [0m +AP[3].SECURITY:[35mWPA1 WPA2[0m +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-147.expected b/clients/tests/test-client.check-on-disk/test_004-147.expected index ec43aefbe5..c27be06a53 100644 --- a/clients/tests/test-client.check-on-disk/test_004-147.expected +++ b/clients/tests/test-client.check-on-disk/test_004-147.expected @@ -1,18 +1,33 @@ -location: clients/tests/test-client.py:1000:test_004()/147 -cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/147 +cmd: $NMCLI --terse --color yes -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 446 bytes +stdout: 739 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 +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-148.expected b/clients/tests/test-client.check-on-disk/test_004-148.expected index 79e266d3a0..6ae2ebaed7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-148.expected +++ b/clients/tests/test-client.check-on-disk/test_004-148.expected @@ -1,18 +1,33 @@ -location: clients/tests/test-client.py:1000:test_004()/148 -cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/148 +cmd: $NMCLI --terse --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 447 bytes +stdout: 740 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 +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-149.expected b/clients/tests/test-client.check-on-disk/test_004-149.expected index f762f005c6..f815ba4955 100644 --- a/clients/tests/test-client.check-on-disk/test_004-149.expected +++ b/clients/tests/test-client.check-on-disk/test_004-149.expected @@ -1,20 +1,98 @@ -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 +location: clients/tests/test-client.py:988:test_004()/149 +cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 1164 bytes +stdout: 2683 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 +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:[32m [0m +AP[1].SSID:[32mwlan0-ap-2[0m +AP[1].MODE:[32mInfra[0m +AP[1].CHAN:[32m1[0m +AP[1].RATE:[32m54 Mbit/s[0m +AP[1].SIGNAL:[32m92[0m +AP[1].BARS:[32m****[0m +AP[1].SECURITY:[32mWPA1 WPA2[0m +AP[2].IN-USE:[32m [0m +AP[2].SSID:[32mwlan0-ap-1[0m +AP[2].MODE:[32mInfra[0m +AP[2].CHAN:[32m1[0m +AP[2].RATE:[32m54 Mbit/s[0m +AP[2].SIGNAL:[32m81[0m +AP[2].BARS:[32m****[0m +AP[2].SECURITY:[32mWPA1 WPA2[0m +AP[3].IN-USE:[35m [0m +AP[3].SSID:[35mwlan0-ap-3[0m +AP[3].MODE:[35mInfra[0m +AP[3].CHAN:[35m1[0m +AP[3].RATE:[35m54 Mbit/s[0m +AP[3].SIGNAL:[35m55[0m +AP[3].BARS:[35m** [0m +AP[3].SECURITY:[35mWPA1 WPA2[0m +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-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected index 68b97c695c..aeb3f0588a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-150.expected +++ b/clients/tests/test-client.check-on-disk/test_004-150.expected @@ -1,20 +1,98 @@ -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 +location: clients/tests/test-client.py:988:test_004()/150 +cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1207 bytes +stdout: 2726 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 +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:[32m [0m +AP[1].SSID:[32mwlan0-ap-2[0m +AP[1].MODE:[32mInfrastruktura[0m +AP[1].CHAN:[32m1[0m +AP[1].RATE:[32m54 Mb/s[0m +AP[1].SIGNAL:[32m92[0m +AP[1].BARS:[32m****[0m +AP[1].SECURITY:[32mWPA1 WPA2[0m +AP[2].IN-USE:[32m [0m +AP[2].SSID:[32mwlan0-ap-1[0m +AP[2].MODE:[32mInfrastruktura[0m +AP[2].CHAN:[32m1[0m +AP[2].RATE:[32m54 Mb/s[0m +AP[2].SIGNAL:[32m81[0m +AP[2].BARS:[32m****[0m +AP[2].SECURITY:[32mWPA1 WPA2[0m +AP[3].IN-USE:[35m [0m +AP[3].SSID:[35mwlan0-ap-3[0m +AP[3].MODE:[35mInfrastruktura[0m +AP[3].CHAN:[35m1[0m +AP[3].RATE:[35m54 Mb/s[0m +AP[3].SIGNAL:[35m55[0m +AP[3].BARS:[35m** [0m +AP[3].SECURITY:[35mWPA1 WPA2[0m +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-151.expected b/clients/tests/test-client.check-on-disk/test_004-151.expected index 81040467d3..7112ba7593 100644 --- a/clients/tests/test-client.check-on-disk/test_004-151.expected +++ b/clients/tests/test-client.check-on-disk/test_004-151.expected @@ -1,79 +1,18 @@ -location: clients/tests/test-client.py:984:test_004()/151 -cmd: $NMCLI --mode multiline -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/151 +cmd: $NMCLI --mode tabular -f ALL device wifi list lang: C returncode: 0 -stdout: 3722 bytes +stdout: 1840 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 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: 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 +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-152.expected b/clients/tests/test-client.check-on-disk/test_004-152.expected index 20fd995709..e985f11d9d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-152.expected +++ b/clients/tests/test-client.check-on-disk/test_004-152.expected @@ -1,79 +1,18 @@ -location: clients/tests/test-client.py:984:test_004()/152 -cmd: $NMCLI --mode multiline -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/152 +cmd: $NMCLI --mode tabular -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 3770 bytes +stdout: 1898 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 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: 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 +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-153.expected b/clients/tests/test-client.check-on-disk/test_004-153.expected index 2f536c690d..db70fcb1c8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-153.expected +++ b/clients/tests/test-client.check-on-disk/test_004-153.expected @@ -1,43 +1,18 @@ -location: clients/tests/test-client.py:986:test_004()/153 -cmd: $NMCLI --mode multiline -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/153 +cmd: $NMCLI --mode tabular -f COMMON device wifi list lang: C returncode: 0 -stdout: 1478 bytes +stdout: 472 bytes >>> -IN-USE: -SSID: wlan1-ap-4 -MODE: Infra -CHAN: 1 -RATE: 54 Mbit/s -SIGNAL: 48 -BARS: ** -SECURITY: WPA1 WPA2 +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: 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 +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-154.expected b/clients/tests/test-client.check-on-disk/test_004-154.expected index 03dd63d2d2..8278a5cdea 100644 --- a/clients/tests/test-client.check-on-disk/test_004-154.expected +++ b/clients/tests/test-client.check-on-disk/test_004-154.expected @@ -1,43 +1,18 @@ -location: clients/tests/test-client.py:986:test_004()/154 -cmd: $NMCLI --mode multiline -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/154 +cmd: $NMCLI --mode tabular -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 1514 bytes +stdout: 522 bytes >>> -IN-USE: -SSID: wlan1-ap-4 -MODE: Infrastruktura -CHAN: 1 -RATE: 54 Mb/s -SIGNAL: 48 -BARS: ** -SECURITY: WPA1 WPA2 +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: 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 +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-155.expected b/clients/tests/test-client.check-on-disk/test_004-155.expected index 2eae8f16f3..b018b1746b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-155.expected +++ b/clients/tests/test-client.check-on-disk/test_004-155.expected @@ -1,79 +1,18 @@ -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 +location: clients/tests/test-client.py:975:test_004()/155 +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: 3722 bytes +stdout: 1840 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 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: 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 +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-156.expected b/clients/tests/test-client.check-on-disk/test_004-156.expected index 3de2d74036..5241e95d52 100644 --- a/clients/tests/test-client.check-on-disk/test_004-156.expected +++ b/clients/tests/test-client.check-on-disk/test_004-156.expected @@ -1,79 +1,18 @@ -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 +location: clients/tests/test-client.py:975:test_004()/156 +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: 3770 bytes +stdout: 1898 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 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: 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 +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-157.expected b/clients/tests/test-client.check-on-disk/test_004-157.expected index 6bde4e05e1..b13719fb87 100644 --- a/clients/tests/test-client.check-on-disk/test_004-157.expected +++ b/clients/tests/test-client.check-on-disk/test_004-157.expected @@ -1,26 +1,11 @@ -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 +location: clients/tests/test-client.py:977:test_004()/157 +cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 930 bytes +stdout: 568 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 +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-158.expected b/clients/tests/test-client.check-on-disk/test_004-158.expected index 4dda764aaa..bea10dfe62 100644 --- a/clients/tests/test-client.check-on-disk/test_004-158.expected +++ b/clients/tests/test-client.check-on-disk/test_004-158.expected @@ -1,26 +1,11 @@ -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 +location: clients/tests/test-client.py:977:test_004()/158 +cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 942 bytes +stdout: 586 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 +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-159.expected b/clients/tests/test-client.check-on-disk/test_004-159.expected index ab27a85c5e..cec9521a43 100644 --- a/clients/tests/test-client.check-on-disk/test_004-159.expected +++ b/clients/tests/test-client.check-on-disk/test_004-159.expected @@ -1,17 +1,11 @@ -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 +location: clients/tests/test-client.py:979:test_004()/159 +cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 369 bytes +stdout: 138 bytes >>> -IN-USE: -SSID: wlan0-ap-2 -MODE: Infra -CHAN: 1 -RATE: 54 Mbit/s -SIGNAL: 92 -BARS: **** -SECURITY: WPA1 WPA2 +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-160.expected b/clients/tests/test-client.check-on-disk/test_004-160.expected index 7b86148d69..e6e0ea171b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-160.expected +++ b/clients/tests/test-client.check-on-disk/test_004-160.expected @@ -1,17 +1,11 @@ -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 +location: clients/tests/test-client.py:979:test_004()/160 +cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 378 bytes +stdout: 154 bytes >>> -IN-USE: -SSID: wlan0-ap-2 -MODE: Infrastruktura -CHAN: 1 -RATE: 54 Mb/s -SIGNAL: 92 -BARS: **** -SECURITY: WPA1 WPA2 +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-161.expected b/clients/tests/test-client.check-on-disk/test_004-161.expected index 144e13e043..f3cedad304 100644 --- a/clients/tests/test-client.check-on-disk/test_004-161.expected +++ b/clients/tests/test-client.check-on-disk/test_004-161.expected @@ -1,26 +1,11 @@ -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 +location: clients/tests/test-client.py:982:test_004()/161 +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: 930 bytes +stdout: 568 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 +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-162.expected b/clients/tests/test-client.check-on-disk/test_004-162.expected index c494d83743..563c54b8d4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-162.expected +++ b/clients/tests/test-client.check-on-disk/test_004-162.expected @@ -1,26 +1,11 @@ -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 +location: clients/tests/test-client.py:982:test_004()/162 +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: 942 bytes +stdout: 586 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 +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-163.expected b/clients/tests/test-client.check-on-disk/test_004-163.expected index 342e916ed2..fad3d76496 100644 --- a/clients/tests/test-client.check-on-disk/test_004-163.expected +++ b/clients/tests/test-client.check-on-disk/test_004-163.expected @@ -1,98 +1,37 @@ -location: clients/tests/test-client.py:998:test_004()/163 -cmd: $NMCLI --mode multiline -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/163 +cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4600 bytes +stdout: 2760 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 +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-164.expected b/clients/tests/test-client.check-on-disk/test_004-164.expected index bd7da288f9..975c433ea2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-164.expected +++ b/clients/tests/test-client.check-on-disk/test_004-164.expected @@ -1,98 +1,37 @@ -location: clients/tests/test-client.py:998:test_004()/164 -cmd: $NMCLI --mode multiline -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/164 +cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4643 bytes +stdout: 2813 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 +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-165.expected b/clients/tests/test-client.check-on-disk/test_004-165.expected index b1c15fa7e1..e4d8abfeb2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-165.expected +++ b/clients/tests/test-client.check-on-disk/test_004-165.expected @@ -1,33 +1,35 @@ -location: clients/tests/test-client.py:1000:test_004()/165 -cmd: $NMCLI --mode multiline -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/165 +cmd: $NMCLI --mode tabular -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 1363 bytes +stdout: 980 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 +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-166.expected b/clients/tests/test-client.check-on-disk/test_004-166.expected index 798a3c7280..fee61d9842 100644 --- a/clients/tests/test-client.check-on-disk/test_004-166.expected +++ b/clients/tests/test-client.check-on-disk/test_004-166.expected @@ -1,33 +1,35 @@ -location: clients/tests/test-client.py:1000:test_004()/166 -cmd: $NMCLI --mode multiline -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/166 +cmd: $NMCLI --mode tabular -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1364 bytes +stdout: 981 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 +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-167.expected b/clients/tests/test-client.check-on-disk/test_004-167.expected index 47d0a820c4..cccf23a009 100644 --- a/clients/tests/test-client.check-on-disk/test_004-167.expected +++ b/clients/tests/test-client.check-on-disk/test_004-167.expected @@ -1,98 +1,37 @@ -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 +location: clients/tests/test-client.py:988:test_004()/167 +cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4600 bytes +stdout: 2760 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 +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-168.expected b/clients/tests/test-client.check-on-disk/test_004-168.expected index 0066041a6c..cff1e0f555 100644 --- a/clients/tests/test-client.check-on-disk/test_004-168.expected +++ b/clients/tests/test-client.check-on-disk/test_004-168.expected @@ -1,98 +1,37 @@ -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 +location: clients/tests/test-client.py:988:test_004()/168 +cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4643 bytes +stdout: 2813 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 +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-169.expected b/clients/tests/test-client.check-on-disk/test_004-169.expected index 8154f557a2..da98353789 100644 --- a/clients/tests/test-client.check-on-disk/test_004-169.expected +++ b/clients/tests/test-client.check-on-disk/test_004-169.expected @@ -1,92 +1,18 @@ -location: clients/tests/test-client.py:984:test_004()/169 -cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/169 +cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list lang: C returncode: 0 -stdout: 4678 bytes +stdout: 2452 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -=============================================================================== - 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: 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index f9e7f80edc..36a0b0aff2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-170.expected +++ b/clients/tests/test-client.check-on-disk/test_004-170.expected @@ -1,92 +1,18 @@ -location: clients/tests/test-client.py:984:test_004()/170 -cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/170 +cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 4744 bytes +stdout: 2510 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -=============================================================================== - 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: 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 3f8b9ff3d8..d24803d3d6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-171.expected +++ b/clients/tests/test-client.check-on-disk/test_004-171.expected @@ -1,56 +1,18 @@ -location: clients/tests/test-client.py:986:test_004()/171 -cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/171 +cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list lang: C returncode: 0 -stdout: 2434 bytes +stdout: 760 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 -------------------------------------------------------------------------------- +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +[35m [0m [35mwlan1-ap-4[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m -=============================================================================== - Wi-Fi scan list (wlan1) -=============================================================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -=============================================================================== - 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 -------------------------------------------------------------------------------- +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +[32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32m [0m [32mwlan0-ap-1[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35m [0m [35mwlan0-ap-3[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m <<< 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 index c4589f478a..1ef80d16c8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-172.expected +++ b/clients/tests/test-client.check-on-disk/test_004-172.expected @@ -1,56 +1,18 @@ -location: clients/tests/test-client.py:986:test_004()/172 -cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/172 +cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 2488 bytes +stdout: 810 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 -------------------------------------------------------------------------------- +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +[35m [0m [35mwlan1-ap-4[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m -=============================================================================== - Lista skanowania sieci Wi-Fi (wlan1) -=============================================================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -=============================================================================== - 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 -------------------------------------------------------------------------------- +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +[32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32m [0m [32mwlan0-ap-1[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35m [0m [35mwlan0-ap-3[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m <<< 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 index d365b53659..34877b3c2d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-173.expected +++ b/clients/tests/test-client.check-on-disk/test_004-173.expected @@ -1,92 +1,18 @@ -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 +location: clients/tests/test-client.py:975:test_004()/173 +cmd: $NMCLI --mode tabular --color yes -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 +stdout: 2452 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -=============================================================================== - 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: 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 359d92a6f2..2fc6960813 100644 --- a/clients/tests/test-client.check-on-disk/test_004-174.expected +++ b/clients/tests/test-client.check-on-disk/test_004-174.expected @@ -1,92 +1,18 @@ -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 +location: clients/tests/test-client.py:975:test_004()/174 +cmd: $NMCLI --mode tabular --color yes -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 +stdout: 2510 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m -=============================================================================== - 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: 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m <<< 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 index 26f6204eed..69ef25bd66 100644 --- a/clients/tests/test-client.check-on-disk/test_004-175.expected +++ b/clients/tests/test-client.check-on-disk/test_004-175.expected @@ -1,30 +1,11 @@ -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 +location: clients/tests/test-client.py:977:test_004()/175 +cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 1222 bytes +stdout: 721 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index eff16cb866..a676324386 100644 --- a/clients/tests/test-client.check-on-disk/test_004-176.expected +++ b/clients/tests/test-client.check-on-disk/test_004-176.expected @@ -1,30 +1,11 @@ -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 +location: clients/tests/test-client.py:977:test_004()/176 +cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1240 bytes +stdout: 739 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index 7b8b90007e..a0fd7e315b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-177.expected +++ b/clients/tests/test-client.check-on-disk/test_004-177.expected @@ -1,21 +1,11 @@ -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 +location: clients/tests/test-client.py:979:test_004()/177 +cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 661 bytes +stdout: 210 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 -------------------------------------------------------------------------------- +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +[32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m <<< 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 index 2597d07395..482cafcfa1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-178.expected +++ b/clients/tests/test-client.check-on-disk/test_004-178.expected @@ -1,21 +1,11 @@ -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 +location: clients/tests/test-client.py:979:test_004()/178 +cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 -stdout: 676 bytes +stdout: 226 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 -------------------------------------------------------------------------------- +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +[32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m <<< 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 index 26bc0af22f..a0cf1d22de 100644 --- a/clients/tests/test-client.check-on-disk/test_004-179.expected +++ b/clients/tests/test-client.check-on-disk/test_004-179.expected @@ -1,30 +1,11 @@ -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 +location: clients/tests/test-client.py:982:test_004()/179 +cmd: $NMCLI --mode tabular --color yes -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 +stdout: 721 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< 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 index b2a131978a..69af0871d6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-180.expected +++ b/clients/tests/test-client.check-on-disk/test_004-180.expected @@ -1,30 +1,11 @@ -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 +location: clients/tests/test-client.py:982:test_004()/180 +cmd: $NMCLI --mode tabular --color yes -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 +stdout: 739 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 -------------------------------------------------------------------------------- +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-181.expected b/clients/tests/test-client.check-on-disk/test_004-181.expected index 3b18e5b67e..d23e45ec8e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-181.expected +++ b/clients/tests/test-client.check-on-disk/test_004-181.expected @@ -1,112 +1,37 @@ -location: clients/tests/test-client.py:998:test_004()/181 -cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/181 +cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5691 bytes +stdout: 3003 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 -------------------------------------------------------------------------------- +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 +[32mAP[1][0m [32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32mAP[2][0m [32m [0m [32mwlan0-ap-1[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35mAP[3][0m [35m [0m [35mwlan0-ap-3[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +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-182.expected b/clients/tests/test-client.check-on-disk/test_004-182.expected index 66d96e741e..f2479a0e11 100644 --- a/clients/tests/test-client.check-on-disk/test_004-182.expected +++ b/clients/tests/test-client.check-on-disk/test_004-182.expected @@ -1,112 +1,37 @@ -location: clients/tests/test-client.py:998:test_004()/182 -cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/182 +cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5741 bytes +stdout: 3056 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 -------------------------------------------------------------------------------- +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 +[32mAP[1][0m [32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32mAP[2][0m [32m [0m [32mwlan0-ap-1[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35mAP[3][0m [35m [0m [35mwlan0-ap-3[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +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-183.expected b/clients/tests/test-client.check-on-disk/test_004-183.expected index ac5627ed43..70dbdce923 100644 --- a/clients/tests/test-client.check-on-disk/test_004-183.expected +++ b/clients/tests/test-client.check-on-disk/test_004-183.expected @@ -1,45 +1,35 @@ -location: clients/tests/test-client.py:1000:test_004()/183 -cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/183 +cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 2294 bytes +stdout: 980 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 -------------------------------------------------------------------------------- +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-184.expected b/clients/tests/test-client.check-on-disk/test_004-184.expected index a7d2dfa2fc..8c94c9eb9a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-184.expected +++ b/clients/tests/test-client.check-on-disk/test_004-184.expected @@ -1,45 +1,35 @@ -location: clients/tests/test-client.py:1000:test_004()/184 -cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/184 +cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2302 bytes +stdout: 981 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 -------------------------------------------------------------------------------- +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-185.expected b/clients/tests/test-client.check-on-disk/test_004-185.expected index ead7bffe83..5388190a7d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-185.expected +++ b/clients/tests/test-client.check-on-disk/test_004-185.expected @@ -1,112 +1,37 @@ -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 +location: clients/tests/test-client.py:988:test_004()/185 +cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5691 bytes +stdout: 3003 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 -------------------------------------------------------------------------------- +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 +[32mAP[1][0m [32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32mAP[2][0m [32m [0m [32mwlan0-ap-1[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35mAP[3][0m [35m [0m [35mwlan0-ap-3[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +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-186.expected b/clients/tests/test-client.check-on-disk/test_004-186.expected index f09d09c60d..eedb660ff7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-186.expected +++ b/clients/tests/test-client.check-on-disk/test_004-186.expected @@ -1,112 +1,37 @@ -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 +location: clients/tests/test-client.py:988:test_004()/186 +cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5741 bytes +stdout: 3056 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 -------------------------------------------------------------------------------- +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 +[32mAP[1][0m [32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32mAP[2][0m [32m [0m [32mwlan0-ap-1[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35mAP[3][0m [35m [0m [35mwlan0-ap-3[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +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-187.expected b/clients/tests/test-client.check-on-disk/test_004-187.expected index 4feaad4ff6..53e7d54da4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-187.expected +++ b/clients/tests/test-client.check-on-disk/test_004-187.expected @@ -1,79 +1,30 @@ -location: clients/tests/test-client.py:984:test_004()/187 -cmd: $NMCLI --mode multiline --terse -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/187 +cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list lang: C returncode: 0 -stdout: 1470 bytes +stdout: 2872 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 +=========================== + 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------- -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 +=========================== + 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-188.expected b/clients/tests/test-client.check-on-disk/test_004-188.expected index d4dfac8b9e..f5f3944aba 100644 --- a/clients/tests/test-client.check-on-disk/test_004-188.expected +++ b/clients/tests/test-client.check-on-disk/test_004-188.expected @@ -1,79 +1,30 @@ -location: clients/tests/test-client.py:984:test_004()/188 -cmd: $NMCLI --mode multiline --terse -f ALL device wifi list +location: clients/tests/test-client.py:970:test_004()/188 +cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 1518 bytes +stdout: 3100 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 +======================================== + 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -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 +======================================== + 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-189.expected b/clients/tests/test-client.check-on-disk/test_004-189.expected index e707c55029..ca6a89ddf3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-189.expected +++ b/clients/tests/test-client.check-on-disk/test_004-189.expected @@ -1,43 +1,30 @@ -location: clients/tests/test-client.py:986:test_004()/189 -cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/189 +cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list lang: C returncode: 0 -stdout: 390 bytes +stdout: 996 bytes >>> -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) +=========================== +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 +----------------------------------------------------------------------------------- -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 +=========================== + 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-190.expected b/clients/tests/test-client.check-on-disk/test_004-190.expected index 720cd91db2..2512b4d600 100644 --- a/clients/tests/test-client.check-on-disk/test_004-190.expected +++ b/clients/tests/test-client.check-on-disk/test_004-190.expected @@ -1,43 +1,30 @@ -location: clients/tests/test-client.py:986:test_004()/190 -cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list +location: clients/tests/test-client.py:972:test_004()/190 +cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 -stdout: 426 bytes +stdout: 1216 bytes >>> -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) +======================================== +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 +------------------------------------------------------------------------------------------------ -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 +======================================== + 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-191.expected b/clients/tests/test-client.check-on-disk/test_004-191.expected index ab3f13b5bd..8d9a884bad 100644 --- a/clients/tests/test-client.check-on-disk/test_004-191.expected +++ b/clients/tests/test-client.check-on-disk/test_004-191.expected @@ -1,79 +1,30 @@ -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 +location: clients/tests/test-client.py:975:test_004()/191 +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: 1470 bytes +stdout: 2872 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 +=========================== + 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------- -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 +=========================== + 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-192.expected b/clients/tests/test-client.check-on-disk/test_004-192.expected index d044881733..77e9b48870 100644 --- a/clients/tests/test-client.check-on-disk/test_004-192.expected +++ b/clients/tests/test-client.check-on-disk/test_004-192.expected @@ -1,79 +1,30 @@ -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 +location: clients/tests/test-client.py:975:test_004()/192 +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: 1518 bytes +stdout: 3100 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 +======================================== + 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -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 +======================================== + 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-193.expected b/clients/tests/test-client.check-on-disk/test_004-193.expected index 18ace0c55a..c5f9dac251 100644 --- a/clients/tests/test-client.check-on-disk/test_004-193.expected +++ b/clients/tests/test-client.check-on-disk/test_004-193.expected @@ -1,26 +1,15 @@ -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 +location: clients/tests/test-client.py:977:test_004()/193 +cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 367 bytes +stdout: 962 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 +=========================== + 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-194.expected b/clients/tests/test-client.check-on-disk/test_004-194.expected index 1604a8bfd9..1437017d58 100644 --- a/clients/tests/test-client.check-on-disk/test_004-194.expected +++ b/clients/tests/test-client.check-on-disk/test_004-194.expected @@ -1,26 +1,15 @@ -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 +location: clients/tests/test-client.py:977:test_004()/194 +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: 379 bytes +stdout: 1039 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 +======================================== + 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-195.expected b/clients/tests/test-client.check-on-disk/test_004-195.expected index 89f90be606..6fce301e7e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-195.expected +++ b/clients/tests/test-client.check-on-disk/test_004-195.expected @@ -1,17 +1,15 @@ -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 +location: clients/tests/test-client.py:979:test_004()/195 +cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 -stdout: 97 bytes +stdout: 317 bytes >>> -IN-USE: -SSID:wlan0-ap-2 -MODE:Infra -CHAN:1 -RATE:54 Mbit/s -SIGNAL:92 -BARS:**** -SECURITY:WPA1 WPA2 +=========================== + 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-196.expected b/clients/tests/test-client.check-on-disk/test_004-196.expected index d2f2803c02..fdcf4cbb3e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-196.expected +++ b/clients/tests/test-client.check-on-disk/test_004-196.expected @@ -1,17 +1,15 @@ -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 +location: clients/tests/test-client.py:979:test_004()/196 +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: 106 bytes +stdout: 392 bytes >>> -IN-USE: -SSID:wlan0-ap-2 -MODE:Infrastruktura -CHAN:1 -RATE:54 Mb/s -SIGNAL:92 -BARS:**** -SECURITY:WPA1 WPA2 +======================================== + 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-197.expected b/clients/tests/test-client.check-on-disk/test_004-197.expected index 2c0e1a2e77..62b7df8fa8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-197.expected +++ b/clients/tests/test-client.check-on-disk/test_004-197.expected @@ -1,26 +1,15 @@ -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 +location: clients/tests/test-client.py:982:test_004()/197 +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: 367 bytes +stdout: 962 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 +=========================== + 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-198.expected b/clients/tests/test-client.check-on-disk/test_004-198.expected index b639cf8152..af6bedc518 100644 --- a/clients/tests/test-client.check-on-disk/test_004-198.expected +++ b/clients/tests/test-client.check-on-disk/test_004-198.expected @@ -1,26 +1,15 @@ -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 +location: clients/tests/test-client.py:982:test_004()/198 +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: 379 bytes +stdout: 1039 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 +======================================== + 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-199.expected b/clients/tests/test-client.check-on-disk/test_004-199.expected index 01bbbc726c..ed7a8e5ac1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-199.expected +++ b/clients/tests/test-client.check-on-disk/test_004-199.expected @@ -1,98 +1,49 @@ -location: clients/tests/test-client.py:998:test_004()/199 -cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/199 +cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2467 bytes +stdout: 4148 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 +========================== + 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-200.expected b/clients/tests/test-client.check-on-disk/test_004-200.expected index 331d875b3a..ef7399f40e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-200.expected +++ b/clients/tests/test-client.check-on-disk/test_004-200.expected @@ -1,98 +1,49 @@ -location: clients/tests/test-client.py:998:test_004()/200 -cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 +location: clients/tests/test-client.py:984:test_004()/200 +cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2510 bytes +stdout: 4246 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 +=================================== + 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-201.expected b/clients/tests/test-client.check-on-disk/test_004-201.expected index 4584e5022e..f6a75b5a32 100644 --- a/clients/tests/test-client.check-on-disk/test_004-201.expected +++ b/clients/tests/test-client.check-on-disk/test_004-201.expected @@ -1,33 +1,47 @@ -location: clients/tests/test-client.py:1000:test_004()/201 -cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/201 +cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 739 bytes +stdout: 1554 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 +========================== + 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-202.expected b/clients/tests/test-client.check-on-disk/test_004-202.expected index 053e07f949..f41a8c1f7b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-202.expected +++ b/clients/tests/test-client.check-on-disk/test_004-202.expected @@ -1,33 +1,47 @@ -location: clients/tests/test-client.py:1000:test_004()/202 -cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 +location: clients/tests/test-client.py:986:test_004()/202 +cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 740 bytes +stdout: 1584 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 +=================================== + 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-203.expected b/clients/tests/test-client.check-on-disk/test_004-203.expected index 1eb7293249..3eff1ecd85 100644 --- a/clients/tests/test-client.check-on-disk/test_004-203.expected +++ b/clients/tests/test-client.check-on-disk/test_004-203.expected @@ -1,98 +1,49 @@ -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 +location: clients/tests/test-client.py:988:test_004()/203 +cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2467 bytes +stdout: 4148 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 +========================== + 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-204.expected b/clients/tests/test-client.check-on-disk/test_004-204.expected index e062a79969..780d2e1257 100644 --- a/clients/tests/test-client.check-on-disk/test_004-204.expected +++ b/clients/tests/test-client.check-on-disk/test_004-204.expected @@ -1,98 +1,49 @@ -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 +location: clients/tests/test-client.py:988:test_004()/204 +cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2510 bytes +stdout: 4246 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 +=================================== + 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-205.expected b/clients/tests/test-client.check-on-disk/test_004-205.expected new file mode 100644 index 0000000000..1a3eca4498 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-205.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:970:test_004()/205 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list +lang: C +returncode: 0 +stdout: 3484 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + +=========================== + 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-206.expected b/clients/tests/test-client.check-on-disk/test_004-206.expected new file mode 100644 index 0000000000..b8bdb3683b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-206.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:970:test_004()/206 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3712 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + +======================================== + 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-207.expected b/clients/tests/test-client.check-on-disk/test_004-207.expected new file mode 100644 index 0000000000..25b8b4507f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-207.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:972:test_004()/207 +cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 1284 bytes +>>> +=========================== + Wi-Fi scan list (wlan1) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ +[35m [0m [35mwlan1-ap-4[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m + +=========================== + 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 +------------------------------------------------------------------------------------------------ +[32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32m [0m [32mwlan0-ap-1[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35m [0m [35mwlan0-ap-3[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-208.expected b/clients/tests/test-client.check-on-disk/test_004-208.expected new file mode 100644 index 0000000000..d575849223 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-208.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:972:test_004()/208 +cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1504 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan1) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +-------------------------------------------------------------------------------------------------------------------- +[35m [0m [35mwlan1-ap-4[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m + +======================================== + 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 +-------------------------------------------------------------------------------------------------------------------- +[32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32m [0m [32mwlan0-ap-1[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35m [0m [35mwlan0-ap-3[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-209.expected b/clients/tests/test-client.check-on-disk/test_004-209.expected new file mode 100644 index 0000000000..f3fdfba5d7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-209.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:975:test_004()/209 +cmd: $NMCLI --mode tabular --pretty --color yes -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: 3484 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + +=========================== + 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfra[0m [35m1[0m [35m2412 MHz[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mno[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-210.expected b/clients/tests/test-client.check-on-disk/test_004-210.expected new file mode 100644 index 0000000000..efe96b2a62 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-210.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:975:test_004()/210 +cmd: $NMCLI --mode tabular --pretty --color yes -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: 3712 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[35mAP[1][0m [35mwlan1-ap-4[0m [35m776C616E312D61702D34[0m [35m94:2B:E8:F6:D2:86[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m48[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan1[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + +======================================== + 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m [32mwlan0-ap-1[0m [32m776C616E302D61702D31[0m [32m61:95:77:AC:1E:4C[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m [35mwlan0-ap-3[0m [35m776C616E302D61702D33[0m [35m9B:F6:B7:EC:97:76[0m [35mInfrastruktura[0m [35m1[0m [35m2412 MHz[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [35mwlan0[0m [35mnie[0m [35m [0m [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-211.expected b/clients/tests/test-client.check-on-disk/test_004-211.expected new file mode 100644 index 0000000000..11593832c6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-211.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:977:test_004()/211 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 1115 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-212.expected b/clients/tests/test-client.check-on-disk/test_004-212.expected new file mode 100644 index 0000000000..8c3e2081ae --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-212.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:977:test_004()/212 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1192 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-213.expected b/clients/tests/test-client.check-on-disk/test_004-213.expected new file mode 100644 index 0000000000..cc808f42d4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-213.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:979:test_004()/213 +cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 389 bytes +>>> +=========================== + Wi-Fi scan list (wlan0) +=========================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +------------------------------------------------------------------------------------------------ +[32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-214.expected b/clients/tests/test-client.check-on-disk/test_004-214.expected new file mode 100644 index 0000000000..f1f4e60ec6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-214.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:979:test_004()/214 +cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 464 bytes +>>> +======================================== + Lista skanowania sieci Wi-Fi (wlan0) +======================================== +IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +-------------------------------------------------------------------------------------------------------------------- +[32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-215.expected b/clients/tests/test-client.check-on-disk/test_004-215.expected new file mode 100644 index 0000000000..a47d1506d1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-215.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:982:test_004()/215 +cmd: $NMCLI --mode tabular --pretty --color yes -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: 1115 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 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfra[0m [32m1[0m [32m2412 MHz[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mno[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-216.expected b/clients/tests/test-client.check-on-disk/test_004-216.expected new file mode 100644 index 0000000000..0d4b4804ef --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-216.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:982:test_004()/216 +cmd: $NMCLI --mode tabular --pretty --color yes -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: 1192 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 +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +[32mAP[1][0m [32mwlan0-ap-2[0m [32m776C616E302D61702D32[0m [32mC0:E2:BE:E8:EF:B6[0m [32mInfrastruktura[0m [32m1[0m [32m2412 MHz[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m [32mwlan0[0m [32mnie[0m [32m [0m [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-217.expected b/clients/tests/test-client.check-on-disk/test_004-217.expected new file mode 100644 index 0000000000..59734df68e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-217.expected @@ -0,0 +1,52 @@ +location: clients/tests/test-client.py:984:test_004()/217 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 4391 bytes +>>> +========================== + 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 +---------------------------------------------------------------------------- +[32mAP[1][0m [32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32mAP[2][0m [32m [0m [32mwlan0-ap-1[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35mAP[3][0m [35m [0m [35mwlan0-ap-3[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +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-218.expected b/clients/tests/test-client.check-on-disk/test_004-218.expected new file mode 100644 index 0000000000..16f08c99d4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-218.expected @@ -0,0 +1,52 @@ +location: clients/tests/test-client.py:984:test_004()/218 +cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4489 bytes +>>> +=================================== + 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 +----------------------------------------------------------------------------------- +[32mAP[1][0m [32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32mAP[2][0m [32m [0m [32mwlan0-ap-1[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35mAP[3][0m [35m [0m [35mwlan0-ap-3[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +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-219.expected b/clients/tests/test-client.check-on-disk/test_004-219.expected new file mode 100644 index 0000000000..e1559e1e6f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-219.expected @@ -0,0 +1,50 @@ +location: clients/tests/test-client.py:986:test_004()/219 +cmd: $NMCLI --mode tabular --pretty --color yes -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-220.expected b/clients/tests/test-client.check-on-disk/test_004-220.expected new file mode 100644 index 0000000000..d014f53302 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-220.expected @@ -0,0 +1,50 @@ +location: clients/tests/test-client.py:986:test_004()/220 +cmd: $NMCLI --mode tabular --pretty --color yes -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-221.expected b/clients/tests/test-client.check-on-disk/test_004-221.expected new file mode 100644 index 0000000000..8f50cabe4e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-221.expected @@ -0,0 +1,52 @@ +location: clients/tests/test-client.py:988:test_004()/221 +cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 4391 bytes +>>> +========================== + 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 +---------------------------------------------------------------------------- +[32mAP[1][0m [32m [0m [32mwlan0-ap-2[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32mAP[2][0m [32m [0m [32mwlan0-ap-1[0m [32mInfra[0m [32m1[0m [32m54 Mbit/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35mAP[3][0m [35m [0m [35mwlan0-ap-3[0m [35mInfra[0m [35m1[0m [35m54 Mbit/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +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-222.expected b/clients/tests/test-client.check-on-disk/test_004-222.expected new file mode 100644 index 0000000000..a577b116ad --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-222.expected @@ -0,0 +1,52 @@ +location: clients/tests/test-client.py:988:test_004()/222 +cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4489 bytes +>>> +=================================== + 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 +----------------------------------------------------------------------------------- +[32mAP[1][0m [32m [0m [32mwlan0-ap-2[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m92[0m [32m****[0m [32mWPA1 WPA2[0m +[32mAP[2][0m [32m [0m [32mwlan0-ap-1[0m [32mInfrastruktura[0m [32m1[0m [32m54 Mb/s[0m [32m81[0m [32m****[0m [32mWPA1 WPA2[0m +[35mAP[3][0m [35m [0m [35mwlan0-ap-3[0m [35mInfrastruktura[0m [35m1[0m [35m54 Mb/s[0m [35m55[0m [35m** [0m [35mWPA1 WPA2[0m + +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-223.expected b/clients/tests/test-client.check-on-disk/test_004-223.expected new file mode 100644 index 0000000000..6e5be968b7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-223.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:970:test_004()/223 +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-224.expected b/clients/tests/test-client.check-on-disk/test_004-224.expected new file mode 100644 index 0000000000..165a664f99 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-224.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:970:test_004()/224 +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-225.expected b/clients/tests/test-client.check-on-disk/test_004-225.expected new file mode 100644 index 0000000000..cc0e738b1b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-225.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:972:test_004()/225 +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-226.expected b/clients/tests/test-client.check-on-disk/test_004-226.expected new file mode 100644 index 0000000000..843a7b75a1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-226.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:972:test_004()/226 +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-227.expected b/clients/tests/test-client.check-on-disk/test_004-227.expected new file mode 100644 index 0000000000..306e5d92d2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-227.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:975:test_004()/227 +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-228.expected b/clients/tests/test-client.check-on-disk/test_004-228.expected new file mode 100644 index 0000000000..4391a7eb03 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-228.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:975:test_004()/228 +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-229.expected b/clients/tests/test-client.check-on-disk/test_004-229.expected new file mode 100644 index 0000000000..655110eac4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-229.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:977:test_004()/229 +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-230.expected b/clients/tests/test-client.check-on-disk/test_004-230.expected new file mode 100644 index 0000000000..2be9ecb875 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-230.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:977:test_004()/230 +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-231.expected b/clients/tests/test-client.check-on-disk/test_004-231.expected new file mode 100644 index 0000000000..8dd9c61e53 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-231.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:979:test_004()/231 +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-232.expected b/clients/tests/test-client.check-on-disk/test_004-232.expected new file mode 100644 index 0000000000..440043b530 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-232.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:979:test_004()/232 +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-233.expected b/clients/tests/test-client.check-on-disk/test_004-233.expected new file mode 100644 index 0000000000..dcece1275c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-233.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:982:test_004()/233 +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-234.expected b/clients/tests/test-client.check-on-disk/test_004-234.expected new file mode 100644 index 0000000000..ca24233dcb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-234.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:982:test_004()/234 +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-235.expected b/clients/tests/test-client.check-on-disk/test_004-235.expected new file mode 100644 index 0000000000..e13b008d0d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-235.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:984:test_004()/235 +cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 1164 bytes +>>> +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-236.expected b/clients/tests/test-client.check-on-disk/test_004-236.expected new file mode 100644 index 0000000000..b35e6f1e42 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-236.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:984:test_004()/236 +cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1207 bytes +>>> +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-237.expected b/clients/tests/test-client.check-on-disk/test_004-237.expected new file mode 100644 index 0000000000..b7f4bcf277 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-237.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:986:test_004()/237 +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-238.expected b/clients/tests/test-client.check-on-disk/test_004-238.expected new file mode 100644 index 0000000000..dd78d13094 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-238.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:986:test_004()/238 +cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 447 bytes +>>> +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-239.expected b/clients/tests/test-client.check-on-disk/test_004-239.expected new file mode 100644 index 0000000000..714add3ef7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-239.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:988:test_004()/239 +cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 1164 bytes +>>> +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-240.expected b/clients/tests/test-client.check-on-disk/test_004-240.expected new file mode 100644 index 0000000000..b246d9a043 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-240.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:988:test_004()/240 +cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1207 bytes +>>> +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-241.expected b/clients/tests/test-client.check-on-disk/test_004-241.expected new file mode 100644 index 0000000000..6ab04ae756 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-241.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:970:test_004()/241 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list +lang: C +returncode: 0 +stdout: 1634 bytes +>>> +[35mAP[1][0m:[35mwlan1-ap-4[0m:[35m776C616E312D61702D34[0m:[35m94\:2B\:E8\:F6\:D2\:86[0m:[35mInfra[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mbit/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan1[0m:[35mno[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m:[32mwlan0-ap-1[0m:[32m776C616E302D61702D31[0m:[32m61\:95\:77\:AC\:1E\:4C[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m:[35mwlan0-ap-3[0m:[35m776C616E302D61702D33[0m:[35m9B\:F6\:B7\:EC\:97\:76[0m:[35mInfra[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mbit/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan0[0m:[35mno[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-242.expected b/clients/tests/test-client.check-on-disk/test_004-242.expected new file mode 100644 index 0000000000..bb7760a4ff --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-242.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:970:test_004()/242 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1682 bytes +>>> +[35mAP[1][0m:[35mwlan1-ap-4[0m:[35m776C616E312D61702D34[0m:[35m94\:2B\:E8\:F6\:D2\:86[0m:[35mInfrastruktura[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mb/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan1[0m:[35mnie[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m:[32mwlan0-ap-1[0m:[32m776C616E302D61702D31[0m:[32m61\:95\:77\:AC\:1E\:4C[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m:[35mwlan0-ap-3[0m:[35m776C616E302D61702D33[0m:[35m9B\:F6\:B7\:EC\:97\:76[0m:[35mInfrastruktura[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mb/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan0[0m:[35mnie[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-243.expected b/clients/tests/test-client.check-on-disk/test_004-243.expected new file mode 100644 index 0000000000..f1c52313a3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-243.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:972:test_004()/243 +cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 486 bytes +>>> +[35m [0m:[35mwlan1-ap-4[0m:[35mInfra[0m:[35m1[0m:[35m54 Mbit/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m + + +[32m [0m:[32mwlan0-ap-2[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m +[32m [0m:[32mwlan0-ap-1[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m +[35m [0m:[35mwlan0-ap-3[0m:[35mInfra[0m:[35m1[0m:[35m54 Mbit/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-244.expected b/clients/tests/test-client.check-on-disk/test_004-244.expected new file mode 100644 index 0000000000..c3e0fcddef --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-244.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:972:test_004()/244 +cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 522 bytes +>>> +[35m [0m:[35mwlan1-ap-4[0m:[35mInfrastruktura[0m:[35m1[0m:[35m54 Mb/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m + + +[32m [0m:[32mwlan0-ap-2[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m +[32m [0m:[32mwlan0-ap-1[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m +[35m [0m:[35mwlan0-ap-3[0m:[35mInfrastruktura[0m:[35m1[0m:[35m54 Mb/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-245.expected b/clients/tests/test-client.check-on-disk/test_004-245.expected new file mode 100644 index 0000000000..9901f2bd95 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-245.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:975:test_004()/245 +cmd: $NMCLI --mode tabular --terse --color yes -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: 1634 bytes +>>> +[35mAP[1][0m:[35mwlan1-ap-4[0m:[35m776C616E312D61702D34[0m:[35m94\:2B\:E8\:F6\:D2\:86[0m:[35mInfra[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mbit/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan1[0m:[35mno[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m:[32mwlan0-ap-1[0m:[32m776C616E302D61702D31[0m:[32m61\:95\:77\:AC\:1E\:4C[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m:[35mwlan0-ap-3[0m:[35m776C616E302D61702D33[0m:[35m9B\:F6\:B7\:EC\:97\:76[0m:[35mInfra[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mbit/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan0[0m:[35mno[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-246.expected b/clients/tests/test-client.check-on-disk/test_004-246.expected new file mode 100644 index 0000000000..7b4ca1c3ce --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-246.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:975:test_004()/246 +cmd: $NMCLI --mode tabular --terse --color yes -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: 1682 bytes +>>> +[35mAP[1][0m:[35mwlan1-ap-4[0m:[35m776C616E312D61702D34[0m:[35m94\:2B\:E8\:F6\:D2\:86[0m:[35mInfrastruktura[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mb/s[0m:[35m48[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan1[0m:[35mnie[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +[32mAP[2][0m:[32mwlan0-ap-1[0m:[32m776C616E302D61702D31[0m:[32m61\:95\:77\:AC\:1E\:4C[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +[35mAP[3][0m:[35mwlan0-ap-3[0m:[35m776C616E302D61702D33[0m:[35m9B\:F6\:B7\:EC\:97\:76[0m:[35mInfrastruktura[0m:[35m1[0m:[35m2412 MHz[0m:[35m54 Mb/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[35mwlan0[0m:[35mnie[0m:[35m [0m:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-247.expected b/clients/tests/test-client.check-on-disk/test_004-247.expected new file mode 100644 index 0000000000..1263cd213d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-247.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:977:test_004()/247 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 408 bytes +>>> +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-248.expected b/clients/tests/test-client.check-on-disk/test_004-248.expected new file mode 100644 index 0000000000..e0ec0c297d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-248.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:977:test_004()/248 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 420 bytes +>>> +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-249.expected b/clients/tests/test-client.check-on-disk/test_004-249.expected new file mode 100644 index 0000000000..de069ea52e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-249.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:979:test_004()/249 +cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 121 bytes +>>> +[32m [0m:[32mwlan0-ap-2[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-250.expected b/clients/tests/test-client.check-on-disk/test_004-250.expected new file mode 100644 index 0000000000..19b3582c5c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-250.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:979:test_004()/250 +cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 130 bytes +>>> +[32m [0m:[32mwlan0-ap-2[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-251.expected b/clients/tests/test-client.check-on-disk/test_004-251.expected new file mode 100644 index 0000000000..2ed951fb9e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-251.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:982:test_004()/251 +cmd: $NMCLI --mode tabular --terse --color yes -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: 408 bytes +>>> +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfra[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mno[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-252.expected b/clients/tests/test-client.check-on-disk/test_004-252.expected new file mode 100644 index 0000000000..d35cdd3a8f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-252.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:982:test_004()/252 +cmd: $NMCLI --mode tabular --terse --color yes -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: 420 bytes +>>> +[32mAP[1][0m:[32mwlan0-ap-2[0m:[32m776C616E302D61702D32[0m:[32mC0\:E2\:BE\:E8\:EF\:B6[0m:[32mInfrastruktura[0m:[32m1[0m:[32m2412 MHz[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m:[32mwlan0[0m:[32mnie[0m:[32m [0m:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-253.expected b/clients/tests/test-client.check-on-disk/test_004-253.expected new file mode 100644 index 0000000000..1615f87ada --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-253.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:984:test_004()/253 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 1407 bytes +>>> +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 +[32mAP[1][0m:[32m [0m:[32mwlan0-ap-2[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m +[32mAP[2][0m:[32m [0m:[32mwlan0-ap-1[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m +[35mAP[3][0m:[35m [0m:[35mwlan0-ap-3[0m:[35mInfra[0m:[35m1[0m:[35m54 Mbit/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m +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-254.expected b/clients/tests/test-client.check-on-disk/test_004-254.expected new file mode 100644 index 0000000000..01a7767ece --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-254.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:984:test_004()/254 +cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1450 bytes +>>> +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 +[32mAP[1][0m:[32m [0m:[32mwlan0-ap-2[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m +[32mAP[2][0m:[32m [0m:[32mwlan0-ap-1[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m +[35mAP[3][0m:[35m [0m:[35mwlan0-ap-3[0m:[35mInfrastruktura[0m:[35m1[0m:[35m54 Mb/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m +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-255.expected b/clients/tests/test-client.check-on-disk/test_004-255.expected new file mode 100644 index 0000000000..f409fff9cb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-255.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:986:test_004()/255 +cmd: $NMCLI --mode tabular --terse --color yes -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-256.expected b/clients/tests/test-client.check-on-disk/test_004-256.expected new file mode 100644 index 0000000000..c29a93b849 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-256.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:986:test_004()/256 +cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 447 bytes +>>> +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-257.expected b/clients/tests/test-client.check-on-disk/test_004-257.expected new file mode 100644 index 0000000000..8858c7ed49 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-257.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:988:test_004()/257 +cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 1407 bytes +>>> +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 +[32mAP[1][0m:[32m [0m:[32mwlan0-ap-2[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m +[32mAP[2][0m:[32m [0m:[32mwlan0-ap-1[0m:[32mInfra[0m:[32m1[0m:[32m54 Mbit/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m +[35mAP[3][0m:[35m [0m:[35mwlan0-ap-3[0m:[35mInfra[0m:[35m1[0m:[35m54 Mbit/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m +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-258.expected b/clients/tests/test-client.check-on-disk/test_004-258.expected new file mode 100644 index 0000000000..f56c1906be --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-258.expected @@ -0,0 +1,23 @@ +location: clients/tests/test-client.py:988:test_004()/258 +cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1450 bytes +>>> +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 +[32mAP[1][0m:[32m [0m:[32mwlan0-ap-2[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m92[0m:[32m****[0m:[32mWPA1 WPA2[0m +[32mAP[2][0m:[32m [0m:[32mwlan0-ap-1[0m:[32mInfrastruktura[0m:[32m1[0m:[32m54 Mb/s[0m:[32m81[0m:[32m****[0m:[32mWPA1 WPA2[0m +[35mAP[3][0m:[35m [0m:[35mwlan0-ap-3[0m:[35mInfrastruktura[0m:[35m1[0m:[35m54 Mb/s[0m:[35m55[0m:[35m** [0m:[35mWPA1 WPA2[0m +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-259.expected b/clients/tests/test-client.check-on-disk/test_004-259.expected new file mode 100644 index 0000000000..b37abdfd4c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-259.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:970:test_004()/259 +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-260.expected b/clients/tests/test-client.check-on-disk/test_004-260.expected new file mode 100644 index 0000000000..32e566a937 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-260.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:970:test_004()/260 +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-261.expected b/clients/tests/test-client.check-on-disk/test_004-261.expected new file mode 100644 index 0000000000..0caaf74e35 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-261.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:972:test_004()/261 +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-262.expected b/clients/tests/test-client.check-on-disk/test_004-262.expected new file mode 100644 index 0000000000..0abca79ec9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-262.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:972:test_004()/262 +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-263.expected b/clients/tests/test-client.check-on-disk/test_004-263.expected new file mode 100644 index 0000000000..3966a9d57a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-263.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:975:test_004()/263 +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-264.expected b/clients/tests/test-client.check-on-disk/test_004-264.expected new file mode 100644 index 0000000000..bdd21d8993 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-264.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:975:test_004()/264 +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-265.expected b/clients/tests/test-client.check-on-disk/test_004-265.expected new file mode 100644 index 0000000000..d3cb3901fd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-265.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:977:test_004()/265 +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-266.expected b/clients/tests/test-client.check-on-disk/test_004-266.expected new file mode 100644 index 0000000000..6e3fc8a1f6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-266.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:977:test_004()/266 +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-267.expected b/clients/tests/test-client.check-on-disk/test_004-267.expected new file mode 100644 index 0000000000..9fc3b18965 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-267.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:979:test_004()/267 +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-268.expected b/clients/tests/test-client.check-on-disk/test_004-268.expected new file mode 100644 index 0000000000..a2eea56094 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-268.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:979:test_004()/268 +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-269.expected b/clients/tests/test-client.check-on-disk/test_004-269.expected new file mode 100644 index 0000000000..8f830e7e4e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-269.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:982:test_004()/269 +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-270.expected b/clients/tests/test-client.check-on-disk/test_004-270.expected new file mode 100644 index 0000000000..579b623457 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-270.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:982:test_004()/270 +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-271.expected b/clients/tests/test-client.check-on-disk/test_004-271.expected new file mode 100644 index 0000000000..1b29d1dcd6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-271.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:984:test_004()/271 +cmd: $NMCLI --mode multiline -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 4600 bytes +>>> +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-272.expected b/clients/tests/test-client.check-on-disk/test_004-272.expected new file mode 100644 index 0000000000..80a931a9d0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-272.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:984:test_004()/272 +cmd: $NMCLI --mode multiline -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4643 bytes +>>> +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-273.expected b/clients/tests/test-client.check-on-disk/test_004-273.expected new file mode 100644 index 0000000000..5546afa6f7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-273.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:986:test_004()/273 +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-274.expected b/clients/tests/test-client.check-on-disk/test_004-274.expected new file mode 100644 index 0000000000..7a0f9b55b7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-274.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:986:test_004()/274 +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-275.expected b/clients/tests/test-client.check-on-disk/test_004-275.expected new file mode 100644 index 0000000000..8b52dd9334 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-275.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:988:test_004()/275 +cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 4600 bytes +>>> +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-276.expected b/clients/tests/test-client.check-on-disk/test_004-276.expected new file mode 100644 index 0000000000..0a0cf672a7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-276.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:988:test_004()/276 +cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4643 bytes +>>> +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-277.expected b/clients/tests/test-client.check-on-disk/test_004-277.expected new file mode 100644 index 0000000000..fd04cf3f38 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-277.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:970:test_004()/277 +cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list +lang: C +returncode: 0 +stdout: 4334 bytes +>>> +NAME: [35mAP[1][0m +SSID: [35mwlan1-ap-4[0m +SSID-HEX: [35m776C616E312D61702D34[0m +BSSID: [35m94:2B:E8:F6:D2:86[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan1[0m +ACTIVE: [35mno[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +NAME: [32mAP[2][0m +SSID: [32mwlan0-ap-1[0m +SSID-HEX: [32m776C616E302D61702D31[0m +BSSID: [32m61:95:77:AC:1E:4C[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +NAME: [35mAP[3][0m +SSID: [35mwlan0-ap-3[0m +SSID-HEX: [35m776C616E302D61702D33[0m +BSSID: [35m9B:F6:B7:EC:97:76[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan0[0m +ACTIVE: [35mno[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-278.expected b/clients/tests/test-client.check-on-disk/test_004-278.expected new file mode 100644 index 0000000000..5e6f601c9f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-278.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:970:test_004()/278 +cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4382 bytes +>>> +NAME: [35mAP[1][0m +SSID: [35mwlan1-ap-4[0m +SSID-HEX: [35m776C616E312D61702D34[0m +BSSID: [35m94:2B:E8:F6:D2:86[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan1[0m +ACTIVE: [35mnie[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +NAME: [32mAP[2][0m +SSID: [32mwlan0-ap-1[0m +SSID-HEX: [32m776C616E302D61702D31[0m +BSSID: [32m61:95:77:AC:1E:4C[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +NAME: [35mAP[3][0m +SSID: [35mwlan0-ap-3[0m +SSID-HEX: [35m776C616E302D61702D33[0m +BSSID: [35m9B:F6:B7:EC:97:76[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan0[0m +ACTIVE: [35mnie[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-279.expected b/clients/tests/test-client.check-on-disk/test_004-279.expected new file mode 100644 index 0000000000..c5e0cce390 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-279.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:972:test_004()/279 +cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 1766 bytes +>>> +IN-USE: [35m [0m +SSID: [35mwlan1-ap-4[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m + + +IN-USE: [32m [0m +SSID: [32mwlan0-ap-2[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +IN-USE: [32m [0m +SSID: [32mwlan0-ap-1[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +IN-USE: [35m [0m +SSID: [35mwlan0-ap-3[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-280.expected b/clients/tests/test-client.check-on-disk/test_004-280.expected new file mode 100644 index 0000000000..86049af445 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-280.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:972:test_004()/280 +cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1802 bytes +>>> +IN-USE: [35m [0m +SSID: [35mwlan1-ap-4[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m + + +IN-USE: [32m [0m +SSID: [32mwlan0-ap-2[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +IN-USE: [32m [0m +SSID: [32mwlan0-ap-1[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +IN-USE: [35m [0m +SSID: [35mwlan0-ap-3[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-281.expected b/clients/tests/test-client.check-on-disk/test_004-281.expected new file mode 100644 index 0000000000..76e7b6addb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-281.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:975:test_004()/281 +cmd: $NMCLI --mode multiline --color yes -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: 4334 bytes +>>> +NAME: [35mAP[1][0m +SSID: [35mwlan1-ap-4[0m +SSID-HEX: [35m776C616E312D61702D34[0m +BSSID: [35m94:2B:E8:F6:D2:86[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan1[0m +ACTIVE: [35mno[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +NAME: [32mAP[2][0m +SSID: [32mwlan0-ap-1[0m +SSID-HEX: [32m776C616E302D61702D31[0m +BSSID: [32m61:95:77:AC:1E:4C[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +NAME: [35mAP[3][0m +SSID: [35mwlan0-ap-3[0m +SSID-HEX: [35m776C616E302D61702D33[0m +BSSID: [35m9B:F6:B7:EC:97:76[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan0[0m +ACTIVE: [35mno[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-282.expected b/clients/tests/test-client.check-on-disk/test_004-282.expected new file mode 100644 index 0000000000..88e0dab9f1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-282.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:975:test_004()/282 +cmd: $NMCLI --mode multiline --color yes -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: 4382 bytes +>>> +NAME: [35mAP[1][0m +SSID: [35mwlan1-ap-4[0m +SSID-HEX: [35m776C616E312D61702D34[0m +BSSID: [35m94:2B:E8:F6:D2:86[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan1[0m +ACTIVE: [35mnie[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +NAME: [32mAP[2][0m +SSID: [32mwlan0-ap-1[0m +SSID-HEX: [32m776C616E302D61702D31[0m +BSSID: [32m61:95:77:AC:1E:4C[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +NAME: [35mAP[3][0m +SSID: [35mwlan0-ap-3[0m +SSID-HEX: [35m776C616E302D61702D33[0m +BSSID: [35m9B:F6:B7:EC:97:76[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan0[0m +ACTIVE: [35mnie[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-283.expected b/clients/tests/test-client.check-on-disk/test_004-283.expected new file mode 100644 index 0000000000..7c38833e88 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-283.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:977:test_004()/283 +cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 1083 bytes +>>> +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-284.expected b/clients/tests/test-client.check-on-disk/test_004-284.expected new file mode 100644 index 0000000000..daf4a1c6e3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-284.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:977:test_004()/284 +cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1095 bytes +>>> +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-285.expected b/clients/tests/test-client.check-on-disk/test_004-285.expected new file mode 100644 index 0000000000..af3304db99 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-285.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:979:test_004()/285 +cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 441 bytes +>>> +IN-USE: [32m [0m +SSID: [32mwlan0-ap-2[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-286.expected b/clients/tests/test-client.check-on-disk/test_004-286.expected new file mode 100644 index 0000000000..e8389e49df --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-286.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:979:test_004()/286 +cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 450 bytes +>>> +IN-USE: [32m [0m +SSID: [32mwlan0-ap-2[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-287.expected b/clients/tests/test-client.check-on-disk/test_004-287.expected new file mode 100644 index 0000000000..8e46f268f0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-287.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:982:test_004()/287 +cmd: $NMCLI --mode multiline --color yes -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: 1083 bytes +>>> +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-288.expected b/clients/tests/test-client.check-on-disk/test_004-288.expected new file mode 100644 index 0000000000..5852a2f7a2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-288.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:982:test_004()/288 +cmd: $NMCLI --mode multiline --color yes -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: 1095 bytes +>>> +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-289.expected b/clients/tests/test-client.check-on-disk/test_004-289.expected new file mode 100644 index 0000000000..f3ce7b56c9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-289.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:984:test_004()/289 +cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 4816 bytes +>>> +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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfra[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mbit/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfra[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mbit/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfra[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mbit/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +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-290.expected b/clients/tests/test-client.check-on-disk/test_004-290.expected new file mode 100644 index 0000000000..4fe20920f2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-290.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:984:test_004()/290 +cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4859 bytes +>>> +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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfrastruktura[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mb/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfrastruktura[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mb/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfrastruktura[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mb/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +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-291.expected b/clients/tests/test-client.check-on-disk/test_004-291.expected new file mode 100644 index 0000000000..af475cc63a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-291.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:986:test_004()/291 +cmd: $NMCLI --mode multiline --color yes -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-292.expected b/clients/tests/test-client.check-on-disk/test_004-292.expected new file mode 100644 index 0000000000..a4d6a20d25 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-292.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:986:test_004()/292 +cmd: $NMCLI --mode multiline --color yes -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-293.expected b/clients/tests/test-client.check-on-disk/test_004-293.expected new file mode 100644 index 0000000000..d447e3ca00 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-293.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:988:test_004()/293 +cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 4816 bytes +>>> +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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfra[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mbit/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfra[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mbit/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfra[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mbit/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +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-294.expected b/clients/tests/test-client.check-on-disk/test_004-294.expected new file mode 100644 index 0000000000..dd30287a5d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-294.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:988:test_004()/294 +cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4859 bytes +>>> +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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfrastruktura[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mb/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfrastruktura[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mb/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfrastruktura[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mb/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +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-295.expected b/clients/tests/test-client.check-on-disk/test_004-295.expected new file mode 100644 index 0000000000..16942ca50a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-295.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:970:test_004()/295 +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-296.expected b/clients/tests/test-client.check-on-disk/test_004-296.expected new file mode 100644 index 0000000000..ba71072ebf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-296.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:970:test_004()/296 +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-297.expected b/clients/tests/test-client.check-on-disk/test_004-297.expected new file mode 100644 index 0000000000..ed1c82a43b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-297.expected @@ -0,0 +1,59 @@ +location: clients/tests/test-client.py:972:test_004()/297 +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-298.expected b/clients/tests/test-client.check-on-disk/test_004-298.expected new file mode 100644 index 0000000000..1671d9611d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-298.expected @@ -0,0 +1,59 @@ +location: clients/tests/test-client.py:972:test_004()/298 +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-299.expected b/clients/tests/test-client.check-on-disk/test_004-299.expected new file mode 100644 index 0000000000..dd3649e511 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-299.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:975:test_004()/299 +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-300.expected b/clients/tests/test-client.check-on-disk/test_004-300.expected new file mode 100644 index 0000000000..aba27deb65 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-300.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:975:test_004()/300 +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-301.expected b/clients/tests/test-client.check-on-disk/test_004-301.expected new file mode 100644 index 0000000000..bb19f4c0a5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-301.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:977:test_004()/301 +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-302.expected b/clients/tests/test-client.check-on-disk/test_004-302.expected new file mode 100644 index 0000000000..8e28c37900 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-302.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:977:test_004()/302 +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-303.expected b/clients/tests/test-client.check-on-disk/test_004-303.expected new file mode 100644 index 0000000000..8a64ec9409 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-303.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:979:test_004()/303 +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-304.expected b/clients/tests/test-client.check-on-disk/test_004-304.expected new file mode 100644 index 0000000000..25268c8ec0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-304.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:979:test_004()/304 +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-305.expected b/clients/tests/test-client.check-on-disk/test_004-305.expected new file mode 100644 index 0000000000..a64949ef8f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-305.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:982:test_004()/305 +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-306.expected b/clients/tests/test-client.check-on-disk/test_004-306.expected new file mode 100644 index 0000000000..de328b98b0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-306.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:982:test_004()/306 +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-307.expected b/clients/tests/test-client.check-on-disk/test_004-307.expected new file mode 100644 index 0000000000..e0d952ae71 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-307.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:984:test_004()/307 +cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 5691 bytes +>>> +=============================================================================== + 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-308.expected b/clients/tests/test-client.check-on-disk/test_004-308.expected new file mode 100644 index 0000000000..a9c0e91fdd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-308.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:984:test_004()/308 +cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5741 bytes +>>> +=============================================================================== + 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-309.expected b/clients/tests/test-client.check-on-disk/test_004-309.expected new file mode 100644 index 0000000000..010b3a534c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-309.expected @@ -0,0 +1,48 @@ +location: clients/tests/test-client.py:986:test_004()/309 +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-310.expected b/clients/tests/test-client.check-on-disk/test_004-310.expected new file mode 100644 index 0000000000..0c83622101 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-310.expected @@ -0,0 +1,48 @@ +location: clients/tests/test-client.py:986:test_004()/310 +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-311.expected b/clients/tests/test-client.check-on-disk/test_004-311.expected new file mode 100644 index 0000000000..9dcf1837ef --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-311.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:988:test_004()/311 +cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 5691 bytes +>>> +=============================================================================== + 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-312.expected b/clients/tests/test-client.check-on-disk/test_004-312.expected new file mode 100644 index 0000000000..3d65693d6b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-312.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:988:test_004()/312 +cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5741 bytes +>>> +=============================================================================== + 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-313.expected b/clients/tests/test-client.check-on-disk/test_004-313.expected new file mode 100644 index 0000000000..624e23531f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-313.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:970:test_004()/313 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list +lang: C +returncode: 0 +stdout: 5290 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== +NAME: [35mAP[1][0m +SSID: [35mwlan1-ap-4[0m +SSID-HEX: [35m776C616E312D61702D34[0m +BSSID: [35m94:2B:E8:F6:D2:86[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan1[0m +ACTIVE: [35mno[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m +------------------------------------------------------------------------------- + +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== + +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +------------------------------------------------------------------------------- +NAME: [32mAP[2][0m +SSID: [32mwlan0-ap-1[0m +SSID-HEX: [32m776C616E302D61702D31[0m +BSSID: [32m61:95:77:AC:1E:4C[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +------------------------------------------------------------------------------- +NAME: [35mAP[3][0m +SSID: [35mwlan0-ap-3[0m +SSID-HEX: [35m776C616E302D61702D33[0m +BSSID: [35m9B:F6:B7:EC:97:76[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan0[0m +ACTIVE: [35mno[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-314.expected b/clients/tests/test-client.check-on-disk/test_004-314.expected new file mode 100644 index 0000000000..c0f9de9e67 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-314.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:970:test_004()/314 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5356 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== +NAME: [35mAP[1][0m +SSID: [35mwlan1-ap-4[0m +SSID-HEX: [35m776C616E312D61702D34[0m +BSSID: [35m94:2B:E8:F6:D2:86[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan1[0m +ACTIVE: [35mnie[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m +------------------------------------------------------------------------------- + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +------------------------------------------------------------------------------- +NAME: [32mAP[2][0m +SSID: [32mwlan0-ap-1[0m +SSID-HEX: [32m776C616E302D61702D31[0m +BSSID: [32m61:95:77:AC:1E:4C[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +------------------------------------------------------------------------------- +NAME: [35mAP[3][0m +SSID: [35mwlan0-ap-3[0m +SSID-HEX: [35m776C616E302D61702D33[0m +BSSID: [35m9B:F6:B7:EC:97:76[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan0[0m +ACTIVE: [35mnie[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-315.expected b/clients/tests/test-client.check-on-disk/test_004-315.expected new file mode 100644 index 0000000000..63042e95ed --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-315.expected @@ -0,0 +1,59 @@ +location: clients/tests/test-client.py:972:test_004()/315 +cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 2722 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== +IN-USE: [35m [0m +SSID: [35mwlan1-ap-4[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- + +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== + +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +IN-USE: [32m [0m +SSID: [32mwlan0-ap-2[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +IN-USE: [32m [0m +SSID: [32mwlan0-ap-1[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +IN-USE: [35m [0m +SSID: [35mwlan0-ap-3[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-316.expected b/clients/tests/test-client.check-on-disk/test_004-316.expected new file mode 100644 index 0000000000..aade67b6f6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-316.expected @@ -0,0 +1,59 @@ +location: clients/tests/test-client.py:972:test_004()/316 +cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2776 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== +IN-USE: [35m [0m +SSID: [35mwlan1-ap-4[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +IN-USE: [32m [0m +SSID: [32mwlan0-ap-2[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +IN-USE: [32m [0m +SSID: [32mwlan0-ap-1[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +IN-USE: [35m [0m +SSID: [35mwlan0-ap-3[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-317.expected b/clients/tests/test-client.check-on-disk/test_004-317.expected new file mode 100644 index 0000000000..b1e063f190 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-317.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:975:test_004()/317 +cmd: $NMCLI --mode multiline --pretty --color yes -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: 5290 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== +NAME: [35mAP[1][0m +SSID: [35mwlan1-ap-4[0m +SSID-HEX: [35m776C616E312D61702D34[0m +BSSID: [35m94:2B:E8:F6:D2:86[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan1[0m +ACTIVE: [35mno[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m +------------------------------------------------------------------------------- + +=============================================================================== + Wi-Fi scan list (wlan1) +=============================================================================== + +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +------------------------------------------------------------------------------- +NAME: [32mAP[2][0m +SSID: [32mwlan0-ap-1[0m +SSID-HEX: [32m776C616E302D61702D31[0m +BSSID: [32m61:95:77:AC:1E:4C[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +------------------------------------------------------------------------------- +NAME: [35mAP[3][0m +SSID: [35mwlan0-ap-3[0m +SSID-HEX: [35m776C616E302D61702D33[0m +BSSID: [35m9B:F6:B7:EC:97:76[0m +MODE: [35mInfra[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mbit/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan0[0m +ACTIVE: [35mno[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-318.expected b/clients/tests/test-client.check-on-disk/test_004-318.expected new file mode 100644 index 0000000000..3a18cbbaff --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-318.expected @@ -0,0 +1,95 @@ +location: clients/tests/test-client.py:975:test_004()/318 +cmd: $NMCLI --mode multiline --pretty --color yes -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: 5356 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== +NAME: [35mAP[1][0m +SSID: [35mwlan1-ap-4[0m +SSID-HEX: [35m776C616E312D61702D34[0m +BSSID: [35m94:2B:E8:F6:D2:86[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m48[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan1[0m +ACTIVE: [35mnie[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/4[0m +------------------------------------------------------------------------------- + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan1) +=============================================================================== + +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +------------------------------------------------------------------------------- +NAME: [32mAP[2][0m +SSID: [32mwlan0-ap-1[0m +SSID-HEX: [32m776C616E302D61702D31[0m +BSSID: [32m61:95:77:AC:1E:4C[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m81[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +------------------------------------------------------------------------------- +NAME: [35mAP[3][0m +SSID: [35mwlan0-ap-3[0m +SSID-HEX: [35m776C616E302D61702D33[0m +BSSID: [35m9B:F6:B7:EC:97:76[0m +MODE: [35mInfrastruktura[0m +CHAN: [35m1[0m +FREQ: [35m2412 MHz[0m +RATE: [35m54 Mb/s[0m +SIGNAL: [35m55[0m +BARS: [35m** [0m +SECURITY: [35mWPA1 WPA2[0m +WPA-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [35mwlan0[0m +ACTIVE: [35mnie[0m +IN-USE: [35m [0m +DBUS-PATH: [35m/org/freedesktop/NetworkManager/AccessPoint/3[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-319.expected b/clients/tests/test-client.check-on-disk/test_004-319.expected new file mode 100644 index 0000000000..91cb18f2cb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-319.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:977:test_004()/319 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 1375 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-320.expected b/clients/tests/test-client.check-on-disk/test_004-320.expected new file mode 100644 index 0000000000..c991d03d82 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-320.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:977:test_004()/320 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1393 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-321.expected b/clients/tests/test-client.check-on-disk/test_004-321.expected new file mode 100644 index 0000000000..46366a0053 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-321.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:979:test_004()/321 +cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 733 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +IN-USE: [32m [0m +SSID: [32mwlan0-ap-2[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-322.expected b/clients/tests/test-client.check-on-disk/test_004-322.expected new file mode 100644 index 0000000000..bdcba65b75 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-322.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:979:test_004()/322 +cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 748 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +IN-USE: [32m [0m +SSID: [32mwlan0-ap-2[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-323.expected b/clients/tests/test-client.check-on-disk/test_004-323.expected new file mode 100644 index 0000000000..6b5ebaa59f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-323.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:982:test_004()/323 +cmd: $NMCLI --mode multiline --pretty --color yes -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: 1375 bytes +>>> +=============================================================================== + Wi-Fi scan list (wlan0) +=============================================================================== +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfra[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mbit/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mno[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-324.expected b/clients/tests/test-client.check-on-disk/test_004-324.expected new file mode 100644 index 0000000000..d0109d9ad1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-324.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:982:test_004()/324 +cmd: $NMCLI --mode multiline --pretty --color yes -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: 1393 bytes +>>> +=============================================================================== + Lista skanowania sieci Wi-Fi (wlan0) +=============================================================================== +NAME: [32mAP[1][0m +SSID: [32mwlan0-ap-2[0m +SSID-HEX: [32m776C616E302D61702D32[0m +BSSID: [32mC0:E2:BE:E8:EF:B6[0m +MODE: [32mInfrastruktura[0m +CHAN: [32m1[0m +FREQ: [32m2412 MHz[0m +RATE: [32m54 Mb/s[0m +SIGNAL: [32m92[0m +BARS: [32m****[0m +SECURITY: [32mWPA1 WPA2[0m +WPA-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS: [32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE: [32mwlan0[0m +ACTIVE: [32mnie[0m +IN-USE: [32m [0m +DBUS-PATH: [32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-325.expected b/clients/tests/test-client.check-on-disk/test_004-325.expected new file mode 100644 index 0000000000..ce69bfbef4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-325.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:984:test_004()/325 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 5907 bytes +>>> +=============================================================================== + 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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfra[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mbit/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfra[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mbit/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfra[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mbit/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- +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-326.expected b/clients/tests/test-client.check-on-disk/test_004-326.expected new file mode 100644 index 0000000000..146e5f157d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-326.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:984:test_004()/326 +cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5957 bytes +>>> +=============================================================================== + 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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfrastruktura[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mb/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfrastruktura[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mb/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfrastruktura[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mb/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- +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-327.expected b/clients/tests/test-client.check-on-disk/test_004-327.expected new file mode 100644 index 0000000000..7cc536f099 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-327.expected @@ -0,0 +1,48 @@ +location: clients/tests/test-client.py:986:test_004()/327 +cmd: $NMCLI --mode multiline --pretty --color yes -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-328.expected b/clients/tests/test-client.check-on-disk/test_004-328.expected new file mode 100644 index 0000000000..7265a792bb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-328.expected @@ -0,0 +1,48 @@ +location: clients/tests/test-client.py:986:test_004()/328 +cmd: $NMCLI --mode multiline --pretty --color yes -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-329.expected b/clients/tests/test-client.check-on-disk/test_004-329.expected new file mode 100644 index 0000000000..faed570e81 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-329.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:988:test_004()/329 +cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 5907 bytes +>>> +=============================================================================== + 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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfra[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mbit/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfra[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mbit/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfra[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mbit/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- +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-330.expected b/clients/tests/test-client.check-on-disk/test_004-330.expected new file mode 100644 index 0000000000..2e887975f2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-330.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:988:test_004()/330 +cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 5957 bytes +>>> +=============================================================================== + 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: [32m [0m +AP[1].SSID: [32mwlan0-ap-2[0m +AP[1].MODE: [32mInfrastruktura[0m +AP[1].CHAN: [32m1[0m +AP[1].RATE: [32m54 Mb/s[0m +AP[1].SIGNAL: [32m92[0m +AP[1].BARS: [32m****[0m +AP[1].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[2].IN-USE: [32m [0m +AP[2].SSID: [32mwlan0-ap-1[0m +AP[2].MODE: [32mInfrastruktura[0m +AP[2].CHAN: [32m1[0m +AP[2].RATE: [32m54 Mb/s[0m +AP[2].SIGNAL: [32m81[0m +AP[2].BARS: [32m****[0m +AP[2].SECURITY: [32mWPA1 WPA2[0m +------------------------------------------------------------------------------- +AP[3].IN-USE: [35m [0m +AP[3].SSID: [35mwlan0-ap-3[0m +AP[3].MODE: [35mInfrastruktura[0m +AP[3].CHAN: [35m1[0m +AP[3].RATE: [35m54 Mb/s[0m +AP[3].SIGNAL: [35m55[0m +AP[3].BARS: [35m** [0m +AP[3].SECURITY: [35mWPA1 WPA2[0m +------------------------------------------------------------------------------- +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-331.expected b/clients/tests/test-client.check-on-disk/test_004-331.expected new file mode 100644 index 0000000000..a9fe39d737 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-331.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:970:test_004()/331 +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-332.expected b/clients/tests/test-client.check-on-disk/test_004-332.expected new file mode 100644 index 0000000000..baec97cd69 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-332.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:970:test_004()/332 +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-333.expected b/clients/tests/test-client.check-on-disk/test_004-333.expected new file mode 100644 index 0000000000..321b00247c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-333.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:972:test_004()/333 +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-334.expected b/clients/tests/test-client.check-on-disk/test_004-334.expected new file mode 100644 index 0000000000..acde12a35b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-334.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:972:test_004()/334 +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-335.expected b/clients/tests/test-client.check-on-disk/test_004-335.expected new file mode 100644 index 0000000000..cb2d79d36b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-335.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:975:test_004()/335 +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-336.expected b/clients/tests/test-client.check-on-disk/test_004-336.expected new file mode 100644 index 0000000000..27f21d96ab --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-336.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:975:test_004()/336 +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-337.expected b/clients/tests/test-client.check-on-disk/test_004-337.expected new file mode 100644 index 0000000000..0ada8160d7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-337.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:977:test_004()/337 +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-338.expected b/clients/tests/test-client.check-on-disk/test_004-338.expected new file mode 100644 index 0000000000..5548fecace --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-338.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:977:test_004()/338 +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-339.expected b/clients/tests/test-client.check-on-disk/test_004-339.expected new file mode 100644 index 0000000000..009425d49a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-339.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:979:test_004()/339 +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-340.expected b/clients/tests/test-client.check-on-disk/test_004-340.expected new file mode 100644 index 0000000000..e372797eed --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-340.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:979:test_004()/340 +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-341.expected b/clients/tests/test-client.check-on-disk/test_004-341.expected new file mode 100644 index 0000000000..450e274aff --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-341.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:982:test_004()/341 +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-342.expected b/clients/tests/test-client.check-on-disk/test_004-342.expected new file mode 100644 index 0000000000..fc980eed52 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-342.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:982:test_004()/342 +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-343.expected b/clients/tests/test-client.check-on-disk/test_004-343.expected new file mode 100644 index 0000000000..7d054d88f0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-343.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:984:test_004()/343 +cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 2467 bytes +>>> +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-344.expected b/clients/tests/test-client.check-on-disk/test_004-344.expected new file mode 100644 index 0000000000..cc4ac7be7c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-344.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:984:test_004()/344 +cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2510 bytes +>>> +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-345.expected b/clients/tests/test-client.check-on-disk/test_004-345.expected new file mode 100644 index 0000000000..bb74f48027 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-345.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:986:test_004()/345 +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-346.expected b/clients/tests/test-client.check-on-disk/test_004-346.expected new file mode 100644 index 0000000000..b728a32e71 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-346.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:986:test_004()/346 +cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 740 bytes +>>> +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-347.expected b/clients/tests/test-client.check-on-disk/test_004-347.expected new file mode 100644 index 0000000000..07b0c58671 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-347.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:988:test_004()/347 +cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 2467 bytes +>>> +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-348.expected b/clients/tests/test-client.check-on-disk/test_004-348.expected new file mode 100644 index 0000000000..370e51b90a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-348.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:988:test_004()/348 +cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2510 bytes +>>> +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-349.expected b/clients/tests/test-client.check-on-disk/test_004-349.expected new file mode 100644 index 0000000000..d7cbbb939c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-349.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:970:test_004()/349 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list +lang: C +returncode: 0 +stdout: 2082 bytes +>>> +NAME:[35mAP[1][0m +SSID:[35mwlan1-ap-4[0m +SSID-HEX:[35m776C616E312D61702D34[0m +BSSID:[35m94:2B:E8:F6:D2:86[0m +MODE:[35mInfra[0m +CHAN:[35m1[0m +FREQ:[35m2412 MHz[0m +RATE:[35m54 Mbit/s[0m +SIGNAL:[35m48[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m +WPA-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[35mwlan1[0m +ACTIVE:[35mno[0m +IN-USE:[35m [0m +DBUS-PATH:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +NAME:[32mAP[1][0m +SSID:[32mwlan0-ap-2[0m +SSID-HEX:[32m776C616E302D61702D32[0m +BSSID:[32mC0:E2:BE:E8:EF:B6[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mno[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +NAME:[32mAP[2][0m +SSID:[32mwlan0-ap-1[0m +SSID-HEX:[32m776C616E302D61702D31[0m +BSSID:[32m61:95:77:AC:1E:4C[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m81[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mno[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +NAME:[35mAP[3][0m +SSID:[35mwlan0-ap-3[0m +SSID-HEX:[35m776C616E302D61702D33[0m +BSSID:[35m9B:F6:B7:EC:97:76[0m +MODE:[35mInfra[0m +CHAN:[35m1[0m +FREQ:[35m2412 MHz[0m +RATE:[35m54 Mbit/s[0m +SIGNAL:[35m55[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m +WPA-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[35mwlan0[0m +ACTIVE:[35mno[0m +IN-USE:[35m [0m +DBUS-PATH:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-350.expected b/clients/tests/test-client.check-on-disk/test_004-350.expected new file mode 100644 index 0000000000..ea73f413a0 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-350.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:970:test_004()/350 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2130 bytes +>>> +NAME:[35mAP[1][0m +SSID:[35mwlan1-ap-4[0m +SSID-HEX:[35m776C616E312D61702D34[0m +BSSID:[35m94:2B:E8:F6:D2:86[0m +MODE:[35mInfrastruktura[0m +CHAN:[35m1[0m +FREQ:[35m2412 MHz[0m +RATE:[35m54 Mb/s[0m +SIGNAL:[35m48[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m +WPA-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[35mwlan1[0m +ACTIVE:[35mnie[0m +IN-USE:[35m [0m +DBUS-PATH:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +NAME:[32mAP[1][0m +SSID:[32mwlan0-ap-2[0m +SSID-HEX:[32m776C616E302D61702D32[0m +BSSID:[32mC0:E2:BE:E8:EF:B6[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mnie[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +NAME:[32mAP[2][0m +SSID:[32mwlan0-ap-1[0m +SSID-HEX:[32m776C616E302D61702D31[0m +BSSID:[32m61:95:77:AC:1E:4C[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m81[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mnie[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +NAME:[35mAP[3][0m +SSID:[35mwlan0-ap-3[0m +SSID-HEX:[35m776C616E302D61702D33[0m +BSSID:[35m9B:F6:B7:EC:97:76[0m +MODE:[35mInfrastruktura[0m +CHAN:[35m1[0m +FREQ:[35m2412 MHz[0m +RATE:[35m54 Mb/s[0m +SIGNAL:[35m55[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m +WPA-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[35mwlan0[0m +ACTIVE:[35mnie[0m +IN-USE:[35m [0m +DBUS-PATH:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-351.expected b/clients/tests/test-client.check-on-disk/test_004-351.expected new file mode 100644 index 0000000000..c12141fd9f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-351.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:972:test_004()/351 +cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list +lang: C +returncode: 0 +stdout: 678 bytes +>>> +IN-USE:[35m [0m +SSID:[35mwlan1-ap-4[0m +MODE:[35mInfra[0m +CHAN:[35m1[0m +RATE:[35m54 Mbit/s[0m +SIGNAL:[35m48[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m + + +IN-USE:[32m [0m +SSID:[32mwlan0-ap-2[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +IN-USE:[32m [0m +SSID:[32mwlan0-ap-1[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m81[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +IN-USE:[35m [0m +SSID:[35mwlan0-ap-3[0m +MODE:[35mInfra[0m +CHAN:[35m1[0m +RATE:[35m54 Mbit/s[0m +SIGNAL:[35m55[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-352.expected b/clients/tests/test-client.check-on-disk/test_004-352.expected new file mode 100644 index 0000000000..8bae27726a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-352.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:972:test_004()/352 +cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 714 bytes +>>> +IN-USE:[35m [0m +SSID:[35mwlan1-ap-4[0m +MODE:[35mInfrastruktura[0m +CHAN:[35m1[0m +RATE:[35m54 Mb/s[0m +SIGNAL:[35m48[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m + + +IN-USE:[32m [0m +SSID:[32mwlan0-ap-2[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +IN-USE:[32m [0m +SSID:[32mwlan0-ap-1[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m81[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +IN-USE:[35m [0m +SSID:[35mwlan0-ap-3[0m +MODE:[35mInfrastruktura[0m +CHAN:[35m1[0m +RATE:[35m54 Mb/s[0m +SIGNAL:[35m55[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-353.expected b/clients/tests/test-client.check-on-disk/test_004-353.expected new file mode 100644 index 0000000000..71df9d3726 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-353.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:975:test_004()/353 +cmd: $NMCLI --mode multiline --terse --color yes -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: 2082 bytes +>>> +NAME:[35mAP[1][0m +SSID:[35mwlan1-ap-4[0m +SSID-HEX:[35m776C616E312D61702D34[0m +BSSID:[35m94:2B:E8:F6:D2:86[0m +MODE:[35mInfra[0m +CHAN:[35m1[0m +FREQ:[35m2412 MHz[0m +RATE:[35m54 Mbit/s[0m +SIGNAL:[35m48[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m +WPA-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[35mwlan1[0m +ACTIVE:[35mno[0m +IN-USE:[35m [0m +DBUS-PATH:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +NAME:[32mAP[1][0m +SSID:[32mwlan0-ap-2[0m +SSID-HEX:[32m776C616E302D61702D32[0m +BSSID:[32mC0:E2:BE:E8:EF:B6[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mno[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +NAME:[32mAP[2][0m +SSID:[32mwlan0-ap-1[0m +SSID-HEX:[32m776C616E302D61702D31[0m +BSSID:[32m61:95:77:AC:1E:4C[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m81[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mno[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +NAME:[35mAP[3][0m +SSID:[35mwlan0-ap-3[0m +SSID-HEX:[35m776C616E302D61702D33[0m +BSSID:[35m9B:F6:B7:EC:97:76[0m +MODE:[35mInfra[0m +CHAN:[35m1[0m +FREQ:[35m2412 MHz[0m +RATE:[35m54 Mbit/s[0m +SIGNAL:[35m55[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m +WPA-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[35mwlan0[0m +ACTIVE:[35mno[0m +IN-USE:[35m [0m +DBUS-PATH:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-354.expected b/clients/tests/test-client.check-on-disk/test_004-354.expected new file mode 100644 index 0000000000..e173a145b8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-354.expected @@ -0,0 +1,82 @@ +location: clients/tests/test-client.py:975:test_004()/354 +cmd: $NMCLI --mode multiline --terse --color yes -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: 2130 bytes +>>> +NAME:[35mAP[1][0m +SSID:[35mwlan1-ap-4[0m +SSID-HEX:[35m776C616E312D61702D34[0m +BSSID:[35m94:2B:E8:F6:D2:86[0m +MODE:[35mInfrastruktura[0m +CHAN:[35m1[0m +FREQ:[35m2412 MHz[0m +RATE:[35m54 Mb/s[0m +SIGNAL:[35m48[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m +WPA-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[35mwlan1[0m +ACTIVE:[35mnie[0m +IN-USE:[35m [0m +DBUS-PATH:[35m/org/freedesktop/NetworkManager/AccessPoint/4[0m + + +NAME:[32mAP[1][0m +SSID:[32mwlan0-ap-2[0m +SSID-HEX:[32m776C616E302D61702D32[0m +BSSID:[32mC0:E2:BE:E8:EF:B6[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mnie[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m +NAME:[32mAP[2][0m +SSID:[32mwlan0-ap-1[0m +SSID-HEX:[32m776C616E302D61702D31[0m +BSSID:[32m61:95:77:AC:1E:4C[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m81[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mnie[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/1[0m +NAME:[35mAP[3][0m +SSID:[35mwlan0-ap-3[0m +SSID-HEX:[35m776C616E302D61702D33[0m +BSSID:[35m9B:F6:B7:EC:97:76[0m +MODE:[35mInfrastruktura[0m +CHAN:[35m1[0m +FREQ:[35m2412 MHz[0m +RATE:[35m54 Mb/s[0m +SIGNAL:[35m55[0m +BARS:[35m** [0m +SECURITY:[35mWPA1 WPA2[0m +WPA-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[35mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[35mwlan0[0m +ACTIVE:[35mnie[0m +IN-USE:[35m [0m +DBUS-PATH:[35m/org/freedesktop/NetworkManager/AccessPoint/3[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-355.expected b/clients/tests/test-client.check-on-disk/test_004-355.expected new file mode 100644 index 0000000000..37dbddd68f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-355.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:977:test_004()/355 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 520 bytes +>>> +NAME:[32mAP[1][0m +SSID:[32mwlan0-ap-2[0m +SSID-HEX:[32m776C616E302D61702D32[0m +BSSID:[32mC0:E2:BE:E8:EF:B6[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mno[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-356.expected b/clients/tests/test-client.check-on-disk/test_004-356.expected new file mode 100644 index 0000000000..91d824dd6f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-356.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:977:test_004()/356 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 532 bytes +>>> +NAME:[32mAP[1][0m +SSID:[32mwlan0-ap-2[0m +SSID-HEX:[32m776C616E302D61702D32[0m +BSSID:[32mC0:E2:BE:E8:EF:B6[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mnie[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-357.expected b/clients/tests/test-client.check-on-disk/test_004-357.expected new file mode 100644 index 0000000000..cbf1792f1b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-357.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:979:test_004()/357 +cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: C +returncode: 0 +stdout: 169 bytes +>>> +IN-USE:[32m [0m +SSID:[32mwlan0-ap-2[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-358.expected b/clients/tests/test-client.check-on-disk/test_004-358.expected new file mode 100644 index 0000000000..d91e0209ea --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-358.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:979:test_004()/358 +cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 178 bytes +>>> +IN-USE:[32m [0m +SSID:[32mwlan0-ap-2[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-359.expected b/clients/tests/test-client.check-on-disk/test_004-359.expected new file mode 100644 index 0000000000..04208d5464 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-359.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:982:test_004()/359 +cmd: $NMCLI --mode multiline --terse --color yes -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: 520 bytes +>>> +NAME:[32mAP[1][0m +SSID:[32mwlan0-ap-2[0m +SSID-HEX:[32m776C616E302D61702D32[0m +BSSID:[32mC0:E2:BE:E8:EF:B6[0m +MODE:[32mInfra[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mbit/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mno[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-360.expected b/clients/tests/test-client.check-on-disk/test_004-360.expected new file mode 100644 index 0000000000..6ef9b446f9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-360.expected @@ -0,0 +1,29 @@ +location: clients/tests/test-client.py:982:test_004()/360 +cmd: $NMCLI --mode multiline --terse --color yes -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: 532 bytes +>>> +NAME:[32mAP[1][0m +SSID:[32mwlan0-ap-2[0m +SSID-HEX:[32m776C616E302D61702D32[0m +BSSID:[32mC0:E2:BE:E8:EF:B6[0m +MODE:[32mInfrastruktura[0m +CHAN:[32m1[0m +FREQ:[32m2412 MHz[0m +RATE:[32m54 Mb/s[0m +SIGNAL:[32m92[0m +BARS:[32m****[0m +SECURITY:[32mWPA1 WPA2[0m +WPA-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +RSN-FLAGS:[32mpair_tkip pair_ccmp group_tkip group_ccmp psk[0m +DEVICE:[32mwlan0[0m +ACTIVE:[32mnie[0m +IN-USE:[32m [0m +DBUS-PATH:[32m/org/freedesktop/NetworkManager/AccessPoint/2[0m + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-361.expected b/clients/tests/test-client.check-on-disk/test_004-361.expected new file mode 100644 index 0000000000..2e8fdb364a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-361.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:984:test_004()/361 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 +lang: C +returncode: 0 +stdout: 2683 bytes +>>> +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:[32m [0m +AP[1].SSID:[32mwlan0-ap-2[0m +AP[1].MODE:[32mInfra[0m +AP[1].CHAN:[32m1[0m +AP[1].RATE:[32m54 Mbit/s[0m +AP[1].SIGNAL:[32m92[0m +AP[1].BARS:[32m****[0m +AP[1].SECURITY:[32mWPA1 WPA2[0m +AP[2].IN-USE:[32m [0m +AP[2].SSID:[32mwlan0-ap-1[0m +AP[2].MODE:[32mInfra[0m +AP[2].CHAN:[32m1[0m +AP[2].RATE:[32m54 Mbit/s[0m +AP[2].SIGNAL:[32m81[0m +AP[2].BARS:[32m****[0m +AP[2].SECURITY:[32mWPA1 WPA2[0m +AP[3].IN-USE:[35m [0m +AP[3].SSID:[35mwlan0-ap-3[0m +AP[3].MODE:[35mInfra[0m +AP[3].CHAN:[35m1[0m +AP[3].RATE:[35m54 Mbit/s[0m +AP[3].SIGNAL:[35m55[0m +AP[3].BARS:[35m** [0m +AP[3].SECURITY:[35mWPA1 WPA2[0m +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-362.expected b/clients/tests/test-client.check-on-disk/test_004-362.expected new file mode 100644 index 0000000000..a8096a9b23 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-362.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:984:test_004()/362 +cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2726 bytes +>>> +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:[32m [0m +AP[1].SSID:[32mwlan0-ap-2[0m +AP[1].MODE:[32mInfrastruktura[0m +AP[1].CHAN:[32m1[0m +AP[1].RATE:[32m54 Mb/s[0m +AP[1].SIGNAL:[32m92[0m +AP[1].BARS:[32m****[0m +AP[1].SECURITY:[32mWPA1 WPA2[0m +AP[2].IN-USE:[32m [0m +AP[2].SSID:[32mwlan0-ap-1[0m +AP[2].MODE:[32mInfrastruktura[0m +AP[2].CHAN:[32m1[0m +AP[2].RATE:[32m54 Mb/s[0m +AP[2].SIGNAL:[32m81[0m +AP[2].BARS:[32m****[0m +AP[2].SECURITY:[32mWPA1 WPA2[0m +AP[3].IN-USE:[35m [0m +AP[3].SSID:[35mwlan0-ap-3[0m +AP[3].MODE:[35mInfrastruktura[0m +AP[3].CHAN:[35m1[0m +AP[3].RATE:[35m54 Mb/s[0m +AP[3].SIGNAL:[35m55[0m +AP[3].BARS:[35m** [0m +AP[3].SECURITY:[35mWPA1 WPA2[0m +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-363.expected b/clients/tests/test-client.check-on-disk/test_004-363.expected new file mode 100644 index 0000000000..33c98fd478 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-363.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:986:test_004()/363 +cmd: $NMCLI --mode multiline --terse --color yes -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-364.expected b/clients/tests/test-client.check-on-disk/test_004-364.expected new file mode 100644 index 0000000000..9e406882a3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-364.expected @@ -0,0 +1,36 @@ +location: clients/tests/test-client.py:986:test_004()/364 +cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 740 bytes +>>> +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-365.expected b/clients/tests/test-client.check-on-disk/test_004-365.expected new file mode 100644 index 0000000000..a554b0bff4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-365.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:988:test_004()/365 +cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: C +returncode: 0 +stdout: 2683 bytes +>>> +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:[32m [0m +AP[1].SSID:[32mwlan0-ap-2[0m +AP[1].MODE:[32mInfra[0m +AP[1].CHAN:[32m1[0m +AP[1].RATE:[32m54 Mbit/s[0m +AP[1].SIGNAL:[32m92[0m +AP[1].BARS:[32m****[0m +AP[1].SECURITY:[32mWPA1 WPA2[0m +AP[2].IN-USE:[32m [0m +AP[2].SSID:[32mwlan0-ap-1[0m +AP[2].MODE:[32mInfra[0m +AP[2].CHAN:[32m1[0m +AP[2].RATE:[32m54 Mbit/s[0m +AP[2].SIGNAL:[32m81[0m +AP[2].BARS:[32m****[0m +AP[2].SECURITY:[32mWPA1 WPA2[0m +AP[3].IN-USE:[35m [0m +AP[3].SSID:[35mwlan0-ap-3[0m +AP[3].MODE:[35mInfra[0m +AP[3].CHAN:[35m1[0m +AP[3].RATE:[35m54 Mbit/s[0m +AP[3].SIGNAL:[35m55[0m +AP[3].BARS:[35m** [0m +AP[3].SECURITY:[35mWPA1 WPA2[0m +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-366.expected b/clients/tests/test-client.check-on-disk/test_004-366.expected new file mode 100644 index 0000000000..311fd8e42c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-366.expected @@ -0,0 +1,101 @@ +location: clients/tests/test-client.py:988:test_004()/366 +cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2726 bytes +>>> +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:[32m [0m +AP[1].SSID:[32mwlan0-ap-2[0m +AP[1].MODE:[32mInfrastruktura[0m +AP[1].CHAN:[32m1[0m +AP[1].RATE:[32m54 Mb/s[0m +AP[1].SIGNAL:[32m92[0m +AP[1].BARS:[32m****[0m +AP[1].SECURITY:[32mWPA1 WPA2[0m +AP[2].IN-USE:[32m [0m +AP[2].SSID:[32mwlan0-ap-1[0m +AP[2].MODE:[32mInfrastruktura[0m +AP[2].CHAN:[32m1[0m +AP[2].RATE:[32m54 Mb/s[0m +AP[2].SIGNAL:[32m81[0m +AP[2].BARS:[32m****[0m +AP[2].SECURITY:[32mWPA1 WPA2[0m +AP[3].IN-USE:[35m [0m +AP[3].SSID:[35mwlan0-ap-3[0m +AP[3].MODE:[35mInfrastruktura[0m +AP[3].CHAN:[35m1[0m +AP[3].RATE:[35m54 Mb/s[0m +AP[3].SIGNAL:[35m55[0m +AP[3].BARS:[35m** [0m +AP[3].SECURITY:[35mWPA1 WPA2[0m +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 74225ccfab..b8010bc247 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -235,7 +235,9 @@ class Util: for fmt in [[], ['--pretty'], ['--terse']]: - yield mode + fmt + for color in [[], + ['--color', 'yes']]: + yield mode + fmt + color ############################################################################### @@ -552,6 +554,7 @@ class TestNmcli(NmTestBase): env['LIBNM_USE_SESSION_BUS'] = '1' env['LIBNM_USE_NO_UDEV'] = '1' env['TERM'] = 'linux' + env['XDG_CONFIG_HOME'] = PathConfiguration.srcdir() if fatal_warnings is _DEFAULT_ARG or fatal_warnings: env['G_DEBUG'] = 'fatal-warnings' @@ -867,38 +870,21 @@ class TestNmcli(NmTestBase): self.async_wait() self.srv.op_ConnectionSetVisible(False, con_id = 'ethernet') - self.call_nmcli_l(['-f', 'ALL', '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', 'con'], - replace_stdout = replace_stdout) + for mode in Util.iter_nmcli_output_modes(): + self.call_nmcli_l(mode + ['-f', 'ALL', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--terse', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['-f', 'UUID,TYPE', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--pretty', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['con', 's', 'ethernet'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['c', 's', '/org/freedesktop/NetworkManager/ActiveConnection/1'], + 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', '--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) + self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'show', 'eth0'], + replace_stdout = replace_stdout) def test_004(self): self.init_001() diff --git a/configure.ac b/configure.ac index 97fe1b7c24..52c3801dbb 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [12]) -m4_define([nm_micro_version], [0]) +m4_define([nm_minor_version], [13]) +m4_define([nm_micro_version], [1]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/contrib/test/modemu.pl b/contrib/test/modemu.pl new file mode 100755 index 0000000000..26182ffdc1 --- /dev/null +++ b/contrib/test/modemu.pl @@ -0,0 +1,268 @@ +#!/usr/bin/env perl + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Copyright 2018 Red Hat, Inc. + +# $ perldoc modemu.pl for eye-pleasing view of the manual: + +=head1 NAME + +modemu.pl - emulate a serial modem + +=head1 SYNOPSIS + +modemu.pl [<name>] [-- <pppd> ...] + +=head1 DESCRIPTION + +B<modemu.pl> opens a PTY, links the slave side to F</dev> and announces a +fake kobject via netlink as if it were a real serial device, so that +ModemManager picks it up. + +Then it answers to a very basic subset of AT commands, sufficient making +ModemManager recognize it as a 3GPP capable modem registered to a network. + +Upon receiving the dial (ATD) command, it spawns C<pppd> so that +NetworkManager can establish a connection. + +B<modemu.pl> needs superuser privileges to be able to announce a kobject +and create a F</dev> node. + +=head1 OPTIONS + +=over 4 + +=item B<< <name> >> + +Create a modem of given name. Links it to F<< /dev/<name> >>. + +Defaults to I<modemu>. + +=item B<< <pppd> >> + +Specifies extra arguments to be prepended before C<pppd> to the default +set of I<nodetach notty local logfd 2 nopersist>. + +Defaults to I<pppd dump debug 172.31.82.1:172.31.82.2>. + +=back + +=cut + +use strict; +use warnings; + +use Errno; +use Socket; +use IO::Pty; +use IO::Handle; + +use constant AF_NETLINK => 16; +use constant NETLINK_KOBJECT_UEVENT => 15; + +# This allows us to use buffered read for lines from ModemManager +# despite not ending with \n +IO::Handle->input_record_separator ("\r"); + +# Parse command line arguments +my $name; +my @pppd = qw/pppd dump debug 172.31.82.1:172.31.82.2/; +while (@ARGV) { + $_ = shift @ARGV; + if ($_ eq '--') { + @pppd = @ARGV; + last; + } else { + die "Extra argument: '$_'" if $name; + $name = $_; + } +}; +$name ||= 'modemu'; + +socket my $fd, AF_NETLINK, SOCK_RAW, NETLINK_KOBJECT_UEVENT + or die "Can't create a netlink socket: $!"; + +sub send_netlink +{ + my %props = @_; + my $props = join '', map { $_, '=', $props{$_}, "\0" } keys %props; + + my $head = pack 'a8NLLLLLLL', + # signature + magic + 'libudev', + 0xfeedcafe, + + # 40 octets is the length of this header + 40, 40, 40 + length ($props), + + # SUBSYS=tty hash. Precomputed somehow. + 0xc890fa8a, + 0x00000000, + 0x00040002, + 0x00008010; + + $! = undef; + send $fd, "$head$props", 0, pack 'SSLL', AF_NETLINK, 0, 0, 0x0002; + # RHEL 7 kernel responds ECONNREFUSED even thoguh the sendto succeeded. Weird. + die "Can't send a netlink message: $!" if $! and not $!{ECONNREFUSED}; +} + +my %props = ( + DEVPATH => "/devices/pci0000:00/0000:00:00.0/$name", + SUBSYSTEM => 'tty', + DEVNAME => "/dev/$name", + + # Whitelisting that works for both ModemManager 1.6 and 1.8 + ID_MM_CANDIDATE => '1', + ID_MM_DEVICE_PROCESS => '1', +); + +sub cleanup +{ + unlink "/dev/$name"; + send_netlink (ACTION => 'remove', %props) if $fd; +} + +# Ensure we clean up before and after. +END { cleanup }; +$SIG{INT} = sub { cleanup; die }; +cleanup; + +my $pty = new IO::Pty; +my $ptyname = ttyname $pty; +symlink $ptyname, "/dev/$name" or die "Can't create /dev/$name: $!"; +send_netlink (ACTION => 'add', %props); + +while (<$pty>) { + chomp; + + if (/^AT$/ or /^ATE0$/ or /^ATV1$/ or /^AT\+CMEE=1$/ or /^ATX4$/ or /^AT&C1$/ or /^ATZ$/) { + # Standard Hayes commands that are basically used to + # ensure the modem is in a known state. Accept them all. + print $pty "\r\n"; + print $pty "OK\r\n"; + + } elsif (/^AT\+CPIN\?$/) { + # PIN unlocked. Required. + print $pty "\r\n"; + print $pty "+CPIN:READY\r\n"; + print $pty "\r\n"; + print $pty "OK\r\n"; + + } elsif (/^AT\+COPS=0$/) { + # Select access technology (we just accept 0=automatic) + print $pty "\r\n"; + print $pty "OK\r\n"; + + } elsif (/^AT\+CGREG\?$/) { + # 3GPP Registration status. + print $pty "\r\n"; + print $pty "+CGREG: 0,1\r\n"; + print $pty "\r\n"; + print $pty "OK\r\n"; + + } elsif (/^AT\+CGDCONT=\?$/) { + # Get supported PDP contexts + print $pty "\r\n"; + print $pty "+CGDCONT: (1-10),(\"IP\"),,,(0-1),(0-1)\r\n"; + print $pty "+CGDCONT: (1-10),(\"IPV6\"),,,(0-1),(0-1)\r\n"; + print $pty "OK\r\n"; + + } elsif (/^AT\+CGACT=0,1$/) { + # Activate a PDP context + print $pty "\r\n"; + print $pty "OK\r\n"; + + } elsif (/^AT\+CGDCONT=1,"(.*)","(.*)"$/) { + # Set PDP context. We accept any. + print $pty "\r\n"; + print $pty "OK\r\n"; + + } elsif (/^ATD/) { + print $pty "\r\n"; + print $pty "CONNECT 28800000\r\n"; + + my $ppp = fork; + die "Can't fork: $!" unless defined $ppp; + if ($ppp == 0) { + close STDIN; + close STDOUT; + open STDIN, '<&', $pty or die "Can't dup pty to a pppd stdin: $!"; + open STDOUT, '>&', $pty or die "Can't dup pty to a pppd stdout: $!"; + close $pty; + exec @pppd, qw/nodetach notty local logfd 2 nopersist/; + die "Can't exec pppd: $!"; + } + waitpid $ppp, 0; + } else { + print $pty "\r\n"; + print $pty "ERROR\r\n"; + } +} + +=head1 EXAMPLES + +=over + +=item B<modemu.pl> + +Just create a modem named I<modemu>, with the default PPP arguments. + +=item B<modemu.pl ttyS666> + +Same as above, just name the modem I<ttyS666>. + +=item B<modemu.pl -- unshare --net pppd 172.31.82.1:172.31.82.2> + +Avoid polluting the namespace with the modem end of PPP connection. + +=item B<modemu.pl -- pppd 10.0.0.1:10.0.0.2> + +Override the C<pppd> parameters: no debug logging and different set of +addresses. + +=item B<modemu.pl mymodem -- pppd 10.0.0.1:10.0.0.2> + +Same as above, with a modem name different from default. + +=back + +=head1 BUGS + +Only works on machines with a PCI bus. ModemManager is picky about platform +devices and accepts PCI and USB busses easily. Which is why pretent to have +our tty on the PCI root device. + +Terminates after a single PPP session. C<pppd> seems to hang up the PTY. + +=head1 SEE ALSO + +L<ModemManager(8)>, L<pppd(8)> + +=head1 COPYRIGHT + +Copyright 2018 Lubomir Rintel + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +=head1 AUTHOR + +Lubomir Rintel C<lkundrak@v3.sk> + +=cut diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index 625c3d57a4..790cfb572a 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -19,6 +19,7 @@ <year>2015</year> <year>2016</year> <year>2017</year> + <year>2018</year> <holder>The NetworkManager Authors</holder> </copyright> @@ -188,6 +189,7 @@ <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Generic.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macsec.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Modem.xml"/> @@ -202,6 +204,7 @@ <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vlan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wireless.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wpan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/> </chapter> diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml index 135fcc7f49..07551fb82c 100644 --- a/docs/libnm-glib/libnm-glib-docs.xml +++ b/docs/libnm-glib/libnm-glib-docs.xml @@ -20,6 +20,7 @@ <year>2015</year> <year>2016</year> <year>2017</year> + <year>2018</year> <holder>The NetworkManager Authors</holder> </copyright> diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml index 6cc56e9960..6581788894 100644 --- a/docs/libnm-util/libnm-util-docs.sgml +++ b/docs/libnm-util/libnm-util-docs.sgml @@ -21,6 +21,7 @@ <year>2015</year> <year>2016</year> <year>2017</year> + <year>2018</year> <holder>The NetworkManager Authors</holder> </copyright> diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml index 3105f514f2..14d9636e26 100644 --- a/docs/libnm/libnm-docs.xml +++ b/docs/libnm/libnm-docs.xml @@ -20,6 +20,7 @@ <year>2015</year> <year>2016</year> <year>2017</year> + <year>2018</year> <holder>The NetworkManager Authors</holder> </copyright> @@ -191,6 +192,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <xi:include href="xml/nm-setting.xml"/> <xi:include href="xml/nm-setting-connection.xml"/> <!-- begin alphabetical --> + <xi:include href="xml/nm-setting-6lowpan.xml"/> <xi:include href="xml/nm-setting-8021x.xml"/> <xi:include href="xml/nm-setting-adsl.xml"/> <xi:include href="xml/nm-setting-bluetooth.xml"/> @@ -230,6 +232,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <xi:include href="xml/nm-setting-wired.xml"/> <xi:include href="xml/nm-setting-wireless-security.xml"/> <xi:include href="xml/nm-setting-wireless.xml"/> + <xi:include href="xml/nm-setting-wpan.xml"/> <!-- end alphabetical --> </chapter> @@ -237,6 +240,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <title>Device and Runtime Configuration API Reference</title> <xi:include href="xml/nm-device.xml"/> <!-- begin alphabetical --> + <xi:include href="xml/nm-device-6lowpan.xml"/> <xi:include href="xml/nm-device-adsl.xml"/> <xi:include href="xml/nm-device-bond.xml"/> <xi:include href="xml/nm-device-bridge.xml"/> @@ -260,6 +264,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <xi:include href="xml/nm-device-vxlan.xml"/> <xi:include href="xml/nm-device-wifi.xml"/> <xi:include href="xml/nm-device-wimax.xml"/> + <xi:include href="xml/nm-device-wpan.xml"/> <!-- end alphabetical --> <xi:include href="xml/nm-active-connection.xml"/> <xi:include href="xml/nm-vpn-connection.xml"/> diff --git a/introspection/meson.build b/introspection/meson.build index b135a867da..57d6a196c1 100644 --- a/introspection/meson.build +++ b/introspection/meson.build @@ -15,6 +15,7 @@ ifaces = [ 'org.freedesktop.NetworkManager.Device.Generic', 'org.freedesktop.NetworkManager.Device.Infiniband', 'org.freedesktop.NetworkManager.Device.IPTunnel', + 'org.freedesktop.NetworkManager.Device.Lowpan', 'org.freedesktop.NetworkManager.Device.Macsec', 'org.freedesktop.NetworkManager.Device.Macvlan', 'org.freedesktop.NetworkManager.Device.Modem', @@ -30,6 +31,7 @@ ifaces = [ 'org.freedesktop.NetworkManager.Device.Vlan', 'org.freedesktop.NetworkManager.Device.Vxlan', 'org.freedesktop.NetworkManager.Device.WiMax', + 'org.freedesktop.NetworkManager.Device.Wpan', 'org.freedesktop.NetworkManager.Device.Wired', 'org.freedesktop.NetworkManager.Device.Wireless', 'org.freedesktop.NetworkManager.Device', diff --git a/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml b/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml new file mode 100644 index 0000000000..c0317be6c3 --- /dev/null +++ b/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<node name="/"> + <!-- + org.freedesktop.NetworkManager.Device.Lowpan: + @short_description: 6LoWPAN Device + + --> + <interface name="org.freedesktop.NetworkManager.Device.Lowpan"> + + <!-- + HwAddress: + + The active hardware address of the device. + --> + <property name="HwAddress" type="s" access="read"/> + + <!-- + Parent: + + The object path of the parent device. + --> + <property name="Parent" type="o" access="read"/> + </interface> +</node> diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wpan.xml b/introspection/org.freedesktop.NetworkManager.Device.Wpan.xml new file mode 100644 index 0000000000..32bc6f95d4 --- /dev/null +++ b/introspection/org.freedesktop.NetworkManager.Device.Wpan.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<node name="/"> + <!-- + org.freedesktop.NetworkManager.Device.Wpan: + @short_description: IEEE 802.15.4 (WPAN) MAC Layer Device + + --> + <interface name="org.freedesktop.NetworkManager.Device.Wpan"> + + <!-- + HwAddress: + + The active hardware address of the device. + --> + <property name="HwAddress" type="s" access="read"/> + + </interface> +</node> diff --git a/libnm-core/meson.build b/libnm-core/meson.build index 7b14370650..39ea608c44 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -5,6 +5,7 @@ libnm_core_headers = files( 'nm-core-types.h', 'nm-dbus-interface.h', 'nm-errors.h', + 'nm-setting-6lowpan.h', 'nm-setting-8021x.h', 'nm-setting-adsl.h', 'nm-setting-bluetooth.h', @@ -45,6 +46,7 @@ libnm_core_headers = files( 'nm-setting-wired.h', 'nm-setting-wireless-security.h', 'nm-setting-wireless.h', + 'nm-setting-wpan.h', 'nm-setting.h', 'nm-simple-connection.h', 'nm-utils.h', @@ -55,6 +57,7 @@ libnm_core_headers = files( ) libnm_core_settings_sources = files( + 'nm-setting-6lowpan.c', 'nm-setting-8021x.c', 'nm-setting-adsl.c', 'nm-setting-bluetooth.c', @@ -94,7 +97,8 @@ libnm_core_settings_sources = files( 'nm-setting-wimax.c', 'nm-setting-wired.c', 'nm-setting-wireless-security.c', - 'nm-setting-wireless.c' + 'nm-setting-wireless.c', + 'nm-setting-wpan.c' ) libnm_core_sources = libnm_core_settings_sources + files( diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 0c4d7ce18c..8a66afc61a 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright 2007 - 2017 Red Hat, Inc. + * Copyright 2007 - 2018 Red Hat, Inc. * Copyright 2007 - 2008 Novell, Inc. */ @@ -809,16 +809,34 @@ _normalize_ethernet_link_neg (NMConnection *self) return FALSE; } +/** + * _supports_addr_family: + * @self: a #NMConnection + * @family: AF_* + * + * Check whether the connection supports certain L3 address family, + * in order to be able to tell whether is should have the corresponding + * setting ("ipv4" for AF_INET and "ipv6" for AF_INET6). + * + * If AF_UNSPEC is given, then the function checks whether the connection + * supports any L3 configuration at all. + * + * Returns: %TRUE if the AF is supported, %FALSE otherwise + **/ static gboolean -_without_ip_config (NMConnection *self) +_supports_addr_family (NMConnection *self, int family) { const char *connection_type = nm_connection_get_connection_type (self); - g_return_val_if_fail (connection_type, FALSE); + g_return_val_if_fail (connection_type, TRUE); if (strcmp (connection_type, NM_SETTING_OVS_INTERFACE_SETTING_NAME) == 0) + return TRUE; + if (strcmp (connection_type, NM_SETTING_WPAN_SETTING_NAME) == 0) return FALSE; + if (strcmp (connection_type, NM_SETTING_6LOWPAN_SETTING_NAME) == 0) + return family == AF_INET6 || family == AF_UNSPEC; - return !!nm_setting_connection_get_master (nm_connection_get_setting_connection (self)); + return !nm_setting_connection_get_master (nm_connection_get_setting_connection (self)); } static gboolean @@ -841,32 +859,18 @@ _normalize_ip_config (NMConnection *self, GHashTable *parameters) s_ip6 = nm_connection_get_setting_ip6_config (self); s_proxy = nm_connection_get_setting_proxy (self); - if (_without_ip_config (self)) { - /* Slave connections don't have IP configuration. */ - - if (s_ip4) - nm_connection_remove_setting (self, NM_TYPE_SETTING_IP4_CONFIG); - - if (s_ip6) - nm_connection_remove_setting (self, NM_TYPE_SETTING_IP6_CONFIG); - - if (s_proxy) - nm_connection_remove_setting (self, NM_TYPE_SETTING_PROXY); - - return s_ip4 || s_ip6 || s_proxy; - } else { - /* Ensure all non-slave connections have IP4 and IP6 settings objects. If no - * IP6 setting was specified, then assume that means IP6 config is allowed - * to fail. But if no IP4 setting was specified, assume the caller was just - * being lazy. - */ + if (_supports_addr_family (self, AF_INET)) { if (!s_ip4) { + /* But if no IP4 setting was specified, assume the caller was just + * being lazy and use the default method. + */ setting = nm_setting_ip4_config_new (); g_object_set (setting, NM_SETTING_IP_CONFIG_METHOD, default_ip4_method, NULL); nm_connection_add_setting (self, setting); + changed = TRUE; } else { if ( nm_setting_ip_config_get_gateway (s_ip4) && nm_setting_ip_config_get_never_default (s_ip4)) { @@ -890,7 +894,18 @@ _normalize_ip_config (NMConnection *self, GHashTable *parameters) changed = TRUE; } } + } else { + if (s_ip4) { + nm_connection_remove_setting (self, NM_TYPE_SETTING_IP4_CONFIG); + changed = TRUE; + } + } + + if (_supports_addr_family (self, AF_INET6)) { if (!s_ip6) { + /* If no IP6 setting was specified, then assume that means IP6 config is + * allowed to fail. + */ setting = nm_setting_ip6_config_new (); g_object_set (setting, @@ -898,6 +913,7 @@ _normalize_ip_config (NMConnection *self, GHashTable *parameters) NM_SETTING_IP_CONFIG_MAY_FAIL, TRUE, NULL); nm_connection_add_setting (self, setting); + changed = TRUE; } else { const char *token; @@ -930,14 +946,27 @@ _normalize_ip_config (NMConnection *self, GHashTable *parameters) changed = TRUE; } } + } else { + if (s_ip6) { + nm_connection_remove_setting (self, NM_TYPE_SETTING_IP6_CONFIG); + changed = TRUE; + } + } + if (_supports_addr_family (self, AF_UNSPEC)) { if (!s_proxy) { setting = nm_setting_proxy_new (); nm_connection_add_setting (self, setting); + changed = TRUE; + } + } else { + if (s_proxy) { + nm_connection_remove_setting (self, NM_TYPE_SETTING_PROXY); + changed = TRUE; } - - return !s_ip4 || !s_ip6 || !s_proxy || changed; } + + return changed; } static gboolean @@ -1288,39 +1317,79 @@ _nm_connection_verify (NMConnection *connection, GError **error) nm_assert (normalizable_error_type != NM_SETTING_VERIFY_ERROR); if (NM_IN_SET (normalizable_error_type, NM_SETTING_VERIFY_SUCCESS, NM_SETTING_VERIFY_NORMALIZABLE)) { - if (_without_ip_config (connection)) { - if (s_ip4 || s_ip6 || s_proxy) { + if (_supports_addr_family (connection, AF_INET)) { + if (!s_ip4 && normalizable_error_type == NM_SETTING_VERIFY_SUCCESS) { + g_set_error_literal (&normalizable_error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_MISSING_SETTING, + _("setting is required for non-slave connections")); + g_prefix_error (&normalizable_error, "%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME); + + /* having a master without IP config was not a verify() error, accept + * it for backward compatibility. */ + normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; + } + } else { + if (s_ip4) { g_clear_error (&normalizable_error); g_set_error_literal (&normalizable_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, _("setting not allowed in slave connection")); - g_prefix_error (&normalizable_error, "%s: ", - s_ip4 - ? NM_SETTING_IP4_CONFIG_SETTING_NAME - : (s_ip6 - ? NM_SETTING_IP6_CONFIG_SETTING_NAME - : NM_SETTING_PROXY_SETTING_NAME)); + g_prefix_error (&normalizable_error, "%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME); /* having a slave with IP config *was* and is a verify() error. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE_ERROR; } - } else { - if ( normalizable_error_type == NM_SETTING_VERIFY_SUCCESS - && (!s_ip4 || !s_ip6 || !s_proxy)) { + } + + if (_supports_addr_family (connection, AF_INET6)) { + if (!s_ip6 && normalizable_error_type == NM_SETTING_VERIFY_SUCCESS) { g_set_error_literal (&normalizable_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, _("setting is required for non-slave connections")); - g_prefix_error (&normalizable_error, "%s: ", - !s_ip4 - ? NM_SETTING_IP4_CONFIG_SETTING_NAME - : (!s_ip6 - ? NM_SETTING_IP6_CONFIG_SETTING_NAME - : NM_SETTING_PROXY_SETTING_NAME)); + g_prefix_error (&normalizable_error, "%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME); + /* having a master without IP config was not a verify() error, accept * it for backward compatibility. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; } + } else { + if (s_ip6) { + g_clear_error (&normalizable_error); + g_set_error_literal (&normalizable_error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_SETTING, + _("setting not allowed in slave connection")); + g_prefix_error (&normalizable_error, "%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME); + /* having a slave with IP config *was* and is a verify() error. */ + normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE_ERROR; + } + } + + if (_supports_addr_family (connection, AF_UNSPEC)) { + if (!s_proxy && normalizable_error_type == NM_SETTING_VERIFY_SUCCESS) { + g_set_error_literal (&normalizable_error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_MISSING_SETTING, + _("setting is required for non-slave connections")); + g_prefix_error (&normalizable_error, "%s: ", NM_SETTING_PROXY_SETTING_NAME); + + /* having a master without proxy config was not a verify() error, accept + * it for backward compatibility. */ + normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; + } + } else { + if (s_proxy) { + g_clear_error (&normalizable_error); + g_set_error_literal (&normalizable_error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_SETTING, + _("setting not allowed in slave connection")); + g_prefix_error (&normalizable_error, "%s: ", NM_SETTING_PROXY_SETTING_NAME); + /* having a slave with proxy config *was* and is a verify() error. */ + normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE_ERROR; + } } } @@ -2033,7 +2102,8 @@ nm_connection_is_virtual (NMConnection *connection) if (!type) return FALSE; - if ( !strcmp (type, NM_SETTING_BOND_SETTING_NAME) + if ( !strcmp (type, NM_SETTING_6LOWPAN_SETTING_NAME) + || !strcmp (type, NM_SETTING_BOND_SETTING_NAME) || !strcmp (type, NM_SETTING_DUMMY_SETTING_NAME) || !strcmp (type, NM_SETTING_TEAM_SETTING_NAME) || !strcmp (type, NM_SETTING_BRIDGE_SETTING_NAME) @@ -2114,6 +2184,22 @@ nm_connection_get_virtual_device_description (NMConnection *connection) /*****************************************************************************/ /** + * nm_connection_get_setting_6lowpan: + * @connection: the #NMConnection + * + * A shortcut to return any #NMSetting6Lowpan the connection might contain. + * + * Returns: (transfer none): an #NMSetting6Lowpan if the connection contains one, otherwise %NULL + * + * Since: 1.14 + **/ +NMSetting6Lowpan * +nm_connection_get_setting_6lowpan (NMConnection *connection) +{ + return _connection_get_setting_check (connection, NM_TYPE_SETTING_6LOWPAN); +} + +/** * nm_connection_get_setting_802_1x: * @connection: the #NMConnection * @@ -2679,6 +2765,22 @@ nm_connection_get_setting_vlan (NMConnection *connection) return _connection_get_setting_check (connection, NM_TYPE_SETTING_VLAN); } +/** + * nm_connection_get_setting_wpan: + * @connection: the #NMConnection + * + * A shortcut to return any #NMSettingWpan the connection might contain. + * + * Returns: (transfer none): an #NMSettingWpan if the connection contains one, otherwise %NULL + * + * Since: 1.14 + **/ +NMSettingWpan * +nm_connection_get_setting_wpan (NMConnection *connection) +{ + return _connection_get_setting_check (connection, NM_TYPE_SETTING_WPAN); +} + NMSettingBluetooth * _nm_connection_get_setting_bluetooth_for_nap (NMConnection *connection) { diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h index 6d23cfdbab..8f65e9fce9 100644 --- a/libnm-core/nm-connection.h +++ b/libnm-core/nm-connection.h @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright 2007 - 2017 Red Hat, Inc. + * Copyright 2007 - 2018 Red Hat, Inc. * Copyright 2007 - 2008 Novell, Inc. */ @@ -193,6 +193,8 @@ const char * nm_connection_get_connection_type (NMConnection *connection); gboolean nm_connection_is_virtual (NMConnection *connection); char * nm_connection_get_virtual_device_description (NMConnection *connection); +NM_AVAILABLE_IN_1_14 +NMSetting6Lowpan * nm_connection_get_setting_6lowpan (NMConnection *connection); NMSetting8021x * nm_connection_get_setting_802_1x (NMConnection *connection); NMSettingBluetooth * nm_connection_get_setting_bluetooth (NMConnection *connection); NMSettingBond * nm_connection_get_setting_bond (NMConnection *connection); @@ -241,6 +243,8 @@ NMSettingWirelessSecurity *nm_connection_get_setting_wireless_security (NMConnec NMSettingVlan * nm_connection_get_setting_vlan (NMConnection *connection); NM_AVAILABLE_IN_1_2 NMSettingVxlan * nm_connection_get_setting_vxlan (NMConnection *connection); +NM_AVAILABLE_IN_1_14 +NMSettingWpan * nm_connection_get_setting_wpan (NMConnection *connection); G_END_DECLS diff --git a/libnm-core/nm-core-enum-types.c.template b/libnm-core/nm-core-enum-types.c.template index 9c08f52651..605fa34ae4 100644 --- a/libnm-core/nm-core-enum-types.c.template +++ b/libnm-core/nm-core-enum-types.c.template @@ -48,6 +48,7 @@ #include "nm-setting-wired.h" #include "nm-setting-wireless-security.h" #include "nm-setting-wireless.h" +#include "nm-setting-wpan.h" #include "nm-setting.h" #include "nm-simple-connection.h" #include "nm-utils.h" diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 2a2045e6ba..8413bf99fa 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -15,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2014 - 2017 Red Hat, Inc. + * (C) Copyright 2014 - 2018 Red Hat, Inc. */ #ifndef NM_CORE_NM_INTERNAL_H @@ -37,6 +37,7 @@ #include "nm-connection.h" #include "nm-core-enum-types.h" +#include "nm-setting-6lowpan.h" #include "nm-setting-8021x.h" #include "nm-setting-adsl.h" #include "nm-setting-bluetooth.h" @@ -75,6 +76,7 @@ #include "nm-setting-wired.h" #include "nm-setting-wireless-security.h" #include "nm-setting-wireless.h" +#include "nm-setting-wpan.h" #include "nm-setting.h" #include "nm-simple-connection.h" #include "nm-utils.h" diff --git a/libnm-core/nm-core-types.h b/libnm-core/nm-core-types.h index 6a274333b6..73ba579489 100644 --- a/libnm-core/nm-core-types.h +++ b/libnm-core/nm-core-types.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2014 - 2017 Red Hat, Inc. + * Copyright 2014 - 2018 Red Hat, Inc. */ #ifndef __NM_CORE_TYPES_H__ @@ -29,6 +29,7 @@ typedef struct _NMConnection NMConnection; typedef struct _NMSetting NMSetting; +typedef struct _NMSetting6Lowpan NMSetting6Lowpan; typedef struct _NMSetting8021x NMSetting8021x; typedef struct _NMSettingAdsl NMSettingAdsl; typedef struct _NMSettingBluetooth NMSettingBluetooth; @@ -69,6 +70,7 @@ typedef struct _NMSettingWimax NMSettingWimax; typedef struct _NMSettingWired NMSettingWired; typedef struct _NMSettingWireless NMSettingWireless; typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity; +typedef struct _NMSettingWpan NMSettingWpan; typedef struct _NMSimpleConnection NMSimpleConnection; #endif /* __NM_CORE_TYPES_H__ */ diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index e7c0bc2c9c..8e0882ff1a 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2004 - 2017 Red Hat, Inc. + * Copyright 2004 - 2018 Red Hat, Inc. */ /* Definitions related to NetworkManager's D-Bus interfaces. @@ -75,6 +75,8 @@ #define NM_DBUS_INTERFACE_DEVICE_VXLAN NM_DBUS_INTERFACE_DEVICE ".Vxlan" #define NM_DBUS_INTERFACE_DEVICE_GRE NM_DBUS_INTERFACE_DEVICE ".Gre" #define NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL NM_DBUS_INTERFACE_DEVICE ".IPTunnel" +#define NM_DBUS_INTERFACE_DEVICE_WPAN NM_DBUS_INTERFACE_DEVICE ".Wpan" +#define NM_DBUS_INTERFACE_DEVICE_6LOWPAN NM_DBUS_INTERFACE_DEVICE ".Lowpan" #define NM_DBUS_INTERFACE_DEVICE_STATISTICS NM_DBUS_INTERFACE_DEVICE ".Statistics" #define NM_DBUS_INTERFACE_CHECKPOINT NM_DBUS_INTERFACE ".Checkpoint" @@ -212,6 +214,8 @@ typedef enum { * @NM_DEVICE_TYPE_OVS_INTERFACE: a Open vSwitch interface * @NM_DEVICE_TYPE_OVS_PORT: a Open vSwitch port * @NM_DEVICE_TYPE_OVS_BRIDGE: a Open vSwitch bridge + * @NM_DEVICE_TYPE_WPAN: a IEEE 802.15.4 (WPAN) MAC Layer Device + * @NM_DEVICE_TYPE_6LOWPAN: 6LoWPAN interface * * #NMDeviceType values indicate the type of hardware represented by a * device object. @@ -244,6 +248,8 @@ typedef enum { NM_DEVICE_TYPE_OVS_INTERFACE = 24, NM_DEVICE_TYPE_OVS_PORT = 25, NM_DEVICE_TYPE_OVS_BRIDGE = 26, + NM_DEVICE_TYPE_WPAN = 27, + NM_DEVICE_TYPE_6LOWPAN = 28, } NMDeviceType; /** diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c index 5c94c35c3e..3ea1a53e67 100644 --- a/libnm-core/nm-keyfile.c +++ b/libnm-core/nm-keyfile.c @@ -2360,7 +2360,7 @@ _parse_info_find (const char *setting_name, const char *property_name) g_assert (pis->setting_name); if ( i > 0 - && strcmp (pis[-1].setting_name, pis->setting_name) >= 0) + && strcmp (pis[-1].setting_name, pis->setting_name) >= 0) g_error ("Wrong order at index #%d: \"%s\" before \"%s\"", i - 1, pis[-1].setting_name, pis->setting_name); g_assert (pis->properties); g_assert (pis->properties[0]); @@ -2388,6 +2388,7 @@ _parse_info_find (const char *setting_name, const char *property_name) if (idx >= 0) { const ParseInfoSetting *pis = &parse_infos[idx]; + G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (ParseInfoProperty, property_name) == 0); nm_assert (nm_streq (pis->setting_name, setting_name)); idx = _nm_utils_ptrarray_find_binary_search ((gconstpointer *) pis->properties, NM_PTRARRAY_LEN (pis->properties), diff --git a/libnm-core/nm-setting-6lowpan.c b/libnm-core/nm-setting-6lowpan.c new file mode 100644 index 0000000000..3ea1c69b4b --- /dev/null +++ b/libnm-core/nm-setting-6lowpan.c @@ -0,0 +1,229 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "nm-setting-private.h" +#include "nm-setting-6lowpan.h" + +NM_GOBJECT_PROPERTIES_DEFINE_BASE ( + PROP_PARENT, +); + +typedef struct { + char *parent; +} NMSetting6LowpanPrivate; + +/** + * NMSetting6Lowpan: + * + * 6LoWPAN Settings + */ +struct _NMSetting6Lowpan { + NMSetting parent; +}; + +typedef struct { + NMSettingClass parent; +} NMSetting6LowpanClass; + +/** + * SECTION:nm-setting-6lowpan + * @short_description: Describes connection properties for 6LoWPAN interfaces + * + * The #NMSetting6Lowpan object is a #NMSetting subclass that describes properties + * necessary for connection to 6LoWPAN interfaces. + **/ + +G_DEFINE_TYPE_WITH_CODE (NMSetting6Lowpan, nm_setting_6lowpan, NM_TYPE_SETTING, + _nm_register_setting (6LOWPAN, NM_SETTING_PRIORITY_HW_BASE)) +NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_6LOWPAN) + +#define NM_SETTING_6LOWPAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_6LOWPAN, NMSetting6LowpanPrivate)) + + +/** + * nm_setting_6lowpan_new: + * + * Creates a new #NMSetting6Lowpan object with default values. + * + * Returns: (transfer full): the new empty #NMSetting6Lowpan object + * + * Since: 1.14 + **/ +NMSetting * +nm_setting_6lowpan_new (void) +{ + return (NMSetting *) g_object_new (NM_TYPE_SETTING_6LOWPAN, NULL); +} + +/** + * nm_setting_6lowpan_get_parent: + * @setting: the #NMSetting6Lowpan + * + * Returns: the #NMSetting6Lowpan:parent property of the setting + * + * Since: 1.14 + **/ +const char * +nm_setting_6lowpan_get_parent (NMSetting6Lowpan *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_6LOWPAN (setting), NULL); + return NM_SETTING_6LOWPAN_GET_PRIVATE (setting)->parent; +} + +/*********************************************************************/ + +static gboolean +verify (NMSetting *setting, NMConnection *connection, GError **error) +{ + NMSetting6LowpanPrivate *priv = NM_SETTING_6LOWPAN_GET_PRIVATE (setting); + NMSettingConnection *s_con = NULL; + + if (connection) + s_con = nm_connection_get_setting_connection (connection); + + if (!priv->parent) { + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_MISSING_PROPERTY, + _("property is not specified")); + g_prefix_error (error, "%s.%s: ", NM_SETTING_6LOWPAN_SETTING_NAME, NM_SETTING_6LOWPAN_PARENT); + return FALSE; + } + + + + if (nm_utils_is_uuid (priv->parent)) { + /* If we have an NMSettingConnection:master with slave-type="6lowpan", + * then it must be the same UUID. + */ + if (s_con) { + const char *master = NULL, *slave_type = NULL; + + slave_type = nm_setting_connection_get_slave_type (s_con); + if (!g_strcmp0 (slave_type, NM_SETTING_6LOWPAN_SETTING_NAME)) + master = nm_setting_connection_get_master (s_con); + + if (master && g_strcmp0 (priv->parent, master) != 0) { + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' value doesn't match '%s=%s'"), + priv->parent, NM_SETTING_CONNECTION_MASTER, master); + g_prefix_error (error, "%s.%s: ", NM_SETTING_6LOWPAN_SETTING_NAME, NM_SETTING_6LOWPAN_PARENT); + return FALSE; + } + } + } else if (!nm_utils_iface_valid_name (priv->parent)) { + /* parent must be either a UUID or an interface name */ + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' is neither an UUID nor an interface name"), + priv->parent); + g_prefix_error (error, "%s.%s: ", NM_SETTING_6LOWPAN_SETTING_NAME, NM_SETTING_6LOWPAN_PARENT); + return FALSE; + } + + return TRUE; +} + +static void +nm_setting_6lowpan_init (NMSetting6Lowpan *setting) +{ +} + +static void +set_property (GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + NMSetting6Lowpan *setting = NM_SETTING_6LOWPAN (object); + NMSetting6LowpanPrivate *priv = NM_SETTING_6LOWPAN_GET_PRIVATE (setting); + + switch (prop_id) { + case PROP_PARENT: + g_free (priv->parent); + priv->parent = g_value_dup_string (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) +{ + NMSetting6Lowpan *setting = NM_SETTING_6LOWPAN (object); + NMSetting6LowpanPrivate *priv = NM_SETTING_6LOWPAN_GET_PRIVATE (setting); + + switch (prop_id) { + case PROP_PARENT: + g_value_set_string (value, priv->parent); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +finalize (GObject *object) +{ + NMSetting6Lowpan *setting = NM_SETTING_6LOWPAN (object); + NMSetting6LowpanPrivate *priv = NM_SETTING_6LOWPAN_GET_PRIVATE (setting); + + g_free (priv->parent); + + G_OBJECT_CLASS (nm_setting_6lowpan_parent_class)->finalize (object); +} + +static void +nm_setting_6lowpan_class_init (NMSetting6LowpanClass *setting_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (setting_class); + NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class); + + g_type_class_add_private (setting_class, sizeof (NMSetting6LowpanPrivate)); + + object_class->set_property = set_property; + object_class->get_property = get_property; + object_class->finalize = finalize; + parent_class->verify = verify; + + /** + * NMSetting6Lowpan:parent: + * + * If given, specifies the parent interface name or parent connection UUID + * from which this 6LowPAN interface should be created. + * + * Since: 1.14 + **/ + obj_properties[PROP_PARENT] = + g_param_spec_string (NM_SETTING_6LOWPAN_PARENT, "", "", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | + G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); +} diff --git a/libnm-core/nm-setting-6lowpan.h b/libnm-core/nm-setting-6lowpan.h new file mode 100644 index 0000000000..5663bdde33 --- /dev/null +++ b/libnm-core/nm-setting-6lowpan.h @@ -0,0 +1,52 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Red Hat, Inc. + */ + +#ifndef __NM_SETTING_6LOWPAN_H__ +#define __NM_SETTING_6LOWPAN_H__ + +#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) +#error "Only <NetworkManager.h> can be included directly." +#endif + +#include "nm-setting.h" + +G_BEGIN_DECLS + +#define NM_TYPE_SETTING_6LOWPAN (nm_setting_6lowpan_get_type ()) +#define NM_SETTING_6LOWPAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_6LOWPAN, NMSetting6Lowpan)) +#define NM_SETTING_6LOWPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_6LOWPANCONFIG, NMSetting6LowpanClass)) +#define NM_IS_SETTING_6LOWPAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_6LOWPAN)) +#define NM_IS_SETTING_6LOWPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_6LOWPAN)) +#define NM_SETTING_6LOWPAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_6LOWPAN, NMSetting6LowpanClass)) + +#define NM_SETTING_6LOWPAN_SETTING_NAME "6lowpan" + +#define NM_SETTING_6LOWPAN_PARENT "parent" + +NM_AVAILABLE_IN_1_14 +GType nm_setting_6lowpan_get_type (void); +NM_AVAILABLE_IN_1_14 +NMSetting *nm_setting_6lowpan_new (void); + +NM_AVAILABLE_IN_1_14 +const char *nm_setting_6lowpan_get_parent (NMSetting6Lowpan *setting); + +G_END_DECLS + +#endif /* __NM_SETTING_6LOWPAN_H__ */ diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c index c9cb97dfe2..d664166263 100644 --- a/libnm-core/nm-setting-ip-tunnel.c +++ b/libnm-core/nm-setting-ip-tunnel.c @@ -410,7 +410,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) priv->input_key); g_prefix_error (error, "%s.%s: ", NM_SETTING_IP_TUNNEL_SETTING_NAME, NM_SETTING_IP_TUNNEL_INPUT_KEY); - return FALSE; + return FALSE; } } @@ -426,7 +426,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) priv->output_key); g_prefix_error (error, "%s.%s: ", NM_SETTING_IP_TUNNEL_SETTING_NAME, NM_SETTING_IP_TUNNEL_OUTPUT_KEY); - return FALSE; + return FALSE; } } diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c index e86988b5b4..620a9c30b8 100644 --- a/libnm-core/nm-setting-serial.c +++ b/libnm-core/nm-setting-serial.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2018 Red Hat, Inc. * Copyright 2007 - 2008 Novell, Inc. */ @@ -145,12 +145,6 @@ nm_setting_serial_get_send_delay (NMSettingSerial *setting) return NM_SETTING_SERIAL_GET_PRIVATE (setting)->send_delay; } -static gboolean -verify (NMSetting *setting, NMConnection *connection, GError **error) -{ - return TRUE; -} - static void nm_setting_serial_init (NMSettingSerial *setting) { @@ -254,7 +248,6 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) /* virtual methods */ object_class->set_property = set_property; object_class->get_property = get_property; - parent_class->verify = verify; /* Properties */ diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 5da9ce7d7f..5608fb103d 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -766,8 +766,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) || ((!priv->speed) && (priv->duplex))) { g_set_error_literal (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, priv->auto_negotiate ? _("both speed and duplex should have a valid value or both should be unset") : _("both speed and duplex are required for static link configuration")); diff --git a/libnm-core/nm-setting-wpan.c b/libnm-core/nm-setting-wpan.c new file mode 100644 index 0000000000..5ca1d39391 --- /dev/null +++ b/libnm-core/nm-setting-wpan.c @@ -0,0 +1,273 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Lubomir Rintel <lkundrak@v3.sk> + */ + +#include "nm-default.h" + +#include "nm-setting-wpan.h" + +#include "nm-connection-private.h" +#include "nm-setting-connection.h" +#include "nm-setting-private.h" +#include "nm-utils-private.h" + +/* Ideally we'll be able to get this from a public header. */ +#ifndef IEEE802154_ADDR_LEN +#define IEEE802154_ADDR_LEN 8 +#endif + +enum { + PROP_0, + PROP_MAC_ADDRESS, + PROP_PAN_ID, + PROP_SHORT_ADDRESS, +}; + +typedef struct { + char *mac_address; + guint16 pan_id; + guint16 short_address; +} NMSettingWpanPrivate; + +/** + * NMSettingWpan: + * + * IEEE 802.15.4 (WPAN) MAC Settings + */ +struct _NMSettingWpan { + NMSetting parent; +}; + +typedef struct { + NMSettingClass parent; +} NMSettingWpanClass; + +/** + * SECTION:nm-setting-wpan + * @short_description: Describes connection properties for IEEE 802.15.4 (WPAN) MAC + * + * The #NMSettingWpan object is a #NMSetting subclass that describes properties + * necessary for configuring IEEE 802.15.4 (WPAN) MAC layer devices. + **/ + +G_DEFINE_TYPE_WITH_CODE (NMSettingWpan, nm_setting_wpan, NM_TYPE_SETTING, + _nm_register_setting (WPAN, NM_SETTING_PRIORITY_HW_BASE)) +NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_WPAN) + +#define NM_SETTING_WPAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_WPAN, NMSettingWpanPrivate)) + +/** + * nm_setting_wpan_get_mac_address: + * @setting: the #NMSettingWpan + * + * Returns: the #NMSettingWpan:mac-address property of the setting + * + * Since: 1.14 + **/ +const char * +nm_setting_wpan_get_mac_address (NMSettingWpan *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_WPAN (setting), NULL); + + return NM_SETTING_WPAN_GET_PRIVATE (setting)->mac_address; +} + +/** + * nm_setting_wpan_get_pan_id: + * @setting: the #NMSettingWpan + * + * Returns: the #NMSettingWpan:pan-id property of the setting + * + * Since: 1.14 + **/ +guint16 +nm_setting_wpan_get_pan_id (NMSettingWpan *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_WPAN (setting), G_MAXUINT16); + + return NM_SETTING_WPAN_GET_PRIVATE (setting)->pan_id; +} + +/** + * nm_setting_wpan_get_short_address: + * @setting: the #NMSettingWpan + * + * Returns: the #NMSettingWpan:short-address property of the setting + * + * Since: 1.14 + **/ +guint16 +nm_setting_wpan_get_short_address (NMSettingWpan *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_WPAN (setting), G_MAXUINT16); + + return NM_SETTING_WPAN_GET_PRIVATE (setting)->short_address; +} + +static gboolean +verify (NMSetting *setting, NMConnection *connection, GError **error) +{ + NMSettingWpanPrivate *priv = NM_SETTING_WPAN_GET_PRIVATE (setting); + + if (priv->mac_address && !nm_utils_hwaddr_valid (priv->mac_address, IEEE802154_ADDR_LEN)) { + g_set_error_literal (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("property is invalid")); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WPAN_SETTING_NAME, NM_SETTING_WPAN_MAC_ADDRESS); + return FALSE; + } + + return TRUE; +} + +static void +get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + NMSettingWpan *setting = NM_SETTING_WPAN (object); + + switch (prop_id) { + case PROP_MAC_ADDRESS: + g_value_set_string (value, nm_setting_wpan_get_mac_address (setting)); + break; + case PROP_PAN_ID: + g_value_set_uint (value, nm_setting_wpan_get_pan_id (setting)); + break; + case PROP_SHORT_ADDRESS: + g_value_set_uint (value, nm_setting_wpan_get_short_address (setting)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +{ + NMSettingWpanPrivate *priv = NM_SETTING_WPAN_GET_PRIVATE (object); + + switch (prop_id) { + case PROP_MAC_ADDRESS: + g_free (priv->mac_address); + priv->mac_address = _nm_utils_hwaddr_canonical_or_invalid (g_value_get_string (value), + IEEE802154_ADDR_LEN); + break; + case PROP_PAN_ID: + priv->pan_id = g_value_get_uint (value); + break; + case PROP_SHORT_ADDRESS: + priv->short_address = g_value_get_uint (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +nm_setting_wpan_init (NMSettingWpan *setting) +{ + NMSettingWpanPrivate *priv = NM_SETTING_WPAN_GET_PRIVATE (setting); + + priv->short_address = G_MAXUINT16; + priv->pan_id = G_MAXUINT16; +} + +/** + * nm_setting_wpan_new: + * + * Creates a new #NMSettingWpan object with default values. + * + * Returns: (transfer full): the new empty #NMSettingWpan object + * + * Since: 1.14 + **/ +NMSetting * +nm_setting_wpan_new (void) +{ + return (NMSetting *) g_object_new (NM_TYPE_SETTING_WPAN, NULL); +} + +static void +finalize (GObject *object) +{ + NMSettingWpanPrivate *priv = NM_SETTING_WPAN_GET_PRIVATE (object); + + g_free (priv->mac_address); + + G_OBJECT_CLASS (nm_setting_wpan_parent_class)->finalize (object); +} + +static void +nm_setting_wpan_class_init (NMSettingWpanClass *setting_wpan_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (setting_wpan_class); + NMSettingClass *setting_class = NM_SETTING_CLASS (setting_wpan_class); + + g_type_class_add_private (setting_class, sizeof (NMSettingWpanPrivate)); + + object_class->set_property = set_property; + object_class->get_property = get_property; + object_class->finalize = finalize; + setting_class->verify = verify; + + /** + * NMSettingWpan:mac-address: + * + * If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) + * MAC layer device whose permanent MAC address matches. + **/ + /* ---keyfile--- + * property: mac-address + * format: usual hex-digits-and-colons notation + * description: MAC address in hex-digits-and-colons notation + * (e.g. 76:d8:9b:87:66:60:84:ee). + * ---end--- + */ + g_object_class_install_property + (object_class, PROP_MAC_ADDRESS, + g_param_spec_string (NM_SETTING_WPAN_MAC_ADDRESS, "", "", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + /** + * NMSettingWpan:pan-id: + * + * IEEE 802.15.4 Personal Area Network (PAN) identifier. + **/ + g_object_class_install_property + (object_class, PROP_PAN_ID, + g_param_spec_uint (NM_SETTING_WPAN_PAN_ID, "", "", + 0, G_MAXUINT16, G_MAXUINT16, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + + /** + * NMSettingWpan:short-address: + * + * Short IEEE 802.15.4 address to be used within a restricted environment. + **/ + g_object_class_install_property + (object_class, PROP_SHORT_ADDRESS, + g_param_spec_uint (NM_SETTING_WPAN_SHORT_ADDRESS, "", "", + 0, G_MAXUINT16, G_MAXUINT16, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); +} diff --git a/libnm-core/nm-setting-wpan.h b/libnm-core/nm-setting-wpan.h new file mode 100644 index 0000000000..a2da30f7ac --- /dev/null +++ b/libnm-core/nm-setting-wpan.h @@ -0,0 +1,57 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Lubomir Rintel <lkundrak@v3.sk> + */ + +#ifndef __NM_SETTING_WPAN_H__ +#define __NM_SETTING_WPAN_H__ + +#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) +#error "Only <NetworkManager.h> can be included directly." +#endif + +#include "nm-setting.h" + +G_BEGIN_DECLS + +#define NM_TYPE_SETTING_WPAN (nm_setting_wpan_get_type ()) +#define NM_SETTING_WPAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_WPAN, NMSettingWpan)) +#define NM_SETTING_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_WPANCONFIG, NMSettingWpanClass)) +#define NM_IS_SETTING_WPAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_WPAN)) +#define NM_IS_SETTING_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_WPAN)) +#define NM_SETTING_WPAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_WPAN, NMSettingWpanClass)) + +#define NM_SETTING_WPAN_SETTING_NAME "wpan" +#define NM_SETTING_WPAN_MAC_ADDRESS "mac-address" +#define NM_SETTING_WPAN_PAN_ID "pan-id" +#define NM_SETTING_WPAN_SHORT_ADDRESS "short-address" + +NM_AVAILABLE_IN_1_14 +GType nm_setting_wpan_get_type (void); +NM_AVAILABLE_IN_1_14 +NMSetting *nm_setting_wpan_new (void); + +NM_AVAILABLE_IN_1_14 +const char *nm_setting_wpan_get_mac_address (NMSettingWpan *setting); +NM_AVAILABLE_IN_1_14 +guint16 nm_setting_wpan_get_pan_id (NMSettingWpan *setting); +NM_AVAILABLE_IN_1_14 +guint16 nm_setting_wpan_get_short_address (NMSettingWpan *setting); + +G_END_DECLS + +#endif /* __NM_SETTING_WPAN_H__ */ diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index 0412bc8e94..59482d4eeb 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -160,4 +160,18 @@ # define NM_AVAILABLE_IN_1_12 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_14 +# define NM_DEPRECATED_IN_1_14 G_DEPRECATED +# define NM_DEPRECATED_IN_1_14_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_14 +# define NM_DEPRECATED_IN_1_14_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_14 +# define NM_AVAILABLE_IN_1_14 G_UNAVAILABLE(1,14) +#else +# define NM_AVAILABLE_IN_1_14 +#endif + #endif /* NM_VERSION_H */ diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 3b9debd935..5c3926f081 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2008 - 2011 Red Hat, Inc. + * Copyright 2008 - 2018 Red Hat, Inc. * */ @@ -61,6 +61,7 @@ #include "nm-setting-wired.h" #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" +#include "nm-setting-wpan.h" #include "nm-simple-connection.h" #include "nm-keyfile-internal.h" #include "nm-utils/nm-dedup-multi.h" diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index fabd881874..016aa6389a 100644 --- a/libnm-glib/meson.build +++ b/libnm-glib/meson.build @@ -269,10 +269,10 @@ executable( link_with: libnm_glib ) -run_target( +test( 'check-local-exports-' + libnm_glib_name, - command: [check_exports, libnm_glib.full_path(), linker_script], - depends: libnm_glib + check_exports, + args: [libnm_glib.full_path(), linker_script], ) if enable_tests diff --git a/libnm-util/meson.build b/libnm-util/meson.build index 55df550175..0ba7b6ee36 100644 --- a/libnm-util/meson.build +++ b/libnm-util/meson.build @@ -167,10 +167,10 @@ if enable_introspection ) endif -run_target( +test( 'check-local-exports-' + libnm_util_name, - command: [check_exports, libnm_util.full_path(), linker_script], - depends: libnm_util + check_exports, + args: [libnm_util.full_path(), linker_script], ) sources = files( diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h index 9226aa35f8..73186f74ea 100644 --- a/libnm/NetworkManager.h +++ b/libnm/NetworkManager.h @@ -15,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright 2014 - 2017 Red Hat, Inc. + * Copyright 2014 - 2018 Red Hat, Inc. */ #ifndef __NETWORKMANAGER_H__ @@ -29,6 +29,7 @@ #include "nm-connection.h" #include "nm-core-enum-types.h" #include "nm-dbus-interface.h" +#include "nm-device-6lowpan.h" #include "nm-device-adsl.h" #include "nm-device-bond.h" #include "nm-device-bridge.h" @@ -52,12 +53,14 @@ #include "nm-device-vxlan.h" #include "nm-device-wifi.h" #include "nm-device-wimax.h" +#include "nm-device-wpan.h" #include "nm-device.h" #include "nm-dhcp-config.h" #include "nm-enum-types.h" #include "nm-ip-config.h" #include "nm-object.h" #include "nm-remote-connection.h" +#include "nm-setting-6lowpan.h" #include "nm-setting-8021x.h" #include "nm-setting-adsl.h" #include "nm-setting-bluetooth.h" @@ -98,6 +101,7 @@ #include "nm-setting-wired.h" #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" +#include "nm-setting-wpan.h" #include "nm-setting.h" #include "nm-simple-connection.h" #include "nm-utils.h" diff --git a/libnm/libnm.ver b/libnm/libnm.ver index 5011906c65..74dda254db 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1349,11 +1349,14 @@ global: nm_client_checkpoint_rollback_finish; nm_client_get_checkpoints; nm_connection_get_setting_tc_config; + nm_device_6lowpan_get_type; nm_device_ip_tunnel_get_flags; nm_device_wifi_get_last_scan; + nm_device_wpan_get_type; nm_ip_tunnel_flags_get_type; nm_remote_connection_get_filename; nm_remote_connection_get_flags; + nm_setting_6lowpan_get_type; nm_setting_connection_get_mdns; nm_setting_connection_mdns_get_type; nm_setting_ip_tunnel_get_flags; @@ -1365,6 +1368,7 @@ global: nm_setting_wireless_security_fils_get_type; nm_setting_wireless_get_wake_on_wlan; nm_setting_wireless_wake_on_wlan_get_type; + nm_setting_wpan_get_type; nm_settings_connection_flags_get_type; nm_utils_get_timestamp_msec; nm_vpn_service_plugin_shutdown; diff --git a/libnm/meson.build b/libnm/meson.build index 76c77d0ced..27089004c7 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -32,6 +32,7 @@ libnm_headers = files( 'nm-autoptr.h', 'nm-checkpoint.h', 'nm-client.h', + 'nm-device-6lowpan.h', 'nm-device-adsl.h', 'nm-device-bond.h', 'nm-device-bridge.h', @@ -56,6 +57,7 @@ libnm_headers = files( 'nm-device-vxlan.h', 'nm-device-wifi.h', 'nm-device-wimax.h', + 'nm-device-wpan.h', 'nm-dhcp-config.h', 'nm-ip-config.h', 'nm-object.h', @@ -93,6 +95,7 @@ libnm_sources = files( 'nm-checkpoint.c', 'nm-client.c', 'nm-dbus-helpers.c', + 'nm-device-6lowpan.c', 'nm-device-adsl.c', 'nm-device-bond.c', 'nm-device-bridge.c', @@ -117,6 +120,7 @@ libnm_sources = files( 'nm-device-vxlan.c', 'nm-device-wifi.c', 'nm-device-wimax.c', + 'nm-device-wpan.c', 'nm-dhcp-config.c', 'nm-dhcp4-config.c', 'nm-dhcp6-config.c', @@ -182,10 +186,10 @@ pkg.generate( ] ) -run_target( +test( 'check-local-exports-' + libnm_name, - command: [check_exports, libnm.full_path(), linker_script], - depends: libnm + check_exports, + args: [libnm.full_path(), linker_script], ) if enable_introspection diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 18d3e318ce..543dd4e8ea 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -16,7 +16,7 @@ * Boston, MA 02110-1301 USA. * * Copyright 2007 - 2008 Novell, Inc. - * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -51,6 +51,7 @@ #include "nm-access-point.h" #include "nm-active-connection.h" #include "nm-checkpoint.h" +#include "nm-device-6lowpan.h" #include "nm-device-adsl.h" #include "nm-device-bond.h" #include "nm-device-bridge.h" @@ -74,6 +75,7 @@ #include "nm-device-vxlan.h" #include "nm-device-wifi.h" #include "nm-device-wimax.h" +#include "nm-device-wpan.h" #include "nm-dhcp4-config.h" #include "nm-dhcp6-config.h" #include "nm-dhcp-config.h" @@ -2523,6 +2525,8 @@ obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager type = NM_TYPE_ACCESS_POINT; else if (strcmp (ifname, NM_DBUS_INTERFACE_ACTIVE_CONNECTION) == 0 && type != NM_TYPE_VPN_CONNECTION) type = NM_TYPE_ACTIVE_CONNECTION; + else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_6LOWPAN) == 0) + type = NM_TYPE_DEVICE_6LOWPAN; else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_ADSL) == 0) type = NM_TYPE_DEVICE_ADSL; else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_BOND) == 0) @@ -2563,6 +2567,8 @@ obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager type = NM_TYPE_DEVICE_TUN; else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_VLAN) == 0) type = NM_TYPE_DEVICE_VLAN; + else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_WPAN) == 0) + type = NM_TYPE_DEVICE_WPAN; else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_VXLAN) == 0) type = NM_TYPE_DEVICE_VXLAN; else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_WIRELESS) == 0) diff --git a/libnm/nm-device-6lowpan.c b/libnm/nm-device-6lowpan.c new file mode 100644 index 0000000000..9a305d26ae --- /dev/null +++ b/libnm/nm-device-6lowpan.c @@ -0,0 +1,193 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "nm-device-6lowpan.h" +#include "nm-object-private.h" + +typedef struct { + NMDevice *parent; + char *hw_address; +} NMDevice6LowpanPrivate; + +/** + * NMDevice6Lowpan: + */ +struct _NMDevice6Lowpan { + NMDevice parent; +}; + +typedef struct { + NMDeviceClass parent; + + /*< private >*/ + gpointer padding[4]; +} NMDevice6LowpanClass; + +G_DEFINE_TYPE (NMDevice6Lowpan, nm_device_6lowpan, NM_TYPE_DEVICE) + +#define NM_DEVICE_6LOWPAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_6LOWPAN, NMDevice6LowpanPrivate)) + +NM_GOBJECT_PROPERTIES_DEFINE_BASE ( + PROP_PARENT, + PROP_HW_ADDRESS, +); + +/** + * nm_device_6lowpan_get_parent: + * @device: a #NMDevice6Lowpan + * + * Returns: (transfer none): the device's parent device + * + * Since: 1.14 + **/ +NMDevice * +nm_device_6lowpan_get_parent (NMDevice6Lowpan *device) +{ + g_return_val_if_fail (NM_IS_DEVICE_6LOWPAN (device), NULL); + + return NM_DEVICE_6LOWPAN_GET_PRIVATE (device)->parent; +} + +/** + * nm_device_6lowpan_get_hw_address: + * @device: a #NMDevice6Lowpan + * + * Gets the hardware (MAC) address of the #NMDevice6Lowpan + * + * Returns: the hardware address. This is the internal string used by the + * device, and must not be modified. + * + * Since: 1.14 + **/ +const char * +nm_device_6lowpan_get_hw_address (NMDevice6Lowpan *device) +{ + g_return_val_if_fail (NM_IS_DEVICE_6LOWPAN (device), NULL); + + return NM_DEVICE_6LOWPAN_GET_PRIVATE (device)->hw_address; +} + +static const char * +get_hw_address (NMDevice *device) +{ + return nm_device_6lowpan_get_hw_address (NM_DEVICE_6LOWPAN (device)); +} + +/***********************************************************/ + +static void +nm_device_6lowpan_init (NMDevice6Lowpan *device) +{ +} + +static void +init_dbus (NMObject *object) +{ + NMDevice6LowpanPrivate *priv = NM_DEVICE_6LOWPAN_GET_PRIVATE (object); + const NMPropertiesInfo property_info[] = { + { NM_DEVICE_6LOWPAN_PARENT, &priv->parent, NULL, NM_TYPE_DEVICE }, + { NM_DEVICE_6LOWPAN_HW_ADDRESS, &priv->hw_address }, + { NULL }, + }; + + NM_OBJECT_CLASS (nm_device_6lowpan_parent_class)->init_dbus (object); + + _nm_object_register_properties (object, + NM_DBUS_INTERFACE_DEVICE_6LOWPAN, + property_info); +} + +static void +finalize (GObject *object) +{ + NMDevice6LowpanPrivate *priv = NM_DEVICE_6LOWPAN_GET_PRIVATE (object); + + g_free (priv->hw_address); + g_clear_object (&priv->parent); + + G_OBJECT_CLASS (nm_device_6lowpan_parent_class)->finalize (object); +} + +static void +get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + NMDevice6Lowpan *device = NM_DEVICE_6LOWPAN (object); + + switch (prop_id) { + case PROP_PARENT: + g_value_set_object (value, nm_device_6lowpan_get_parent (device)); + break; + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_6lowpan_get_hw_address (device)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +nm_device_6lowpan_class_init (NMDevice6LowpanClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS (klass); + NMDeviceClass *device_class = NM_DEVICE_CLASS (klass); + + g_type_class_add_private (klass, sizeof (NMDevice6LowpanPrivate)); + + object_class->finalize = finalize; + object_class->get_property = get_property; + + nm_object_class->init_dbus = init_dbus; + + device_class->get_hw_address = get_hw_address; + + /** + * NMDevice6Lowpan:parent: + * + * The devices's parent device. + * + * Since: 1.14 + **/ + obj_properties[PROP_PARENT] = + g_param_spec_object (NM_DEVICE_6LOWPAN_PARENT, "", "", + NM_TYPE_DEVICE, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); + + /** + * NMDevice6Lowpan:hw-address: + * + * The hardware (MAC) address of the device. + * + * Since: 1.14 + **/ + obj_properties[PROP_HW_ADDRESS] = + g_param_spec_string (NM_DEVICE_6LOWPAN_HW_ADDRESS, "", "", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); +} diff --git a/libnm/nm-device-6lowpan.h b/libnm/nm-device-6lowpan.h new file mode 100644 index 0000000000..96f34dc312 --- /dev/null +++ b/libnm/nm-device-6lowpan.h @@ -0,0 +1,50 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Red Hat, Inc. + */ + +#ifndef __NM_DEVICE_6LOWPAN_H__ +#define __NM_DEVICE_6LOWPAN_H__ + +#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION) +#error "Only <NetworkManager.h> can be included directly." +#endif + +#include "nm-device.h" + +G_BEGIN_DECLS + +#define NM_TYPE_DEVICE_6LOWPAN (nm_device_6lowpan_get_type ()) +#define NM_DEVICE_6LOWPAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_6LOWPAN, NMDevice6Lowpan)) +#define NM_DEVICE_6LOWPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_6LOWPAN, NMDevice6LowpanClass)) +#define NM_IS_DEVICE_6LOWPAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_6LOWPAN)) +#define NM_IS_DEVICE_6LOWPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_6LOWPAN)) +#define NM_DEVICE_6LOWPAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_6LOWPAN, NMDevice6LowpanClass)) + +#define NM_DEVICE_6LOWPAN_PARENT "parent" +#define NM_DEVICE_6LOWPAN_HW_ADDRESS "hw-address" + +NM_AVAILABLE_IN_1_14 +GType nm_device_6lowpan_get_type (void); + +NM_AVAILABLE_IN_1_14 +NMDevice * nm_device_6lowpan_get_parent (NMDevice6Lowpan *device); +NM_AVAILABLE_IN_1_14 +const char * nm_device_6lowpan_get_hw_address (NMDevice6Lowpan *device); +G_END_DECLS + +#endif /* __NM_DEVICE_6LOWPAN_H__ */ diff --git a/libnm/nm-device-wpan.c b/libnm/nm-device-wpan.c new file mode 100644 index 0000000000..6118362316 --- /dev/null +++ b/libnm/nm-device-wpan.c @@ -0,0 +1,179 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Lubomir Rintel <lkundrak@v3.sk> + */ + +#include "nm-default.h" + +#include <string.h> + +#include "nm-device-wpan.h" +#include "nm-object-private.h" +#include "nm-setting-wpan.h" +#include "nm-setting-connection.h" + +enum { + PROP_0, + PROP_HW_ADDRESS, + + LAST_PROP +}; + +typedef struct { + char *hw_address; +} NMDeviceWpanPrivate; + +/** + * NMDeviceWpan: + */ +struct _NMDeviceWpan { + NMDevice parent; +}; + +typedef struct { + NMDeviceClass parent; +} NMDeviceWpanClass; + +G_DEFINE_TYPE (NMDeviceWpan, nm_device_wpan, NM_TYPE_DEVICE) + +#define NM_DEVICE_WPAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_WPAN, NMDeviceWpanPrivate)) + +/*****************************************************************************/ + +/** + * nm_device_wpan_get_hw_address: + * @device: a #NMDeviceWpan + * + * Gets the active hardware (MAC) address of the #NMDeviceWpan + * + * Returns: the active hardware address. This is the internal string used by the + * device, and must not be modified. + **/ +const char * +nm_device_wpan_get_hw_address (NMDeviceWpan *device) +{ + g_return_val_if_fail (NM_IS_DEVICE_WPAN (device), NULL); + + return nm_str_not_empty (NM_DEVICE_WPAN_GET_PRIVATE (device)->hw_address); +} + +static gboolean +connection_compatible (NMDevice *device, NMConnection *connection, GError **error) +{ + if (!NM_DEVICE_CLASS (nm_device_wpan_parent_class)->connection_compatible (device, connection, error)) + return FALSE; + + if (!nm_connection_is_type (connection, NM_SETTING_WPAN_SETTING_NAME)) { + g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, + _("The connection was not a wpan connection.")); + return FALSE; + } + + return TRUE; +} + +static GType +get_setting_type (NMDevice *device) +{ + return NM_TYPE_SETTING_WPAN; +} + +static const char * +get_hw_address (NMDevice *device) +{ + return nm_device_wpan_get_hw_address (NM_DEVICE_WPAN (device)); +} + +/*****************************************************************************/ + +static void +get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + switch (prop_id) { + case PROP_HW_ADDRESS: + g_value_set_string (value, nm_device_wpan_get_hw_address (NM_DEVICE_WPAN (object))); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +nm_device_wpan_init (NMDeviceWpan *device) +{ +} + +static void +init_dbus (NMObject *object) +{ + NMDeviceWpanPrivate *priv = NM_DEVICE_WPAN_GET_PRIVATE (object); + const NMPropertiesInfo property_info[] = { + { NM_DEVICE_WPAN_HW_ADDRESS, &priv->hw_address }, + { NULL }, + }; + + NM_OBJECT_CLASS (nm_device_wpan_parent_class)->init_dbus (object); + + _nm_object_register_properties (object, + NM_DBUS_INTERFACE_DEVICE_WPAN, + property_info); +} + +static void +finalize (GObject *object) +{ + NMDeviceWpanPrivate *priv = NM_DEVICE_WPAN_GET_PRIVATE (object); + + g_free (priv->hw_address); + + G_OBJECT_CLASS (nm_device_wpan_parent_class)->finalize (object); +} + +static void +nm_device_wpan_class_init (NMDeviceWpanClass *wpan_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (wpan_class); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS (wpan_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (wpan_class); + + g_type_class_add_private (wpan_class, sizeof (NMDeviceWpanPrivate)); + + /* virtual methods */ + object_class->finalize = finalize; + object_class->get_property = get_property; + + nm_object_class->init_dbus = init_dbus; + + device_class->connection_compatible = connection_compatible; + device_class->get_setting_type = get_setting_type; + device_class->get_hw_address = get_hw_address; + + /* properties */ + + /** + * NMDeviceWpan:hw-address: + * + * The active hardware (MAC) address of the device. + **/ + g_object_class_install_property + (object_class, PROP_HW_ADDRESS, + g_param_spec_string (NM_DEVICE_WPAN_HW_ADDRESS, "", "", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); +} diff --git a/libnm/nm-device-wpan.h b/libnm/nm-device-wpan.h new file mode 100644 index 0000000000..d20113dd36 --- /dev/null +++ b/libnm/nm-device-wpan.h @@ -0,0 +1,48 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Lubomir Rintel <lkundrak@v3.sk> + */ + +#ifndef __NM_DEVICE_WPAN_H__ +#define __NM_DEVICE_WPAN_H__ + +#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) +#error "Only <NetworkManager.h> can be included directly." +#endif + +#include "nm-device.h" + +G_BEGIN_DECLS + +#define NM_TYPE_DEVICE_WPAN (nm_device_wpan_get_type ()) +#define NM_DEVICE_WPAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_WPAN, NMDeviceWpan)) +#define NM_DEVICE_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_WPAN, NMDeviceWpanClass)) +#define NM_IS_DEVICE_WPAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_WPAN)) +#define NM_IS_DEVICE_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_WPAN)) +#define NM_DEVICE_WPAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_WPAN, NMDeviceWpanClass)) + +#define NM_DEVICE_WPAN_HW_ADDRESS "hw-address" + +NM_AVAILABLE_IN_1_14 +GType nm_device_wpan_get_type (void); + +NM_AVAILABLE_IN_1_14 +const char *nm_device_wpan_get_hw_address (NMDeviceWpan *device); + +G_END_DECLS + +#endif /* __NM_DEVICE_WPAN_H__ */ diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 0ae3da535f..8c594d28b1 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -16,7 +16,7 @@ * Boston, MA 02110-1301 USA. * * Copyright 2007 - 2008 Novell, Inc. - * Copyright 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -284,6 +284,8 @@ coerce_type (NMDeviceType type) case NM_DEVICE_TYPE_UNKNOWN: case NM_DEVICE_TYPE_DUMMY: case NM_DEVICE_TYPE_PPP: + case NM_DEVICE_TYPE_WPAN: + case NM_DEVICE_TYPE_6LOWPAN: return type; } return NM_DEVICE_TYPE_UNKNOWN; @@ -1345,6 +1347,10 @@ get_type_name (NMDevice *device) return _("Dummy"); case NM_DEVICE_TYPE_PPP: return _("PPP"); + case NM_DEVICE_TYPE_WPAN: + return _("IEEE 802.15.4"); + case NM_DEVICE_TYPE_6LOWPAN: + return _("6LoWPAN"); case NM_DEVICE_TYPE_GENERIC: case NM_DEVICE_TYPE_UNUSED1: case NM_DEVICE_TYPE_UNUSED2: diff --git a/libnm/nm-types.h b/libnm/nm-types.h index dff8cb901f..d759b890ae 100644 --- a/libnm/nm-types.h +++ b/libnm/nm-types.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2014 Red Hat, Inc. + * Copyright 2014 - 2018 Red Hat, Inc. */ #ifndef __NM_TYPES_H__ @@ -31,6 +31,7 @@ typedef struct _NMActiveConnection NMActiveConnection; typedef struct _NMCheckpoint NMCheckpoint; typedef struct _NMClient NMClient; typedef struct _NMDevice NMDevice; +typedef struct _NMDevice6Lowpan NMDevice6Lowpan; typedef struct _NMDeviceAdsl NMDeviceAdsl; typedef struct _NMDeviceBond NMDeviceBond; typedef struct _NMDeviceBridge NMDeviceBridge; @@ -54,6 +55,7 @@ typedef struct _NMDeviceVlan NMDeviceVlan; typedef struct _NMDeviceVxlan NMDeviceVxlan; typedef struct _NMDeviceWifi NMDeviceWifi; typedef struct _NMDeviceWimax NMDeviceWimax; +typedef struct _NMDeviceWpan NMDeviceWpan; typedef struct _NMDhcpConfig NMDhcpConfig; typedef struct _NMIPConfig NMIPConfig; typedef struct _NMObject NMObject; diff --git a/man/nmcli.xml b/man/nmcli.xml index 9b951c1985..79deffbc8b 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -2003,6 +2003,26 @@ It's equivalent to the <literal>+bond.options 'option=value'</literal> syntax.</ </tbody> </tgroup></table> + <table><title>WPAN options</title><tgroup cols="2"> + <thead> + <row><entry>Alias</entry><entry>Property</entry></row> + </thead> + <tbody> + <row><entry align="left">mac</entry><entry align="left"><link linkend="nm-settings.property.wpan.mac">wpan.mac</link></entry></row> + <row><entry align="left">short-addr</entry><entry align="left"><link linkend="nm-settings.property.wpan.short-addr">wpan.short-addr</link></entry></row> + <row><entry align="left">pan-id</entry><entry align="left"><link linkend="nm-settings.property.wpan.pan-id">wpan.pan-id</link></entry></row> + </tbody> + </tgroup></table> + + <table><title>6LoWPAN options</title><tgroup cols="2"> + <thead> + <row><entry>Alias</entry><entry>Property</entry></row> + </thead> + <tbody> + <row><entry align="left">dev</entry><entry align="left"><link linkend="nm-settings.property.6lowpan.dev">6lowpan.parent</link></entry></row> + </tbody> + </tgroup></table> + <table><title>IPv4 options</title><tgroup cols="3"> <thead> <row><entry>Alias</entry><entry>Property</entry><entry>Note</entry></row> diff --git a/meson.build b/meson.build index 6877f15f9e..2ef561f1ac 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "shared/nm-version-macros.h.in" # - update number in configure.ac - version: '1.12.0', + version: '1.13.1', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', @@ -809,7 +809,7 @@ intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@ perl = find_program('perl') xsltproc = find_program('xsltproc') -check_exports = join_paths(meson.source_root(), 'tools', 'check-exports.sh') +check_exports = find_program(join_paths(meson.source_root(), 'tools', 'check-exports.sh')) content_files = [] diff --git a/po/POTFILES.in b/po/POTFILES.in index 941250418b..f432d5f0d2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -57,6 +57,7 @@ libnm-core/crypto_nss.c libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c libnm-core/nm-keyfile.c +libnm-core/nm-setting-6lowpan.c libnm-core/nm-setting-8021x.c libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c @@ -94,6 +95,7 @@ libnm-core/nm-setting-wimax.c libnm-core/nm-setting-wired.c libnm-core/nm-setting-wireless-security.c libnm-core/nm-setting-wireless.c +libnm-core/nm-setting-wpan.c libnm-core/nm-setting.c libnm-core/nm-utils.c libnm-core/nm-vpn-editor-plugin.c @@ -129,6 +131,7 @@ libnm-util/nm-setting-wired.c libnm-util/nm-setting-wireless-security.c libnm-util/nm-setting-wireless.c libnm-util/nm-utils.c +libnm/nm-device-6lowpan.c libnm/nm-device-adsl.c libnm/nm-device-bond.c libnm/nm-device-bridge.c @@ -150,6 +153,7 @@ libnm/nm-device-vlan.c libnm/nm-device-vxlan.c libnm/nm-device-wifi.c libnm/nm-device-wimax.c +libnm/nm-device-wpan.c libnm/nm-device.c libnm/nm-manager.c libnm/nm-object.c @@ -169,6 +173,7 @@ src/dns/nm-dns-manager.c src/devices/adsl/nm-device-adsl.c src/devices/bluetooth/nm-bluez-device.c src/devices/bluetooth/nm-device-bt.c +src/devices/nm-device-6lowpan.c src/devices/nm-device-bond.c src/devices/nm-device-bridge.c src/devices/nm-device-dummy.c @@ -180,6 +185,7 @@ src/devices/nm-device-macvlan.c src/devices/nm-device-tun.c src/devices/nm-device-vlan.c src/devices/nm-device-vxlan.c +src/devices/nm-device-wpan.c src/devices/team/nm-device-team.c src/devices/wifi/nm-device-olpc-mesh.c src/devices/wifi/nm-device-wifi.c diff --git a/shared/nm-meta-setting.c b/shared/nm-meta-setting.c index 8841273919..b984a1ff52 100644 --- a/shared/nm-meta-setting.c +++ b/shared/nm-meta-setting.c @@ -16,13 +16,14 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright 2017 Red Hat, Inc. + * Copyright 2017 - 2018 Red Hat, Inc. */ #include "nm-default.h" #include "nm-meta-setting.h" +#include "nm-setting-6lowpan.h" #include "nm-setting-8021x.h" #include "nm-setting-adsl.h" #include "nm-setting-bluetooth.h" @@ -63,6 +64,7 @@ #include "nm-setting-wired.h" #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" +#include "nm-setting-wpan.h" /*****************************************************************************/ @@ -145,6 +147,11 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = { /*****************************************************************************/ const NMMetaSettingInfo nm_meta_setting_infos[] = { + [NM_META_SETTING_TYPE_6LOWPAN] = { + .meta_type = NM_META_SETTING_TYPE_6LOWPAN, + .setting_name = NM_SETTING_6LOWPAN_SETTING_NAME, + .get_setting_gtype = nm_setting_6lowpan_get_type, + }, [NM_META_SETTING_TYPE_802_1X] = { .meta_type = NM_META_SETTING_TYPE_802_1X, .setting_name = NM_SETTING_802_1X_SETTING_NAME, @@ -340,6 +347,11 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = { .setting_name = NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, .get_setting_gtype = nm_setting_wireless_security_get_type, }, + [NM_META_SETTING_TYPE_WPAN] = { + .meta_type = NM_META_SETTING_TYPE_WPAN, + .setting_name = NM_SETTING_WPAN_SETTING_NAME, + .get_setting_gtype = nm_setting_wpan_get_type, + }, [NM_META_SETTING_TYPE_UNKNOWN] = { .meta_type = NM_META_SETTING_TYPE_UNKNOWN, diff --git a/shared/nm-meta-setting.h b/shared/nm-meta-setting.h index 4333001bff..e8d4db9c92 100644 --- a/shared/nm-meta-setting.h +++ b/shared/nm-meta-setting.h @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright 2017 Red Hat, Inc. + * Copyright 2017 - 2018 Red Hat, Inc. */ #ifndef __NM_META_SETTING_H__ @@ -56,6 +56,7 @@ extern const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[_NM_SETTI /*****************************************************************************/ typedef enum { + NM_META_SETTING_TYPE_6LOWPAN, NM_META_SETTING_TYPE_802_1X, NM_META_SETTING_TYPE_ADSL, NM_META_SETTING_TYPE_BLUETOOTH, @@ -95,6 +96,7 @@ typedef enum { NM_META_SETTING_TYPE_WIRED, NM_META_SETTING_TYPE_WIRELESS, NM_META_SETTING_TYPE_WIRELESS_SECURITY, + NM_META_SETTING_TYPE_WPAN, NM_META_SETTING_TYPE_UNKNOWN, diff --git a/shared/nm-test-libnm-utils.h b/shared/nm-test-libnm-utils.h index 20a15e5f85..2b4fa600d2 100644 --- a/shared/nm-test-libnm-utils.h +++ b/shared/nm-test-libnm-utils.h @@ -48,9 +48,11 @@ static inline void _nmtstc_auto_service_cleanup (NMTstcServiceInfo **info) { nmtstc_service_cleanup (g_steal_pointer (info)); } +#define nmtstc_auto_service_cleanup nm_auto(_nmtstc_auto_service_cleanup) + #define NMTSTC_SERVICE_INFO_SETUP(sinfo) \ NM_PRAGMA_WARNING_DISABLE ("-Wunused-variable") \ - __attribute__ ((cleanup(_nmtstc_auto_service_cleanup))) NMTstcServiceInfo *sinfo = ({ \ + nmtstc_auto_service_cleanup NMTstcServiceInfo *sinfo = ({ \ NMTstcServiceInfo *_sinfo; \ \ _sinfo = nmtstc_service_init (); \ diff --git a/shared/nm-utils/nm-hash-utils.h b/shared/nm-utils/nm-hash-utils.h index b7742e0fe3..d0bb6cf9b8 100644 --- a/shared/nm-utils/nm-hash-utils.h +++ b/shared/nm-utils/nm-hash-utils.h @@ -168,7 +168,7 @@ nm_hash_update_mem (NMHashState *state, const void *ptr, gsize n) * instead. */ nm_hash_update (state, &n, sizeof (n)); if (n > 0) - c_siphash_append (&state->_state, ptr, n); + nm_hash_update (state, ptr, n); } static inline void diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index 8d07fc82ba..6f2a186779 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -73,6 +73,7 @@ #define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) #define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) #define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0)) +#define NM_VERSION_1_14 (NM_ENCODE_VERSION (1, 14, 0)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * diff --git a/src/devices/adsl/meson.build b/src/devices/adsl/meson.build index ee804d2387..7ac0e123ea 100644 --- a/src/devices/adsl/meson.build +++ b/src/devices/adsl/meson.build @@ -20,10 +20,10 @@ libnm_device_plugin_adsl = shared_module( core_plugins += libnm_device_plugin_adsl -run_target( +test( 'check-local-devices-adsl', - command: [check_exports, libnm_device_plugin_adsl.full_path(), linker_script_devices], - depends: libnm_device_plugin_adsl + check_exports, + args: [libnm_device_plugin_adsl.full_path(), linker_script_devices], ) # FIXME: check_so_symbols replacement diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build index 30284f9e0f..019f04f6b5 100644 --- a/src/devices/bluetooth/meson.build +++ b/src/devices/bluetooth/meson.build @@ -31,10 +31,10 @@ libnm_device_plugin_bluetooth = shared_module( core_plugins += libnm_device_plugin_bluetooth -run_target( +test( 'check-local-devices-bluetooth', - command: [check_exports, libnm_device_plugin_bluetooth.full_path(), linker_script_devices], - depends: libnm_device_plugin_bluetooth + check_exports, + args: [libnm_device_plugin_bluetooth.full_path(), linker_script_devices], ) # FIXME: check_so_symbols replacement diff --git a/src/devices/nm-device-6lowpan.c b/src/devices/nm-device-6lowpan.c new file mode 100644 index 0000000000..9119ab00c3 --- /dev/null +++ b/src/devices/nm-device-6lowpan.c @@ -0,0 +1,375 @@ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2018 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "nm-device-6lowpan.h" + +#include "nm-device-private.h" +#include "settings/nm-settings.h" +#include "platform/nm-platform.h" +#include "nm-device-factory.h" +#include "nm-setting-6lowpan.h" +#include "nm-utils.h" + +#include "nm-device-logging.h" +_LOG_DECLARE_SELF(NMDevice6Lowpan); + +/*****************************************************************************/ + +typedef struct { + gulong parent_state_id; +} NMDevice6LowpanPrivate; + +struct _NMDevice6Lowpan { + NMDevice parent; + NMDevice6LowpanPrivate _priv; +}; + +struct _NMDevice6LowpanClass { + NMDeviceClass parent; +}; + +G_DEFINE_TYPE (NMDevice6Lowpan, nm_device_6lowpan, NM_TYPE_DEVICE) + +#define NM_DEVICE_6LOWPAN_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMDevice6Lowpan, NM_IS_DEVICE_6LOWPAN) + +/*****************************************************************************/ + +static void +parent_state_changed (NMDevice *parent, + NMDeviceState new_state, + NMDeviceState old_state, + NMDeviceStateReason reason, + gpointer user_data) +{ + NMDevice6Lowpan *self = NM_DEVICE_6LOWPAN (user_data); + + nm_device_set_unmanaged_by_flags (NM_DEVICE (self), NM_UNMANAGED_PARENT, !nm_device_get_managed (parent, FALSE), reason); +} + +static void +parent_changed_notify (NMDevice *device, + int old_ifindex, + NMDevice *old_parent, + int new_ifindex, + NMDevice *new_parent) +{ + NMDevice6Lowpan *self = NM_DEVICE_6LOWPAN (device); + NMDevice6LowpanPrivate *priv = NM_DEVICE_6LOWPAN_GET_PRIVATE (self); + + NM_DEVICE_CLASS (nm_device_6lowpan_parent_class)->parent_changed_notify (device, old_ifindex, old_parent, new_ifindex, new_parent); + + /* note that @self doesn't have to clear @parent_state_id on dispose, + * because NMDevice's dispose() will unset the parent, which in turn calls + * parent_changed_notify(). */ + nm_clear_g_signal_handler (old_parent, &priv->parent_state_id); + + if (new_parent) { + priv->parent_state_id = g_signal_connect (new_parent, + NM_DEVICE_STATE_CHANGED, + G_CALLBACK (parent_state_changed), + device); + + /* Set parent-dependent unmanaged flag */ + nm_device_set_unmanaged_by_flags (device, + NM_UNMANAGED_PARENT, + !nm_device_get_managed (new_parent, FALSE), + NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED); + } + + if (new_ifindex > 0) { + /* Recheck availability now that the parent has changed */ + nm_device_queue_recheck_available (device, + NM_DEVICE_STATE_REASON_PARENT_CHANGED, + NM_DEVICE_STATE_REASON_PARENT_CHANGED); + } +} + +static gboolean +create_and_realize (NMDevice *device, + NMConnection *connection, + NMDevice *parent, + const NMPlatformLink **out_plink, + GError **error) +{ + const char *iface = nm_device_get_iface (device); + NMPlatformError plerr; + NMSetting6Lowpan *s_6lowpan; + int parent_ifindex; + + s_6lowpan = nm_connection_get_setting_6lowpan (connection); + g_return_val_if_fail (s_6lowpan, FALSE); + + parent_ifindex = parent ? nm_device_get_ifindex (parent) : 0; + + if (parent_ifindex <= 0) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_MISSING_DEPENDENCIES, + "6LoWPAN devices can not be created without a parent interface"); + g_return_val_if_fail (!parent, FALSE); + return FALSE; + } + + plerr = nm_platform_link_6lowpan_add (nm_device_get_platform (device), iface, parent_ifindex, out_plink); + if (plerr != NM_PLATFORM_ERROR_SUCCESS) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED, + "Failed to create 6lowpan interface '%s' for '%s': %s", + iface, + nm_connection_get_id (connection), + nm_platform_error_to_string_a (plerr)); + return FALSE; + } + + nm_device_parent_set_ifindex (device, parent_ifindex); + + return TRUE; +} + +static NMDeviceCapabilities +get_generic_capabilities (NMDevice *dev) +{ + return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_IS_SOFTWARE; +} + +static void +link_changed (NMDevice *device, + const NMPlatformLink *pllink) +{ + NMDevice6Lowpan *self = NM_DEVICE_6LOWPAN (device); + int parent = 0; + int ifindex; + + NM_DEVICE_CLASS (nm_device_6lowpan_parent_class)->link_changed (device, pllink); + + ifindex = nm_device_get_ifindex (device); + if (!nm_platform_link_6lowpan_get_properties (nm_device_get_platform (device), ifindex, &parent)) { + _LOGW (LOGD_DEVICE, "could not get 6lowpan properties"); + return; + } + + nm_device_parent_set_ifindex (device, parent); +} + +static gboolean +is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags) +{ + if (!nm_device_parent_get_device (device)) + return FALSE; + return NM_DEVICE_CLASS (nm_device_6lowpan_parent_class)->is_available (device, flags); +} + +static gboolean +check_connection_compatible (NMDevice *device, NMConnection *connection) +{ + NMSetting6Lowpan *s_6lowpan; + + if (!NM_DEVICE_CLASS (nm_device_6lowpan_parent_class)->check_connection_compatible (device, connection)) + return FALSE; + + s_6lowpan = nm_connection_get_setting_6lowpan (connection); + if (!s_6lowpan) + return FALSE; + + return TRUE; +} + +static gboolean +complete_connection (NMDevice *device, + NMConnection *connection, + const char *specific_object, + NMConnection *const*existing_connections, + GError **error) +{ + NMSetting6Lowpan *s_6lowpan; + + nm_utils_complete_generic (nm_device_get_platform (device), + connection, + NM_SETTING_6LOWPAN_SETTING_NAME, + existing_connections, + NULL, + _("6LOWPAN connection"), + NULL, + TRUE); + + s_6lowpan = nm_connection_get_setting_6lowpan (connection); + if (!s_6lowpan) { + g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION, + "A '6lowpan' setting is required."); + return FALSE; + } + + /* If there's no 6LoWPAN interface, no parent, and no hardware address in the + * settings, then there's not enough information to complete the setting. + */ + if ( !nm_setting_6lowpan_get_parent (s_6lowpan) + && !nm_device_match_hwaddr (device, connection, TRUE)) { + g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION, + "The '6lowpan' setting had no interface name, parent, or hardware address."); + return FALSE; + } + + return TRUE; +} + +static void +update_connection (NMDevice *device, NMConnection *connection) +{ + NMSetting6Lowpan *s_6lowpan = nm_connection_get_setting_6lowpan (connection); + NMDevice *parent_device; + const char *setting_parent, *new_parent; + + if (!s_6lowpan) { + s_6lowpan = (NMSetting6Lowpan *) nm_setting_6lowpan_new (); + nm_connection_add_setting (connection, (NMSetting *) s_6lowpan); + } + + /* Update parent in the connection; default to parent's interface name */ + parent_device = nm_device_parent_get_device (device); + if (parent_device) { + new_parent = nm_device_get_iface (parent_device); + setting_parent = nm_setting_6lowpan_get_parent (s_6lowpan); + if (setting_parent && nm_utils_is_uuid (setting_parent)) { + NMConnection *parent_connection; + + /* Don't change a parent specified by UUID if it's still valid */ + parent_connection = (NMConnection *) nm_settings_get_connection_by_uuid (nm_device_get_settings (device), setting_parent); + if (parent_connection && nm_device_check_connection_compatible (parent_device, parent_connection)) + new_parent = NULL; + } + if (new_parent) + g_object_set (s_6lowpan, NM_SETTING_6LOWPAN_PARENT, new_parent, NULL); + } else + g_object_set (s_6lowpan, NM_SETTING_6LOWPAN_PARENT, NULL, NULL); + +} + +static NMActStageReturn +act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *out_failure_reason) +{ + NMActStageReturn ret; + + ret = NM_DEVICE_CLASS (nm_device_6lowpan_parent_class)->act_stage1_prepare (dev, out_failure_reason); + if (ret != NM_ACT_STAGE_RETURN_SUCCESS) + return ret; + + if (!nm_device_hw_addr_set_cloned (dev, nm_device_get_applied_connection (dev), FALSE)) + return NM_ACT_STAGE_RETURN_FAILURE; + return NM_ACT_STAGE_RETURN_SUCCESS; +} + +/*****************************************************************************/ + +static void +nm_device_6lowpan_init (NMDevice6Lowpan *self) +{ +} + +static const NMDBusInterfaceInfoExtended interface_info_device_6lowpan = { + .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT ( + NM_DBUS_INTERFACE_DEVICE_6LOWPAN, + .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS ( + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("HwAddress", "s", NM_DEVICE_HW_ADDRESS), + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("Parent", "o", NM_DEVICE_PARENT), + ), + ), +}; + +static void +nm_device_6lowpan_class_init (NMDevice6LowpanClass *klass) +{ + NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass); + NMDeviceClass *device_class = NM_DEVICE_CLASS (klass); + + NM_DEVICE_CLASS_DECLARE_TYPES (klass, NULL, NM_LINK_TYPE_6LOWPAN) + + dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_6lowpan); + + device_class->act_stage1_prepare = act_stage1_prepare; + device_class->check_connection_compatible = check_connection_compatible; + device_class->complete_connection = complete_connection; + device_class->connection_type = NM_SETTING_6LOWPAN_SETTING_NAME; + device_class->create_and_realize = create_and_realize; + device_class->get_generic_capabilities = get_generic_capabilities; + device_class->get_configured_mtu = nm_device_get_configured_mtu_for_wired; + device_class->link_changed = link_changed; + device_class->is_available = is_available; + device_class->parent_changed_notify = parent_changed_notify; + device_class->update_connection = update_connection; +} + +/*****************************************************************************/ + +#define NM_TYPE_6LOWPAN_DEVICE_FACTORY (nm_6lowpan_device_factory_get_type ()) +#define NM_6LOWPAN_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_6LOWPAN_DEVICE_FACTORY, NM6LowpanDeviceFactory)) + +static NMDevice * +create_device (NMDeviceFactory *factory, + const char *iface, + const NMPlatformLink *plink, + NMConnection *connection, + gboolean *out_ignore) +{ + return (NMDevice *) g_object_new (NM_TYPE_DEVICE_6LOWPAN, + NM_DEVICE_IFACE, iface, + NM_DEVICE_TYPE_DESC, "6LoWPAN", + NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_6LOWPAN, + NM_DEVICE_LINK_TYPE, NM_LINK_TYPE_6LOWPAN, + NULL); +} + +static const char * +get_connection_parent (NMDeviceFactory *factory, NMConnection *connection) +{ + NMSetting6Lowpan *s_6lowpan; + + g_return_val_if_fail (nm_connection_is_type (connection, NM_SETTING_6LOWPAN_SETTING_NAME), NULL); + + s_6lowpan = nm_connection_get_setting_6lowpan (connection); + g_assert (s_6lowpan); + + return nm_setting_6lowpan_get_parent (s_6lowpan); +} + +static char * +get_connection_iface (NMDeviceFactory *factory, + NMConnection *connection, + const char *parent_iface) +{ + NMSetting6Lowpan *s_6lowpan; + const char *ifname; + + g_return_val_if_fail (nm_connection_is_type (connection, NM_SETTING_6LOWPAN_SETTING_NAME), NULL); + + s_6lowpan = nm_connection_get_setting_6lowpan (connection); + g_assert (s_6lowpan); + + if (!parent_iface) + return NULL; + + ifname = nm_connection_get_interface_name (connection); + return g_strdup (ifname); +} + +NM_DEVICE_FACTORY_DEFINE_INTERNAL (6LOWPAN, 6Lowpan, 6lowpan, + NM_DEVICE_FACTORY_DECLARE_LINK_TYPES (NM_LINK_TYPE_6LOWPAN) + NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_6LOWPAN_SETTING_NAME), + factory_class->create_device = create_device; + factory_class->get_connection_parent = get_connection_parent; + factory_class->get_connection_iface = get_connection_iface; +); diff --git a/src/devices/nm-device-6lowpan.h b/src/devices/nm-device-6lowpan.h new file mode 100644 index 0000000000..86edf4af59 --- /dev/null +++ b/src/devices/nm-device-6lowpan.h @@ -0,0 +1,37 @@ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2018 Red Hat, Inc. + */ + +#ifndef __NETWORKMANAGER_DEVICE_6LOWPAN_H__ +#define __NETWORKMANAGER_DEVICE_6LOWPAN_H__ + +#include "nm-device.h" + +#define NM_TYPE_DEVICE_6LOWPAN (nm_device_6lowpan_get_type ()) +#define NM_DEVICE_6LOWPAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_6LOWPAN, NMDevice6Lowpan)) +#define NM_DEVICE_6LOWPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_6LOWPAN, NMDevice6LowpanClass)) +#define NM_IS_DEVICE_6LOWPAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_6LOWPAN)) +#define NM_IS_DEVICE_6LOWPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_6LOWPAN)) +#define NM_DEVICE_6LOWPAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_6LOWPAN, NMDevice6LowpanClass)) + +typedef struct _NMDevice6Lowpan NMDevice6Lowpan; +typedef struct _NMDevice6LowpanClass NMDevice6LowpanClass; + +GType nm_device_6lowpan_get_type (void); + +#endif /* __NETWORKMANAGER_DEVICE_6LOWPAN_H__ */ diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index f59ec9ff22..ff7ecdbe23 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2011 - 2016 Red Hat, Inc. + * Copyright 2011 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -363,7 +363,6 @@ static NMActStageReturn act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *out_failure_reason) { NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS; - gboolean no_firmware = FALSE; ret = NM_DEVICE_CLASS (nm_device_bond_parent_class)->act_stage1_prepare (dev, out_failure_reason); if (ret != NM_ACT_STAGE_RETURN_SUCCESS) @@ -374,7 +373,7 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *out_failure_reason) ret = apply_bonding_config (dev); if (ret != NM_ACT_STAGE_RETURN_FAILURE) ret = nm_device_hw_addr_set_cloned (dev, nm_device_get_applied_connection (dev), FALSE); - nm_device_bring_up (dev, TRUE, &no_firmware); + nm_device_bring_up (dev, TRUE, NULL); return ret; } @@ -386,7 +385,7 @@ enslave_slave (NMDevice *device, gboolean configure) { NMDeviceBond *self = NM_DEVICE_BOND (device); - gboolean success = TRUE, no_firmware = FALSE; + gboolean success = TRUE; const char *slave_iface = nm_device_get_ip_iface (slave); NMConnection *master_con; @@ -397,7 +396,7 @@ enslave_slave (NMDevice *device, success = nm_platform_link_enslave (nm_device_get_platform (device), nm_device_get_ip_ifindex (device), nm_device_get_ip_ifindex (slave)); - nm_device_bring_up (slave, TRUE, &no_firmware); + nm_device_bring_up (slave, TRUE, NULL); if (!success) return FALSE; @@ -434,7 +433,7 @@ release_slave (NMDevice *device, gboolean configure) { NMDeviceBond *self = NM_DEVICE_BOND (device); - gboolean success, no_firmware = FALSE; + gboolean success; gs_free char *address = NULL; if (configure) { @@ -463,7 +462,7 @@ release_slave (NMDevice *device, * IFF_UP), so we must bring it back up here to ensure carrier changes and * other state is noticed by the now-released slave. */ - if (!nm_device_bring_up (slave, TRUE, &no_firmware)) + if (!nm_device_bring_up (slave, TRUE, NULL)) _LOGW (LOGD_BOND, "released bond slave could not be brought up."); } else { _LOGI (LOGD_BOND, "bond slave %s was released", diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c index bc717bb3d6..30f6aa9910 100644 --- a/src/devices/nm-device-factory.c +++ b/src/devices/nm-device-factory.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -417,6 +417,7 @@ nm_device_factory_manager_load_factories (NMDeviceFactoryManagerFactoryFunc call callback, user_data); \ } G_STMT_END + _ADD_INTERNAL (nm_6lowpan_device_factory_get_type); _ADD_INTERNAL (nm_bond_device_factory_get_type); _ADD_INTERNAL (nm_bridge_device_factory_get_type); _ADD_INTERNAL (nm_dummy_device_factory_get_type); @@ -430,6 +431,7 @@ nm_device_factory_manager_load_factories (NMDeviceFactoryManagerFactoryFunc call _ADD_INTERNAL (nm_veth_device_factory_get_type); _ADD_INTERNAL (nm_vlan_device_factory_get_type); _ADD_INTERNAL (nm_vxlan_device_factory_get_type); + _ADD_INTERNAL (nm_wpan_device_factory_get_type); load_factories_from_dir (NMPLUGINDIR, callback, user_data); } diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index 99bcef0045..122ae25953 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2011 Red Hat, Inc. + * Copyright 2011 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -80,7 +80,7 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) NMSettingInfiniband *s_infiniband; char ifname_verified[IFNAMSIZ]; const char *transport_mode; - gboolean ok, no_firmware = FALSE; + gboolean ok; ret = NM_DEVICE_CLASS (nm_device_infiniband_parent_class)->act_stage1_prepare (device, out_failure_reason); if (ret != NM_ACT_STAGE_RETURN_SUCCESS) @@ -104,7 +104,7 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) /* With some drivers the interface must be down to set transport mode */ nm_device_take_down (device, TRUE); ok = nm_platform_sysctl_set (nm_device_get_platform (device), NMP_SYSCTL_PATHID_NETDIR (dirfd, ifname_verified, "mode"), transport_mode); - nm_device_bring_up (device, TRUE, &no_firmware); + nm_device_bring_up (device, TRUE, NULL); if (!ok) { NM_SET_OUT (out_failure_reason, NM_DEVICE_STATE_REASON_CONFIG_FAILED); diff --git a/src/devices/nm-device-wpan.c b/src/devices/nm-device-wpan.c new file mode 100644 index 0000000000..978dfa00ac --- /dev/null +++ b/src/devices/nm-device-wpan.c @@ -0,0 +1,251 @@ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2018 Lubomir Rintel <lkundrak@v3.sk> + */ + +#include "nm-default.h" + +#include "nm-manager.h" +#include "nm-device-wpan.h" + +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> + +#include "nm-act-request.h" +#include "nm-device-private.h" +#include "nm-ip4-config.h" +#include "platform/nm-platform.h" +#include "nm-device-factory.h" +#include "nm-setting-wpan.h" +#include "nm-core-internal.h" + +#include "nm-device-logging.h" +_LOG_DECLARE_SELF(NMDeviceWpan); + +/*****************************************************************************/ + +struct _NMDeviceWpan { + NMDevice parent; +}; + +struct _NMDeviceWpanClass { + NMDeviceClass parent; +}; + +G_DEFINE_TYPE (NMDeviceWpan, nm_device_wpan, NM_TYPE_DEVICE) + +/*****************************************************************************/ + +static gboolean +complete_connection (NMDevice *device, + NMConnection *connection, + const char *specific_object, + NMConnection *const*existing_connections, + GError **error) +{ + NMSettingWpan *s_wpan; + + nm_utils_complete_generic (nm_device_get_platform (device), + connection, + NM_SETTING_WPAN_SETTING_NAME, + existing_connections, + NULL, + _("WPAN connection"), + NULL, + TRUE); + + s_wpan = nm_connection_get_setting_wpan (connection); + if (!s_wpan) { + g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION, + "A 'wpan' setting is required."); + return FALSE; + } + + return TRUE; +} + +static void +update_connection (NMDevice *device, NMConnection *connection) +{ + NMSettingWpan *s_wpan = nm_connection_get_setting_wpan (connection); + + if (!s_wpan) { + s_wpan = (NMSettingWpan *) nm_setting_wpan_new (); + nm_connection_add_setting (connection, (NMSetting *) s_wpan); + } +} + +static gboolean +check_connection_compatible (NMDevice *device, NMConnection *connection) +{ + NMSettingWpan *s_wpan; + const char *mac, *hw_addr; + + if (!NM_DEVICE_CLASS (nm_device_wpan_parent_class)->check_connection_compatible (device, connection)) + return FALSE; + + s_wpan = nm_connection_get_setting_wpan (connection); + if (!s_wpan) + return FALSE; + + mac = nm_setting_wpan_get_mac_address (s_wpan); + if (mac) { + hw_addr = nm_device_get_hw_address (device); + if (!nm_utils_hwaddr_matches (mac, -1, hw_addr, -1)) + return FALSE; + } + + return TRUE; +} + +static NMActStageReturn +act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) +{ + NMDeviceWpan *self = NM_DEVICE_WPAN (device); + NMConnection *connection; + NMSettingWpan *s_wpan; + NMPlatform *platform; + guint16 pan_id; + guint16 short_address; + int ifindex; + const guint8 *hwaddr; + gsize hwaddr_len = 0; + const NMPlatformLink *lowpan_plink; + NMDevice *lowpan_device = NULL; + NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE; + + ret = NM_DEVICE_CLASS (nm_device_wpan_parent_class)->act_stage1_prepare (device, out_failure_reason); + if (ret != NM_ACT_STAGE_RETURN_SUCCESS) + return ret; + + platform = nm_device_get_platform (device); + g_return_val_if_fail (platform, NM_ACT_STAGE_RETURN_FAILURE); + + ifindex = nm_device_get_ifindex (device); + g_return_val_if_fail (ifindex > 0, NM_ACT_STAGE_RETURN_FAILURE); + + connection = nm_device_get_applied_connection (device); + g_return_val_if_fail (connection, NM_ACT_STAGE_RETURN_FAILURE); + + s_wpan = nm_connection_get_setting_wpan (connection); + g_return_val_if_fail (s_wpan, NM_ACT_STAGE_RETURN_FAILURE); + + hwaddr = nm_platform_link_get_address (platform, ifindex, &hwaddr_len); + g_return_val_if_fail (hwaddr, NM_ACT_STAGE_RETURN_FAILURE); + + /* As of kernel 4.16, the 6LoWPAN devices layered on top of WPANs + * need to be DOWN as well as the WPAN device itself in order to + * modify the WPAN properties. */ + lowpan_plink = nm_platform_link_get_by_address (platform, + NM_LINK_TYPE_6LOWPAN, + hwaddr, + hwaddr_len); + if (lowpan_plink && NM_FLAGS_HAS (lowpan_plink->n_ifi_flags, IFF_UP)) { + lowpan_device = nm_manager_get_device_by_ifindex (nm_manager_get (), + lowpan_plink->ifindex); + } + + if (lowpan_device) + nm_device_take_down (lowpan_device, TRUE); + + nm_device_take_down (device, TRUE); + + pan_id = nm_setting_wpan_get_pan_id (s_wpan); + if (pan_id != G_MAXUINT16) { + if (!nm_platform_wpan_set_pan_id (platform, ifindex, pan_id)) { + _LOGW (LOGD_DEVICE, "unable to set the PAN ID"); + goto out; + } + } + + short_address = nm_setting_wpan_get_short_address (s_wpan); + if (short_address != G_MAXUINT16) { + if (!nm_platform_wpan_set_short_addr (platform, ifindex, short_address)) { + _LOGW (LOGD_DEVICE, "unable to set the short address"); + goto out; + } + } + + ret = NM_ACT_STAGE_RETURN_SUCCESS; +out: + nm_device_bring_up (device, TRUE, NULL); + + if (lowpan_device) + nm_device_bring_up (lowpan_device, TRUE, NULL); + + return ret; +} + +/*****************************************************************************/ + +static void +nm_device_wpan_init (NMDeviceWpan *self) +{ +} + +static const NMDBusInterfaceInfoExtended interface_info_device_wpan = { + .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT ( + NM_DBUS_INTERFACE_DEVICE_WPAN, + .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS ( + NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE ("HwAddress", "s", NM_DEVICE_HW_ADDRESS), + ), + ), +}; + +static void +nm_device_wpan_class_init (NMDeviceWpanClass *klass) +{ + NMDeviceClass *device_class = NM_DEVICE_CLASS (klass); + NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass); + + NM_DEVICE_CLASS_DECLARE_TYPES (klass, NULL, NM_LINK_TYPE_WPAN) + + dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_wpan); + + device_class->connection_type = NM_SETTING_WPAN_SETTING_NAME; + device_class->complete_connection = complete_connection; + device_class->check_connection_compatible = check_connection_compatible; + device_class->update_connection = update_connection; + device_class->act_stage1_prepare = act_stage1_prepare; +} + +/*****************************************************************************/ + +#define NM_TYPE_WPAN_DEVICE_FACTORY (nm_wpan_device_factory_get_type ()) +#define NM_WPAN_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WPAN_DEVICE_FACTORY, NMWpanDeviceFactory)) + +static NMDevice * +create_device (NMDeviceFactory *factory, + const char *iface, + const NMPlatformLink *plink, + NMConnection *connection, + gboolean *out_ignore) +{ + return (NMDevice *) g_object_new (NM_TYPE_DEVICE_WPAN, + NM_DEVICE_IFACE, iface, + NM_DEVICE_TYPE_DESC, "WPAN", + NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_WPAN, + NM_DEVICE_LINK_TYPE, NM_LINK_TYPE_WPAN, + NULL); +} + +NM_DEVICE_FACTORY_DEFINE_INTERNAL (WPAN, Wpan, wpan, + NM_DEVICE_FACTORY_DECLARE_LINK_TYPES (NM_LINK_TYPE_WPAN) + NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_WPAN_SETTING_NAME), + factory_class->create_device = create_device; +); diff --git a/src/devices/nm-device-wpan.h b/src/devices/nm-device-wpan.h new file mode 100644 index 0000000000..33f247768a --- /dev/null +++ b/src/devices/nm-device-wpan.h @@ -0,0 +1,35 @@ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2018 Lubomir Rintel <lkundrak@v3.sk> + */ + +#ifndef __NETWORKMANAGER_DEVICE_WPAN_H__ +#define __NETWORKMANAGER_DEVICE_WPAN_H__ + +#define NM_TYPE_DEVICE_WPAN (nm_device_wpan_get_type ()) +#define NM_DEVICE_WPAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_WPAN, NMDeviceWpan)) +#define NM_DEVICE_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_WPAN, NMDeviceWpanClass)) +#define NM_IS_DEVICE_WPAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_WPAN)) +#define NM_IS_DEVICE_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_WPAN)) +#define NM_DEVICE_WPAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_WPAN, NMDeviceWpanClass)) + +typedef struct _NMDeviceWpan NMDeviceWpan; +typedef struct _NMDeviceWpanClass NMDeviceWpanClass; + +GType nm_device_wpan_get_type (void); + +#endif /* __NETWORKMANAGER_DEVICE_WPAN_H__ */ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 5a5cb50e9f..d646493a5c 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2005 - 2017 Red Hat, Inc. + * Copyright (C) 2005 - 2018 Red Hat, Inc. * Copyright (C) 2006 - 2008 Novell, Inc. */ @@ -1731,7 +1731,11 @@ static gboolean get_ip_iface_identifier (NMDevice *self, NMUtilsIPv6IfaceId *out_iid) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + NMPlatform *platform = nm_device_get_platform (self); const NMPlatformLink *pllink; + const guint8 *hwaddr; + guint8 pseudo_hwaddr[ETH_ALEN]; + guint hwaddr_len; int ifindex; gboolean success; @@ -1739,7 +1743,7 @@ get_ip_iface_identifier (NMDevice *self, NMUtilsIPv6IfaceId *out_iid) ifindex = nm_device_get_ip_ifindex (self); g_return_val_if_fail (ifindex > 0, FALSE); - pllink = nm_platform_link_get (nm_device_get_platform (self), ifindex); + pllink = nm_platform_link_get (platform, ifindex); if ( !pllink || NM_IN_SET (pllink->type, NM_LINK_TYPE_NONE, NM_LINK_TYPE_UNKNOWN)) return FALSE; @@ -1749,9 +1753,35 @@ get_ip_iface_identifier (NMDevice *self, NMUtilsIPv6IfaceId *out_iid) if (pllink->addr.len > NM_UTILS_HWADDR_LEN_MAX) g_return_val_if_reached (FALSE); + hwaddr = pllink->addr.data; + hwaddr_len = pllink->addr.len; + + if (pllink->type == NM_LINK_TYPE_6LOWPAN) { + /* If the underlying IEEE 802.15.4 device has a short address we generate + * a "pseudo 48-bit address" that's to be used in the same fashion as a + * wired Ethernet address. The mechanism is specified in Section 6. of + * RFC 4944 */ + guint16 pan_id; + guint16 short_addr; + + short_addr = nm_platform_wpan_get_short_addr (platform, pllink->parent); + if (short_addr != G_MAXUINT16) { + pan_id = nm_platform_wpan_get_pan_id (platform, pllink->parent); + pseudo_hwaddr[0] = short_addr & 0xff; + pseudo_hwaddr[1] = (short_addr >> 8) & 0xff; + pseudo_hwaddr[2] = 0; + pseudo_hwaddr[3] = 0; + pseudo_hwaddr[4] = pan_id & 0xff; + pseudo_hwaddr[5] = (pan_id >> 8) & 0xff; + + hwaddr = pseudo_hwaddr; + hwaddr_len = G_N_ELEMENTS (pseudo_hwaddr); + } + } + success = nm_utils_get_ipv6_interface_identifier (pllink->type, - pllink->addr.data, - pllink->addr.len, + hwaddr, + hwaddr_len, priv->dev_id, out_iid); if (!success) { @@ -1905,10 +1935,14 @@ nm_device_get_route_metric_default (NMDeviceType device_type) return 700; case NM_DEVICE_TYPE_BT: return 750; + case NM_DEVICE_TYPE_6LOWPAN: + return 775; case NM_DEVICE_TYPE_OVS_BRIDGE: case NM_DEVICE_TYPE_OVS_INTERFACE: case NM_DEVICE_TYPE_OVS_PORT: return 800; + case NM_DEVICE_TYPE_WPAN: + return 850; case NM_DEVICE_TYPE_GENERIC: return 950; case NM_DEVICE_TYPE_UNKNOWN: diff --git a/src/devices/ovs/meson.build b/src/devices/ovs/meson.build index f4edd57c00..731965d61e 100644 --- a/src/devices/ovs/meson.build +++ b/src/devices/ovs/meson.build @@ -24,10 +24,10 @@ libnm_device_plugin_ovs = shared_module( core_plugins += libnm_device_plugin_ovs -run_target( +test( 'check-local-devices-ovs', - command: [check_exports, libnm_device_plugin_ovs.full_path(), linker_script_devices], - depends: libnm_device_plugin_ovs + check_exports, + args: [libnm_device_plugin_ovs.full_path(), linker_script_devices], ) # FIXME: check_so_symbols replacement diff --git a/src/devices/team/meson.build b/src/devices/team/meson.build index 159c182a2e..0f0763bd20 100644 --- a/src/devices/team/meson.build +++ b/src/devices/team/meson.build @@ -21,10 +21,10 @@ libnm_device_plugin_team = shared_module( core_plugins += libnm_device_plugin_team -run_target( +test( 'check-local-devices-team', - command: [check_exports, libnm_device_plugin_team.full_path(), linker_script_devices], - depends: libnm_device_plugin_team + check_exports, + args: [libnm_device_plugin_team.full_path(), linker_script_devices], ) # FIXME: check_so_symbols replacement diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index f83ba22b5d..bfca8ec186 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* NetworkManager -- Network link manager * - * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,6 +14,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> + * Copyright (C) 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -703,7 +704,7 @@ enslave_slave (NMDevice *device, { NMDeviceTeam *self = NM_DEVICE_TEAM (device); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self); - gboolean success = TRUE, no_firmware = FALSE; + gboolean success = TRUE; const char *slave_iface = nm_device_get_ip_iface (slave); NMSettingTeamPort *s_team_port; @@ -738,7 +739,7 @@ enslave_slave (NMDevice *device, success = nm_platform_link_enslave (nm_device_get_platform (device), nm_device_get_ip_ifindex (device), nm_device_get_ip_ifindex (slave)); - nm_device_bring_up (slave, TRUE, &no_firmware); + nm_device_bring_up (slave, TRUE, NULL); if (!success) return FALSE; @@ -762,7 +763,7 @@ release_slave (NMDevice *device, { NMDeviceTeam *self = NM_DEVICE_TEAM (device); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (self); - gboolean success, no_firmware = FALSE; + gboolean success; if (configure) { success = nm_platform_link_release (nm_device_get_platform (device), @@ -778,7 +779,7 @@ release_slave (NMDevice *device, * IFF_UP), so we must bring it back up here to ensure carrier changes and * other state is noticed by the now-released port. */ - if (!nm_device_bring_up (slave, TRUE, &no_firmware)) + if (!nm_device_bring_up (slave, TRUE, NULL)) _LOGW (LOGD_TEAM, "released team port %s could not be brought up", nm_device_get_ip_iface (slave)); diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build index a27f8e6a03..2745040bed 100644 --- a/src/devices/wifi/meson.build +++ b/src/devices/wifi/meson.build @@ -33,10 +33,10 @@ libnm_device_plugin_wifi = shared_module( core_plugins += libnm_device_plugin_wifi -run_target( +test( 'check-local-devices-wifi', - command: [check_exports, libnm_device_plugin_wifi.full_path(), linker_script_devices], - depends: libnm_device_plugin_wifi + check_exports, + args: [libnm_device_plugin_wifi.full_path(), linker_script_devices], ) # FIXME: check_so_symbols replacement diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 6bd06524ad..b77cf8002e 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -121,6 +121,8 @@ typedef struct { gint32 hw_addr_scan_expire; guint wps_timeout_id; + + NMSettingWirelessWakeOnWLan wowlan_restore; } NMDeviceWifiPrivate; struct _NMDeviceWifi @@ -508,6 +510,22 @@ remove_all_aps (NMDeviceWifi *self) nm_device_recheck_available_connections (NM_DEVICE (self)); } +static gboolean +wake_on_wlan_restore (NMDeviceWifi *self) +{ + NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); + NMSettingWirelessWakeOnWLan w; + + w = priv->wowlan_restore; + if (w == NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE) + return TRUE; + + priv->wowlan_restore = NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE; + return nm_platform_wifi_set_wake_on_wlan (NM_PLATFORM_GET, + nm_device_get_ifindex (NM_DEVICE (self)), + w); +} + static void deactivate (NMDevice *device) { @@ -524,6 +542,9 @@ deactivate (NMDevice *device) set_current_ap (self, NULL, TRUE); + if (!wake_on_wlan_restore (self)) + _LOGW (LOGD_DEVICE | LOGD_WIFI, "Cannot unconfigure WoWLAN."); + /* Clear any critical protocol notification in the Wi-Fi stack */ nm_platform_wifi_indicate_addressing_running (nm_device_get_platform (device), ifindex, FALSE); @@ -2426,6 +2447,7 @@ error: static gboolean wake_on_wlan_enable (NMDeviceWifi *self) { + NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self); NMSettingWirelessWakeOnWLan wowl; NMSettingWireless *s_wireless; gs_free char *value = NULL; @@ -2461,8 +2483,19 @@ wake_on_wlan_enable (NMDeviceWifi *self) goto found; } wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE; + found: - return nm_platform_wifi_set_wake_on_wlan (NM_PLATFORM_GET, nm_device_get_ifindex (NM_DEVICE (self)), wowl); + if (wowl == NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE) { + priv->wowlan_restore = wowl; + return TRUE; + } + + priv->wowlan_restore = nm_platform_wifi_get_wake_on_wlan (NM_PLATFORM_GET, + nm_device_get_ifindex (NM_DEVICE (self))); + + return nm_platform_wifi_set_wake_on_wlan (NM_PLATFORM_GET, + nm_device_get_ifindex (NM_DEVICE (self)), + wowl); } static NMActStageReturn @@ -2658,8 +2691,6 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason) s_wireless = nm_connection_get_setting_wireless (connection); g_assert (s_wireless); - wake_on_wlan_enable (self); - /* If we need secrets, get them */ setting_name = nm_connection_need_secrets (connection, NULL); if (setting_name) { @@ -2676,6 +2707,9 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason) goto out; } + if (!wake_on_wlan_enable (self)) + _LOGW (LOGD_DEVICE | LOGD_WIFI, "Cannot configure WoWLAN."); + /* have secrets, or no secrets required */ if (nm_connection_get_setting_wireless_security (connection)) { _LOGI (LOGD_DEVICE | LOGD_WIFI, @@ -2726,8 +2760,10 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason) ret = NM_ACT_STAGE_RETURN_POSTPONE; out: - if (ret == NM_ACT_STAGE_RETURN_FAILURE) + if (ret == NM_ACT_STAGE_RETURN_FAILURE) { cleanup_association_attempt (self, TRUE); + wake_on_wlan_restore (self); + } if (config) { /* Supplicant interface object refs the config; we no longer care about @@ -3133,7 +3169,8 @@ reapply_connection (NMDevice *device, NMConnection *con_old, NMConnection *con_n _LOGD (LOGD_DEVICE, "reapplying wireless settings"); - wake_on_wlan_enable (self); + if (!wake_on_wlan_enable (self)) + _LOGW (LOGD_DEVICE | LOGD_WIFI, "Cannot configure WoWLAN."); } /*****************************************************************************/ @@ -3206,6 +3243,7 @@ nm_device_wifi_init (NMDeviceWifi *self) c_list_init (&priv->aps_lst_head); priv->mode = NM_802_11_MODE_INFRA; + priv->wowlan_restore = NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE; } static void diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build index abf585946a..2c0ea5a10c 100644 --- a/src/devices/wwan/meson.build +++ b/src/devices/wwan/meson.build @@ -35,10 +35,10 @@ libnm_wwan_dep = declare_dependency( core_plugins += libnm_wwan -run_target( +test( 'check-wwan', - command: [check_exports, libnm_wwan.full_path(), linker_script], - depends: libnm_wwan + check_exports, + args: [libnm_wwan.full_path(), linker_script], ) sources = files( diff --git a/src/meson.build b/src/meson.build index e60ab93fb9..abc3069a17 100644 --- a/src/meson.build +++ b/src/meson.build @@ -55,8 +55,9 @@ sources = files( 'ndisc/nm-lndp-ndisc.c', 'ndisc/nm-ndisc.c', 'platform/nm-netlink.c', - 'platform/wifi/wifi-utils-nl80211.c', - 'platform/wifi/wifi-utils.c', + 'platform/wifi/nm-wifi-utils-nl80211.c', + 'platform/wifi/nm-wifi-utils.c', + 'platform/wpan/nm-wpan-utils.c', 'platform/nm-linux-platform.c', 'platform/nm-platform.c', 'platform/nm-platform-utils.c', @@ -79,7 +80,7 @@ deps = [ ] if enable_wext - sources += files('platform/wifi/wifi-utils-wext.c') + sources += files('platform/wifi/nm-wifi-utils-wext.c') endif libnetwork_manager_base = static_library( @@ -92,6 +93,7 @@ libnetwork_manager_base = static_library( sources = files( 'devices/nm-acd-manager.c', + 'devices/nm-device-6lowpan.c', 'devices/nm-device-bond.c', 'devices/nm-device-bridge.c', 'devices/nm-device.c', @@ -109,6 +111,7 @@ sources = files( 'devices/nm-device-veth.c', 'devices/nm-device-vlan.c', 'devices/nm-device-vxlan.c', + 'devices/nm-device-wpan.c', 'devices/nm-lldp-listener.c', 'dhcp/nm-dhcp-dhclient.c', 'dhcp/nm-dhcp-dhclient-utils.c', diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index 54ccdb836d..50e107ecda 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2004 - 2014 Red Hat, Inc. + * Copyright 2004 - 2018 Red Hat, Inc. * Copyright 2005 - 2008 Novell, Inc. */ @@ -45,15 +45,6 @@ #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" -/* - * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export - * CLOCK_BOOTTIME even though the kernel supports it, so provide a - * local definition - */ -#ifndef CLOCK_BOOTTIME -#define CLOCK_BOOTTIME 7 -#endif - G_STATIC_ASSERT (sizeof (NMUtilsTestFlags) <= sizeof (int)); static int _nm_utils_testing = 0; @@ -3027,6 +3018,11 @@ nm_utils_get_ipv6_interface_identifier (NMLinkType link_type, out_iid->id_u8[3] = 0xFE; memcpy (out_iid->id_u8 + 4, &addr, 4); return TRUE; + case NM_LINK_TYPE_6LOWPAN: + /* The hardware address is already 64-bit. This is the case for + * IEEE 802.15.4 networks. */ + memcpy (out_iid->id_u8, hwaddr, sizeof (out_iid->id_u8)); + return TRUE; default: if (hwaddr_len == ETH_ALEN) { /* Translate 48-bit MAC address to a 64-bit Modified EUI-64. See diff --git a/src/nm-manager.c b/src/nm-manager.c index 0fea13de69..67c71fea91 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4311,7 +4311,7 @@ _new_active_connection (NMManager *self, } /* FIXME: apparently, activation here only works if @connection is - * a settings-connection. Which is not the case during AddAndActivatate. + * a settings-connection. Which is not the case during AddAndActivate. * Probably, AddAndActivate is broken for VPN. */ if (activation_type != NM_ACTIVATION_TYPE_MANAGED) g_return_val_if_reached (NULL); diff --git a/src/nm-types.h b/src/nm-types.h index 1477d22696..a441a7a32d 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 - 2017 Red Hat, Inc. + * Copyright (C) 2012 - 2018 Red Hat, Inc. */ #ifndef __NETWORKMANAGER_TYPES_H__ @@ -150,6 +150,8 @@ typedef enum { NM_LINK_TYPE_WIFI, NM_LINK_TYPE_WWAN_NET, /* WWAN kernel netdevice */ NM_LINK_TYPE_WIMAX, + NM_LINK_TYPE_WPAN, + NM_LINK_TYPE_6LOWPAN, /* Software types */ NM_LINK_TYPE_BNEP = 0x10000, /* Bluetooth Ethernet emulation */ diff --git a/src/platform/linux/nl802154.h b/src/platform/linux/nl802154.h new file mode 100644 index 0000000000..ddcee128f5 --- /dev/null +++ b/src/platform/linux/nl802154.h @@ -0,0 +1,452 @@ +#ifndef __NL802154_H +#define __NL802154_H +/* + * 802.15.4 netlink interface public header + * + * Copyright 2014 Alexander Aring <aar@pengutronix.de> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#define NL802154_GENL_NAME "nl802154" + +enum nl802154_commands { +/* don't change the order or add anything between, this is ABI! */ +/* currently we don't shipping this file via uapi, ignore the above one */ + NL802154_CMD_UNSPEC, + + NL802154_CMD_GET_WPAN_PHY, /* can dump */ + NL802154_CMD_SET_WPAN_PHY, + NL802154_CMD_NEW_WPAN_PHY, + NL802154_CMD_DEL_WPAN_PHY, + + NL802154_CMD_GET_INTERFACE, /* can dump */ + NL802154_CMD_SET_INTERFACE, + NL802154_CMD_NEW_INTERFACE, + NL802154_CMD_DEL_INTERFACE, + + NL802154_CMD_SET_CHANNEL, + + NL802154_CMD_SET_PAN_ID, + NL802154_CMD_SET_SHORT_ADDR, + + NL802154_CMD_SET_TX_POWER, + NL802154_CMD_SET_CCA_MODE, + NL802154_CMD_SET_CCA_ED_LEVEL, + + NL802154_CMD_SET_MAX_FRAME_RETRIES, + + NL802154_CMD_SET_BACKOFF_EXPONENT, + NL802154_CMD_SET_MAX_CSMA_BACKOFFS, + + NL802154_CMD_SET_LBT_MODE, + + NL802154_CMD_SET_ACKREQ_DEFAULT, + + NL802154_CMD_SET_WPAN_PHY_NETNS, + + /* add new commands above here */ + +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL + NL802154_CMD_SET_SEC_PARAMS, + NL802154_CMD_GET_SEC_KEY, /* can dump */ + NL802154_CMD_NEW_SEC_KEY, + NL802154_CMD_DEL_SEC_KEY, + NL802154_CMD_GET_SEC_DEV, /* can dump */ + NL802154_CMD_NEW_SEC_DEV, + NL802154_CMD_DEL_SEC_DEV, + NL802154_CMD_GET_SEC_DEVKEY, /* can dump */ + NL802154_CMD_NEW_SEC_DEVKEY, + NL802154_CMD_DEL_SEC_DEVKEY, + NL802154_CMD_GET_SEC_LEVEL, /* can dump */ + NL802154_CMD_NEW_SEC_LEVEL, + NL802154_CMD_DEL_SEC_LEVEL, +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */ + + /* used to define NL802154_CMD_MAX below */ + __NL802154_CMD_AFTER_LAST, + NL802154_CMD_MAX = __NL802154_CMD_AFTER_LAST - 1 +}; + +enum nl802154_attrs { +/* don't change the order or add anything between, this is ABI! */ +/* currently we don't shipping this file via uapi, ignore the above one */ + NL802154_ATTR_UNSPEC, + + NL802154_ATTR_WPAN_PHY, + NL802154_ATTR_WPAN_PHY_NAME, + + NL802154_ATTR_IFINDEX, + NL802154_ATTR_IFNAME, + NL802154_ATTR_IFTYPE, + + NL802154_ATTR_WPAN_DEV, + + NL802154_ATTR_PAGE, + NL802154_ATTR_CHANNEL, + + NL802154_ATTR_PAN_ID, + NL802154_ATTR_SHORT_ADDR, + + NL802154_ATTR_TX_POWER, + + NL802154_ATTR_CCA_MODE, + NL802154_ATTR_CCA_OPT, + NL802154_ATTR_CCA_ED_LEVEL, + + NL802154_ATTR_MAX_FRAME_RETRIES, + + NL802154_ATTR_MAX_BE, + NL802154_ATTR_MIN_BE, + NL802154_ATTR_MAX_CSMA_BACKOFFS, + + NL802154_ATTR_LBT_MODE, + + NL802154_ATTR_GENERATION, + + NL802154_ATTR_CHANNELS_SUPPORTED, + NL802154_ATTR_SUPPORTED_CHANNEL, + + NL802154_ATTR_EXTENDED_ADDR, + + NL802154_ATTR_WPAN_PHY_CAPS, + + NL802154_ATTR_SUPPORTED_COMMANDS, + + NL802154_ATTR_ACKREQ_DEFAULT, + + NL802154_ATTR_PAD, + + NL802154_ATTR_PID, + NL802154_ATTR_NETNS_FD, + + /* add attributes here, update the policy in nl802154.c */ + +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL + NL802154_ATTR_SEC_ENABLED, + NL802154_ATTR_SEC_OUT_LEVEL, + NL802154_ATTR_SEC_OUT_KEY_ID, + NL802154_ATTR_SEC_FRAME_COUNTER, + + NL802154_ATTR_SEC_LEVEL, + NL802154_ATTR_SEC_DEVICE, + NL802154_ATTR_SEC_DEVKEY, + NL802154_ATTR_SEC_KEY, +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */ + + __NL802154_ATTR_AFTER_LAST, + NL802154_ATTR_MAX = __NL802154_ATTR_AFTER_LAST - 1 +}; + +enum nl802154_iftype { + /* for backwards compatibility TODO */ + NL802154_IFTYPE_UNSPEC = -1, + + NL802154_IFTYPE_NODE, + NL802154_IFTYPE_MONITOR, + NL802154_IFTYPE_COORD, + + /* keep last */ + NUM_NL802154_IFTYPES, + NL802154_IFTYPE_MAX = NUM_NL802154_IFTYPES - 1 +}; + +/** + * enum nl802154_wpan_phy_capability_attr - wpan phy capability attributes + * + * @__NL802154_CAP_ATTR_INVALID: attribute number 0 is reserved + * @NL802154_CAP_ATTR_CHANNELS: a nested attribute for nl802154_channel_attr + * @NL802154_CAP_ATTR_TX_POWERS: a nested attribute for + * nl802154_wpan_phy_tx_power + * @NL802154_CAP_ATTR_MIN_CCA_ED_LEVEL: minimum value for cca_ed_level + * @NL802154_CAP_ATTR_MAX_CCA_ED_LEVEL: maxmimum value for cca_ed_level + * @NL802154_CAP_ATTR_CCA_MODES: nl802154_cca_modes flags + * @NL802154_CAP_ATTR_CCA_OPTS: nl802154_cca_opts flags + * @NL802154_CAP_ATTR_MIN_MINBE: minimum of minbe value + * @NL802154_CAP_ATTR_MAX_MINBE: maximum of minbe value + * @NL802154_CAP_ATTR_MIN_MAXBE: minimum of maxbe value + * @NL802154_CAP_ATTR_MAX_MINBE: maximum of maxbe value + * @NL802154_CAP_ATTR_MIN_CSMA_BACKOFFS: minimum of csma backoff value + * @NL802154_CAP_ATTR_MAX_CSMA_BACKOFFS: maximum of csma backoffs value + * @NL802154_CAP_ATTR_MIN_FRAME_RETRIES: minimum of frame retries value + * @NL802154_CAP_ATTR_MAX_FRAME_RETRIES: maximum of frame retries value + * @NL802154_CAP_ATTR_IFTYPES: nl802154_iftype flags + * @NL802154_CAP_ATTR_LBT: nl802154_supported_bool_states flags + * @NL802154_CAP_ATTR_MAX: highest cap attribute currently defined + * @__NL802154_CAP_ATTR_AFTER_LAST: internal use + */ +enum nl802154_wpan_phy_capability_attr { + __NL802154_CAP_ATTR_INVALID, + + NL802154_CAP_ATTR_IFTYPES, + + NL802154_CAP_ATTR_CHANNELS, + NL802154_CAP_ATTR_TX_POWERS, + + NL802154_CAP_ATTR_CCA_ED_LEVELS, + NL802154_CAP_ATTR_CCA_MODES, + NL802154_CAP_ATTR_CCA_OPTS, + + NL802154_CAP_ATTR_MIN_MINBE, + NL802154_CAP_ATTR_MAX_MINBE, + + NL802154_CAP_ATTR_MIN_MAXBE, + NL802154_CAP_ATTR_MAX_MAXBE, + + NL802154_CAP_ATTR_MIN_CSMA_BACKOFFS, + NL802154_CAP_ATTR_MAX_CSMA_BACKOFFS, + + NL802154_CAP_ATTR_MIN_FRAME_RETRIES, + NL802154_CAP_ATTR_MAX_FRAME_RETRIES, + + NL802154_CAP_ATTR_LBT, + + /* keep last */ + __NL802154_CAP_ATTR_AFTER_LAST, + NL802154_CAP_ATTR_MAX = __NL802154_CAP_ATTR_AFTER_LAST - 1 +}; + +/** + * enum nl802154_cca_modes - cca modes + * + * @__NL802154_CCA_INVALID: cca mode number 0 is reserved + * @NL802154_CCA_ENERGY: Energy above threshold + * @NL802154_CCA_CARRIER: Carrier sense only + * @NL802154_CCA_ENERGY_CARRIER: Carrier sense with energy above threshold + * @NL802154_CCA_ALOHA: CCA shall always report an idle medium + * @NL802154_CCA_UWB_SHR: UWB preamble sense based on the SHR of a frame + * @NL802154_CCA_UWB_MULTIPLEXED: UWB preamble sense based on the packet with + * the multiplexed preamble + * @__NL802154_CCA_ATTR_AFTER_LAST: Internal + * @NL802154_CCA_ATTR_MAX: Maximum CCA attribute number + */ +enum nl802154_cca_modes { + __NL802154_CCA_INVALID, + NL802154_CCA_ENERGY, + NL802154_CCA_CARRIER, + NL802154_CCA_ENERGY_CARRIER, + NL802154_CCA_ALOHA, + NL802154_CCA_UWB_SHR, + NL802154_CCA_UWB_MULTIPLEXED, + + /* keep last */ + __NL802154_CCA_ATTR_AFTER_LAST, + NL802154_CCA_ATTR_MAX = __NL802154_CCA_ATTR_AFTER_LAST - 1 +}; + +/** + * enum nl802154_cca_opts - additional options for cca modes + * + * @NL802154_CCA_OPT_ENERGY_CARRIER_OR: NL802154_CCA_ENERGY_CARRIER with OR + * @NL802154_CCA_OPT_ENERGY_CARRIER_AND: NL802154_CCA_ENERGY_CARRIER with AND + */ +enum nl802154_cca_opts { + NL802154_CCA_OPT_ENERGY_CARRIER_AND, + NL802154_CCA_OPT_ENERGY_CARRIER_OR, + + /* keep last */ + __NL802154_CCA_OPT_ATTR_AFTER_LAST, + NL802154_CCA_OPT_ATTR_MAX = __NL802154_CCA_OPT_ATTR_AFTER_LAST - 1 +}; + +/** + * enum nl802154_supported_bool_states - bool states for bool capability entry + * + * @NL802154_SUPPORTED_BOOL_FALSE: indicates to set false + * @NL802154_SUPPORTED_BOOL_TRUE: indicates to set true + * @__NL802154_SUPPORTED_BOOL_INVALD: reserved + * @NL802154_SUPPORTED_BOOL_BOTH: indicates to set true and false + * @__NL802154_SUPPORTED_BOOL_AFTER_LAST: Internal + * @NL802154_SUPPORTED_BOOL_MAX: highest value for bool states + */ +enum nl802154_supported_bool_states { + NL802154_SUPPORTED_BOOL_FALSE, + NL802154_SUPPORTED_BOOL_TRUE, + /* to handle them in a mask */ + __NL802154_SUPPORTED_BOOL_INVALD, + NL802154_SUPPORTED_BOOL_BOTH, + + /* keep last */ + __NL802154_SUPPORTED_BOOL_AFTER_LAST, + NL802154_SUPPORTED_BOOL_MAX = __NL802154_SUPPORTED_BOOL_AFTER_LAST - 1 +}; + +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL + +enum nl802154_dev_addr_modes { + NL802154_DEV_ADDR_NONE, + __NL802154_DEV_ADDR_INVALID, + NL802154_DEV_ADDR_SHORT, + NL802154_DEV_ADDR_EXTENDED, + + /* keep last */ + __NL802154_DEV_ADDR_AFTER_LAST, + NL802154_DEV_ADDR_MAX = __NL802154_DEV_ADDR_AFTER_LAST - 1 +}; + +enum nl802154_dev_addr_attrs { + NL802154_DEV_ADDR_ATTR_UNSPEC, + + NL802154_DEV_ADDR_ATTR_PAN_ID, + NL802154_DEV_ADDR_ATTR_MODE, + NL802154_DEV_ADDR_ATTR_SHORT, + NL802154_DEV_ADDR_ATTR_EXTENDED, + NL802154_DEV_ADDR_ATTR_PAD, + + /* keep last */ + __NL802154_DEV_ADDR_ATTR_AFTER_LAST, + NL802154_DEV_ADDR_ATTR_MAX = __NL802154_DEV_ADDR_ATTR_AFTER_LAST - 1 +}; + +enum nl802154_key_id_modes { + NL802154_KEY_ID_MODE_IMPLICIT, + NL802154_KEY_ID_MODE_INDEX, + NL802154_KEY_ID_MODE_INDEX_SHORT, + NL802154_KEY_ID_MODE_INDEX_EXTENDED, + + /* keep last */ + __NL802154_KEY_ID_MODE_AFTER_LAST, + NL802154_KEY_ID_MODE_MAX = __NL802154_KEY_ID_MODE_AFTER_LAST - 1 +}; + +enum nl802154_key_id_attrs { + NL802154_KEY_ID_ATTR_UNSPEC, + + NL802154_KEY_ID_ATTR_MODE, + NL802154_KEY_ID_ATTR_INDEX, + NL802154_KEY_ID_ATTR_IMPLICIT, + NL802154_KEY_ID_ATTR_SOURCE_SHORT, + NL802154_KEY_ID_ATTR_SOURCE_EXTENDED, + NL802154_KEY_ID_ATTR_PAD, + + /* keep last */ + __NL802154_KEY_ID_ATTR_AFTER_LAST, + NL802154_KEY_ID_ATTR_MAX = __NL802154_KEY_ID_ATTR_AFTER_LAST - 1 +}; + +enum nl802154_seclevels { + NL802154_SECLEVEL_NONE, + NL802154_SECLEVEL_MIC32, + NL802154_SECLEVEL_MIC64, + NL802154_SECLEVEL_MIC128, + NL802154_SECLEVEL_ENC, + NL802154_SECLEVEL_ENC_MIC32, + NL802154_SECLEVEL_ENC_MIC64, + NL802154_SECLEVEL_ENC_MIC128, + + /* keep last */ + __NL802154_SECLEVEL_AFTER_LAST, + NL802154_SECLEVEL_MAX = __NL802154_SECLEVEL_AFTER_LAST - 1 +}; + +enum nl802154_frames { + NL802154_FRAME_BEACON, + NL802154_FRAME_DATA, + NL802154_FRAME_ACK, + NL802154_FRAME_CMD, + + /* keep last */ + __NL802154_FRAME_AFTER_LAST, + NL802154_FRAME_MAX = __NL802154_FRAME_AFTER_LAST - 1 +}; + +enum nl802154_cmd_frames { + __NL802154_CMD_FRAME_INVALID, + NL802154_CMD_FRAME_ASSOC_REQUEST, + NL802154_CMD_FRAME_ASSOC_RESPONSE, + NL802154_CMD_FRAME_DISASSOC_NOTIFY, + NL802154_CMD_FRAME_DATA_REQUEST, + NL802154_CMD_FRAME_PAN_ID_CONFLICT_NOTIFY, + NL802154_CMD_FRAME_ORPHAN_NOTIFY, + NL802154_CMD_FRAME_BEACON_REQUEST, + NL802154_CMD_FRAME_COORD_REALIGNMENT, + NL802154_CMD_FRAME_GTS_REQUEST, + + /* keep last */ + __NL802154_CMD_FRAME_AFTER_LAST, + NL802154_CMD_FRAME_MAX = __NL802154_CMD_FRAME_AFTER_LAST - 1 +}; + +enum nl802154_seclevel_attrs { + NL802154_SECLEVEL_ATTR_UNSPEC, + + NL802154_SECLEVEL_ATTR_LEVELS, + NL802154_SECLEVEL_ATTR_FRAME, + NL802154_SECLEVEL_ATTR_CMD_FRAME, + NL802154_SECLEVEL_ATTR_DEV_OVERRIDE, + + /* keep last */ + __NL802154_SECLEVEL_ATTR_AFTER_LAST, + NL802154_SECLEVEL_ATTR_MAX = __NL802154_SECLEVEL_ATTR_AFTER_LAST - 1 +}; + +/* TODO what is this? couldn't find in mib */ +enum { + NL802154_DEVKEY_IGNORE, + NL802154_DEVKEY_RESTRICT, + NL802154_DEVKEY_RECORD, + + /* keep last */ + __NL802154_DEVKEY_AFTER_LAST, + NL802154_DEVKEY_MAX = __NL802154_DEVKEY_AFTER_LAST - 1 +}; + +enum nl802154_dev { + NL802154_DEV_ATTR_UNSPEC, + + NL802154_DEV_ATTR_FRAME_COUNTER, + NL802154_DEV_ATTR_PAN_ID, + NL802154_DEV_ATTR_SHORT_ADDR, + NL802154_DEV_ATTR_EXTENDED_ADDR, + NL802154_DEV_ATTR_SECLEVEL_EXEMPT, + NL802154_DEV_ATTR_KEY_MODE, + NL802154_DEV_ATTR_PAD, + + /* keep last */ + __NL802154_DEV_ATTR_AFTER_LAST, + NL802154_DEV_ATTR_MAX = __NL802154_DEV_ATTR_AFTER_LAST - 1 +}; + +enum nl802154_devkey { + NL802154_DEVKEY_ATTR_UNSPEC, + + NL802154_DEVKEY_ATTR_FRAME_COUNTER, + NL802154_DEVKEY_ATTR_EXTENDED_ADDR, + NL802154_DEVKEY_ATTR_ID, + NL802154_DEVKEY_ATTR_PAD, + + /* keep last */ + __NL802154_DEVKEY_ATTR_AFTER_LAST, + NL802154_DEVKEY_ATTR_MAX = __NL802154_DEVKEY_ATTR_AFTER_LAST - 1 +}; + +enum nl802154_key { + NL802154_KEY_ATTR_UNSPEC, + + NL802154_KEY_ATTR_ID, + NL802154_KEY_ATTR_USAGE_FRAMES, + NL802154_KEY_ATTR_USAGE_CMDS, + NL802154_KEY_ATTR_BYTES, + + /* keep last */ + __NL802154_KEY_ATTR_AFTER_LAST, + NL802154_KEY_ATTR_MAX = __NL802154_KEY_ATTR_AFTER_LAST - 1 +}; + +#define NL802154_KEY_SIZE 16 +#define NL802154_CMD_FRAME_NR_IDS 256 + +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */ + +#endif /* __NL802154_H */ diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 9bd662a18c..f8f68550de 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 - 2017 Red Hat, Inc. + * Copyright (C) 2012 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -50,8 +50,9 @@ #include "nmp-netns.h" #include "nm-platform-utils.h" #include "nm-platform-private.h" -#include "wifi/wifi-utils.h" -#include "wifi/wifi-utils-wext.h" +#include "wifi/nm-wifi-utils.h" +#include "wifi/nm-wifi-utils-wext.h" +#include "wpan/nm-wpan-utils.h" #include "nm-utils/unaligned.h" #include "nm-utils/nm-udev-utils.h" @@ -154,6 +155,13 @@ G_STATIC_ASSERT (RTA_MAX == (__RTA_MAX - 1)); /*****************************************************************************/ +/* Appeared in in kernel prior to 3.13 dated 19 January, 2014 */ +#ifndef ARPHRD_6LOWPAN +#define ARPHRD_6LOWPAN 825 +#endif + +/*****************************************************************************/ + #define IFLA_MACSEC_UNSPEC 0 #define IFLA_MACSEC_SCI 1 #define IFLA_MACSEC_PORT 2 @@ -317,6 +325,7 @@ static void cache_on_change (NMPlatform *platform, const NMPObject *obj_new); static void cache_prune_all (NMPlatform *platform); static gboolean event_handler_read_netlink (NMPlatform *platform, gboolean wait_for_acks); +static struct nl_sock *_genl_sock (NMLinuxPlatform *platform); /*****************************************************************************/ @@ -533,6 +542,8 @@ static const LinkDesc linktypes[] = { { NM_LINK_TYPE_WIFI, "wifi", NULL, "wlan" }, { NM_LINK_TYPE_WWAN_NET, "wwan", NULL, "wwan" }, { NM_LINK_TYPE_WIMAX, "wimax", "wimax", "wimax" }, + { NM_LINK_TYPE_WPAN, "wpan", NULL, NULL }, + { NM_LINK_TYPE_6LOWPAN, "6lowpan", NULL, NULL }, { NM_LINK_TYPE_BNEP, "bluetooth", NULL, "bluetooth" }, { NM_LINK_TYPE_DUMMY, "dummy", "dummy", NULL }, @@ -841,6 +852,10 @@ _linktype_get_type (NMPlatform *platform, return NM_LINK_TYPE_IP6TNL; else if (arptype == ARPHRD_PPP) return NM_LINK_TYPE_PPP; + else if (arptype == ARPHRD_IEEE802154) + return NM_LINK_TYPE_WPAN; + else if (arptype == ARPHRD_6LOWPAN) + return NM_LINK_TYPE_6LOWPAN; { NMPUtilsEthtoolDriverInfo driver_info; @@ -885,7 +900,7 @@ _linktype_get_type (NMPlatform *platform, } /* Fallback for drivers that don't call SET_NETDEV_DEVTYPE() */ - if (wifi_utils_is_wifi (dirfd, ifname_verified)) + if (nm_wifi_utils_is_wifi (dirfd, ifname_verified)) return NM_LINK_TYPE_WIFI; } @@ -1714,6 +1729,7 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr NMPObject *lnk_data = NULL; gboolean address_complete_from_cache = TRUE; gboolean lnk_data_complete_from_cache = TRUE; + gboolean need_ext_data = FALSE; gboolean af_inet6_token_valid = FALSE; gboolean af_inet6_addr_gen_mode_valid = FALSE; @@ -1868,6 +1884,12 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr case NM_LINK_TYPE_VXLAN: lnk_data = _parse_lnk_vxlan (nl_info_kind, nl_info_data); break; + case NM_LINK_TYPE_WIFI: + case NM_LINK_TYPE_OLPC_MESH: + case NM_LINK_TYPE_WPAN: + need_ext_data = TRUE; + lnk_data_complete_from_cache = FALSE; + break; default: lnk_data_complete_from_cache = FALSE; break; @@ -1895,6 +1917,14 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr nmp_object_unref (lnk_data); lnk_data = (NMPObject *) nmp_object_ref (link_cached->_link.netlink.lnk); } + + if ( need_ext_data + && link_cached->link.type == obj->link.type + && link_cached->_link.ext_data) { + /* Prefer reuse of existing ext_data object */ + obj->_link.ext_data = g_object_ref (link_cached->_link.ext_data); + } + if (address_complete_from_cache) obj->link.addr = link_cached->link.addr; if (!af_inet6_token_valid) @@ -1912,6 +1942,33 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr obj->_link.netlink.lnk = lnk_data; + if (need_ext_data && obj->_link.ext_data == NULL) { + switch (obj->link.type) { + case NM_LINK_TYPE_WIFI: + obj->_link.ext_data = (GObject *) nm_wifi_utils_new (ifi->ifi_index, + _genl_sock (NM_LINUX_PLATFORM (platform)), + TRUE); + break; + case NM_LINK_TYPE_OLPC_MESH: +#if HAVE_WEXT + /* The kernel driver now uses nl80211, but we force use of WEXT because + * the cfg80211 interactions are not quite ready to support access to + * mesh control through nl80211 just yet. + */ + obj->_link.ext_data = (GObject *) nm_wifi_utils_wext_new (ifi->ifi_index, FALSE); +#endif + break; + case NM_LINK_TYPE_WPAN: + obj->_link.ext_data = (GObject *) nm_wpan_utils_new (ifi->ifi_index, + _genl_sock (NM_LINUX_PLATFORM (platform)), + TRUE); + break; + default: + g_assert_not_reached (); + } + } + + obj->_link.netlink.is_in_netlink = TRUE; id_only_handled: obj_result = obj; @@ -2966,6 +3023,8 @@ typedef struct { } DelayedActionWaitForNlResponseData; typedef struct { + struct nl_sock *genl; + struct nl_sock *nlh; guint32 nlh_seq_next; #ifdef NM_MORE_LOGGING @@ -2997,8 +3056,6 @@ typedef struct { gint is_handling; } delayed_action; - - GHashTable *wifi_data; } NMLinuxPlatformPrivate; struct _NMLinuxPlatform { @@ -3038,6 +3095,14 @@ nm_linux_platform_setup (void) /*****************************************************************************/ +static struct nl_sock * +_genl_sock (NMLinuxPlatform *platform) +{ + NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); + + return priv->genl; +} + #define ASSERT_SYSCTL_ARGS(pathid, dirfd, path) \ G_STMT_START { \ const char *const _pathid = (pathid); \ @@ -5718,6 +5783,41 @@ nla_put_failure: g_return_val_if_reached (FALSE); } +static gboolean +link_6lowpan_add (NMPlatform *platform, + const char *name, + int parent, + const NMPlatformLink **out_link) +{ + nm_auto_nlmsg struct nl_msg *nlmsg = NULL; + struct nlattr *info; + + nlmsg = _nl_msg_new_link (RTM_NEWLINK, + NLM_F_CREATE | NLM_F_EXCL, + 0, + name, + 0, + 0); + if (!nlmsg) + return FALSE; + + NLA_PUT_U32 (nlmsg, IFLA_LINK, parent); + + if (!(info = nla_nest_start (nlmsg, IFLA_LINKINFO))) + goto nla_put_failure; + + NLA_PUT_STRING (nlmsg, IFLA_INFO_KIND, "lowpan"); + + nla_nest_end (nlmsg, info); + + return do_add_link_with_lookup (platform, + NM_LINK_TYPE_6LOWPAN, + name, nlmsg, out_link); +nla_put_failure: + g_return_val_if_reached (FALSE); +} + + static void _vlan_change_vlan_qos_mapping_create (gboolean is_ingress_map, gboolean reset_all, @@ -5980,43 +6080,26 @@ infiniband_partition_delete (NMPlatform *platform, int parent, int p_key) /*****************************************************************************/ -static WifiData * -wifi_get_wifi_data (NMPlatform *platform, int ifindex) +static GObject * +get_ext_data (NMPlatform *platform, int ifindex) { - NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); - const NMPlatformLink *pllink; - WifiData *wifi_data; - - wifi_data = g_hash_table_lookup (priv->wifi_data, GINT_TO_POINTER (ifindex)); - pllink = nm_platform_link_get (platform, ifindex); - - if (!wifi_data) { - if (pllink) { - if (pllink->type == NM_LINK_TYPE_WIFI) - wifi_data = wifi_utils_init (ifindex, TRUE); - else if (pllink->type == NM_LINK_TYPE_OLPC_MESH) { - /* The kernel driver now uses nl80211, but we force use of WEXT because - * the cfg80211 interactions are not quite ready to support access to - * mesh control through nl80211 just yet. - */ -#if HAVE_WEXT - wifi_data = wifi_wext_init (ifindex, FALSE); -#endif - } + const NMPObject *obj; - if (wifi_data) - g_hash_table_insert (priv->wifi_data, GINT_TO_POINTER (ifindex), wifi_data); - } - } + obj = nmp_cache_lookup_link (nm_platform_get_cache (platform), ifindex); + if (!obj) + return NULL; - return wifi_data; + return obj->_link.ext_data; } + +/*****************************************************************************/ + #define WIFI_GET_WIFI_DATA_NETNS(wifi_data, platform, ifindex, retval) \ nm_auto_pop_netns NMPNetns *netns = NULL; \ - WifiData *wifi_data; \ + NMWifiUtils *wifi_data; \ if (!nm_platform_netns_push (platform, &netns)) \ return retval; \ - wifi_data = wifi_get_wifi_data (platform, ifindex); \ + wifi_data = NM_WIFI_UTILS (get_ext_data (platform, ifindex)); \ if (!wifi_data) \ return retval; @@ -6025,7 +6108,7 @@ wifi_get_capabilities (NMPlatform *platform, int ifindex, NMDeviceWifiCapabiliti { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, FALSE); if (caps) - *caps = wifi_utils_get_caps (wifi_data); + *caps = nm_wifi_utils_get_caps (wifi_data); return TRUE; } @@ -6033,63 +6116,70 @@ static gboolean wifi_get_bssid (NMPlatform *platform, int ifindex, guint8 *bssid) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, FALSE); - return wifi_utils_get_bssid (wifi_data, bssid); + return nm_wifi_utils_get_bssid (wifi_data, bssid); } static guint32 wifi_get_frequency (NMPlatform *platform, int ifindex) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, 0); - return wifi_utils_get_freq (wifi_data); + return nm_wifi_utils_get_freq (wifi_data); } static gboolean wifi_get_quality (NMPlatform *platform, int ifindex) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, FALSE); - return wifi_utils_get_qual (wifi_data); + return nm_wifi_utils_get_qual (wifi_data); } static guint32 wifi_get_rate (NMPlatform *platform, int ifindex) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, FALSE); - return wifi_utils_get_rate (wifi_data); + return nm_wifi_utils_get_rate (wifi_data); } static NM80211Mode wifi_get_mode (NMPlatform *platform, int ifindex) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, NM_802_11_MODE_UNKNOWN); - return wifi_utils_get_mode (wifi_data); + return nm_wifi_utils_get_mode (wifi_data); } static void wifi_set_mode (NMPlatform *platform, int ifindex, NM80211Mode mode) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, ); - wifi_utils_set_mode (wifi_data, mode); + nm_wifi_utils_set_mode (wifi_data, mode); } static void wifi_set_powersave (NMPlatform *platform, int ifindex, guint32 powersave) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, ); - wifi_utils_set_powersave (wifi_data, powersave); + nm_wifi_utils_set_powersave (wifi_data, powersave); } static guint32 wifi_find_frequency (NMPlatform *platform, int ifindex, const guint32 *freqs) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, 0); - return wifi_utils_find_freq (wifi_data, freqs); + return nm_wifi_utils_find_freq (wifi_data, freqs); } static void wifi_indicate_addressing_running (NMPlatform *platform, int ifindex, gboolean running) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, ); - wifi_utils_indicate_addressing_running (wifi_data, running); + nm_wifi_utils_indicate_addressing_running (wifi_data, running); +} + +static NMSettingWirelessWakeOnWLan +wifi_get_wake_on_wlan (NMPlatform *platform, int ifindex) +{ + WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, FALSE); + return nm_wifi_utils_get_wake_on_wlan (wifi_data); } static gboolean @@ -6097,7 +6187,7 @@ wifi_set_wake_on_wlan (NMPlatform *platform, int ifindex, NMSettingWirelessWakeOnWLan wowl) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, FALSE); - return wifi_utils_set_wake_on_wlan (wifi_data, wowl); + return nm_wifi_utils_set_wake_on_wlan (wifi_data, wowl); } /*****************************************************************************/ @@ -6148,21 +6238,56 @@ static guint32 mesh_get_channel (NMPlatform *platform, int ifindex) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, 0); - return wifi_utils_get_mesh_channel (wifi_data); + return nm_wifi_utils_get_mesh_channel (wifi_data); } static gboolean mesh_set_channel (NMPlatform *platform, int ifindex, guint32 channel) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, FALSE); - return wifi_utils_set_mesh_channel (wifi_data, channel); + return nm_wifi_utils_set_mesh_channel (wifi_data, channel); } static gboolean mesh_set_ssid (NMPlatform *platform, int ifindex, const guint8 *ssid, gsize len) { WIFI_GET_WIFI_DATA_NETNS (wifi_data, platform, ifindex, FALSE); - return wifi_utils_set_mesh_ssid (wifi_data, ssid, len); + return nm_wifi_utils_set_mesh_ssid (wifi_data, ssid, len); +} + +/*****************************************************************************/ + +#define WPAN_GET_WPAN_DATA(wpan_data, platform, ifindex, retval) \ + NMWpanUtils *wpan_data = NM_WPAN_UTILS (get_ext_data (platform, ifindex)); \ + if (!wpan_data) \ + return retval; + +static guint16 +wpan_get_pan_id (NMPlatform *platform, int ifindex) +{ + WPAN_GET_WPAN_DATA (wpan_data, platform, ifindex, G_MAXINT16); + return nm_wpan_utils_get_pan_id (wpan_data); +} + +static gboolean +wpan_set_pan_id (NMPlatform *platform, int ifindex, guint16 pan_id) +{ + WPAN_GET_WPAN_DATA (wpan_data, platform, ifindex, FALSE); + return nm_wpan_utils_set_pan_id (wpan_data, pan_id); +} + +static guint16 +wpan_get_short_addr (NMPlatform *platform, int ifindex) +{ + WPAN_GET_WPAN_DATA (wpan_data, platform, ifindex, G_MAXINT16); + return nm_wpan_utils_get_short_addr (wpan_data); +} + +static gboolean +wpan_set_short_addr (NMPlatform *platform, int ifindex, guint16 short_addr) +{ + WPAN_GET_WPAN_DATA (wpan_data, platform, ifindex, FALSE); + return nm_wpan_utils_set_short_addr (wpan_data, short_addr); } /*****************************************************************************/ @@ -6179,12 +6304,12 @@ link_get_wake_on_lan (NMPlatform *platform, int ifindex) if (type == NM_LINK_TYPE_ETHERNET) return nmp_utils_ethtool_get_wake_on_lan (ifindex); else if (type == NM_LINK_TYPE_WIFI) { - WifiData *wifi_data = wifi_get_wifi_data (platform, ifindex); + NMWifiUtils *wifi_data = NM_WIFI_UTILS (get_ext_data (platform, ifindex)); if (!wifi_data) return FALSE; - return wifi_utils_get_wowlan (wifi_data); + return nm_wifi_utils_get_wake_on_wlan (wifi_data) != NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE; } else return FALSE; } @@ -7006,7 +7131,6 @@ nm_linux_platform_init (NMLinuxPlatform *self) priv->delayed_action.list_master_connected = g_ptr_array_new (); priv->delayed_action.list_refresh_link = g_ptr_array_new (); priv->delayed_action.list_wait_for_nl_response = g_array_new (FALSE, TRUE, sizeof (DelayedActionWaitForNlResponseData)); - priv->wifi_data = g_hash_table_new_full (nm_direct_hash, NULL, NULL, (GDestroyNotify) wifi_utils_unref); } static void @@ -7036,6 +7160,18 @@ constructed (GObject *_object) nmp_netns_get_current () == nmp_netns_get_initial () ? "/main" : "")), nm_platform_get_use_udev (platform) ? "use" : "no"); + + priv->genl = nl_socket_alloc (); + g_assert (priv->genl); + + nle = nl_connect (priv->genl, NETLINK_GENERIC); + if (nle) { + _LOGE ("unable to connect the generic netlink socket \"%s\" (%d)", + nl_geterror (nle), -nle); + nl_socket_free (priv->genl); + priv->genl = NULL; + } + priv->nlh = nl_socket_alloc (); g_assert (priv->nlh); @@ -7154,12 +7290,12 @@ finalize (GObject *object) g_ptr_array_unref (priv->delayed_action.list_refresh_link); g_array_unref (priv->delayed_action.list_wait_for_nl_response); + nl_socket_free (priv->genl); + g_source_remove (priv->event_id); g_io_channel_unref (priv->event_channel); nl_socket_free (priv->nlh); - g_hash_table_unref (priv->wifi_data); - if (priv->sysctl_get_prev_values) { sysctl_clear_cache_list = g_slist_remove (sysctl_clear_cache_list, object); g_hash_table_destroy (priv->sysctl_get_prev_values); @@ -7238,12 +7374,18 @@ nm_linux_platform_class_init (NMLinuxPlatformClass *klass) platform_class->wifi_set_powersave = wifi_set_powersave; platform_class->wifi_find_frequency = wifi_find_frequency; platform_class->wifi_indicate_addressing_running = wifi_indicate_addressing_running; + platform_class->wifi_get_wake_on_wlan = wifi_get_wake_on_wlan; platform_class->wifi_set_wake_on_wlan = wifi_set_wake_on_wlan; platform_class->mesh_get_channel = mesh_get_channel; platform_class->mesh_set_channel = mesh_set_channel; platform_class->mesh_set_ssid = mesh_set_ssid; + platform_class->wpan_get_pan_id = wpan_get_pan_id; + platform_class->wpan_set_pan_id = wpan_set_pan_id; + platform_class->wpan_get_short_addr = wpan_get_short_addr; + platform_class->wpan_set_short_addr = wpan_set_short_addr; + platform_class->link_gre_add = link_gre_add; platform_class->link_ip6tnl_add = link_ip6tnl_add; platform_class->link_macsec_add = link_macsec_add; @@ -7251,6 +7393,7 @@ nm_linux_platform_class_init (NMLinuxPlatformClass *klass) platform_class->link_ipip_add = link_ipip_add; platform_class->link_sit_add = link_sit_add; platform_class->link_tun_add = link_tun_add; + platform_class->link_6lowpan_add = link_6lowpan_add; platform_class->object_delete = object_delete; platform_class->ip4_address_add = ip4_address_add; diff --git a/src/platform/nm-netlink.h b/src/platform/nm-netlink.h index b938fa4a4d..24565d074d 100644 --- a/src/platform/nm-netlink.h +++ b/src/platform/nm-netlink.h @@ -177,6 +177,12 @@ nla_get_u8 (const struct nlattr *nla) } static inline uint8_t +nla_get_s8 (const struct nlattr *nla) +{ + return *(const int8_t *) nla_data (nla); +} + +static inline uint8_t nla_get_u8_cond (/*const*/ struct nlattr *const*tb, int attr, uint8_t default_val) { nm_assert (tb); @@ -197,6 +203,12 @@ nla_get_u32(const struct nlattr *nla) return *(const uint32_t *) nla_data (nla); } +static inline int32_t +nla_get_s32(const struct nlattr *nla) +{ + return *(const int32_t *) nla_data (nla); +} + uint64_t nla_get_u64 (const struct nlattr *nla); static inline char * @@ -225,19 +237,25 @@ nla_put_string (struct nl_msg *msg, int attrtype, const char *str) #define NLA_PUT_TYPE(msg, type, attrtype, value) \ do { \ - type __tmp = value; \ - NLA_PUT(msg, attrtype, sizeof(type), &__tmp); \ + type __nla_tmp = value; \ + NLA_PUT(msg, attrtype, sizeof(type), &__nla_tmp); \ } while(0) #define NLA_PUT_U8(msg, attrtype, value) \ NLA_PUT_TYPE(msg, uint8_t, attrtype, value) +#define NLA_PUT_S8(msg, attrtype, value) \ + NLA_PUT_TYPE(msg, int8_t, attrtype, value) + #define NLA_PUT_U16(msg, attrtype, value) \ NLA_PUT_TYPE(msg, uint16_t, attrtype, value) #define NLA_PUT_U32(msg, attrtype, value) \ NLA_PUT_TYPE(msg, uint32_t, attrtype, value) +#define NLA_PUT_S32(msg, attrtype, value) \ + NLA_PUT_TYPE(msg, int32_t, attrtype, value) + #define NLA_PUT_U64(msg, attrtype, value) \ NLA_PUT_TYPE(msg, uint64_t, attrtype, value) diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index f75019e8ba..1fcb4d79c5 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 - 2017 Red Hat, Inc. + * Copyright (C) 2012 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -807,6 +807,7 @@ _nm_platform_link_get_by_address_match_link (const NMPObject *obj, struct _nm_pl **/ const NMPlatformLink * nm_platform_link_get_by_address (NMPlatform *self, + NMLinkType link_type, gconstpointer address, size_t length) { @@ -827,7 +828,7 @@ nm_platform_link_get_by_address (NMPlatform *self, g_return_val_if_reached (NULL); obj = nmp_cache_lookup_link_full (nm_platform_get_cache (self), - 0, NULL, TRUE, NM_LINK_TYPE_NONE, + 0, NULL, TRUE, link_type, (NMPObjectMatchFn) _nm_platform_link_get_by_address_match_link, &d); return NMP_OBJECT_CAST_LINK (obj); } @@ -2087,6 +2088,70 @@ nm_platform_link_tun_add (NMPlatform *self, return NM_PLATFORM_ERROR_SUCCESS; } +/** + * nm_platform_6lowpan_add: + * @self: platform instance + * @parent: parent link + * @name: name of the new interface + * @out_link: on success, the link object + * + * Create a 6LoWPAN interface. + */ +NMPlatformError +nm_platform_link_6lowpan_add (NMPlatform *self, + const char *name, + int parent, + const NMPlatformLink **out_link) +{ + NMPlatformError plerr; + + _CHECK_SELF (self, klass, NM_PLATFORM_ERROR_BUG); + + g_return_val_if_fail (name, NM_PLATFORM_ERROR_BUG); + + plerr = _link_add_check_existing (self, name, NM_LINK_TYPE_6LOWPAN, out_link); + if (plerr != NM_PLATFORM_ERROR_SUCCESS) + return plerr; + + _LOGD ("adding 6lowpan '%s' parent %u", name, parent); + + if (!klass->link_6lowpan_add (self, name, parent, out_link)) + return NM_PLATFORM_ERROR_UNSPECIFIED; + return NM_PLATFORM_ERROR_SUCCESS; +} + +gboolean +nm_platform_link_6lowpan_get_properties (NMPlatform *self, int ifindex, int *out_parent) +{ + const NMPlatformLink *plink; + _CHECK_SELF (self, klass, FALSE); + + plink = nm_platform_link_get (self, ifindex); + + if (!plink) + return FALSE; + if (plink->type != NM_LINK_TYPE_6LOWPAN) + return FALSE; + + if (plink->parent != 0) { + NM_SET_OUT (out_parent, plink->parent); + return TRUE; + } + + /* As of 4.16 kernel does not expose the peer_ifindex as IFA_LINK. + * Find the WPAN device with the same MAC address. */ + if (out_parent) { + const NMPlatformLink *parent_plink; + + parent_plink = nm_platform_link_get_by_address (self, NM_LINK_TYPE_WPAN, + plink->addr.data, + plink->addr.len); + NM_SET_OUT (out_parent, parent_plink ? parent_plink->ifindex : -1); + } + + return TRUE; +} + /*****************************************************************************/ static gboolean @@ -2538,6 +2603,7 @@ nm_platform_link_ipip_add (NMPlatform *self, * nm_platform_macsec_add: * @self: platform instance * @name: name of the new interface + * @parent: parent link * @props: interface properties * @out_link: on success, the link object * @@ -2888,6 +2954,16 @@ nm_platform_wifi_indicate_addressing_running (NMPlatform *self, int ifindex, gbo klass->wifi_indicate_addressing_running (self, ifindex, running); } +NMSettingWirelessWakeOnWLan +nm_platform_wifi_get_wake_on_wlan (NMPlatform *self, int ifindex) +{ + _CHECK_SELF (self, klass, FALSE); + + g_return_val_if_fail (ifindex > 0, FALSE); + + return klass->wifi_get_wake_on_wlan (self, ifindex); +} + gboolean nm_platform_wifi_set_wake_on_wlan (NMPlatform *self, int ifindex, NMSettingWirelessWakeOnWLan wowl) { @@ -2929,6 +3005,46 @@ nm_platform_mesh_set_ssid (NMPlatform *self, int ifindex, const guint8 *ssid, gs return klass->mesh_set_ssid (self, ifindex, ssid, len); } +guint16 +nm_platform_wpan_get_pan_id (NMPlatform *self, int ifindex) +{ + _CHECK_SELF (self, klass, FALSE); + + g_return_val_if_fail (ifindex > 0, FALSE); + + return klass->wpan_get_pan_id (self, ifindex); +} + +gboolean +nm_platform_wpan_set_pan_id (NMPlatform *self, int ifindex, guint16 pan_id) +{ + _CHECK_SELF (self, klass, FALSE); + + g_return_val_if_fail (ifindex > 0, FALSE); + + return klass->wpan_set_pan_id (self, ifindex, pan_id); +} + +guint16 +nm_platform_wpan_get_short_addr (NMPlatform *self, int ifindex) +{ + _CHECK_SELF (self, klass, FALSE); + + g_return_val_if_fail (ifindex > 0, FALSE); + + return klass->wpan_get_short_addr (self, ifindex); +} + +gboolean +nm_platform_wpan_set_short_addr (NMPlatform *self, int ifindex, guint16 short_addr) +{ + _CHECK_SELF (self, klass, FALSE); + + g_return_val_if_fail (ifindex > 0, FALSE); + + return klass->wpan_set_short_addr (self, ifindex, short_addr); +} + #define TO_STRING_DEV_BUF_SIZE (5+15+1) static const char * _to_string_dev (NMPlatform *self, int ifindex, char *buf, size_t size) diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 866df7362e..986df9b63f 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2009 - 2017 Red Hat, Inc. + * Copyright (C) 2009 - 2018 Red Hat, Inc. */ #ifndef __NETWORKMANAGER_PLATFORM_H__ @@ -854,6 +854,11 @@ typedef struct { const NMPlatformLink **out_link, int *out_fd); + gboolean (*link_6lowpan_add) (NMPlatform *platform, + const char *name, + int parent, + const NMPlatformLink **out_link); + gboolean (*infiniband_partition_add) (NMPlatform *, int parent, int p_key, const NMPlatformLink **out_link); gboolean (*infiniband_partition_delete) (NMPlatform *, int parent, int p_key); @@ -868,12 +873,18 @@ typedef struct { void (*wifi_set_powersave) (NMPlatform *, int ifindex, guint32 powersave); guint32 (*wifi_find_frequency) (NMPlatform *, int ifindex, const guint32 *freqs); void (*wifi_indicate_addressing_running) (NMPlatform *, int ifindex, gboolean running); + NMSettingWirelessWakeOnWLan (*wifi_get_wake_on_wlan) (NMPlatform *, int ifindex); gboolean (*wifi_set_wake_on_wlan) (NMPlatform *, int ifindex, NMSettingWirelessWakeOnWLan wowl); guint32 (*mesh_get_channel) (NMPlatform *, int ifindex); gboolean (*mesh_set_channel) (NMPlatform *, int ifindex, guint32 channel); gboolean (*mesh_set_ssid) (NMPlatform *, int ifindex, const guint8 *ssid, gsize len); + guint16 (*wpan_get_pan_id) (NMPlatform *, int ifindex); + gboolean (*wpan_set_pan_id) (NMPlatform *, int ifindex, guint16 pan_id); + guint16 (*wpan_get_short_addr) (NMPlatform *, int ifindex); + gboolean (*wpan_set_short_addr) (NMPlatform *, int ifindex, guint16 short_addr); + gboolean (*object_delete) (NMPlatform *, const NMPObject *obj); gboolean (*ip4_address_add) (NMPlatform *, @@ -1078,7 +1089,7 @@ const NMPObject *nm_platform_link_get_obj (NMPlatform *self, gboolean visible_only); const NMPlatformLink *nm_platform_link_get (NMPlatform *self, int ifindex); const NMPlatformLink *nm_platform_link_get_by_ifname (NMPlatform *self, const char *ifname); -const NMPlatformLink *nm_platform_link_get_by_address (NMPlatform *self, gconstpointer address, size_t length); +const NMPlatformLink *nm_platform_link_get_by_address (NMPlatform *self, NMLinkType link_type, gconstpointer address, size_t length); GPtrArray *nm_platform_link_get_all (NMPlatform *self, gboolean sort_by_name); NMPlatformError nm_platform_link_dummy_add (NMPlatform *self, const char *name, const NMPlatformLink **out_link); @@ -1247,12 +1258,18 @@ void nm_platform_wifi_set_mode (NMPlatform *self, int ifindex, NM void nm_platform_wifi_set_powersave (NMPlatform *self, int ifindex, guint32 powersave); guint32 nm_platform_wifi_find_frequency (NMPlatform *self, int ifindex, const guint32 *freqs); void nm_platform_wifi_indicate_addressing_running (NMPlatform *self, int ifindex, gboolean running); +NMSettingWirelessWakeOnWLan nm_platform_wifi_get_wake_on_wlan (NMPlatform *self, int ifindex); gboolean nm_platform_wifi_set_wake_on_wlan (NMPlatform *self, int ifindex, NMSettingWirelessWakeOnWLan wowl); guint32 nm_platform_mesh_get_channel (NMPlatform *self, int ifindex); gboolean nm_platform_mesh_set_channel (NMPlatform *self, int ifindex, guint32 channel); gboolean nm_platform_mesh_set_ssid (NMPlatform *self, int ifindex, const guint8 *ssid, gsize len); +guint16 nm_platform_wpan_get_pan_id (NMPlatform *platform, int ifindex); +gboolean nm_platform_wpan_set_pan_id (NMPlatform *platform, int ifindex, guint16 pan_id); +guint16 nm_platform_wpan_get_short_addr (NMPlatform *platform, int ifindex); +gboolean nm_platform_wpan_set_short_addr (NMPlatform *platform, int ifindex, guint16 short_addr); + void nm_platform_ip4_address_set_addr (NMPlatformIP4Address *addr, in_addr_t address, guint8 plen); const struct in6_addr *nm_platform_ip6_address_get_peer (const NMPlatformIP6Address *addr); @@ -1289,6 +1306,13 @@ NMPlatformError nm_platform_link_tun_add (NMPlatform *self, const NMPlatformLnkTun *props, const NMPlatformLink **out_link, int *out_fd); +NMPlatformError nm_platform_link_6lowpan_add (NMPlatform *self, + const char *name, + int parent, + const NMPlatformLink **out_link); +gboolean nm_platform_link_6lowpan_get_properties (NMPlatform *self, + int ifindex, + int *out_parent); const NMPlatformIP6Address *nm_platform_ip6_address_get (NMPlatform *self, int ifindex, struct in6_addr address); diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 50e6825bf9..0ffebc9ad3 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2015 - 2017 Red Hat, Inc. + * Copyright (C) 2015 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -31,6 +31,9 @@ #include "nm-core-utils.h" #include "nm-platform-utils.h" +#include "wifi/nm-wifi-utils.h" +#include "wpan/nm-wpan-utils.h" + /*****************************************************************************/ #define _NMLOG_DOMAIN LOGD_PLATFORM @@ -456,6 +459,7 @@ _vt_cmd_obj_dispose_link (NMPObject *obj) udev_device_unref (obj->_link.udev.device); obj->_link.udev.device = NULL; } + g_clear_object (&obj->_link.ext_data); nmp_object_unref (obj->_link.netlink.lnk); } @@ -908,6 +912,12 @@ _vt_cmd_obj_copy_link (NMPObject *dst, const NMPObject *src) nmp_object_unref (dst->_link.netlink.lnk); dst->_link.netlink.lnk = src->_link.netlink.lnk; } + if (dst->_link.ext_data != src->_link.ext_data) { + if (dst->_link.ext_data) + g_clear_object (&dst->_link.ext_data); + if (src->_link.ext_data) + dst->_link.ext_data = g_object_ref (src->_link.ext_data); + } dst->_link = src->_link; } diff --git a/src/platform/nmp-object.h b/src/platform/nmp-object.h index f473f4628f..fab98b8f62 100644 --- a/src/platform/nmp-object.h +++ b/src/platform/nmp-object.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2015 - 2017 Red Hat, Inc. + * Copyright (C) 2015 - 2018 Red Hat, Inc. */ #ifndef __NMP_OBJECT_H__ @@ -164,6 +164,9 @@ typedef struct { */ struct udev_device *device; } udev; + + /* Auxiliary data object for Wi-Fi and WPAN */ + GObject *ext_data; } NMPObjectLink; typedef struct { diff --git a/src/platform/tests/test-general.c b/src/platform/tests/test-general.c index 8708c80f72..eebc15d80d 100644 --- a/src/platform/tests/test-general.c +++ b/src/platform/tests/test-general.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2015 Red Hat, Inc. + * Copyright (C) 2015 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -57,7 +57,7 @@ NMTST_DEFINE (); int main (int argc, char **argv) { - nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT"); + nmtst_init_assert_logging (&argc, &argv, "WARN", "DEFAULT"); g_test_add_func ("/general/init_linux_platform", test_init_linux_platform); g_test_add_func ("/general/link_get_all", test_link_get_all); diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c index 6c2ff3f579..1728ad1809 100644 --- a/src/platform/wifi/wifi-utils-nl80211.c +++ b/src/platform/wifi/nm-wifi-utils-nl80211.c @@ -15,14 +15,14 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2005 - 2011 Red Hat, Inc. + * Copyright (C) 2005 - 2018 Red Hat, Inc. * Copyright (C) 2006 - 2008 Novell, Inc. * Copyright (C) 2011 Intel Corporation. All rights reserved. */ #include "nm-default.h" -#include "wifi-utils-nl80211.h" +#include "nm-wifi-utils-nl80211.h" #include <errno.h> #include <string.h> @@ -32,7 +32,7 @@ #include <linux/nl80211.h> #include "platform/nm-netlink.h" -#include "wifi-utils-private.h" +#include "nm-wifi-utils-private.h" #include "platform/nm-platform.h" #include "platform/nm-platform-utils.h" #include "nm-utils.h" @@ -47,14 +47,20 @@ } G_STMT_END typedef struct { - WifiData parent; + NMWifiUtils parent; struct nl_sock *nl_sock; guint32 *freqs; int id; int num_freqs; int phy; bool can_wowlan:1; -} WifiDataNl80211; +} NMWifiUtilsNl80211; + +typedef struct { + NMWifiUtilsClass parent; +} NMWifiUtilsNl80211Class; + +G_DEFINE_TYPE (NMWifiUtilsNl80211, nm_wifi_utils_nl80211, NM_TYPE_WIFI_UTILS) static int ack_handler (struct nl_msg *msg, void *arg) @@ -97,7 +103,7 @@ nla_put_failure: } static struct nl_msg * -nl80211_alloc_msg (WifiDataNl80211 *nl80211, guint32 cmd, guint32 flags) +nl80211_alloc_msg (NMWifiUtilsNl80211 *nl80211, guint32 cmd, guint32 flags) { return _nl80211_alloc_msg (nl80211->id, nl80211->parent.ifindex, nl80211->phy, cmd, flags); } @@ -154,7 +160,7 @@ _nl80211_send_and_recv (struct nl_sock *nl_sock, } static int -nl80211_send_and_recv (WifiDataNl80211 *nl80211, +nl80211_send_and_recv (NMWifiUtilsNl80211 *nl80211, struct nl_msg *msg, int (*valid_handler) (struct nl_msg *, void *), void *valid_data) @@ -164,13 +170,11 @@ nl80211_send_and_recv (WifiDataNl80211 *nl80211, } static void -wifi_nl80211_deinit (WifiData *parent) +dispose (GObject *object) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) parent; + NMWifiUtilsNl80211 *nl80211 = NM_WIFI_UTILS_NL80211 (object); - if (nl80211->nl_sock) - nl_socket_free (nl80211->nl_sock); - g_free (nl80211->freqs); + g_clear_pointer (&nl80211->freqs, g_free); } struct nl80211_iface_info { @@ -207,9 +211,9 @@ nl80211_iface_info_handler (struct nl_msg *msg, void *arg) } static NM80211Mode -wifi_nl80211_get_mode (WifiData *data) +wifi_nl80211_get_mode (NMWifiUtils *data) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; struct nl80211_iface_info iface_info = { .mode = NM_802_11_MODE_UNKNOWN, }; @@ -225,9 +229,9 @@ wifi_nl80211_get_mode (WifiData *data) } static gboolean -wifi_nl80211_set_mode (WifiData *data, const NM80211Mode mode) +wifi_nl80211_set_mode (NMWifiUtils *data, const NM80211Mode mode) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; nm_auto_nlmsg struct nl_msg *msg = NULL; int err; @@ -255,9 +259,9 @@ nla_put_failure: } static gboolean -wifi_nl80211_set_powersave (WifiData *data, guint32 powersave) +wifi_nl80211_set_powersave (NMWifiUtils *data, guint32 powersave) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; nm_auto_nlmsg struct nl_msg *msg = NULL; int err; @@ -271,10 +275,64 @@ nla_put_failure: return FALSE; } +static int +nl80211_get_wake_on_wlan_handler (struct nl_msg *msg, void *arg) +{ + NMSettingWirelessWakeOnWLan *wowl = arg; + struct nlattr *attrs[NL80211_ATTR_MAX + 1]; + struct nlattr *trig[NUM_NL80211_WOWLAN_TRIG]; + struct genlmsghdr *gnlh = nlmsg_data (nlmsg_hdr (msg)); + + nla_parse (attrs, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), + genlmsg_attrlen(gnlh, 0), NULL); + + if (!attrs[NL80211_ATTR_WOWLAN_TRIGGERS]) + return NL_SKIP; + + nla_parse (trig, MAX_NL80211_WOWLAN_TRIG, + nla_data (attrs[NL80211_ATTR_WOWLAN_TRIGGERS]), + nla_len (attrs[NL80211_ATTR_WOWLAN_TRIGGERS]), + NULL); + + *wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE; + if (trig[NL80211_WOWLAN_TRIG_ANY]) + *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY; + if (trig[NL80211_WOWLAN_TRIG_DISCONNECT]) + *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT; + if (trig[NL80211_WOWLAN_TRIG_MAGIC_PKT]) + *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC; + if (trig[NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE]) + *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE; + if (trig[NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST]) + *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST; + if (trig[NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE]) + *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE; + if (trig[NL80211_WOWLAN_TRIG_RFKILL_RELEASE]) + *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE; + if (trig[NL80211_WOWLAN_TRIG_TCP_CONNECTION]) + *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP; + + return NL_SKIP; +} + +static NMSettingWirelessWakeOnWLan +wifi_nl80211_get_wake_on_wlan (NMWifiUtils *data) +{ + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; + NMSettingWirelessWakeOnWLan wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE; + nm_auto_nlmsg struct nl_msg *msg = NULL; + + msg = nl80211_alloc_msg (nl80211, NL80211_CMD_GET_WOWLAN, 0); + + nl80211_send_and_recv (nl80211, msg, nl80211_get_wake_on_wlan_handler, &wowl); + + return wowl; +} + static gboolean -wifi_nl80211_set_wake_on_wlan (WifiData *data, NMSettingWirelessWakeOnWLan wowl) +wifi_nl80211_set_wake_on_wlan (NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; nm_auto_nlmsg struct nl_msg *msg = NULL; struct nlattr *triggers; int err; @@ -282,11 +340,11 @@ wifi_nl80211_set_wake_on_wlan (WifiData *data, NMSettingWirelessWakeOnWLan wowl) if (wowl == NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE) return TRUE; - msg = nl80211_alloc_msg(nl80211, NL80211_CMD_SET_WOWLAN, 0); + msg = nl80211_alloc_msg (nl80211, NL80211_CMD_SET_WOWLAN, 0); if (!msg) return FALSE; - triggers = nla_nest_start(msg, NL80211_ATTR_WOWLAN_TRIGGERS); + triggers = nla_nest_start (msg, NL80211_ATTR_WOWLAN_TRIGGERS); if (NM_FLAGS_HAS (wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY)) NLA_PUT_FLAG (msg, NL80211_WOWLAN_TRIG_ANY); @@ -306,7 +364,8 @@ wifi_nl80211_set_wake_on_wlan (WifiData *data, NMSettingWirelessWakeOnWLan wowl) nla_nest_end(msg, triggers); err = nl80211_send_and_recv (nl80211, msg, NULL, NULL); - return err ? FALSE : TRUE; + + return err >= 0; nla_put_failure: return FALSE; @@ -432,7 +491,7 @@ nl80211_bss_dump_handler (struct nl_msg *msg, void *arg) } static void -nl80211_get_bss_info (WifiDataNl80211 *nl80211, +nl80211_get_bss_info (NMWifiUtilsNl80211 *nl80211, struct nl80211_bss_info *bss_info) { nm_auto_nlmsg struct nl_msg *msg = NULL; @@ -445,9 +504,9 @@ nl80211_get_bss_info (WifiDataNl80211 *nl80211, } static guint32 -wifi_nl80211_get_freq (WifiData *data) +wifi_nl80211_get_freq (NMWifiUtils *data) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; struct nl80211_bss_info bss_info; nl80211_get_bss_info (nl80211, &bss_info); @@ -456,9 +515,9 @@ wifi_nl80211_get_freq (WifiData *data) } static guint32 -wifi_nl80211_find_freq (WifiData *data, const guint32 *freqs) +wifi_nl80211_find_freq (NMWifiUtils *data, const guint32 *freqs) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; int i; for (i = 0; i < nl80211->num_freqs; i++) { @@ -472,9 +531,9 @@ wifi_nl80211_find_freq (WifiData *data, const guint32 *freqs) } static gboolean -wifi_nl80211_get_bssid (WifiData *data, guint8 *out_bssid) +wifi_nl80211_get_bssid (NMWifiUtils *data, guint8 *out_bssid) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; struct nl80211_bss_info bss_info; nl80211_get_bss_info (nl80211, &bss_info); @@ -556,7 +615,7 @@ nl80211_station_handler (struct nl_msg *msg, void *arg) } static void -nl80211_get_ap_info (WifiDataNl80211 *nl80211, +nl80211_get_ap_info (NMWifiUtilsNl80211 *nl80211, struct nl80211_station_info *sta_info) { nm_auto_nlmsg struct nl_msg *msg = NULL; @@ -586,9 +645,9 @@ nla_put_failure: } static guint32 -wifi_nl80211_get_rate (WifiData *data) +wifi_nl80211_get_rate (NMWifiUtils *data) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; struct nl80211_station_info sta_info; nl80211_get_ap_info (nl80211, &sta_info); @@ -597,9 +656,9 @@ wifi_nl80211_get_rate (WifiData *data) } static int -wifi_nl80211_get_qual (WifiData *data) +wifi_nl80211_get_qual (NMWifiUtils *data) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; struct nl80211_station_info sta_info; nl80211_get_ap_info (nl80211, &sta_info); @@ -607,9 +666,9 @@ wifi_nl80211_get_qual (WifiData *data) } static gboolean -wifi_nl80211_indicate_addressing_running (WifiData *data, gboolean running) +wifi_nl80211_indicate_addressing_running (NMWifiUtils *data, gboolean running) { - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; + NMWifiUtilsNl80211 *nl80211 = (NMWifiUtilsNl80211 *) data; nm_auto_nlmsg struct nl_msg *msg = NULL; int err; @@ -638,44 +697,6 @@ nla_put_failure: return FALSE; } -struct nl80211_wowlan_info { - gboolean enabled; -}; - -static int -nl80211_wowlan_handler (struct nl_msg *msg, void *arg) -{ - struct nlattr *tb[NL80211_ATTR_MAX + 1]; - struct genlmsghdr *gnlh = nlmsg_data (nlmsg_hdr (msg)); - struct nl80211_wowlan_info *info = arg; - - info->enabled = FALSE; - - if (nla_parse (tb, NL80211_ATTR_MAX, genlmsg_attrdata (gnlh, 0), - genlmsg_attrlen (gnlh, 0), NULL) < 0) - return NL_SKIP; - - if (tb[NL80211_ATTR_WOWLAN_TRIGGERS]) - info->enabled = TRUE; - - return NL_SKIP; -} - -static gboolean -wifi_nl80211_get_wowlan (WifiData *data) -{ - WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data; - nm_auto_nlmsg struct nl_msg *msg = NULL; - struct nl80211_wowlan_info info; - - if (!nl80211->can_wowlan) - return FALSE; - - msg = nl80211_alloc_msg (nl80211, NL80211_CMD_GET_WOWLAN, 0); - nl80211_send_and_recv (nl80211, msg, nl80211_wowlan_handler, &info); - return info.enabled; -} - struct nl80211_device_info { int phy; guint32 *freqs; @@ -879,43 +900,53 @@ static int nl80211_wiphy_info_handler (struct nl_msg *msg, void *arg) return NL_SKIP; } -WifiData * -wifi_nl80211_init (int ifindex) +static void +nm_wifi_utils_nl80211_init (NMWifiUtilsNl80211 *self) { - static const WifiDataClass klass = { - .struct_size = sizeof (WifiDataNl80211), - .get_mode = wifi_nl80211_get_mode, - .set_mode = wifi_nl80211_set_mode, - .set_powersave = wifi_nl80211_set_powersave, - .set_wake_on_wlan = wifi_nl80211_set_wake_on_wlan, - .get_freq = wifi_nl80211_get_freq, - .find_freq = wifi_nl80211_find_freq, - .get_bssid = wifi_nl80211_get_bssid, - .get_rate = wifi_nl80211_get_rate, - .get_qual = wifi_nl80211_get_qual, - .get_wowlan = wifi_nl80211_get_wowlan, - .indicate_addressing_running = wifi_nl80211_indicate_addressing_running, - .deinit = wifi_nl80211_deinit, - }; - WifiDataNl80211 *nl80211; +} + +static void +nm_wifi_utils_nl80211_class_init (NMWifiUtilsNl80211Class *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + NMWifiUtilsClass *wifi_utils_class = NM_WIFI_UTILS_CLASS (klass); + + object_class->dispose = dispose; + + wifi_utils_class->get_mode = wifi_nl80211_get_mode; + wifi_utils_class->set_mode = wifi_nl80211_set_mode; + wifi_utils_class->set_powersave = wifi_nl80211_set_powersave; + wifi_utils_class->get_wake_on_wlan = wifi_nl80211_get_wake_on_wlan, + wifi_utils_class->set_wake_on_wlan = wifi_nl80211_set_wake_on_wlan, + wifi_utils_class->get_freq = wifi_nl80211_get_freq; + wifi_utils_class->find_freq = wifi_nl80211_find_freq; + wifi_utils_class->get_bssid = wifi_nl80211_get_bssid; + wifi_utils_class->get_rate = wifi_nl80211_get_rate; + wifi_utils_class->get_qual = wifi_nl80211_get_qual; + wifi_utils_class->indicate_addressing_running = wifi_nl80211_indicate_addressing_running; +} + +NMWifiUtils * +nm_wifi_utils_nl80211_new (int ifindex, struct nl_sock *genl) +{ + NMWifiUtilsNl80211 *nl80211; nm_auto_nlmsg struct nl_msg *msg = NULL; struct nl80211_device_info device_info = {}; char ifname[IFNAMSIZ]; + if (!genl) + return NULL; + if (!nmp_utils_if_indextoname (ifindex, ifname)) { _LOGW (LOGD_PLATFORM | LOGD_WIFI, "can't determine interface name for ifindex %d", ifindex); nm_sprintf_buf (ifname, "if %d", ifindex); } - nl80211 = wifi_data_new (&klass, ifindex); + nl80211 = g_object_new (NM_TYPE_WIFI_UTILS_NL80211, NULL); - nl80211->nl_sock = nl_socket_alloc (); - if (nl80211->nl_sock == NULL) - goto error; - - if (nl_connect (nl80211->nl_sock, NETLINK_GENERIC)) - goto error; + nl80211->parent.ifindex = ifindex; + nl80211->nl_sock = genl; nl80211->id = genl_ctrl_resolve (nl80211->nl_sock, "nl80211"); if (nl80211->id < 0) { @@ -979,10 +1010,9 @@ wifi_nl80211_init (int ifindex) _LOGI (LOGD_PLATFORM | LOGD_WIFI, "(%s): using nl80211 for WiFi device control", ifname); - return (WifiData *) nl80211; + return (NMWifiUtils *) nl80211; error: - wifi_utils_unref ((WifiData *) nl80211); + g_object_unref (nl80211); return NULL; } - diff --git a/src/platform/wifi/wifi-utils-nl80211.h b/src/platform/wifi/nm-wifi-utils-nl80211.h index aff24555fc..27f67697e2 100644 --- a/src/platform/wifi/wifi-utils-nl80211.h +++ b/src/platform/wifi/nm-wifi-utils-nl80211.h @@ -16,13 +16,24 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright (C) 2011 Intel Corporation. All rights reserved. + * Copyright (C) 2018 Red Hat, Inc. */ #ifndef __WIFI_UTILS_NL80211_H__ #define __WIFI_UTILS_NL80211_H__ -#include "wifi-utils.h" +#include "nm-wifi-utils.h" +#include "platform/nm-netlink.h" -WifiData *wifi_nl80211_init (int ifindex); +#define NM_TYPE_WIFI_UTILS_NL80211 (nm_wifi_utils_nl80211_get_type ()) +#define NM_WIFI_UTILS_NL80211(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211)) +#define NM_WIFI_UTILS_NL80211_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211Class)) +#define NM_IS_WIFI_UTILS_NL80211(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_WIFI_UTILS_NL80211)) +#define NM_IS_WIFI_UTILS_NL80211_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_WIFI_UTILS_NL80211)) +#define NM_WIFI_UTILS_NL80211_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211Class)) + +GType nm_wifi_utils_nl80211_get_type (void); + +NMWifiUtils *nm_wifi_utils_nl80211_new (int ifindex, struct nl_sock *genl); #endif /* __WIFI_UTILS_NL80211_H__ */ diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/nm-wifi-utils-private.h index 627108cbca..bcbc1c5170 100644 --- a/src/platform/wifi/wifi-utils-private.h +++ b/src/platform/wifi/nm-wifi-utils-private.h @@ -15,67 +15,65 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2011 - 2018 Red Hat, Inc. */ #ifndef __WIFI_UTILS_PRIVATE_H__ #define __WIFI_UTILS_PRIVATE_H__ #include "nm-dbus-interface.h" -#include "wifi-utils.h" +#include "nm-wifi-utils.h" typedef struct { - gsize struct_size; + GObjectClass parent; - NM80211Mode (*get_mode) (WifiData *data); + NM80211Mode (*get_mode) (NMWifiUtils *data); - gboolean (*set_mode) (WifiData *data, const NM80211Mode mode); + gboolean (*set_mode) (NMWifiUtils *data, const NM80211Mode mode); /* Set power saving mode on an interface */ - gboolean (*set_powersave) (WifiData *data, guint32 powersave); + gboolean (*set_powersave) (NMWifiUtils *data, guint32 powersave); + + /* Get WakeOnWLAN configuration on an interface */ + NMSettingWirelessWakeOnWLan (*get_wake_on_wlan) (NMWifiUtils *data); /* Set WakeOnWLAN mode on an interface */ - gboolean (*set_wake_on_wlan) (WifiData *data, NMSettingWirelessWakeOnWLan wowl); + gboolean (*set_wake_on_wlan) (NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl); /* Return current frequency in MHz (really associated BSS frequency) */ - guint32 (*get_freq) (WifiData *data); + guint32 (*get_freq) (NMWifiUtils *data); /* Return first supported frequency in the zero-terminated list */ - guint32 (*find_freq) (WifiData *data, const guint32 *freqs); + guint32 (*find_freq) (NMWifiUtils *data, const guint32 *freqs); /* Return current bitrate in Kbps */ - guint32 (*get_rate) (WifiData *data); + guint32 (*get_rate) (NMWifiUtils *data); - gboolean (*get_bssid) (WifiData *data, guint8 *out_bssid); + gboolean (*get_bssid) (NMWifiUtils *data, guint8 *out_bssid); /* Return a signal strength percentage 0 - 100% for the current BSSID; * return -1 on errors or if not associated. */ - int (*get_qual) (WifiData *data); - - void (*deinit) (WifiData *data); - - gboolean (*get_wowlan) (WifiData *data); + int (*get_qual) (NMWifiUtils *data); /* OLPC Mesh-only functions */ - guint32 (*get_mesh_channel) (WifiData *data); + guint32 (*get_mesh_channel) (NMWifiUtils *data); /* channel == 0 means "auto channel" */ - gboolean (*set_mesh_channel) (WifiData *data, guint32 channel); + gboolean (*set_mesh_channel) (NMWifiUtils *data, guint32 channel); /* ssid == NULL means "auto SSID" */ - gboolean (*set_mesh_ssid) (WifiData *data, const guint8 *ssid, gsize len); + gboolean (*set_mesh_ssid) (NMWifiUtils *data, const guint8 *ssid, gsize len); - gboolean (*indicate_addressing_running) (WifiData *data, gboolean running); -} WifiDataClass; + gboolean (*indicate_addressing_running) (NMWifiUtils *data, gboolean running); +} NMWifiUtilsClass; + +struct NMWifiUtils { + GObject parent; -struct WifiData { - const WifiDataClass *klass; int ifindex; NMDeviceWifiCapabilities caps; }; -gpointer wifi_data_new (const WifiDataClass *klass, int ifindex); - #endif /* __WIFI_UTILS_PRIVATE_H__ */ diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/nm-wifi-utils-wext.c index c8744f79b6..8045b6d4f7 100644 --- a/src/platform/wifi/wifi-utils-wext.c +++ b/src/platform/wifi/nm-wifi-utils-wext.c @@ -15,13 +15,13 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2005 - 2011 Red Hat, Inc. + * Copyright (C) 2005 - 2018 Red Hat, Inc. * Copyright (C) 2006 - 2008 Novell, Inc. */ #include "nm-default.h" -#include "wifi-utils-wext.h" +#include "nm-wifi-utils-wext.h" #include <errno.h> #include <string.h> @@ -38,17 +38,23 @@ #include <sys/socket.h> #include <linux/wireless.h> -#include "wifi-utils-private.h" +#include "nm-wifi-utils-private.h" #include "nm-utils.h" #include "platform/nm-platform-utils.h" typedef struct { - WifiData parent; + NMWifiUtils parent; int fd; struct iw_quality max_qual; gint8 num_freqs; guint32 freqs[IW_MAX_FREQUENCIES]; -} WifiDataWext; +} NMWifiUtilsWext; + +typedef struct { + NMWifiUtilsClass parent; +} NMWifiUtilsWextClass; + +G_DEFINE_TYPE (NMWifiUtilsWext, nm_wifi_utils_wext, NM_TYPE_WIFI_UTILS) /* Until a new wireless-tools comes out that has the defs and the structure, * need to copy them here. @@ -94,11 +100,11 @@ iw_freq_to_uint32 (const struct iw_freq *freq) } static void -wifi_wext_deinit (WifiData *parent) +dispose (GObject *object) { - WifiDataWext *wext = (WifiDataWext *) parent; + NMWifiUtilsWext *wext = NM_WIFI_UTILS_WEXT (object); - nm_close (wext->fd); + wext->fd = nm_close (wext->fd); } static gboolean @@ -118,9 +124,9 @@ get_ifname (int ifindex, char *buffer, const char *op) } static NM80211Mode -wifi_wext_get_mode_ifname (WifiData *data, const char *ifname) +wifi_wext_get_mode_ifname (NMWifiUtils *data, const char *ifname) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; memset (&wrq, 0, sizeof (struct iwreq)); @@ -150,7 +156,7 @@ wifi_wext_get_mode_ifname (WifiData *data, const char *ifname) } static NM80211Mode -wifi_wext_get_mode (WifiData *data) +wifi_wext_get_mode (NMWifiUtils *data) { char ifname[IFNAMSIZ]; @@ -161,9 +167,9 @@ wifi_wext_get_mode (WifiData *data) } static gboolean -wifi_wext_set_mode (WifiData *data, const NM80211Mode mode) +wifi_wext_set_mode (NMWifiUtils *data, const NM80211Mode mode) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; char ifname[IFNAMSIZ]; @@ -203,9 +209,9 @@ wifi_wext_set_mode (WifiData *data, const NM80211Mode mode) } static gboolean -wifi_wext_set_powersave (WifiData *data, guint32 powersave) +wifi_wext_set_powersave (NMWifiUtils *data, guint32 powersave) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; char ifname[IFNAMSIZ]; @@ -232,9 +238,9 @@ wifi_wext_set_powersave (WifiData *data, guint32 powersave) } static guint32 -wifi_wext_get_freq (WifiData *data) +wifi_wext_get_freq (NMWifiUtils *data) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; char ifname[IFNAMSIZ]; @@ -254,9 +260,9 @@ wifi_wext_get_freq (WifiData *data) } static guint32 -wifi_wext_find_freq (WifiData *data, const guint32 *freqs) +wifi_wext_find_freq (NMWifiUtils *data, const guint32 *freqs) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; int i; for (i = 0; i < wext->num_freqs; i++) { @@ -270,9 +276,9 @@ wifi_wext_find_freq (WifiData *data, const guint32 *freqs) } static gboolean -wifi_wext_get_bssid (WifiData *data, guint8 *out_bssid) +wifi_wext_get_bssid (NMWifiUtils *data, guint8 *out_bssid) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; char ifname[IFNAMSIZ]; @@ -292,9 +298,9 @@ wifi_wext_get_bssid (WifiData *data, guint8 *out_bssid) } static guint32 -wifi_wext_get_rate (WifiData *data) +wifi_wext_get_rate (NMWifiUtils *data) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; int err; char ifname[IFNAMSIZ]; @@ -403,9 +409,9 @@ wext_qual_to_percent (const struct iw_quality *qual, } static int -wifi_wext_get_qual (WifiData *data) +wifi_wext_get_qual (NMWifiUtils *data) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; struct iw_statistics stats; char ifname[IFNAMSIZ]; @@ -433,13 +439,13 @@ wifi_wext_get_qual (WifiData *data) /* OLPC Mesh-only functions */ static guint32 -wifi_wext_get_mesh_channel (WifiData *data) +wifi_wext_get_mesh_channel (NMWifiUtils *data) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; guint32 freq; int i; - freq = wifi_utils_get_freq (data); + freq = nm_wifi_utils_get_freq (data); for (i = 0; i < wext->num_freqs; i++) { if (freq == wext->freqs[i]) return i + 1; @@ -448,9 +454,9 @@ wifi_wext_get_mesh_channel (WifiData *data) } static gboolean -wifi_wext_set_mesh_channel (WifiData *data, guint32 channel) +wifi_wext_set_mesh_channel (NMWifiUtils *data, guint32 channel) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; char ifname[IFNAMSIZ]; @@ -477,9 +483,9 @@ wifi_wext_set_mesh_channel (WifiData *data, guint32 channel) } static gboolean -wifi_wext_set_mesh_ssid (WifiData *data, const guint8 *ssid, gsize len) +wifi_wext_set_mesh_ssid (NMWifiUtils *data, const guint8 *ssid, gsize len) { - WifiDataWext *wext = (WifiDataWext *) data; + NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data; struct iwreq wrq; char buf[IW_ESSID_MAX_SIZE + 1]; char ifname[IFNAMSIZ]; @@ -514,7 +520,7 @@ wifi_wext_set_mesh_ssid (WifiData *data, const guint8 *ssid, gsize len) /*****************************************************************************/ static gboolean -wext_can_scan_ifname (WifiDataWext *wext, const char *ifname) +wext_can_scan_ifname (NMWifiUtilsWext *wext, const char *ifname) { struct iwreq wrq; @@ -528,7 +534,7 @@ wext_can_scan_ifname (WifiDataWext *wext, const char *ifname) } static gboolean -wext_get_range_ifname (WifiDataWext *wext, +wext_get_range_ifname (NMWifiUtilsWext *wext, const char *ifname, struct iw_range *range, guint32 *response_len) @@ -577,7 +583,7 @@ wext_get_range_ifname (WifiDataWext *wext, NM_WIFI_DEVICE_CAP_RSN) static guint32 -wext_get_caps (WifiDataWext *wext, const char *ifname, struct iw_range *range) +wext_get_caps (NMWifiUtilsWext *wext, const char *ifname, struct iw_range *range) { guint32 caps = NM_WIFI_DEVICE_CAP_NONE; @@ -626,25 +632,38 @@ wext_get_caps (WifiDataWext *wext, const char *ifname, struct iw_range *range) return caps; } -WifiData * -wifi_wext_init (int ifindex, gboolean check_scan) +/*****************************************************************************/ + +static void +nm_wifi_utils_wext_init (NMWifiUtilsWext *self) +{ +} + +static void +nm_wifi_utils_wext_class_init (NMWifiUtilsWextClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + NMWifiUtilsClass *wifi_utils_class = NM_WIFI_UTILS_CLASS (klass); + + object_class->dispose = dispose; + + wifi_utils_class->get_mode = wifi_wext_get_mode; + wifi_utils_class->set_mode = wifi_wext_set_mode; + wifi_utils_class->set_powersave = wifi_wext_set_powersave; + wifi_utils_class->get_freq = wifi_wext_get_freq; + wifi_utils_class->find_freq = wifi_wext_find_freq; + wifi_utils_class->get_bssid = wifi_wext_get_bssid; + wifi_utils_class->get_rate = wifi_wext_get_rate; + wifi_utils_class->get_qual = wifi_wext_get_qual; + wifi_utils_class->get_mesh_channel = wifi_wext_get_mesh_channel; + wifi_utils_class->set_mesh_channel = wifi_wext_set_mesh_channel; + wifi_utils_class->set_mesh_ssid = wifi_wext_set_mesh_ssid; +} + +NMWifiUtils * +nm_wifi_utils_wext_new (int ifindex, gboolean check_scan) { - static const WifiDataClass klass = { - .struct_size = sizeof (WifiDataWext), - .get_mode = wifi_wext_get_mode, - .set_mode = wifi_wext_set_mode, - .set_powersave = wifi_wext_set_powersave, - .get_freq = wifi_wext_get_freq, - .find_freq = wifi_wext_find_freq, - .get_bssid = wifi_wext_get_bssid, - .get_rate = wifi_wext_get_rate, - .get_qual = wifi_wext_get_qual, - .deinit = wifi_wext_deinit, - .get_mesh_channel = wifi_wext_get_mesh_channel, - .set_mesh_channel = wifi_wext_set_mesh_channel, - .set_mesh_ssid = wifi_wext_set_mesh_ssid, - }; - WifiDataWext *wext; + NMWifiUtilsWext *wext; struct iw_range range; guint32 response_len = 0; struct iw_range_with_scan_capa *scan_capa_range; @@ -658,8 +677,9 @@ wifi_wext_init (int ifindex, gboolean check_scan) return NULL; } - wext = wifi_data_new (&klass, ifindex); + wext = g_object_new (NM_TYPE_WIFI_UTILS_WEXT, NULL); + wext->parent.ifindex = ifindex; wext->fd = socket (PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (wext->fd < 0) goto error; @@ -731,15 +751,15 @@ wifi_wext_init (int ifindex, gboolean check_scan) "(%s): using WEXT for WiFi device control", ifname); - return (WifiData *) wext; + return (NMWifiUtils *) wext; error: - wifi_utils_unref ((WifiData *) wext); + g_object_unref (wext); return NULL; } gboolean -wifi_wext_is_wifi (const char *iface) +nm_wifi_utils_wext_is_wifi (const char *iface) { int fd; struct iwreq iwr; diff --git a/src/platform/wifi/wifi-utils-wext.h b/src/platform/wifi/nm-wifi-utils-wext.h index 3ef5a173ab..44b11afb5f 100644 --- a/src/platform/wifi/wifi-utils-wext.h +++ b/src/platform/wifi/nm-wifi-utils-wext.h @@ -15,16 +15,25 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2011 - 2018 Red Hat, Inc. */ #ifndef __WIFI_UTILS_WEXT_H__ #define __WIFI_UTILS_WEXT_H__ -#include "wifi-utils.h" +#include "nm-wifi-utils.h" -WifiData *wifi_wext_init (int ifindex, gboolean check_scan); +#define NM_TYPE_WIFI_UTILS_WEXT (nm_wifi_utils_wext_get_type ()) +#define NM_WIFI_UTILS_WEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWext)) +#define NM_WIFI_UTILS_WEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWextClass)) +#define NM_IS_WIFI_UTILS_WEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_WIFI_UTILS_WEXT)) +#define NM_IS_WIFI_UTILS_WEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_WIFI_UTILS_WEXT)) +#define NM_WIFI_UTILS_WEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWextClass)) -gboolean wifi_wext_is_wifi (const char *iface); +GType nm_wifi_utils_wext_get_type (void); + +NMWifiUtils *nm_wifi_utils_wext_new (int ifindex, gboolean check_scan); + +gboolean nm_wifi_utils_wext_is_wifi (const char *iface); #endif /* __WIFI_UTILS_WEXT_H__ */ diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/platform/wifi/nm-wifi-utils.c new file mode 100644 index 0000000000..25d71c6a88 --- /dev/null +++ b/src/platform/wifi/nm-wifi-utils.c @@ -0,0 +1,240 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2005 - 2018 Red Hat, Inc. + * Copyright (C) 2006 - 2008 Novell, Inc. + */ + +#include "nm-default.h" + +#include "nm-wifi-utils.h" + +#include <sys/stat.h> +#include <stdio.h> +#include <string.h> +#include <fcntl.h> + +#include "nm-wifi-utils-private.h" +#include "nm-wifi-utils-nl80211.h" +#if HAVE_WEXT +#include "nm-wifi-utils-wext.h" +#endif +#include "nm-core-utils.h" + +#include "platform/nm-platform-utils.h" + +G_DEFINE_ABSTRACT_TYPE (NMWifiUtils, nm_wifi_utils, G_TYPE_OBJECT) + +/*****************************************************************************/ + +static void +nm_wifi_utils_init (NMWifiUtils *self) +{ +} + +static void +nm_wifi_utils_class_init (NMWifiUtilsClass *klass) +{ +} + +NMWifiUtils * +nm_wifi_utils_new (int ifindex, struct nl_sock *genl, gboolean check_scan) +{ + NMWifiUtils *ret; + + g_return_val_if_fail (ifindex > 0, NULL); + + ret = nm_wifi_utils_nl80211_new (ifindex, genl); + +#if HAVE_WEXT + if (ret == NULL) + ret = nm_wifi_utils_wext_new (ifindex, check_scan); +#endif + + return ret; +} + +NMDeviceWifiCapabilities +nm_wifi_utils_get_caps (NMWifiUtils *data) +{ + g_return_val_if_fail (data != NULL, NM_WIFI_DEVICE_CAP_NONE); + + return data->caps; +} + +NM80211Mode +nm_wifi_utils_get_mode (NMWifiUtils *data) +{ + g_return_val_if_fail (data != NULL, NM_802_11_MODE_UNKNOWN); + return NM_WIFI_UTILS_GET_CLASS (data)->get_mode (data); +} + +gboolean +nm_wifi_utils_set_mode (NMWifiUtils *data, const NM80211Mode mode) +{ + NMWifiUtilsClass *klass; + + g_return_val_if_fail (data != NULL, FALSE); + g_return_val_if_fail ( (mode == NM_802_11_MODE_INFRA) + || (mode == NM_802_11_MODE_AP) + || (mode == NM_802_11_MODE_ADHOC), FALSE); + + klass = NM_WIFI_UTILS_GET_CLASS (data); + + /* nl80211 probably doesn't need this */ + return klass->set_mode ? klass->set_mode (data, mode) : TRUE; +} + +gboolean +nm_wifi_utils_set_powersave (NMWifiUtils *data, guint32 powersave) +{ + NMWifiUtilsClass *klass; + + g_return_val_if_fail (data != NULL, FALSE); + + klass = NM_WIFI_UTILS_GET_CLASS (data); + return klass->set_powersave ? klass->set_powersave (data, powersave) : TRUE; +} + +NMSettingWirelessWakeOnWLan +nm_wifi_utils_get_wake_on_wlan (NMWifiUtils *data) +{ + NMWifiUtilsClass *klass; + + g_return_val_if_fail (data != NULL, NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE); + + klass = NM_WIFI_UTILS_GET_CLASS (data); + + return klass->get_wake_on_wlan ? klass->get_wake_on_wlan (data) : NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE; +} + +gboolean +nm_wifi_utils_set_wake_on_wlan (NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl) +{ + NMWifiUtilsClass *klass; + + g_return_val_if_fail (data != NULL, FALSE); + + klass = NM_WIFI_UTILS_GET_CLASS (data); + return klass->set_wake_on_wlan ? klass->set_wake_on_wlan (data, wowl) : FALSE; +} + +guint32 +nm_wifi_utils_get_freq (NMWifiUtils *data) +{ + g_return_val_if_fail (data != NULL, 0); + return NM_WIFI_UTILS_GET_CLASS (data)->get_freq (data); +} + +guint32 +nm_wifi_utils_find_freq (NMWifiUtils *data, const guint32 *freqs) +{ + g_return_val_if_fail (data != NULL, 0); + g_return_val_if_fail (freqs != NULL, 0); + return NM_WIFI_UTILS_GET_CLASS (data)->find_freq (data, freqs); +} + +gboolean +nm_wifi_utils_get_bssid (NMWifiUtils *data, guint8 *out_bssid) +{ + g_return_val_if_fail (data != NULL, FALSE); + g_return_val_if_fail (out_bssid != NULL, FALSE); + + memset (out_bssid, 0, ETH_ALEN); + return NM_WIFI_UTILS_GET_CLASS (data)->get_bssid (data, out_bssid); +} + +guint32 +nm_wifi_utils_get_rate (NMWifiUtils *data) +{ + g_return_val_if_fail (data != NULL, 0); + return NM_WIFI_UTILS_GET_CLASS (data)->get_rate (data); +} + +int +nm_wifi_utils_get_qual (NMWifiUtils *data) +{ + g_return_val_if_fail (data != NULL, 0); + return NM_WIFI_UTILS_GET_CLASS (data)->get_qual (data); +} + +gboolean +nm_wifi_utils_is_wifi (int dirfd, const char *ifname) +{ + g_return_val_if_fail (dirfd >= 0, FALSE); + + if (faccessat (dirfd, "phy80211", F_OK, 0) == 0) + return TRUE; +#if HAVE_WEXT + if (nm_wifi_utils_wext_is_wifi (ifname)) + return TRUE; +#endif + return FALSE; +} + +/* OLPC Mesh-only functions */ + +guint32 +nm_wifi_utils_get_mesh_channel (NMWifiUtils *data) +{ + NMWifiUtilsClass *klass; + + g_return_val_if_fail (data != NULL, FALSE); + + klass = NM_WIFI_UTILS_GET_CLASS (data); + g_return_val_if_fail (klass->get_mesh_channel != NULL, FALSE); + + return klass->get_mesh_channel (data); +} + +gboolean +nm_wifi_utils_set_mesh_channel (NMWifiUtils *data, guint32 channel) +{ + NMWifiUtilsClass *klass; + + g_return_val_if_fail (data != NULL, FALSE); + g_return_val_if_fail (channel <= 13, FALSE); + + klass = NM_WIFI_UTILS_GET_CLASS (data); + g_return_val_if_fail (klass->set_mesh_channel != NULL, FALSE); + + return klass->set_mesh_channel (data, channel); +} + +gboolean +nm_wifi_utils_set_mesh_ssid (NMWifiUtils *data, const guint8 *ssid, gsize len) +{ + NMWifiUtilsClass *klass; + + g_return_val_if_fail (data != NULL, FALSE); + + klass = NM_WIFI_UTILS_GET_CLASS (data); + g_return_val_if_fail (klass->set_mesh_ssid != NULL, FALSE); + + return klass->set_mesh_ssid (data, ssid, len); +} + +gboolean +nm_wifi_utils_indicate_addressing_running (NMWifiUtils *data, gboolean running) +{ + NMWifiUtilsClass *klass; + + g_return_val_if_fail (data != NULL, FALSE); + + klass = NM_WIFI_UTILS_GET_CLASS (data); + return klass->indicate_addressing_running ? klass->indicate_addressing_running (data, running) : FALSE; +} diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h new file mode 100644 index 0000000000..6cd178bd93 --- /dev/null +++ b/src/platform/wifi/nm-wifi-utils.h @@ -0,0 +1,84 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2005 - 2018 Red Hat, Inc. + * Copyright (C) 2006 - 2008 Novell, Inc. + */ + +#ifndef __WIFI_UTILS_H__ +#define __WIFI_UTILS_H__ + +#include <net/ethernet.h> + +#include "nm-dbus-interface.h" +#include "nm-setting-wireless.h" +#include "platform/nm-netlink.h" + +typedef struct NMWifiUtils NMWifiUtils; + +#define NM_TYPE_WIFI_UTILS (nm_wifi_utils_get_type ()) +#define NM_WIFI_UTILS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WIFI_UTILS, NMWifiUtils)) +#define NM_WIFI_UTILS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_WIFI_UTILS, NMWifiUtilsClass)) +#define NM_IS_WIFI_UTILS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_WIFI_UTILS)) +#define NM_IS_WIFI_UTILS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_WIFI_UTILS)) +#define NM_WIFI_UTILS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_WIFI_UTILS, NMWifiUtilsClass)) + +GType nm_wifi_utils_get_type (void); + +gboolean nm_wifi_utils_is_wifi (int dirfd, const char *ifname); + +NMWifiUtils *nm_wifi_utils_new (int ifindex, struct nl_sock *genl, gboolean check_scan); + +NMDeviceWifiCapabilities nm_wifi_utils_get_caps (NMWifiUtils *data); + +NM80211Mode nm_wifi_utils_get_mode (NMWifiUtils *data); + +gboolean nm_wifi_utils_set_mode (NMWifiUtils *data, const NM80211Mode mode); + +/* Returns frequency in MHz */ +guint32 nm_wifi_utils_get_freq (NMWifiUtils *data); + +/* Return the first supported frequency in the zero-terminated list. + * Frequencies are specified in MHz. */ +guint32 nm_wifi_utils_find_freq (NMWifiUtils *data, const guint32 *freqs); + +/* out_bssid must be ETH_ALEN bytes */ +gboolean nm_wifi_utils_get_bssid (NMWifiUtils *data, guint8 *out_bssid); + +/* Returns current bitrate in Kbps */ +guint32 nm_wifi_utils_get_rate (NMWifiUtils *data); + +/* Returns quality 0 - 100% on succes, or -1 on error */ +int nm_wifi_utils_get_qual (NMWifiUtils *data); + +/* Tells the driver DHCP or SLAAC is running */ +gboolean nm_wifi_utils_indicate_addressing_running (NMWifiUtils *data, gboolean running); + +gboolean nm_wifi_utils_set_powersave (NMWifiUtils *data, guint32 powersave); + +NMSettingWirelessWakeOnWLan nm_wifi_utils_get_wake_on_wlan (NMWifiUtils *data); + +gboolean nm_wifi_utils_set_wake_on_wlan (NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl); + +/* OLPC Mesh-only functions */ +guint32 nm_wifi_utils_get_mesh_channel (NMWifiUtils *data); + +gboolean nm_wifi_utils_set_mesh_channel (NMWifiUtils *data, guint32 channel); + +gboolean nm_wifi_utils_set_mesh_ssid (NMWifiUtils *data, const guint8 *ssid, gsize len); + +#endif /* __WIFI_UTILS_H__ */ diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c deleted file mode 100644 index b3dd92bab0..0000000000 --- a/src/platform/wifi/wifi-utils.c +++ /dev/null @@ -1,231 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Copyright (C) 2005 - 2011 Red Hat, Inc. - * Copyright (C) 2006 - 2008 Novell, Inc. - */ - -#include "nm-default.h" - -#include "wifi-utils.h" - -#include <sys/stat.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> - -#include "wifi-utils-private.h" -#include "wifi-utils-nl80211.h" -#if HAVE_WEXT -#include "wifi-utils-wext.h" -#endif -#include "nm-core-utils.h" - -#include "platform/nm-platform-utils.h" - -gpointer -wifi_data_new (const WifiDataClass *klass, int ifindex) -{ - WifiData *data; - - nm_assert (klass); - nm_assert (klass->struct_size > sizeof (WifiData)); - - data = g_malloc0 (klass->struct_size); - data->klass = klass; - data->ifindex = ifindex; - return data; -} - -/*****************************************************************************/ - -WifiData * -wifi_utils_init (int ifindex, gboolean check_scan) -{ - WifiData *ret; - - g_return_val_if_fail (ifindex > 0, NULL); - - ret = wifi_nl80211_init (ifindex); - if (ret == NULL) { -#if HAVE_WEXT - ret = wifi_wext_init (ifindex, check_scan); -#endif - } - return ret; -} - -int -wifi_utils_get_ifindex (WifiData *data) -{ - g_return_val_if_fail (data != NULL, -1); - - return data->ifindex; -} - -NMDeviceWifiCapabilities -wifi_utils_get_caps (WifiData *data) -{ - g_return_val_if_fail (data != NULL, NM_WIFI_DEVICE_CAP_NONE); - - return data->caps; -} - -NM80211Mode -wifi_utils_get_mode (WifiData *data) -{ - g_return_val_if_fail (data != NULL, NM_802_11_MODE_UNKNOWN); - return data->klass->get_mode (data); -} - -gboolean -wifi_utils_set_mode (WifiData *data, const NM80211Mode mode) -{ - g_return_val_if_fail (data != NULL, FALSE); - g_return_val_if_fail ( (mode == NM_802_11_MODE_INFRA) - || (mode == NM_802_11_MODE_AP) - || (mode == NM_802_11_MODE_ADHOC), FALSE); - - /* nl80211 probably doesn't need this */ - return data->klass->set_mode ? data->klass->set_mode (data, mode) : TRUE; -} - -gboolean -wifi_utils_set_powersave (WifiData *data, guint32 powersave) -{ - g_return_val_if_fail (data != NULL, FALSE); - - return data->klass->set_powersave ? data->klass->set_powersave (data, powersave) : TRUE; -} - -gboolean -wifi_utils_set_wake_on_wlan (WifiData *data, NMSettingWirelessWakeOnWLan wowl) -{ - g_return_val_if_fail (data != NULL, FALSE); - - return data->klass->set_wake_on_wlan ? - data->klass->set_wake_on_wlan (data, wowl) : FALSE; -} - -guint32 -wifi_utils_get_freq (WifiData *data) -{ - g_return_val_if_fail (data != NULL, 0); - return data->klass->get_freq (data); -} - -guint32 -wifi_utils_find_freq (WifiData *data, const guint32 *freqs) -{ - g_return_val_if_fail (data != NULL, 0); - g_return_val_if_fail (freqs != NULL, 0); - return data->klass->find_freq (data, freqs); -} - -gboolean -wifi_utils_get_bssid (WifiData *data, guint8 *out_bssid) -{ - g_return_val_if_fail (data != NULL, FALSE); - g_return_val_if_fail (out_bssid != NULL, FALSE); - - memset (out_bssid, 0, ETH_ALEN); - return data->klass->get_bssid (data, out_bssid); -} - -guint32 -wifi_utils_get_rate (WifiData *data) -{ - g_return_val_if_fail (data != NULL, 0); - return data->klass->get_rate (data); -} - -int -wifi_utils_get_qual (WifiData *data) -{ - g_return_val_if_fail (data != NULL, 0); - return data->klass->get_qual (data); -} - -gboolean -wifi_utils_get_wowlan (WifiData *data) -{ - g_return_val_if_fail (data != NULL, 0); - - if (!data->klass->get_wowlan) - return FALSE; - return data->klass->get_wowlan (data); -} - -void -wifi_utils_unref (WifiData *data) -{ - g_return_if_fail (data != NULL); - - data->klass->deinit (data); - g_free (data); -} - -gboolean -wifi_utils_is_wifi (int dirfd, const char *ifname) -{ - g_return_val_if_fail (dirfd >= 0, FALSE); - - if (faccessat (dirfd, "phy80211", F_OK, 0) == 0) - return TRUE; -#if HAVE_WEXT - if (wifi_wext_is_wifi (ifname)) - return TRUE; -#endif - return FALSE; -} - -/* OLPC Mesh-only functions */ - -guint32 -wifi_utils_get_mesh_channel (WifiData *data) -{ - g_return_val_if_fail (data != NULL, FALSE); - g_return_val_if_fail (data->klass->get_mesh_channel != NULL, FALSE); - return data->klass->get_mesh_channel (data); -} - -gboolean -wifi_utils_set_mesh_channel (WifiData *data, guint32 channel) -{ - g_return_val_if_fail (data != NULL, FALSE); - g_return_val_if_fail (channel <= 13, FALSE); - g_return_val_if_fail (data->klass->set_mesh_channel != NULL, FALSE); - return data->klass->set_mesh_channel (data, channel); -} - -gboolean -wifi_utils_set_mesh_ssid (WifiData *data, const guint8 *ssid, gsize len) -{ - g_return_val_if_fail (data != NULL, FALSE); - g_return_val_if_fail (data->klass->set_mesh_ssid != NULL, FALSE); - return data->klass->set_mesh_ssid (data, ssid, len); -} - -gboolean -wifi_utils_indicate_addressing_running (WifiData *data, gboolean running) -{ - g_return_val_if_fail (data != NULL, FALSE); - if (data->klass->indicate_addressing_running) - return data->klass->indicate_addressing_running (data, running); - return FALSE; -} - diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h deleted file mode 100644 index c69561def4..0000000000 --- a/src/platform/wifi/wifi-utils.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Copyright (C) 2005 - 2011 Red Hat, Inc. - * Copyright (C) 2006 - 2008 Novell, Inc. - */ - -#ifndef __WIFI_UTILS_H__ -#define __WIFI_UTILS_H__ - -#include <net/ethernet.h> - -#include "nm-dbus-interface.h" -#include "nm-setting-wireless.h" - -typedef struct WifiData WifiData; - -gboolean wifi_utils_is_wifi (int dirfd, const char *ifname); - -WifiData *wifi_utils_init (int ifindex, gboolean check_scan); - -int wifi_utils_get_ifindex (WifiData *data); - -void wifi_utils_unref (WifiData *data); - -NMDeviceWifiCapabilities wifi_utils_get_caps (WifiData *data); - -NM80211Mode wifi_utils_get_mode (WifiData *data); - -gboolean wifi_utils_set_mode (WifiData *data, const NM80211Mode mode); - -/* Returns frequency in MHz */ -guint32 wifi_utils_get_freq (WifiData *data); - -/* Return the first supported frequency in the zero-terminated list. - * Frequencies are specified in MHz. */ -guint32 wifi_utils_find_freq (WifiData *data, const guint32 *freqs); - -/* out_bssid must be ETH_ALEN bytes */ -gboolean wifi_utils_get_bssid (WifiData *data, guint8 *out_bssid); - -/* Returns current bitrate in Kbps */ -guint32 wifi_utils_get_rate (WifiData *data); - -/* Returns quality 0 - 100% on succes, or -1 on error */ -int wifi_utils_get_qual (WifiData *data); - -/* Tells the driver DHCP or SLAAC is running */ -gboolean wifi_utils_indicate_addressing_running (WifiData *data, gboolean running); - -/* Returns true if WoWLAN is enabled on device */ -gboolean wifi_utils_get_wowlan (WifiData *data); - -gboolean wifi_utils_set_powersave (WifiData *data, guint32 powersave); - -gboolean wifi_utils_set_wake_on_wlan (WifiData *data, NMSettingWirelessWakeOnWLan wowl); - -/* OLPC Mesh-only functions */ -guint32 wifi_utils_get_mesh_channel (WifiData *data); - -gboolean wifi_utils_set_mesh_channel (WifiData *data, guint32 channel); - -gboolean wifi_utils_set_mesh_ssid (WifiData *data, const guint8 *ssid, gsize len); - -#endif /* __WIFI_UTILS_H__ */ diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/platform/wpan/nm-wpan-utils.c new file mode 100644 index 0000000000..0544539ac6 --- /dev/null +++ b/src/platform/wpan/nm-wpan-utils.c @@ -0,0 +1,286 @@ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2018 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "nm-wpan-utils.h" + +#include "platform/linux/nl802154.h" +#include "platform/nm-netlink.h" + +#define _NMLOG_PREFIX_NAME "wpan-nl802154" +#define _NMLOG(level, domain, ...) \ + G_STMT_START { \ + nm_log ((level), (domain), NULL, NULL, \ + "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ + _NMLOG_PREFIX_NAME \ + _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ + } G_STMT_END + +/*****************************************************************************/ + +struct NMWpanUtils { + GObject parent; + int ifindex; + struct nl_sock *nl_sock; + int id; +}; + +typedef struct { + GObjectClass parent; +} NMWpanUtilsClass; + +G_DEFINE_TYPE (NMWpanUtils, nm_wpan_utils, G_TYPE_OBJECT) + +/*****************************************************************************/ + +static int +ack_handler (struct nl_msg *msg, void *arg) +{ + int *done = arg; + *done = 1; + return NL_STOP; +} + +static int +finish_handler (struct nl_msg *msg, void *arg) +{ + int *done = arg; + *done = 1; + return NL_SKIP; +} + +static int +error_handler (struct sockaddr_nl *nla, struct nlmsgerr *err, void *arg) +{ + int *done = arg; + *done = err->error; + return NL_SKIP; +} + +static struct nl_msg * +_nl802154_alloc_msg (int id, int ifindex, guint32 cmd, guint32 flags) +{ + nm_auto_nlmsg struct nl_msg *msg = NULL; + + msg = nlmsg_alloc (); + genlmsg_put (msg, 0, 0, id, 0, flags, cmd, 0); + NLA_PUT_U32 (msg, NL802154_ATTR_IFINDEX, ifindex); + return g_steal_pointer (&msg); + +nla_put_failure: + return NULL; +} + +static struct nl_msg * +nl802154_alloc_msg (NMWpanUtils *self, guint32 cmd, guint32 flags) +{ + return _nl802154_alloc_msg (self->id, self->ifindex, cmd, flags); +} + +static int +_nl802154_send_and_recv (struct nl_sock *nl_sock, + struct nl_msg *msg, + int (*valid_handler) (struct nl_msg *, void *), + void *valid_data) +{ + int err; + int done = 0; + const struct nl_cb cb = { + .err_cb = error_handler, + .err_arg = &done, + .finish_cb = finish_handler, + .finish_arg = &done, + .ack_cb = ack_handler, + .ack_arg = &done, + .valid_cb = valid_handler, + .valid_arg = valid_data, + }; + + g_return_val_if_fail (msg != NULL, -ENOMEM); + + err = nl_send_auto (nl_sock, msg); + if (err < 0) + return err; + + /* Loop until one of our NL callbacks says we're done; on success + * done will be 1, on error it will be < 0. + */ + while (!done) { + err = nl_recvmsgs (nl_sock, &cb); + if (err < 0 && err != -EAGAIN) { + _LOGW (LOGD_PLATFORM, "nl_recvmsgs() error: (%d) %s", + err, nl_geterror (err)); + break; + } + } + + if (err >= 0 && done < 0) + err = done; + return err; +} + +static int +nl802154_send_and_recv (NMWpanUtils *self, + struct nl_msg *msg, + int (*valid_handler) (struct nl_msg *, void *), + void *valid_data) +{ + return _nl802154_send_and_recv (self->nl_sock, msg, + valid_handler, valid_data); +} + +struct nl802154_interface { + guint16 pan_id; + guint16 short_addr; + + gboolean valid; +}; + +static int +nl802154_get_interface_handler (struct nl_msg *msg, void *arg) +{ + struct nl802154_interface *info = arg; + struct genlmsghdr *gnlh = nlmsg_data (nlmsg_hdr (msg)); + struct nlattr *tb[NL802154_ATTR_MAX + 1] = { 0, }; + static const struct nla_policy nl802154_policy[NL802154_ATTR_MAX + 1] = { + [NL802154_ATTR_PAN_ID] = { .type = NLA_U16 }, + [NL802154_ATTR_SHORT_ADDR] = { .type = NLA_U16 }, + }; + + if (nla_parse (tb, NL802154_ATTR_MAX, genlmsg_attrdata (gnlh, 0), + genlmsg_attrlen (gnlh, 0), nl802154_policy) < 0) + return NL_SKIP; + + if (tb[NL802154_ATTR_PAN_ID]) + info->pan_id = le16toh (nla_get_u16 (tb[NL802154_ATTR_PAN_ID])); + + if (tb[NL802154_ATTR_SHORT_ADDR]) + info->short_addr = le16toh (nla_get_u16 (tb[NL802154_ATTR_SHORT_ADDR])); + + info->valid = TRUE; + + return NL_SKIP; +} + +static void +nl802154_get_interface (NMWpanUtils *self, + struct nl802154_interface *interface) +{ + nm_auto_nlmsg struct nl_msg *msg = NULL; + + memset (interface, 0, sizeof (*interface)); + + msg = nl802154_alloc_msg (self, NL802154_CMD_GET_INTERFACE, 0); + + nl802154_send_and_recv (self, msg, nl802154_get_interface_handler, interface); +} + +/*****************************************************************************/ + +guint16 +nm_wpan_utils_get_pan_id (NMWpanUtils *self) +{ + struct nl802154_interface interface; + + nl802154_get_interface (self, &interface); + + return interface.pan_id; +} + +gboolean +nm_wpan_utils_set_pan_id (NMWpanUtils *self, guint16 pan_id) +{ + nm_auto_nlmsg struct nl_msg *msg = NULL; + int err; + + g_return_val_if_fail (self != NULL, FALSE); + + msg = nl802154_alloc_msg (self, NL802154_CMD_SET_PAN_ID, 0); + NLA_PUT_U16 (msg, NL802154_ATTR_PAN_ID, htole16 (pan_id)); + err = nl802154_send_and_recv (self, msg, NULL, NULL); + return err >= 0; + +nla_put_failure: + return FALSE; +} + +guint16 +nm_wpan_utils_get_short_addr (NMWpanUtils *self) +{ + struct nl802154_interface interface; + + nl802154_get_interface (self, &interface); + + return interface.short_addr; +} + +gboolean +nm_wpan_utils_set_short_addr (NMWpanUtils *self, guint16 short_addr) +{ + nm_auto_nlmsg struct nl_msg *msg = NULL; + int err; + + g_return_val_if_fail (self != NULL, FALSE); + + msg = nl802154_alloc_msg (self, NL802154_CMD_SET_SHORT_ADDR, 0); + NLA_PUT_U16 (msg, NL802154_ATTR_SHORT_ADDR, htole16 (short_addr)); + err = nl802154_send_and_recv (self, msg, NULL, NULL); + return err >= 0; + +nla_put_failure: + return FALSE; +} + +/*****************************************************************************/ + +static void +nm_wpan_utils_init (NMWpanUtils *self) +{ +} + +static void +nm_wpan_utils_class_init (NMWpanUtilsClass *klass) +{ +} + +NMWpanUtils * +nm_wpan_utils_new (int ifindex, struct nl_sock *genl, gboolean check_scan) +{ + NMWpanUtils *self; + int id; + + g_return_val_if_fail (ifindex > 0, NULL); + + if (!genl) + return NULL; + + id = genl_ctrl_resolve (genl, "nl802154"); + if (id < 0) { + _LOGD (LOGD_PLATFORM, "genl_ctrl_resolve: failed to resolve \"nl802154\""); + return NULL; + } + + self = g_object_new (NM_TYPE_WPAN_UTILS, NULL); + self->ifindex = ifindex; + self->nl_sock = genl; + self->id = id; + + return self; +} diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h new file mode 100644 index 0000000000..f7d0c03e98 --- /dev/null +++ b/src/platform/wpan/nm-wpan-utils.h @@ -0,0 +1,47 @@ +/* NetworkManager -- Network link manager + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2018 Red Hat, Inc. + */ + +#ifndef __WPAN_UTILS_H__ +#define __WPAN_UTILS_H__ + +#include <net/ethernet.h> + +#include "nm-dbus-interface.h" +#include "platform/nm-netlink.h" + +typedef struct NMWpanUtils NMWpanUtils; + +#define NM_TYPE_WPAN_UTILS (nm_wpan_utils_get_type ()) +#define NM_WPAN_UTILS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WPAN_UTILS, NMWpanUtils)) +#define NM_WPAN_UTILS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_WPAN_UTILS, NMWpanUtilsClass)) +#define NM_IS_WPAN_UTILS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_WPAN_UTILS)) +#define NM_IS_WPAN_UTILS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_WPAN_UTILS)) +#define NM_WPAN_UTILS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_WPAN_UTILS, NMWpanUtilsClass)) + +GType nm_wpan_utils_get_type (void); + +NMWpanUtils *nm_wpan_utils_new (int ifindex, struct nl_sock *genl, gboolean check_scan); + +guint16 nm_wpan_utils_get_pan_id (NMWpanUtils *self); +gboolean nm_wpan_utils_set_pan_id (NMWpanUtils *self, guint16 pan_id); + +guint16 nm_wpan_utils_get_short_addr (NMWpanUtils *self); +gboolean nm_wpan_utils_set_short_addr (NMWpanUtils *self, guint16 short_addr); + +#endif /* __WPAN_UTILS_H__ */ diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h index 380cbc60e2..e163eedab6 100644 --- a/src/systemd/sd-adapt/nm-sd-adapt.h +++ b/src/systemd/sd-adapt/nm-sd-adapt.h @@ -26,10 +26,6 @@ #include <sys/resource.h> #include <time.h> -#ifndef CLOCK_BOOTTIME -#define CLOCK_BOOTTIME 7 -#endif - #if defined(HAVE_DECL_REALLOCARRAY) && HAVE_DECL_REALLOCARRAY == 1 #define HAVE_REALLOCARRAY 1 #else @@ -180,15 +176,6 @@ sd_notify (int unset_environment, const char *state) #define MAX_HANDLE_SZ 128 #endif -/* - * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export - * CLOCK_BOOTTIME even though the kernel supports it, so provide a - * local definition - */ -#ifndef CLOCK_BOOTTIME -#define CLOCK_BOOTTIME 7 -#endif - #include "sd-id128.h" #include "sparse-endian.h" #include "async.h" diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index a78b531195..ba8e3ce4cb 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -32,10 +32,6 @@ #include "nm-test-utils-core.h" -#ifndef CLOCK_BOOTTIME -#define CLOCK_BOOTTIME 7 -#endif - /*****************************************************************************/ static void |