fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 03:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: merge branch 'th/cli-connection-handling' (part 1)

Browse source 
https://github.com/NetworkManager/NetworkManager/pull/100
This commit is contained in:
Thomas Haller 2018-05-15 11:01:01 +02:00
commit d66b277471
93 changed files with 3216 additions and 1746 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Makefile.am
View file

@ -3793,7 +3793,6 @@ check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-clie
LD_LIBRARY_PATH="$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \
NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \
NM_TEST_CLIENT_NMCLI_PATH=clients/cli/nmcli \
NM_TEST_CLIENT_IN_DBUS_SESSION=0 \
$(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \
cat "$(builddir)/clients/tests/test-client.log"; \
test "$$r" == ok
@ -3811,6 +3810,12 @@ EXTRA_DIST += \
clients/tests/test-client.check-on-disk/test_001-004.expected \
clients/tests/test-client.check-on-disk/test_001-005.expected \
clients/tests/test-client.check-on-disk/test_001-006.expected \
clients/tests/test-client.check-on-disk/test_001-007.expected \
clients/tests/test-client.check-on-disk/test_001-008.expected \
clients/tests/test-client.check-on-disk/test_001-009.expected \
clients/tests/test-client.check-on-disk/test_001-010.expected \
clients/tests/test-client.check-on-disk/test_001-011.expected \
clients/tests/test-client.check-on-disk/test_001-012.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 \
@ -3828,6 +3833,25 @@ EXTRA_DIST += \
clients/tests/test-client.check-on-disk/test_002-015.expected \
clients/tests/test-client.check-on-disk/test_002-016.expected \
clients/tests/test-client.check-on-disk/test_002-017.expected \
clients/tests/test-client.check-on-disk/test_002-018.expected \
clients/tests/test-client.check-on-disk/test_002-019.expected \
clients/tests/test-client.check-on-disk/test_002-020.expected \
clients/tests/test-client.check-on-disk/test_002-021.expected \
clients/tests/test-client.check-on-disk/test_002-022.expected \
clients/tests/test-client.check-on-disk/test_002-023.expected \
clients/tests/test-client.check-on-disk/test_002-024.expected \
clients/tests/test-client.check-on-disk/test_002-025.expected \
clients/tests/test-client.check-on-disk/test_002-026.expected \
clients/tests/test-client.check-on-disk/test_002-027.expected \
clients/tests/test-client.check-on-disk/test_002-028.expected \
clients/tests/test-client.check-on-disk/test_002-029.expected \
clients/tests/test-client.check-on-disk/test_002-030.expected \
clients/tests/test-client.check-on-disk/test_002-031.expected \
clients/tests/test-client.check-on-disk/test_002-032.expected \
clients/tests/test-client.check-on-disk/test_002-033.expected \
clients/tests/test-client.check-on-disk/test_002-034.expected \
clients/tests/test-client.check-on-disk/test_002-035.expected \
clients/tests/test-client.check-on-disk/test_002-036.expected \
clients/tests/test-client.check-on-disk/test_003-001.expected \
clients/tests/test-client.check-on-disk/test_003-002.expected \
clients/tests/test-client.check-on-disk/test_003-003.expected \
@ -3836,6 +3860,28 @@ EXTRA_DIST += \
clients/tests/test-client.check-on-disk/test_003-006.expected \
clients/tests/test-client.check-on-disk/test_003-007.expected \
clients/tests/test-client.check-on-disk/test_003-008.expected \
clients/tests/test-client.check-on-disk/test_003-009.expected \
clients/tests/test-client.check-on-disk/test_003-010.expected \
clients/tests/test-client.check-on-disk/test_003-011.expected \
clients/tests/test-client.check-on-disk/test_003-012.expected \
clients/tests/test-client.check-on-disk/test_003-013.expected \
clients/tests/test-client.check-on-disk/test_003-014.expected \
clients/tests/test-client.check-on-disk/test_003-015.expected \
clients/tests/test-client.check-on-disk/test_003-016.expected \
clients/tests/test-client.check-on-disk/test_003-017.expected \
clients/tests/test-client.check-on-disk/test_003-018.expected \
clients/tests/test-client.check-on-disk/test_003-019.expected \
clients/tests/test-client.check-on-disk/test_003-020.expected \
clients/tests/test-client.check-on-disk/test_003-021.expected \
clients/tests/test-client.check-on-disk/test_003-022.expected \
clients/tests/test-client.check-on-disk/test_003-023.expected \
clients/tests/test-client.check-on-disk/test_003-024.expected \
clients/tests/test-client.check-on-disk/test_003-025.expected \
clients/tests/test-client.check-on-disk/test_003-026.expected \
clients/tests/test-client.check-on-disk/test_003-027.expected \
clients/tests/test-client.check-on-disk/test_003-028.expected \
clients/tests/test-client.check-on-disk/test_003-029.expected \
clients/tests/test-client.check-on-disk/test_003-030.expected \
\
$(NULL)

188
clients/cli/common.c
View file

@ -100,15 +100,7 @@ _ip_config_get_routes (NMIPConfig *cfg)
}
static gconstpointer
_metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment,
gpointer environment_user_data,
const NmcMetaGenericInfo *info,
gpointer target,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gboolean *out_is_default,
gpointer *out_to_free)
_metagen_ip4_config_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NMIPConfig *cfg4 = target;
GPtrArray *ptr_array;
@ -183,15 +175,7 @@ arr_out:
}
static gconstpointer
_metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment,
gpointer environment_user_data,
const NmcMetaGenericInfo *info,
gpointer target,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gboolean *out_is_default,
gpointer *out_to_free)
_metagen_ip6_config_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NMIPConfig *cfg6 = target;
GPtrArray *ptr_array;
@ -271,11 +255,6 @@ const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CO
_METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_WINS, "WINS"),
};
static const NmcMetaGenericInfo *const metagen_ip4_config_group[] = {
NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config, .name_header = N_("GROUP")),
NULL,
};
const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM + 1] = {
#define _METAGEN_IP6_CONFIG(type, name) \
[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_ip6_config_get_fcn)
@ -286,11 +265,6 @@ const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CO
_METAGEN_IP6_CONFIG (NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN, "DOMAIN"),
};
static const NmcMetaGenericInfo *const metagen_ip6_config_group[] = {
NMC_META_GENERIC_WITH_NESTED ("IP6", metagen_ip6_config, .name_header = N_("GROUP")),
NULL,
};
/*****************************************************************************/
const NmcMetaGenericInfo *const nmc_fields_dhcp_config[] = {
@ -326,7 +300,7 @@ print_ip4_config (NMIPConfig *cfg4,
if (!nmc_print (nmc_config,
(gpointer[]) { cfg4, NULL },
NULL,
(const NMMetaAbstractInfo *const*) metagen_ip4_config_group,
NMC_META_GENERIC_GROUP ("IP4", metagen_ip4_config, N_("GROUP")),
field_str,
&error)) {
return FALSE;
@ -352,7 +326,7 @@ print_ip6_config (NMIPConfig *cfg6,
if (!nmc_print (nmc_config,
(gpointer[]) { cfg6, NULL },
NULL,
(const NMMetaAbstractInfo *const*) metagen_ip6_config_group,
NMC_META_GENERIC_GROUP ("IP6", metagen_ip6_config, N_("GROUP")),
field_str,
&error)) {
return FALSE;
@ -412,8 +386,11 @@ print_dhcp_config (NMDhcpConfig *dhcp,
* @connections: array of NMConnections to search in
* @filter_type: "id", "uuid", "path" or %NULL
* @filter_val: connection to find (connection name, UUID or path)
* @start: where to start in @list. The location is updated so that the function
* can be called multiple times (for connections with the same name).
* @out_result: if not NULL, attach all matching connection to this
* list. If necessary, a new array will be allocated. If the array
* already contains a connection, it will not be added a second time.
* All object are referenced by the array. If the function allocates
* a new array, it will set the free function to g_object_unref.
* @complete: print possible completions
*
* Find a connection in @list according to @filter_val. @filter_type determines
@ -428,64 +405,153 @@ NMConnection *
nmc_find_connection (const GPtrArray *connections,
const char *filter_type,
const char *filter_val,
int *start,
GPtrArray **out_result,
gboolean complete)
{
NMConnection *connection;
NMConnection *found = NULL;
int i;
const char *id;
const char *uuid;
const char *path, *path_num;
NMConnection *best_candidate = NULL;
GPtrArray *result = out_result ? *out_result : NULL;
guint i, j;
nm_assert (connections);
nm_assert (filter_val);
for (i = 0; i < connections->len; i++) {
const char *v, *v_num;
for (i = start ? *start : 0; i < connections->len; i++) {
connection = NM_CONNECTION (connections->pdata[i]);
id = nm_connection_get_id (connection);
uuid = nm_connection_get_uuid (connection);
path = nm_connection_get_path (connection);
path_num = path ? strrchr (path, '/') + 1 : NULL;
/* When filter_type is NULL, compare connection ID (filter_val)
* against all types. Otherwise, only compare against the specific
* type. If 'path' filter type is specified, comparison against
* numeric index (in addition to the whole path) is allowed.
*/
if (!filter_type || strcmp (filter_type, "id") == 0) {
if (NM_IN_STRSET (filter_type, NULL, "id")) {
v = nm_connection_get_id (connection);
if (complete)
nmc_complete_strings (filter_val, id, NULL);
if (strcmp (filter_val, id) == 0)
nmc_complete_strings (filter_val, v, NULL);
if (nm_streq0 (filter_val, v))
goto found;
}
if (!filter_type || strcmp (filter_type, "uuid") == 0) {
if (NM_IN_STRSET (filter_type, NULL, "uuid")) {
v = nm_connection_get_uuid (connection);
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, uuid, NULL);
if (strcmp (filter_val, uuid) == 0)
nmc_complete_strings (filter_val, v, NULL);
if (nm_streq0 (filter_val, v))
goto found;
}
if (!filter_type || strcmp (filter_type, "path") == 0) {
if (NM_IN_STRSET (filter_type, NULL, "path")) {
v = nm_connection_get_path (connection);
v_num = nm_utils_dbus_path_get_last_component (v);
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, path, filter_type ? path_num : NULL, NULL);
if (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0))
nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL);
if ( nm_streq0 (filter_val, v)
|| (filter_type && nm_streq0 (filter_val, v_num)))
goto found;
}
continue;
found:
if (!start)
if (!out_result)
return connection;
if (found) {
*start = i;
return found;
if (!best_candidate)
best_candidate = connection;
if (!result)
result = g_ptr_array_new_with_free_func (g_object_unref);
for (j = 0; j < result->len; j++) {
if (connection == result->pdata[j])
break;
}
found = connection;
if (j == result->len)
g_ptr_array_add (result, g_object_ref (connection));
}
if (start)
*start = 0;
return found;
NM_SET_OUT (out_result, result);
return best_candidate;
}
NMActiveConnection *
nmc_find_active_connection (const GPtrArray *active_cons,
const char *filter_type,
const char *filter_val,
GPtrArray **out_result,
gboolean complete)
{
guint i, j;
NMActiveConnection *best_candidate = NULL;
GPtrArray *result = out_result ? *out_result : NULL;
nm_assert (filter_val);
for (i = 0; i < active_cons->len; i++) {
NMRemoteConnection *con;
NMActiveConnection *candidate = g_ptr_array_index (active_cons, i);
const char *v, *v_num;
con = nm_active_connection_get_connection (candidate);
/* When filter_type is NULL, compare connection ID (filter_val)
* against all types. Otherwise, only compare against the specific
* type. If 'path' or 'apath' filter types are specified, comparison
* against numeric index (in addition to the whole path) is allowed.
*/
if (NM_IN_STRSET (filter_type, NULL, "id")) {
v = nm_active_connection_get_id (candidate);
if (complete)
nmc_complete_strings (filter_val, v, NULL);
if (nm_streq0 (filter_val, v))
goto found;
}
if (NM_IN_STRSET (filter_type, NULL, "uuid")) {
v = nm_active_connection_get_uuid (candidate);
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, v, NULL);
if (nm_streq0 (filter_val, v))
goto found;
}
if (NM_IN_STRSET (filter_type, NULL, "path")) {
v = con ? nm_connection_get_path (NM_CONNECTION (con)) : NULL;
v_num = nm_utils_dbus_path_get_last_component (v);
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL);
if ( nm_streq0 (filter_val, v)
|| (filter_type && nm_streq0 (filter_val, v_num)))
goto found;
}
if (NM_IN_STRSET (filter_type, NULL, "apath")) {
v = nm_object_get_path (NM_OBJECT (candidate));
v_num = nm_utils_dbus_path_get_last_component (v);
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL);
if ( nm_streq0 (filter_val, v)
|| (filter_type && nm_streq0 (filter_val, v_num)))
goto found;
}
continue;
found:
if (!out_result)
return candidate;
if (!best_candidate)
best_candidate = candidate;
if (!result)
result = g_ptr_array_new_with_free_func (g_object_unref);
for (j = 0; j < result->len; j++) {
if (candidate == result->pdata[j])
break;
}
if (j == result->len)
g_ptr_array_add (result, g_object_ref (candidate));
}
NM_SET_OUT (out_result, result);
return best_candidate;
}
static gboolean

8
clients/cli/common.h
View file

@ -32,9 +32,15 @@ gboolean print_dhcp_config (NMDhcpConfig *dhcp, const NmcConfig *nmc_config, con
NMConnection *nmc_find_connection (const GPtrArray *connections,
const char *filter_type,
const char *filter_val,
int *start,
GPtrArray **out_result,
gboolean complete);
NMActiveConnection *nmc_find_active_connection (const GPtrArray *active_cons,
const char *filter_type,
const char *filter_val,
GPtrArray **out_result,
gboolean complete);
void nmc_secrets_requested (NMSecretAgentSimple *agent,
const char *request_id,
const char *title,

1129
clients/cli/connections.c
View file

File diff suppressed because it is too large Load diff

30
clients/cli/general.c
View file

@ -172,15 +172,7 @@ _NM_UTILS_LOOKUP_DEFINE (static, permission_result_to_color, NMClientPermissionR
static const NmcMetaGenericInfo *const metagen_general_status[];
static gconstpointer
_metagen_general_status_get_fcn (const NMMetaEnvironment *environment,
gpointer environment_user_data,
const NmcMetaGenericInfo *info,
gpointer target,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gboolean *out_is_default,
gpointer *out_to_free)
_metagen_general_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NmCli *nmc = target;
const char *value;
@ -280,15 +272,7 @@ static const NmcMetaGenericInfo *const metagen_general_status[_NMC_GENERIC_INFO_
/*****************************************************************************/
static gconstpointer
_metagen_general_permissions_get_fcn (const NMMetaEnvironment *environment,
gpointer environment_user_data,
const NmcMetaGenericInfo *info,
gpointer target,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gboolean *out_is_default,
gpointer *out_to_free)
_metagen_general_permissions_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NMClientPermission perm = GPOINTER_TO_UINT (target);
NmCli *nmc = environment_user_data;
@ -329,15 +313,7 @@ typedef struct {
} GetGeneralLoggingData;
static gconstpointer
_metagen_general_logging_get_fcn (const NMMetaEnvironment *environment,
gpointer environment_user_data,
const NmcMetaGenericInfo *info,
gpointer target,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gboolean *out_is_default,
gpointer *out_to_free)
_metagen_general_logging_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NmCli *nmc = environment_user_data;
GetGeneralLoggingData *d = target;

5
clients/cli/nmcli.h
View file

@ -141,6 +141,11 @@ typedef struct _NmCli {
char *palette_buffer; /* Buffer with sequences for terminal-colors.d(5)-based coloring. */
} NmCli;
#define NMC_RETURN(nmc, rvalue) \
G_STMT_START { \
return ((nmc)->return_value = (rvalue)); \
} G_STMT_END
extern NmCli nm_cli;
/* Error quark for GError domain */

3
clients/cli/utils.c
View file

@ -93,7 +93,8 @@ _meta_type_nmc_generic_info_get_fcn (const NMMetaAbstractInfo *abstract_info,
nm_assert (out_to_free || NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_COLOR));
if (info->get_fcn) {
return info->get_fcn (environment, environment_user_data,
return info->get_fcn (environment,
environment_user_data,
info, target,
get_type,
get_flags,

68
clients/cli/utils.h
View file

@ -138,15 +138,19 @@ struct _NmcMetaGenericInfo {
const char *name;
const char *name_header;
const NmcMetaGenericInfo *const*nested;
gconstpointer (*get_fcn) (const NMMetaEnvironment *environment,
gpointer environment_user_data,
const NmcMetaGenericInfo *info,
gpointer target,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gboolean *out_is_default,
gpointer *out_to_free);
#define NMC_META_GENERIC_INFO_GET_FCN_ARGS \
const NMMetaEnvironment *environment, \
gpointer environment_user_data, \
const NmcMetaGenericInfo *info, \
gpointer target, \
NMMetaAccessorGetType get_type, \
NMMetaAccessorGetFlags get_flags, \
NMMetaAccessorGetOutFlags *out_flags, \
gboolean *out_is_default, \
gpointer *out_to_free
gconstpointer (*get_fcn) (NMC_META_GENERIC_INFO_GET_FCN_ARGS);
};
#define NMC_META_GENERIC(n, ...) \
@ -159,6 +163,52 @@ struct _NmcMetaGenericInfo {
#define NMC_META_GENERIC_WITH_NESTED(n, nest, ...) \
NMC_META_GENERIC (n, .nested = (nest), __VA_ARGS__)
#define NMC_META_GENERIC_GROUP(_group_name, _nested, _name_header) \
((const NMMetaAbstractInfo *const*) ((const NmcMetaGenericInfo *const[]) { \
NMC_META_GENERIC_WITH_NESTED (_group_name,_nested, .name_header = _name_header), \
NULL, \
}))
static inline const char *
nmc_meta_generic_get_str_i18n (const char *s, NMMetaAccessorGetType get_type)
{
if (!NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY,
NM_META_ACCESSOR_GET_TYPE_PARSABLE))
g_return_val_if_reached (NULL);
if (!s)
return NULL;
if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
return gettext (s);
return s;
}
static inline const char *
nmc_meta_generic_get_bool (gboolean val, NMMetaAccessorGetType get_type)
{
return nmc_meta_generic_get_str_i18n (val ? N_("yes") : N_("no"), get_type);
}
static inline char *
nmc_meta_generic_get_enum_with_detail (gint64 enum_val, const char *str_val, NMMetaAccessorGetType get_type)
{
if (!NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY,
NM_META_ACCESSOR_GET_TYPE_PARSABLE))
g_return_val_if_reached (NULL);
if (!str_val) {
/* Pass %NULL for only printing the numeric value. */
return g_strdup_printf ("%lld", (long long) enum_val);
}
/* note that this function will always print "$NUM ($NICK)", also in PARSABLE
* mode. That might not be desired, but it's done for certain properties to preserve
* previous behavior. */
if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
return g_strdup_printf (_("%lld (%s)"), (long long) enum_val, gettext (str_val));
return g_strdup_printf ("%lld (%s)", (long long) enum_val, str_val);
}
/*****************************************************************************/
gboolean nmc_print (const NmcConfig *nmc_config,

41
clients/common/nm-client-utils.c
View file

@ -26,6 +26,47 @@
#include "nm-device-bridge.h"
#include "nm-device-team.h"
/*****************************************************************************/
static int
_nmc_objects_sort_by_path_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data)
{
NMObject *a = *((NMObject **) pa);
NMObject *b = *((NMObject **) pb);
NM_CMP_SELF (a, b);
NM_CMP_RETURN (nm_utils_dbus_path_cmp (nm_object_get_path (a),
nm_object_get_path (b)));
return 0;
}
const NMObject **
nmc_objects_sort_by_path (const NMObject *const* objs, gssize len)
{
const NMObject **arr;
gsize i, l;
if (len < 0)
l = NM_PTRARRAY_LEN (objs);
else
l = len;
arr = g_new (const NMObject *, l + 1);
for (i = 0; i < l; i++)
arr[i] = objs[i];
arr[l] = NULL;
if (l > 1) {
g_qsort_with_data (arr,
l,
sizeof (gpointer),
_nmc_objects_sort_by_path_cmp,
NULL);
}
return arr;
}
/*****************************************************************************/
/*
* Convert string to unsigned integer.
* If required, the resulting number is checked to be in the <min,max> range.

2
clients/common/nm-client-utils.h
View file

@ -30,6 +30,8 @@ typedef enum {
NMC_TRI_STATE_UNKNOWN,
} NMCTriStateValue;
const NMObject **nmc_objects_sort_by_path (const NMObject *const*objs, gssize len);
const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error);
gboolean nmc_string_to_uint (const char *str,

2
clients/tests/test-client.check-on-disk/test_001-001.expected
View file

@ -1,4 +1,4 @@
location: clients/tests/test-client.py:489:test_001()/1
location: clients/tests/test-client.py:543:test_001()/1
cmd: $NMCLI
lang: C
returncode: 0

2
clients/tests/test-client.check-on-disk/test_001-002.expected
View file

@ -1,4 +1,4 @@
location: clients/tests/test-client.py:490:test_001()/2
location: clients/tests/test-client.py:543:test_001()/2
cmd: $NMCLI
lang: pl_PL.UTF-8
returncode: 0

27
clients/tests/test-client.check-on-disk/test_001-003.expected
View file

@ -1,13 +1,20 @@
location: clients/tests/test-client.py:492:test_001()/3
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: C
returncode: 10
stdout: 0 bytes
location: clients/tests/test-client.py:543:test_001()/3
cmd: $NMCLI
lang: de_DE.utf8
returncode: 0
stdout: 322 bytes
>>>
DNS configuration:
servers: 1.2.3.4 5.6.7.8
Rufen Sie »nmcli device show« auf, um vollständige Informationen über bekannte Geräte abzurufen
und »nmcli connection show« für eine Übersicht über aktive Verbindungsprofile.
Die Hilfeseiten nmcli(1) und nmcli-examples(5) geben vollständige Aufrufbeschreibungen.
<<<
stderr: 0 bytes
>>>
<<<
stderr: 33 bytes
>>>
Error: Device 'wlan0' not found.
<<<

8
clients/tests/test-client.check-on-disk/test_001-004.expected
View file

@ -1,13 +1,13 @@
location: clients/tests/test-client.py:493:test_001()/4
location: clients/tests/test-client.py:545:test_001()/4
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: de_DE.utf8
lang: C
returncode: 10
stdout: 0 bytes
>>>
<<<
stderr: 47 bytes
stderr: 33 bytes
>>>
Fehler: Gerät »wlan0« wurde nicht gefunden.
Error: Device 'wlan0' not found.
<<<

20
clients/tests/test-client.check-on-disk/test_001-005.expected
View file

@ -1,13 +1,13 @@
location: clients/tests/test-client.py:495:test_001()/5
cmd: $NMCLI c s
lang: C
returncode: 0
stdout: 26 bytes
>>>
NAME UUID TYPE DEVICE
<<<
stderr: 0 bytes
location: clients/tests/test-client.py:545:test_001()/5
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: pl_PL.UTF-8
returncode: 10
stdout: 0 bytes
>>>
<<<
stderr: 49 bytes
>>>
Błąd: Nie odnaleziono urządzenia „wlan0”.
<<<

12
clients/tests/test-client.check-on-disk/test_001-006.expected
View file

@ -1,13 +1,13 @@
location: clients/tests/test-client.py:497:test_001()/6
cmd: $NMCLI bogus s
lang: C
returncode: 2
location: clients/tests/test-client.py:545:test_001()/6
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: de_DE.utf8
returncode: 10
stdout: 0 bytes
>>>
<<<
stderr: 68 bytes
stderr: 47 bytes
>>>
Error: argument 'bogus' not understood. Try passing --help instead.
Fehler: Gerät »wlan0« wurde nicht gefunden.
<<<

13
clients/tests/test-client.check-on-disk/test_001-007.expected Normal file
View file

@ -0,0 +1,13 @@
location: clients/tests/test-client.py:547:test_001()/7
cmd: $NMCLI c s
lang: C
returncode: 0
stdout: 26 bytes
>>>
NAME UUID TYPE DEVICE
<<<
stderr: 0 bytes
>>>
<<<

13
clients/tests/test-client.check-on-disk/test_001-008.expected Normal file
View file

@ -0,0 +1,13 @@
location: clients/tests/test-client.py:547:test_001()/8
cmd: $NMCLI c s
lang: pl_PL.UTF-8
returncode: 0
stdout: 26 bytes
>>>
NAME UUID TYPE DEVICE
<<<
stderr: 0 bytes
>>>
<<<

13
clients/tests/test-client.check-on-disk/test_001-009.expected Normal file
View file

@ -0,0 +1,13 @@
location: clients/tests/test-client.py:547:test_001()/9
cmd: $NMCLI c s
lang: de_DE.utf8
returncode: 0
stdout: 26 bytes
>>>
NAME UUID TYPE DEVICE
<<<
stderr: 0 bytes
>>>
<<<

13
clients/tests/test-client.check-on-disk/test_001-010.expected Normal file
View file

@ -0,0 +1,13 @@
location: clients/tests/test-client.py:549:test_001()/10
cmd: $NMCLI bogus s
lang: C
returncode: 2
stdout: 0 bytes
>>>
<<<
stderr: 68 bytes
>>>
Error: argument 'bogus' not understood. Try passing --help instead.
<<<

13
clients/tests/test-client.check-on-disk/test_001-011.expected Normal file
View file

@ -0,0 +1,13 @@
location: clients/tests/test-client.py:549:test_001()/11
cmd: $NMCLI bogus s
lang: pl_PL.UTF-8
returncode: 2
stdout: 0 bytes
>>>
<<<
stderr: 87 bytes
>>>
Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast tego.
<<<

13
clients/tests/test-client.check-on-disk/test_001-012.expected Normal file
View file

@ -0,0 +1,13 @@
location: clients/tests/test-client.py:549:test_001()/12
cmd: $NMCLI bogus s
lang: de_DE.utf8
returncode: 2
stdout: 0 bytes
>>>
<<<
stderr: 88 bytes
>>>
Fehler: Argument »bogus« wird nicht verstanden. Versuchen Sie stattdessen »--help«.
<<<

2
clients/tests/test-client.check-on-disk/test_002-001.expected
View file

@ -1,4 +1,4 @@
location: clients/tests/test-client.py:502:test_002()/1
location: clients/tests/test-client.py:554:test_002()/1
cmd: $NMCLI d
lang: C
returncode: 0

18
clients/tests/test-client.check-on-disk/test_002-002.expected
View file

@ -1,14 +1,14 @@
location: clients/tests/test-client.py:504:test_002()/2
cmd: $NMCLI -f all d
lang: C
location: clients/tests/test-client.py:554:test_002()/2
cmd: $NMCLI d
lang: pl_PL.UTF-8
returncode: 0
stdout: 530 bytes
stdout: 219 bytes
>>>
DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH
eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 -- -- --
wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- --
wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- --
wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- --
DEVICE TYPE STATE CONNECTION
eth0 ethernet niedostępne --
wlan0 wifi niedostępne --
wlan1 wifi niedostępne --
wlan1 wifi niedostępne --
<<<
stderr: 0 bytes

36
clients/tests/test-client.check-on-disk/test_002-003.expected
View file

@ -1,32 +1,14 @@
location: clients/tests/test-client.py:506:test_002()/3
cmd: $NMCLI
lang: C
location: clients/tests/test-client.py:554:test_002()/3
cmd: $NMCLI d
lang: de_DE.utf8
returncode: 0
stdout: 551 bytes
stdout: 239 bytes
>>>
eth0: unavailable
"eth0"
ethernet (virtual), 72:41:AB:90:41:5D, hw
wlan0: unavailable
"wlan0"
wifi (virtual), 5A:88:5E:B6:90:40, hw
wlan1: unavailable
"wlan1"
wifi (virtual), 7C:D4:69:31:67:0B, hw
wlan1: unavailable
"wlan1"
wifi (virtual), 41:21:6B:F3:C9:4A, hw
DNS configuration:
servers: 1.2.3.4 5.6.7.8
Use "nmcli device show" to get complete information about known devices and
"nmcli connection show" to get an overview on active connection profiles.
Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.
DEVICE TYPE STATE CONNECTION
eth0 ethernet nicht verfügbar --
wlan0 wifi nicht verfügbar --
wlan1 wifi nicht verfügbar --
wlan1 wifi nicht verfügbar --
<<<
stderr: 0 bytes

35
clients/tests/test-client.check-on-disk/test_002-004.expected
View file

@ -1,33 +1,14 @@
location: clients/tests/test-client.py:508:test_002()/4
cmd: $NMCLI -f AP -mode multiline d show wlan0
location: clients/tests/test-client.py:556:test_002()/4
cmd: $NMCLI -f all d
lang: C
returncode: 0
stdout: 1107 bytes
stdout: 530 bytes
>>>
AP[1].IN-USE:
AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infra
AP[1].CHAN: 1
AP[1].RATE: 54 Mbit/s
AP[1].SIGNAL: 61
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: 34
AP[2].BARS: **
AP[2].SECURITY: WPA1 WPA2
AP[3].IN-USE:
AP[3].SSID: wlan0-ap-2
AP[3].MODE: Infra
AP[3].CHAN: 1
AP[3].RATE: 54 Mbit/s
AP[3].SIGNAL: 29
AP[3].BARS: *
AP[3].SECURITY: WPA1 WPA2
DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH
eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 -- -- --
wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- --
wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- --
wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- --
<<<
stderr: 0 bytes

43
clients/tests/test-client.check-on-disk/test_002-005.expected
View file

@ -1,39 +1,14 @@
location: clients/tests/test-client.py:509:test_002()/5
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: C
location: clients/tests/test-client.py:556:test_002()/5
cmd: $NMCLI -f all d
lang: pl_PL.UTF-8
returncode: 0
stdout: 1558 bytes
stdout: 534 bytes
>>>
===============================================================================
Device details (wlan0)
===============================================================================
AP[1].IN-USE:
AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infra
AP[1].CHAN: 1
AP[1].RATE: 54 Mbit/s
AP[1].SIGNAL: 61
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: 34
AP[2].BARS: **
AP[2].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[3].IN-USE:
AP[3].SSID: wlan0-ap-2
AP[3].MODE: Infra
AP[3].CHAN: 1
AP[3].RATE: 54 Mbit/s
AP[3].SIGNAL: 29
AP[3].BARS: *
AP[3].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH
eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 -- -- --
wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- --
wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- --
wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- --
<<<
stderr: 0 bytes

37
clients/tests/test-client.check-on-disk/test_002-006.expected
View file

@ -1,33 +1,14 @@
location: clients/tests/test-client.py:510:test_002()/6
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: C
location: clients/tests/test-client.py:556:test_002()/6
cmd: $NMCLI -f all d
lang: de_DE.utf8
returncode: 0
stdout: 435 bytes
stdout: 554 bytes
>>>
AP[1].IN-USE:
AP[1].SSID:wlan0-ap-3
AP[1].MODE:Infra
AP[1].CHAN:1
AP[1].RATE:54 Mbit/s
AP[1].SIGNAL:61
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:34
AP[2].BARS:**
AP[2].SECURITY:WPA1 WPA2
AP[3].IN-USE:
AP[3].SSID:wlan0-ap-2
AP[3].MODE:Infra
AP[3].CHAN:1
AP[3].RATE:54 Mbit/s
AP[3].SIGNAL:29
AP[3].BARS:*
AP[3].SECURITY:WPA1 WPA2
DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH
eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 -- -- --
wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- --
wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- --
wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- --
<<<
stderr: 0 bytes

33
clients/tests/test-client.check-on-disk/test_002-007.expected
View file

@ -1,13 +1,32 @@
location: clients/tests/test-client.py:511:test_002()/7
cmd: $NMCLI -f AP -mode tabular d show wlan0
location: clients/tests/test-client.py:558:test_002()/7
cmd: $NMCLI
lang: C
returncode: 0
stdout: 304 bytes
stdout: 551 bytes
>>>
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 61 *** WPA1 WPA2
AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 34 ** WPA1 WPA2
AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 29 * WPA1 WPA2
eth0: unavailable
"eth0"
ethernet (virtual), 72:41:AB:90:41:5D, hw
wlan0: unavailable
"wlan0"
wifi (virtual), 5A:88:5E:B6:90:40, hw
wlan1: unavailable
"wlan1"
wifi (virtual), 7C:D4:69:31:67:0B, hw
wlan1: unavailable
"wlan1"
wifi (virtual), 41:21:6B:F3:C9:4A, hw
DNS configuration:
servers: 1.2.3.4 5.6.7.8
Use "nmcli device show" to get complete information about known devices and
"nmcli connection show" to get an overview on active connection profiles.
Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.
<<<
stderr: 0 bytes

41
clients/tests/test-client.check-on-disk/test_002-008.expected
View file

@ -1,17 +1,34 @@
location: clients/tests/test-client.py:512:test_002()/8
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: C
location: clients/tests/test-client.py:558:test_002()/8
cmd: $NMCLI
lang: pl_PL.UTF-8
returncode: 0
stdout: 460 bytes
stdout: 608 bytes
>>>
==========================
Device details (wlan0)
==========================
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
----------------------------------------------------------------------------
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 61 *** WPA1 WPA2
AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 34 ** WPA1 WPA2
AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 29 * WPA1 WPA2
eth0: niedostępne
"eth0"
ethernet (virtual), 72:41:AB:90:41:5D, sprzęt
wlan0: niedostępne
"wlan0"
wifi (virtual), 5A:88:5E:B6:90:40, sprzęt
wlan1: niedostępne
"wlan1"
wifi (virtual), 7C:D4:69:31:67:0B, sprzęt
wlan1: niedostępne
"wlan1"
wifi (virtual), 41:21:6B:F3:C9:4A, sprzęt
DNS configuration:
servers: 1.2.3.4 5.6.7.8
Polecenie „nmcli device show” wyświetli pełne informacje o znanych
urządzeniach, a „nmcli connection show” wyświetli przegląd aktywnych
profili połączeń.
Strony podręcznika nmcli(1) i nmcli-examples(5) zawierają pełne informacje
o użyciu.
<<<
stderr: 0 bytes

35
clients/tests/test-client.check-on-disk/test_002-009.expected
View file

@ -1,12 +1,33 @@
location: clients/tests/test-client.py:513:test_002()/9
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: C
location: clients/tests/test-client.py:558:test_002()/9
cmd: $NMCLI
lang: de_DE.utf8
returncode: 0
stdout: 165 bytes
stdout: 616 bytes
>>>
AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2
AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:34:** :WPA1 WPA2
AP[3]: :wlan0-ap-2:Infra:1:54 Mbit/s:29:* :WPA1 WPA2
eth0: nicht verfügbar
"eth0"
ethernet (virtual), 72:41:AB:90:41:5D, hw
wlan0: nicht verfügbar
"wlan0"
wifi (virtual), 5A:88:5E:B6:90:40, hw
wlan1: nicht verfügbar
"wlan1"
wifi (virtual), 7C:D4:69:31:67:0B, hw
wlan1: nicht verfügbar
"wlan1"
wifi (virtual), 41:21:6B:F3:C9:4A, hw
DNS configuration:
servers: 1.2.3.4 5.6.7.8
Rufen Sie »nmcli device show« auf, um vollständige Informationen über bekannte Geräte abzurufen
und »nmcli connection show« für eine Übersicht über aktive Verbindungsprofile.
Die Hilfeseiten nmcli(1) und nmcli-examples(5) geben vollständige Aufrufbeschreibungen.
<<<
stderr: 0 bytes

30
clients/tests/test-client.check-on-disk/test_002-010.expected
View file

@ -1,30 +1,30 @@
location: clients/tests/test-client.py:515:test_002()/10
location: clients/tests/test-client.py:560:test_002()/10
cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: pl_PL.UTF-8
lang: C
returncode: 0
stdout: 1134 bytes
stdout: 1107 bytes
>>>
AP[1].IN-USE:
AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infrastruktura
AP[1].MODE: Infra
AP[1].CHAN: 1
AP[1].RATE: 54 Mb/s
AP[1].SIGNAL: 61
AP[1].BARS: ***
AP[1].RATE: 54 Mbit/s
AP[1].SIGNAL: 88
AP[1].BARS: ****
AP[1].SECURITY: WPA1 WPA2
AP[2].IN-USE:
AP[2].SSID: wlan0-ap-1
AP[2].MODE: Infrastruktura
AP[2].SSID: wlan0-ap-2
AP[2].MODE: Infra
AP[2].CHAN: 1
AP[2].RATE: 54 Mb/s
AP[2].SIGNAL: 34
AP[2].BARS: **
AP[2].RATE: 54 Mbit/s
AP[2].SIGNAL: 61
AP[2].BARS: ***
AP[2].SECURITY: WPA1 WPA2
AP[3].IN-USE:
AP[3].SSID: wlan0-ap-2
AP[3].MODE: Infrastruktura
AP[3].SSID: wlan0-ap-1
AP[3].MODE: Infra
AP[3].CHAN: 1
AP[3].RATE: 54 Mb/s
AP[3].RATE: 54 Mbit/s
AP[3].SIGNAL: 29
AP[3].BARS: *
AP[3].SECURITY: WPA1 WPA2

24
clients/tests/test-client.check-on-disk/test_002-011.expected
View file

@ -1,39 +1,33 @@
location: clients/tests/test-client.py:516:test_002()/11
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
location: clients/tests/test-client.py:560:test_002()/11
cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1592 bytes
stdout: 1134 bytes
>>>
===============================================================================
Informacje o urządzeniu (wlan0)
===============================================================================
AP[1].IN-USE:
AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infrastruktura
AP[1].CHAN: 1
AP[1].RATE: 54 Mb/s
AP[1].SIGNAL: 61
AP[1].BARS: ***
AP[1].SIGNAL: 88
AP[1].BARS: ****
AP[1].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[2].IN-USE:
AP[2].SSID: wlan0-ap-1
AP[2].SSID: wlan0-ap-2
AP[2].MODE: Infrastruktura
AP[2].CHAN: 1
AP[2].RATE: 54 Mb/s
AP[2].SIGNAL: 34
AP[2].BARS: **
AP[2].SIGNAL: 61
AP[2].BARS: ***
AP[2].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[3].IN-USE:
AP[3].SSID: wlan0-ap-2
AP[3].SSID: wlan0-ap-1
AP[3].MODE: Infrastruktura
AP[3].CHAN: 1
AP[3].RATE: 54 Mb/s
AP[3].SIGNAL: 29
AP[3].BARS: *
AP[3].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
<<<
stderr: 0 bytes

56
clients/tests/test-client.check-on-disk/test_002-012.expected
View file

@ -1,33 +1,33 @@
location: clients/tests/test-client.py:517:test_002()/12
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: pl_PL.UTF-8
location: clients/tests/test-client.py:560:test_002()/12
cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: de_DE.utf8
returncode: 0
stdout: 462 bytes
stdout: 1107 bytes
>>>
AP[1].IN-USE:
AP[1].SSID:wlan0-ap-3
AP[1].MODE:Infrastruktura
AP[1].CHAN:1
AP[1].RATE:54 Mb/s
AP[1].SIGNAL:61
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:34
AP[2].BARS:**
AP[2].SECURITY:WPA1 WPA2
AP[3].IN-USE:
AP[3].SSID:wlan0-ap-2
AP[3].MODE:Infrastruktura
AP[3].CHAN:1
AP[3].RATE:54 Mb/s
AP[3].SIGNAL:29
AP[3].BARS:*
AP[3].SECURITY:WPA1 WPA2
AP[1].IN-USE:
AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infra
AP[1].CHAN: 1
AP[1].RATE: 54 Mbit/s
AP[1].SIGNAL: 88
AP[1].BARS: ****
AP[1].SECURITY: WPA1 WPA2
AP[2].IN-USE:
AP[2].SSID: wlan0-ap-2
AP[2].MODE: Infra
AP[2].CHAN: 1
AP[2].RATE: 54 Mbit/s
AP[2].SIGNAL: 61
AP[2].BARS: ***
AP[2].SECURITY: WPA1 WPA2
AP[3].IN-USE:
AP[3].SSID: wlan0-ap-1
AP[3].MODE: Infra
AP[3].CHAN: 1
AP[3].RATE: 54 Mbit/s
AP[3].SIGNAL: 29
AP[3].BARS: *
AP[3].SECURITY: WPA1 WPA2
<<<
stderr: 0 bytes

42
clients/tests/test-client.check-on-disk/test_002-013.expected
View file

@ -1,13 +1,39 @@
location: clients/tests/test-client.py:518:test_002()/13
cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: pl_PL.UTF-8
location: clients/tests/test-client.py:561:test_002()/13
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: C
returncode: 0
stdout: 338 bytes
stdout: 1558 bytes
>>>
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2
AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2
AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2
===============================================================================
Device details (wlan0)
===============================================================================
AP[1].IN-USE:
AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infra
AP[1].CHAN: 1
AP[1].RATE: 54 Mbit/s
AP[1].SIGNAL: 88
AP[1].BARS: ****
AP[1].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[2].IN-USE:
AP[2].SSID: wlan0-ap-2
AP[2].MODE: Infra
AP[2].CHAN: 1
AP[2].RATE: 54 Mbit/s
AP[2].SIGNAL: 61
AP[2].BARS: ***
AP[2].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[3].IN-USE:
AP[3].SSID: wlan0-ap-1
AP[3].MODE: Infra
AP[3].CHAN: 1
AP[3].RATE: 54 Mbit/s
AP[3].SIGNAL: 29
AP[3].BARS: *
AP[3].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
<<<
stderr: 0 bytes

44
clients/tests/test-client.check-on-disk/test_002-014.expected
View file

@ -1,17 +1,39 @@
location: clients/tests/test-client.py:519:test_002()/14
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
location: clients/tests/test-client.py:561:test_002()/14
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 530 bytes
stdout: 1592 bytes
>>>
===================================
Informacje o urządzeniu (wlan0)
===================================
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-----------------------------------------------------------------------------------
AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2
AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2
AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2
===============================================================================
Informacje o urządzeniu (wlan0)
===============================================================================
AP[1].IN-USE:
AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infrastruktura
AP[1].CHAN: 1
AP[1].RATE: 54 Mb/s
AP[1].SIGNAL: 88
AP[1].BARS: ****
AP[1].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[2].IN-USE:
AP[2].SSID: wlan0-ap-2
AP[2].MODE: Infrastruktura
AP[2].CHAN: 1
AP[2].RATE: 54 Mb/s
AP[2].SIGNAL: 61
AP[2].BARS: ***
AP[2].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[3].IN-USE:
AP[3].SSID: wlan0-ap-1
AP[3].MODE: Infrastruktura
AP[3].CHAN: 1
AP[3].RATE: 54 Mb/s
AP[3].SIGNAL: 29
AP[3].BARS: *
AP[3].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
<<<
stderr: 0 bytes

41
clients/tests/test-client.check-on-disk/test_002-015.expected
View file

@ -1,12 +1,39 @@
location: clients/tests/test-client.py:520:test_002()/15
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: pl_PL.UTF-8
location: clients/tests/test-client.py:561:test_002()/15
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: de_DE.utf8
returncode: 0
stdout: 192 bytes
stdout: 1562 bytes
>>>
AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2
AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:34:** :WPA1 WPA2
AP[3]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:29:* :WPA1 WPA2
===============================================================================
Geräteinformationen (wlan0)
===============================================================================
AP[1].IN-USE:
AP[1].SSID: wlan0-ap-3
AP[1].MODE: Infra
AP[1].CHAN: 1
AP[1].RATE: 54 Mbit/s
AP[1].SIGNAL: 88
AP[1].BARS: ****
AP[1].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[2].IN-USE:
AP[2].SSID: wlan0-ap-2
AP[2].MODE: Infra
AP[2].CHAN: 1
AP[2].RATE: 54 Mbit/s
AP[2].SIGNAL: 61
AP[2].BARS: ***
AP[2].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
AP[3].IN-USE:
AP[3].SSID: wlan0-ap-1
AP[3].MODE: Infra
AP[3].CHAN: 1
AP[3].RATE: 54 Mbit/s
AP[3].SIGNAL: 29
AP[3].BARS: *
AP[3].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
<<<
stderr: 0 bytes

32
clients/tests/test-client.check-on-disk/test_002-016.expected
View file

@ -1,11 +1,33 @@
location: clients/tests/test-client.py:522:test_002()/16
cmd: $NMCLI c
location: clients/tests/test-client.py:562:test_002()/16
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: C
returncode: 0
stdout: 126 bytes
stdout: 435 bytes
>>>
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
AP[1].IN-USE:
AP[1].SSID:wlan0-ap-3
AP[1].MODE:Infra
AP[1].CHAN:1
AP[1].RATE:54 Mbit/s
AP[1].SIGNAL:88
AP[1].BARS:****
AP[1].SECURITY:WPA1 WPA2
AP[2].IN-USE:
AP[2].SSID:wlan0-ap-2
AP[2].MODE:Infra
AP[2].CHAN:1
AP[2].RATE:54 Mbit/s
AP[2].SIGNAL:61
AP[2].BARS:***
AP[2].SECURITY:WPA1 WPA2
AP[3].IN-USE:
AP[3].SSID:wlan0-ap-1
AP[3].MODE:Infra
AP[3].CHAN:1
AP[3].RATE:54 Mbit/s
AP[3].SIGNAL:29
AP[3].BARS:*
AP[3].SECURITY:WPA1 WPA2
<<<
stderr: 0 bytes

53
clients/tests/test-client.check-on-disk/test_002-017.expected
View file

@ -1,30 +1,33 @@
location: clients/tests/test-client.py:524:test_002()/17
cmd: $NMCLI c s con-1
lang: C
location: clients/tests/test-client.py:562:test_002()/17
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 990 bytes
stdout: 462 bytes
>>>
connection.id: con-1
connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d
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)
AP[1].IN-USE:
AP[1].SSID:wlan0-ap-3
AP[1].MODE:Infrastruktura
AP[1].CHAN:1
AP[1].RATE:54 Mb/s
AP[1].SIGNAL:88
AP[1].BARS:****
AP[1].SECURITY:WPA1 WPA2
AP[2].IN-USE:
AP[2].SSID:wlan0-ap-2
AP[2].MODE:Infrastruktura
AP[2].CHAN:1
AP[2].RATE:54 Mb/s
AP[2].SIGNAL:61
AP[2].BARS:***
AP[2].SECURITY:WPA1 WPA2
AP[3].IN-USE:
AP[3].SSID:wlan0-ap-1
AP[3].MODE:Infrastruktura
AP[3].CHAN:1
AP[3].RATE:54 Mb/s
AP[3].SIGNAL:29
AP[3].BARS:*
AP[3].SECURITY:WPA1 WPA2
<<<
stderr: 0 bytes

36
clients/tests/test-client.check-on-disk/test_002-018.expected Normal file
View file

@ -0,0 +1,36 @@
location: clients/tests/test-client.py:562:test_002()/18
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: de_DE.utf8
returncode: 0
stdout: 435 bytes
>>>
AP[1].IN-USE:
AP[1].SSID:wlan0-ap-3
AP[1].MODE:Infra
AP[1].CHAN:1
AP[1].RATE:54 Mbit/s
AP[1].SIGNAL:88
AP[1].BARS:****
AP[1].SECURITY:WPA1 WPA2
AP[2].IN-USE:
AP[2].SSID:wlan0-ap-2
AP[2].MODE:Infra
AP[2].CHAN:1
AP[2].RATE:54 Mbit/s
AP[2].SIGNAL:61
AP[2].BARS:***
AP[2].SECURITY:WPA1 WPA2
AP[3].IN-USE:
AP[3].SSID:wlan0-ap-1
AP[3].MODE:Infra
AP[3].CHAN:1
AP[3].RATE:54 Mbit/s
AP[3].SIGNAL:29
AP[3].BARS:*
AP[3].SECURITY:WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_002-019.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:563:test_002()/19
cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: C
returncode: 0
stdout: 304 bytes
>>>
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2
AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2
AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_002-020.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:563:test_002()/20
cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 338 bytes
>>>
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2
AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2
AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_002-021.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:563:test_002()/21
cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: de_DE.utf8
returncode: 0
stdout: 304 bytes
>>>
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2
AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2
AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

20
clients/tests/test-client.check-on-disk/test_002-022.expected Normal file
View file

@ -0,0 +1,20 @@
location: clients/tests/test-client.py:564:test_002()/22
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: C
returncode: 0
stdout: 460 bytes
>>>
==========================
Device details (wlan0)
==========================
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
----------------------------------------------------------------------------
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2
AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2
AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

20
clients/tests/test-client.check-on-disk/test_002-023.expected Normal file
View file

@ -0,0 +1,20 @@
location: clients/tests/test-client.py:564:test_002()/23
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 530 bytes
>>>
===================================
Informacje o urządzeniu (wlan0)
===================================
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-----------------------------------------------------------------------------------
AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2
AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2
AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

20
clients/tests/test-client.check-on-disk/test_002-024.expected Normal file
View file

@ -0,0 +1,20 @@
location: clients/tests/test-client.py:564:test_002()/24
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: de_DE.utf8
returncode: 0
stdout: 476 bytes
>>>
===============================
Geräteinformationen (wlan0)
===============================
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
----------------------------------------------------------------------------
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2
AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2
AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

15
clients/tests/test-client.check-on-disk/test_002-025.expected Normal file
View file

@ -0,0 +1,15 @@
location: clients/tests/test-client.py:565:test_002()/25
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: C
returncode: 0
stdout: 165 bytes
>>>
AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2
AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2
AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

15
clients/tests/test-client.check-on-disk/test_002-026.expected Normal file
View file

@ -0,0 +1,15 @@
location: clients/tests/test-client.py:565:test_002()/26
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 192 bytes
>>>
AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:88:****:WPA1 WPA2
AP[2]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2
AP[3]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:29:* :WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

15
clients/tests/test-client.check-on-disk/test_002-027.expected Normal file
View file

@ -0,0 +1,15 @@
location: clients/tests/test-client.py:565:test_002()/27
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: de_DE.utf8
returncode: 0
stdout: 165 bytes
>>>
AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2
AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2
AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2
<<<
stderr: 0 bytes
>>>
<<<

21
clients/tests/test-client.check-on-disk/test_002-028.expected Normal file
View file

@ -0,0 +1,21 @@
location: clients/tests/test-client.py:567:test_002()/28
cmd: $NMCLI -f ALL d wifi
lang: C
returncode: 0
stdout: 1840 bytes
>>>
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
<<<
stderr: 0 bytes
>>>
<<<

21
clients/tests/test-client.check-on-disk/test_002-029.expected Normal file
View file

@ -0,0 +1,21 @@
location: clients/tests/test-client.py:567:test_002()/29
cmd: $NMCLI -f ALL d wifi
lang: pl_PL.UTF-8
returncode: 0
stdout: 1898 bytes
>>>
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infrastruktura 1 2412 MHz 54 Mb/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infrastruktura 1 2412 MHz 54 Mb/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infrastruktura 1 2412 MHz 54 Mb/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
<<<
stderr: 0 bytes
>>>
<<<

21
clients/tests/test-client.check-on-disk/test_002-030.expected Normal file
View file

@ -0,0 +1,21 @@
location: clients/tests/test-client.py:567:test_002()/30
cmd: $NMCLI -f ALL d wifi
lang: de_DE.utf8
returncode: 0
stdout: 1840 bytes
>>>
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/3
AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/2
AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/1
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nein /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
<<<
stderr: 0 bytes
>>>
<<<

14
clients/tests/test-client.check-on-disk/test_002-031.expected Normal file
View file

@ -0,0 +1,14 @@
location: clients/tests/test-client.py:569:test_002()/31
cmd: $NMCLI c
lang: C
returncode: 0
stdout: 126 bytes
>>>
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
<<<
stderr: 0 bytes
>>>
<<<

14
clients/tests/test-client.check-on-disk/test_002-032.expected Normal file
View file

@ -0,0 +1,14 @@
location: clients/tests/test-client.py:569:test_002()/32
cmd: $NMCLI c
lang: pl_PL.UTF-8
returncode: 0
stdout: 126 bytes
>>>
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
<<<
stderr: 0 bytes
>>>
<<<

14
clients/tests/test-client.check-on-disk/test_002-033.expected Normal file
View file

@ -0,0 +1,14 @@
location: clients/tests/test-client.py:569:test_002()/33
cmd: $NMCLI c
lang: de_DE.utf8
returncode: 0
stdout: 126 bytes
>>>
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
<<<
stderr: 0 bytes
>>>
<<<

33
clients/tests/test-client.check-on-disk/test_002-034.expected Normal file
View file

@ -0,0 +1,33 @@
location: clients/tests/test-client.py:571:test_002()/34
cmd: $NMCLI c s con-1
lang: C
returncode: 0
stdout: 990 bytes
>>>
connection.id: con-1
connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d
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)
<<<
stderr: 0 bytes
>>>
<<<

33
clients/tests/test-client.check-on-disk/test_002-035.expected Normal file
View file

@ -0,0 +1,33 @@
location: clients/tests/test-client.py:571:test_002()/35
cmd: $NMCLI c s con-1
lang: pl_PL.UTF-8
returncode: 0
stdout: 992 bytes
>>>
connection.id: con-1
connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d
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)
<<<
stderr: 0 bytes
>>>
<<<

33
clients/tests/test-client.check-on-disk/test_002-036.expected Normal file
View file

@ -0,0 +1,33 @@
location: clients/tests/test-client.py:571:test_002()/36
cmd: $NMCLI c s con-1
lang: de_DE.utf8
returncode: 0
stdout: 993 bytes
>>>
connection.id: con-1
connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d
connection.stable-id: --
connection.type: 802-3-ethernet
connection.interface-name: --
connection.autoconnect: ja
connection.autoconnect-priority: 0
connection.autoconnect-retries: -1 (default)
connection.auth-retries: -1
connection.timestamp: 0
connection.read-only: nein
connection.permissions: --
connection.zone: --
connection.master: --
connection.slave-type: --
connection.autoconnect-slaves: -1 (default)
connection.secondaries: --
connection.gateway-ping-timeout: 0
connection.metered: unbekannt
connection.lldp: default
connection.mdns: -1 (default)
<<<
stderr: 0 bytes
>>>
<<<

2
clients/tests/test-client.check-on-disk/test_003-001.expected
View file

@ -1,4 +1,4 @@
location: clients/tests/test-client.py:534:test_003()/1
location: clients/tests/test-client.py:581:test_003()/1
cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1
lang: C
returncode: 0

2
clients/tests/test-client.check-on-disk/test_003-002.expected
View file

@ -1,4 +1,4 @@
location: clients/tests/test-client.py:537:test_003()/2
location: clients/tests/test-client.py:584:test_003()/2
cmd: $NMCLI c s
lang: C
returncode: 0

12
clients/tests/test-client.check-on-disk/test_003-003.expected
View file

@ -1,10 +1,12 @@
location: clients/tests/test-client.py:542:test_003()/3
cmd: $NMCLI c add type ethernet ifname '*'
lang: C
location: clients/tests/test-client.py:584:test_003()/3
cmd: $NMCLI c s
lang: pl_PL.UTF-8
returncode: 0
stdout: 81 bytes
stdout: 195 bytes
>>>
Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added.
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
<<<
stderr: 0 bytes

13
clients/tests/test-client.check-on-disk/test_003-004.expected
View file

@ -1,13 +1,12 @@
location: clients/tests/test-client.py:545:test_003()/4
location: clients/tests/test-client.py:584:test_003()/4
cmd: $NMCLI c s
lang: C
lang: de_DE.utf8
returncode: 0
stdout: 264 bytes
stdout: 195 bytes
>>>
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet --
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
<<<
stderr: 0 bytes

13
clients/tests/test-client.check-on-disk/test_003-005.expected
View file

@ -1,13 +1,10 @@
location: clients/tests/test-client.py:547:test_003()/5
cmd: $NMCLI c s
lang: pl_PL.UTF-8
location: clients/tests/test-client.py:589:test_003()/5
cmd: $NMCLI c add type ethernet ifname '*'
lang: C
returncode: 0
stdout: 264 bytes
stdout: 81 bytes
>>>
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet --
Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added.
<<<
stderr: 0 bytes

14
clients/tests/test-client.check-on-disk/test_003-006.expected
View file

@ -1,13 +1,13 @@
location: clients/tests/test-client.py:550:test_003()/6
cmd: $NMCLI -f ALL c s
location: clients/tests/test-client.py:592:test_003()/6
cmd: $NMCLI c s
lang: C
returncode: 0
stdout: 912 bytes
stdout: 264 bytes
>>>
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- --
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet --
<<<
stderr: 0 bytes

14
clients/tests/test-client.check-on-disk/test_003-007.expected
View file

@ -1,13 +1,13 @@
location: clients/tests/test-client.py:552:test_003()/7
cmd: $NMCLI -f ALL c s
location: clients/tests/test-client.py:592:test_003()/7
cmd: $NMCLI c s
lang: pl_PL.UTF-8
returncode: 0
stdout: 912 bytes
stdout: 264 bytes
>>>
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 nie -- -- -- --
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet --
<<<
stderr: 0 bytes

22
clients/tests/test-client.check-on-disk/test_003-008.expected
View file

@ -1,20 +1,14 @@
location: clients/tests/test-client.py:556:test_003()/8
cmd: $NMCLI --complete-args -f ALL c s ''
lang: pl_PL.UTF-8
location: clients/tests/test-client.py:592:test_003()/8
cmd: $NMCLI c s
lang: de_DE.utf8
returncode: 0
stdout: 64 bytes
stdout: 264 bytes
>>>
NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet --
--active
--order
apath
con-1
con-xx1
ethernet
help
id
path
uuid
<<<
stderr: 0 bytes
>>>

16
clients/tests/test-client.check-on-disk/test_003-009.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:595:test_003()/9
cmd: $NMCLI -f ALL c s
lang: C
returncode: 0
stdout: 912 bytes
>>>
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- --
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_003-010.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:595:test_003()/10
cmd: $NMCLI -f ALL c s
lang: pl_PL.UTF-8
returncode: 0
stdout: 912 bytes
>>>
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 nie -- -- -- --
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_003-011.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:595:test_003()/11
cmd: $NMCLI -f ALL c s
lang: de_DE.utf8
returncode: 0
stdout: 912 bytes
>>>
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/1 nein -- -- -- --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/2 nein -- -- -- --
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 nein -- -- -- --
<<<
stderr: 0 bytes
>>>
<<<

22
clients/tests/test-client.check-on-disk/test_003-012.expected Normal file
View file

@ -0,0 +1,22 @@
location: clients/tests/test-client.py:599:test_003()/12
cmd: $NMCLI --complete-args -f ALL c s ''
lang: C
returncode: 0
stdout: 64 bytes
>>>
--active
--order
apath
con-1
con-xx1
ethernet
help
id
path
uuid
<<<
stderr: 0 bytes
>>>
<<<

22
clients/tests/test-client.check-on-disk/test_003-013.expected Normal file
View file

@ -0,0 +1,22 @@
location: clients/tests/test-client.py:599:test_003()/13
cmd: $NMCLI --complete-args -f ALL c s ''
lang: pl_PL.UTF-8
returncode: 0
stdout: 64 bytes
>>>
--active
--order
apath
con-1
con-xx1
ethernet
help
id
path
uuid
<<<
stderr: 0 bytes
>>>
<<<

22
clients/tests/test-client.check-on-disk/test_003-014.expected Normal file
View file

@ -0,0 +1,22 @@
location: clients/tests/test-client.py:599:test_003()/14
cmd: $NMCLI --complete-args -f ALL c s ''
lang: de_DE.utf8
returncode: 0
stdout: 64 bytes
>>>
--active
--order
apath
con-1
con-xx1
ethernet
help
id
path
uuid
<<<
stderr: 0 bytes
>>>
<<<

13
clients/tests/test-client.check-on-disk/test_003-015.expected Normal file
View file

@ -0,0 +1,13 @@
location: clients/tests/test-client.py:601:test_003()/15
cmd: $NMCLI con up ethernet ifname eth0
lang: C
returncode: 0
stdout: 106 bytes
>>>
Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/1)
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_003-016.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:604:test_003()/16
cmd: $NMCLI con
lang: C
returncode: 0
stdout: 264 bytes
>>>
NAME UUID TYPE DEVICE
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_003-017.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:604:test_003()/17
cmd: $NMCLI con
lang: pl_PL.UTF-8
returncode: 0
stdout: 264 bytes
>>>
NAME UUID TYPE DEVICE
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_003-018.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:604:test_003()/18
cmd: $NMCLI con
lang: de_DE.utf8
returncode: 0
stdout: 264 bytes
>>>
NAME UUID TYPE DEVICE
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet --
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_003-019.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:607:test_003()/19
cmd: $NMCLI -f ALL con
lang: C
returncode: 0
stdout: 1084 bytes
>>>
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 --
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- --
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_003-020.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:607:test_003()/20
cmd: $NMCLI -f ALL con
lang: pl_PL.UTF-8
returncode: 0
stdout: 1088 bytes
>>>
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 --
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- --
<<<
stderr: 0 bytes
>>>
<<<

16
clients/tests/test-client.check-on-disk/test_003-021.expected Normal file
View file

@ -0,0 +1,16 @@
location: clients/tests/test-client.py:607:test_003()/21
cmd: $NMCLI -f ALL con
lang: de_DE.utf8
returncode: 0
stdout: 1084 bytes
>>>
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE
ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 ja eth0 aktiviert /org/freedesktop/NetworkManager/ActiveConnection/1 --
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/1 nein -- -- -- --
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/2 nein -- -- -- --
<<<
stderr: 0 bytes
>>>
<<<

90
clients/tests/test-client.check-on-disk/test_003-022.expected Normal file
View file

@ -0,0 +1,90 @@
location: clients/tests/test-client.py:610:test_003()/22
cmd: $NMCLI -f ALL con s ethernet
lang: C
returncode: 0
stdout: 3516 bytes
>>>
connection.id: ethernet
connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
connection.stable-id: --
connection.type: 802-3-ethernet
connection.interface-name: --
connection.autoconnect: yes
connection.autoconnect-priority: 0
connection.autoconnect-retries: -1 (default)
connection.auth-retries: -1
connection.timestamp: 0
connection.read-only: no
connection.permissions: --
connection.zone: --
connection.master: --
connection.slave-type: --
connection.autoconnect-slaves: -1 (default)
connection.secondaries: --
connection.gateway-ping-timeout: 0
connection.metered: unknown
connection.lldp: default
connection.mdns: -1 (default)
802-3-ethernet.port: --
802-3-ethernet.speed: 0
802-3-ethernet.duplex: --
802-3-ethernet.auto-negotiate: no
802-3-ethernet.mac-address: --
802-3-ethernet.cloned-mac-address: --
802-3-ethernet.generate-mac-address-mask:--
802-3-ethernet.mac-address-blacklist: --
802-3-ethernet.mtu: auto
802-3-ethernet.s390-subchannels: --
802-3-ethernet.s390-nettype: --
802-3-ethernet.s390-options: --
802-3-ethernet.wake-on-lan: default
802-3-ethernet.wake-on-lan-password: --
ipv4.method: auto
ipv4.dns: --
ipv4.dns-search: --
ipv4.dns-options: ""
ipv4.dns-priority: 0
ipv4.addresses: --
ipv4.gateway: --
ipv4.routes: --
ipv4.route-metric: -1
ipv4.route-table: 0 (unspec)
ipv4.ignore-auto-routes: no
ipv4.ignore-auto-dns: no
ipv4.dhcp-client-id: --
ipv4.dhcp-timeout: 0 (default)
ipv4.dhcp-send-hostname: yes
ipv4.dhcp-hostname: --
ipv4.dhcp-fqdn: --
ipv4.never-default: no
ipv4.may-fail: yes
ipv4.dad-timeout: -1 (default)
ipv6.method: auto
ipv6.dns: --
ipv6.dns-search: --
ipv6.dns-options: ""
ipv6.dns-priority: 0
ipv6.addresses: --
ipv6.gateway: --
ipv6.routes: --
ipv6.route-metric: -1
ipv6.route-table: 0 (unspec)
ipv6.ignore-auto-routes: no
ipv6.ignore-auto-dns: no
ipv6.never-default: no
ipv6.may-fail: yes
ipv6.ip6-privacy: -1 (unknown)
ipv6.addr-gen-mode: stable-privacy
ipv6.dhcp-send-hostname: yes
ipv6.dhcp-hostname: --
ipv6.token: --
proxy.method: none
proxy.browser-only: no
proxy.pac-url: --
proxy.pac-script: --
<<<
stderr: 0 bytes
>>>
<<<

90
clients/tests/test-client.check-on-disk/test_003-023.expected Normal file
View file

@ -0,0 +1,90 @@
location: clients/tests/test-client.py:610:test_003()/23
cmd: $NMCLI -f ALL con s ethernet
lang: pl_PL.UTF-8
returncode: 0
stdout: 3534 bytes
>>>
connection.id: ethernet
connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
connection.stable-id: --
connection.type: 802-3-ethernet
connection.interface-name: --
connection.autoconnect: tak
connection.autoconnect-priority: 0
connection.autoconnect-retries: -1 (default)
connection.auth-retries: -1
connection.timestamp: 0
connection.read-only: nie
connection.permissions: --
connection.zone: --
connection.master: --
connection.slave-type: --
connection.autoconnect-slaves: -1 (default)
connection.secondaries: --
connection.gateway-ping-timeout: 0
connection.metered: nieznane
connection.lldp: default
connection.mdns: -1 (default)
802-3-ethernet.port: --
802-3-ethernet.speed: 0
802-3-ethernet.duplex: --
802-3-ethernet.auto-negotiate: nie
802-3-ethernet.mac-address: --
802-3-ethernet.cloned-mac-address: --
802-3-ethernet.generate-mac-address-mask:--
802-3-ethernet.mac-address-blacklist: --
802-3-ethernet.mtu: automatyczne
802-3-ethernet.s390-subchannels: --
802-3-ethernet.s390-nettype: --
802-3-ethernet.s390-options: --
802-3-ethernet.wake-on-lan: default
802-3-ethernet.wake-on-lan-password: --
ipv4.method: auto
ipv4.dns: --
ipv4.dns-search: --
ipv4.dns-options: ""
ipv4.dns-priority: 0
ipv4.addresses: --
ipv4.gateway: --
ipv4.routes: --
ipv4.route-metric: -1
ipv4.route-table: 0 (unspec)
ipv4.ignore-auto-routes: nie
ipv4.ignore-auto-dns: nie
ipv4.dhcp-client-id: --
ipv4.dhcp-timeout: 0 (default)
ipv4.dhcp-send-hostname: tak
ipv4.dhcp-hostname: --
ipv4.dhcp-fqdn: --
ipv4.never-default: nie
ipv4.may-fail: tak
ipv4.dad-timeout: -1 (default)
ipv6.method: auto
ipv6.dns: --
ipv6.dns-search: --
ipv6.dns-options: ""
ipv6.dns-priority: 0
ipv6.addresses: --
ipv6.gateway: --
ipv6.routes: --
ipv6.route-metric: -1
ipv6.route-table: 0 (unspec)
ipv6.ignore-auto-routes: nie
ipv6.ignore-auto-dns: nie
ipv6.never-default: nie
ipv6.may-fail: tak
ipv6.ip6-privacy: -1 (unknown)
ipv6.addr-gen-mode: stable-privacy
ipv6.dhcp-send-hostname: tak
ipv6.dhcp-hostname: --
ipv6.token: --
proxy.method: none
proxy.browser-only: nie
proxy.pac-url: --
proxy.pac-script: --
<<<
stderr: 0 bytes
>>>
<<<

90
clients/tests/test-client.check-on-disk/test_003-024.expected Normal file
View file

@ -0,0 +1,90 @@
location: clients/tests/test-client.py:610:test_003()/24
cmd: $NMCLI -f ALL con s ethernet
lang: de_DE.utf8
returncode: 0
stdout: 3531 bytes
>>>
connection.id: ethernet
connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
connection.stable-id: --
connection.type: 802-3-ethernet
connection.interface-name: --
connection.autoconnect: ja
connection.autoconnect-priority: 0
connection.autoconnect-retries: -1 (default)
connection.auth-retries: -1
connection.timestamp: 0
connection.read-only: nein
connection.permissions: --
connection.zone: --
connection.master: --
connection.slave-type: --
connection.autoconnect-slaves: -1 (default)
connection.secondaries: --
connection.gateway-ping-timeout: 0
connection.metered: unbekannt
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: nein
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: nein
ipv4.ignore-auto-dns: nein
ipv4.dhcp-client-id: --
ipv4.dhcp-timeout: 0 (default)
ipv4.dhcp-send-hostname: ja
ipv4.dhcp-hostname: --
ipv4.dhcp-fqdn: --
ipv4.never-default: nein
ipv4.may-fail: ja
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: nein
ipv6.ignore-auto-dns: nein
ipv6.never-default: nein
ipv6.may-fail: ja
ipv6.ip6-privacy: -1 (unknown)
ipv6.addr-gen-mode: stable-privacy
ipv6.dhcp-send-hostname: ja
ipv6.dhcp-hostname: --
ipv6.token: --
proxy.method: none
proxy.browser-only: nein
proxy.pac-url: --
proxy.pac-script: --
<<<
stderr: 0 bytes
>>>
<<<

18
clients/tests/test-client.check-on-disk/test_003-025.expected Normal file
View file

@ -0,0 +1,18 @@
location: clients/tests/test-client.py:613:test_003()/25
cmd: $NMCLI -f ALL dev s eth0
lang: C
returncode: 0
stdout: 880 bytes
>>>
DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH
wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- --
wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- --
wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- --
eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1
<<<
stderr: 24 bytes
>>>
Unknown parameter: eth0
<<<

18
clients/tests/test-client.check-on-disk/test_003-026.expected Normal file
View file

@ -0,0 +1,18 @@
location: clients/tests/test-client.py:613:test_003()/26
cmd: $NMCLI -f ALL dev s eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 884 bytes
>>>
DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH
wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- --
wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- --
wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- --
eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1
<<<
stderr: 24 bytes
>>>
Nieznany parametr: eth0
<<<

18
clients/tests/test-client.check-on-disk/test_003-027.expected Normal file
View file

@ -0,0 +1,18 @@
location: clients/tests/test-client.py:613:test_003()/27
cmd: $NMCLI -f ALL dev s eth0
lang: de_DE.utf8
returncode: 0
stdout: 904 bytes
>>>
DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH
wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- --
wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- --
wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- --
eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1
<<<
stderr: 28 bytes
>>>
Unbekannter Parameter: eth0
<<<

42
clients/tests/test-client.check-on-disk/test_003-028.expected Normal file
View file

@ -0,0 +1,42 @@
location: clients/tests/test-client.py:616:test_003()/28
cmd: $NMCLI -f ALL dev show eth0
lang: C
returncode: 0
stdout: 1487 bytes
>>>
GENERAL.DEVICE: eth0
GENERAL.TYPE: ethernet
GENERAL.NM-TYPE: NMDeviceEthernet
GENERAL.VENDOR: --
GENERAL.PRODUCT: --
GENERAL.DRIVER: virtual
GENERAL.DRIVER-VERSION: --
GENERAL.FIRMWARE-VERSION: --
GENERAL.HWADDR: 72:41:AB:90:41:5D
GENERAL.MTU: 0
GENERAL.STATE: 20 (unavailable)
GENERAL.REASON: 0 (No reason given)
GENERAL.UDI: /sys/devices/virtual/eth0
GENERAL.IP-IFACE: --
GENERAL.IS-SOFTWARE: no
GENERAL.NM-MANAGED: yes
GENERAL.AUTOCONNECT: yes
GENERAL.FIRMWARE-MISSING: no
GENERAL.NM-PLUGIN-MISSING: no
GENERAL.PHYS-PORT-ID: --
GENERAL.CONNECTION: ethernet
GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
GENERAL.METERED: unknown
CAPABILITIES.CARRIER-DETECT: no
CAPABILITIES.SPEED: 100 Mb/s
CAPABILITIES.IS-SOFTWARE: no
CAPABILITIES.SRIOV: no
WIRED-PROPERTIES.CARRIER: off
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
<<<
stderr: 0 bytes
>>>
<<<

42
clients/tests/test-client.check-on-disk/test_003-029.expected Normal file
View file

@ -0,0 +1,42 @@
location: clients/tests/test-client.py:616:test_003()/29
cmd: $NMCLI -f ALL dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1510 bytes
>>>
GENERAL.DEVICE: eth0
GENERAL.TYPE: ethernet
GENERAL.NM-TYPE: NMDeviceEthernet
GENERAL.VENDOR: --
GENERAL.PRODUCT: --
GENERAL.DRIVER: virtual
GENERAL.DRIVER-VERSION: --
GENERAL.FIRMWARE-VERSION: --
GENERAL.HWADDR: 72:41:AB:90:41:5D
GENERAL.MTU: 0
GENERAL.STATE: 20 (niedostępne)
GENERAL.REASON: 0 (Nie podano przyczyny)
GENERAL.UDI: /sys/devices/virtual/eth0
GENERAL.IP-IFACE: --
GENERAL.IS-SOFTWARE: nie
GENERAL.NM-MANAGED: tak
GENERAL.AUTOCONNECT: tak
GENERAL.FIRMWARE-MISSING: nie
GENERAL.NM-PLUGIN-MISSING: nie
GENERAL.PHYS-PORT-ID: --
GENERAL.CONNECTION: ethernet
GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
GENERAL.METERED: nieznane
CAPABILITIES.CARRIER-DETECT: nie
CAPABILITIES.SPEED: 100 Mb/s
CAPABILITIES.IS-SOFTWARE: nie
CAPABILITIES.SRIOV: nie
WIRED-PROPERTIES.CARRIER: wyłączone
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
<<<
stderr: 0 bytes
>>>
<<<

42
clients/tests/test-client.check-on-disk/test_003-030.expected Normal file
View file

@ -0,0 +1,42 @@
location: clients/tests/test-client.py:616:test_003()/30
cmd: $NMCLI -f ALL dev show eth0
lang: de_DE.utf8
returncode: 0
stdout: 1509 bytes
>>>
GENERAL.DEVICE: eth0
GENERAL.TYPE: ethernet
GENERAL.NM-TYPE: NMDeviceEthernet
GENERAL.VENDOR: --
GENERAL.PRODUCT: --
GENERAL.DRIVER: virtual
GENERAL.DRIVER-VERSION: --
GENERAL.FIRMWARE-VERSION: --
GENERAL.HWADDR: 72:41:AB:90:41:5D
GENERAL.MTU: 0
GENERAL.STATE: 20 (nicht verfügbar)
GENERAL.REASON: 0 (Kein Grund angegeben)
GENERAL.UDI: /sys/devices/virtual/eth0
GENERAL.IP-IFACE: --
GENERAL.IS-SOFTWARE: nein
GENERAL.NM-MANAGED: ja
GENERAL.AUTOCONNECT: ja
GENERAL.FIRMWARE-MISSING: nein
GENERAL.NM-PLUGIN-MISSING: nein
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: unbekannt
CAPABILITIES.CARRIER-DETECT: nein
CAPABILITIES.SPEED: 100 Mb/s
CAPABILITIES.IS-SOFTWARE: nein
CAPABILITIES.SRIOV: nein
WIRED-PROPERTIES.CARRIER: aus
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
<<<
stderr: 0 bytes
>>>
<<<

134
clients/tests/test-client.py
View file

@ -279,8 +279,32 @@ class TestNmcli(NmTestBase):
text = text2
return b''.join([(t[0] if isinstance(t, tuple) else t) for t in text])
def call_nmcli_l(self,
args,
check_on_disk = _DEFAULT_ARG,
expected_returncode = _DEFAULT_ARG,
expected_stdout = _DEFAULT_ARG,
expected_stderr = _DEFAULT_ARG,
replace_stdout = None,
replace_stderr = None,
sort_lines_stdout = False):
frame = sys._getframe(1)
for lang in [ 'C', 'pl', 'de' ]:
self._call_nmcli(args,
lang,
check_on_disk,
expected_returncode,
expected_stdout,
expected_stderr,
replace_stdout,
replace_stderr,
sort_lines_stdout,
frame)
def call_nmcli(self,
args,
langs = None,
lang = None,
check_on_disk = _DEFAULT_ARG,
expected_returncode = _DEFAULT_ARG,
@ -292,8 +316,38 @@ class TestNmcli(NmTestBase):
frame = sys._getframe(1)
calling_fcn = frame.f_code.co_name
if langs is not None:
assert lang is None
else:
if lang is None:
lang = 'C'
langs = [lang]
for lang in langs:
self._call_nmcli(args,
lang,
check_on_disk,
expected_returncode,
expected_stdout,
expected_stderr,
replace_stdout,
replace_stderr,
sort_lines_stdout,
frame)
def _call_nmcli(self,
args,
lang,
check_on_disk,
expected_returncode,
expected_stdout,
expected_stderr,
replace_stdout,
replace_stderr,
sort_lines_stdout,
frame):
calling_fcn = frame.f_code.co_name
calling_num = self._calling_num.get(calling_fcn, 0) + 1
self._calling_num[calling_fcn] = calling_num
@ -486,42 +540,35 @@ class TestNmcli(NmTestBase):
def test_001(self):
self.call_nmcli([])
self.call_nmcli([], lang = 'pl')
self.call_nmcli_l([])
self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'])
self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'], lang = 'de')
self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'])
self.call_nmcli(['c', 's'])
self.call_nmcli_l(['c', 's'])
self.call_nmcli(['bogus', 's'])
self.call_nmcli_l(['bogus', 's'])
def test_002(self):
self.init_001()
self.call_nmcli(['d'])
self.call_nmcli_l(['d'])
self.call_nmcli(['-f', 'all', 'd'])
self.call_nmcli_l(['-f', 'all', 'd'])
self.call_nmcli([])
self.call_nmcli_l([])
self.call_nmcli(['-f', 'AP', '-mode', 'multiline', 'd', 'show', 'wlan0'])
self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'])
self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-t', 'd', 'show', 'wlan0'])
self.call_nmcli(['-f', 'AP', '-mode', 'tabular', 'd', 'show', 'wlan0'])
self.call_nmcli(['-f', 'AP', '-mode', 'tabular', '-p', 'd', 'show', 'wlan0'])
self.call_nmcli(['-f', 'AP', '-mode', 'tabular', '-t', 'd', 'show', 'wlan0'])
self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', 'd', 'show', 'wlan0'])
self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'])
self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-t', 'd', 'show', 'wlan0'])
self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular', 'd', 'show', 'wlan0'])
self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular', '-p', 'd', 'show', 'wlan0'])
self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular', '-t', 'd', 'show', 'wlan0'])
self.call_nmcli(['-f', 'AP', '-mode', 'multiline', 'd', 'show', 'wlan0'], lang = 'pl')
self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'], lang = 'pl')
self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-t', 'd', 'show', 'wlan0'], lang = 'pl')
self.call_nmcli(['-f', 'AP', '-mode', 'tabular', 'd', 'show', 'wlan0'], lang = 'pl')
self.call_nmcli(['-f', 'AP', '-mode', 'tabular', '-p', 'd', 'show', 'wlan0'], lang = 'pl')
self.call_nmcli(['-f', 'AP', '-mode', 'tabular', '-t', 'd', 'show', 'wlan0'], lang = 'pl')
self.call_nmcli_l(['-f', 'ALL', 'd', 'wifi'])
self.call_nmcli(['c'])
self.call_nmcli_l(['c'])
self.call_nmcli(['c', 's', 'con-1'])
self.call_nmcli_l(['c', 's', 'con-1'])
def test_003(self):
self.init_001()
@ -533,27 +580,40 @@ class TestNmcli(NmTestBase):
self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*', 'con-name', 'con-xx1'],
replace_stdout = replace_stdout)
self.call_nmcli(['c', 's'],
replace_stdout = replace_stdout)
self.call_nmcli_l(['c', 's'],
replace_stdout = replace_stdout)
replace_stdout.append((lambda: self.srv.findConnectionUuid('ethernet'), 'UUID-ethernet-REPLACED-REPLACED-REPL'))
self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*'],
replace_stdout = replace_stdout)
self.call_nmcli(['c', 's'],
replace_stdout = replace_stdout)
self.call_nmcli(['c', 's'], lang = 'pl',
replace_stdout = replace_stdout)
self.call_nmcli_l(['c', 's'],
replace_stdout = replace_stdout)
self.call_nmcli(['-f', 'ALL', 'c', 's'],
replace_stdout = replace_stdout)
self.call_nmcli(['-f', 'ALL', 'c', 's'], lang = 'pl',
replace_stdout = replace_stdout)
self.call_nmcli_l(['-f', 'ALL', 'c', 's'],
replace_stdout = replace_stdout)
self.call_nmcli(['--complete-args', '-f', 'ALL', 'c', 's', ''], lang = 'pl',
replace_stdout = replace_stdout,
sort_lines_stdout = True)
self.call_nmcli_l(['--complete-args', '-f', 'ALL', 'c', 's', ''],
replace_stdout = replace_stdout,
sort_lines_stdout = True)
self.call_nmcli(['con', 'up', 'ethernet', 'ifname', 'eth0'])
self.call_nmcli_l(['con'],
replace_stdout = replace_stdout)
self.call_nmcli_l(['-f', 'ALL', 'con'],
replace_stdout = replace_stdout)
self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'],
replace_stdout = replace_stdout)
self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'],
replace_stdout = replace_stdout)
self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'],
replace_stdout = replace_stdout)
###############################################################################

1
po/POTFILES.in
View file

@ -10,6 +10,7 @@ clients/cli/nmcli.c
clients/cli/polkit-agent.c
clients/cli/settings.c
clients/cli/utils.c
clients/cli/utils.h
clients/common/nm-client-utils.c
clients/common/nm-meta-setting-access.c
clients/common/nm-meta-setting-desc.c

102
shared/nm-utils/nm-shared-utils.c
View file

@ -549,6 +549,108 @@ nm_cmp_int2ptr_p_with_data (gconstpointer p_a, gconstpointer p_b, gpointer user_
/*****************************************************************************/
const char *
nm_utils_dbus_path_get_last_component (const char *dbus_path)
{
if (dbus_path) {
dbus_path = strrchr (dbus_path, '/');
if (dbus_path)
return dbus_path + 1;
}
return NULL;
}
static gint64
_dbus_path_component_as_num (const char *p)
{
gint64 n;
/* no odd stuff. No leading zeros, only a non-negative, decimal integer.
*
* Otherwise, there would be multiple ways to encode the same number "10"
* and "010". That is just confusing. A number has no leading zeros,
* if it has, it's not a number (as far as we are concerned here). */
if (p[0] == '0') {
if (p[1] != '\0')
return -1;
else
return 0;
}
if (!(p[0] >= '1' && p[0] <= '9'))
return -1;
if (!NM_STRCHAR_ALL (&p[1], ch, (ch >= '0' && ch <= '9')))
return -1;
n = _nm_utils_ascii_str_to_int64 (p, 10, 0, G_MAXINT64, -1);
nm_assert (n == -1 || nm_streq0 (p, nm_sprintf_bufa (100, "%"G_GINT64_FORMAT, n)));
return n;
}
int
nm_utils_dbus_path_cmp (const char *dbus_path_a, const char *dbus_path_b)
{
const char *l_a, *l_b;
gsize plen;
gint64 n_a, n_b;
/* compare function for two D-Bus paths. It behaves like
* strcmp(), except, if both paths have the same prefix,
* and both end in a (positive) number, then the paths
* will be sorted by number. */
NM_CMP_SELF (dbus_path_a, dbus_path_b);
/* if one or both paths have no slash (and no last component)
* compare the full paths directly. */
if ( !(l_a = nm_utils_dbus_path_get_last_component (dbus_path_a))
|| !(l_b = nm_utils_dbus_path_get_last_component (dbus_path_b)))
goto comp_full;
/* check if both paths have the same prefix (up to the last-component). */
plen = l_a - dbus_path_a;
if (plen != (l_b - dbus_path_b))
goto comp_full;
NM_CMP_RETURN (strncmp (dbus_path_a, dbus_path_b, plen));
n_a = _dbus_path_component_as_num (l_a);
n_b = _dbus_path_component_as_num (l_b);
if (n_a == -1 && n_b == -1)
goto comp_l;
/* both components must be convertiable to a number. If they are not,
* (and only one of them is), then we must always strictly sort numeric parts
* after non-numeric components. If we wouldn't, we wouldn't have
* a total order.
*
* An example of a not total ordering would be:
* "8" < "010" (numeric)
* "0x" < "8" (lexical)
* "0x" > "010" (lexical)
* We avoid this, by forcing that a non-numeric entry "0x" always sorts
* before numeric entries.
*
* Additionally, _dbus_path_component_as_num() would also reject "010" as
* not a valid number.
*/
if (n_a == -1)
return -1;
if (n_b == -1)
return 1;
NM_CMP_DIRECT (n_a, n_b);
nm_assert (nm_streq (dbus_path_a, dbus_path_b));
return 0;
comp_full:
NM_CMP_DIRECT_STRCMP0 (dbus_path_a, dbus_path_b);
return 0;
comp_l:
NM_CMP_DIRECT_STRCMP0 (l_a, l_b);
nm_assert (nm_streq (dbus_path_a, dbus_path_b));
return 0;
}
/*****************************************************************************/
/**
* nm_utils_strsplit_set:
* @str: the string to split.

19
shared/nm-utils/nm-shared-utils.h
View file

@ -113,6 +113,9 @@ nm_ip_addr_set (int addr_family, gpointer dst, const NMIPAddr *src)
#define NM_CMP_DIRECT_MEMCMP(a, b, size) \
NM_CMP_RETURN (memcmp ((a), (b), (size)))
#define NM_CMP_DIRECT_STRCMP0(a, b) \
NM_CMP_RETURN (g_strcmp0 ((a), (b)))
#define NM_CMP_DIRECT_IN6ADDR(a, b) \
G_STMT_START { \
const struct in6_addr *const _a = (a); \
@ -199,6 +202,12 @@ nm_utils_is_separator (const char c)
/*****************************************************************************/
const char *nm_utils_dbus_path_get_last_component (const char *dbus_path);
int nm_utils_dbus_path_cmp (const char *dbus_path_a, const char *dbus_path_b);
/*****************************************************************************/
const char **nm_utils_strsplit_set (const char *str, const char *delimiters);
gssize nm_utils_strv_find_first (char **list, gssize len, const char *needle);
@ -446,6 +455,16 @@ nm_g_variant_unref_floating (GVariant *var)
/*****************************************************************************/
static inline int
nm_utf8_collate0 (const char *a, const char *b)
{
if (!a)
return !b ? 0 : -1;
if (!b)
return 1;
return g_utf8_collate (a, b);
}
int nm_strcmp_p_with_data (gconstpointer a, gconstpointer b, gpointer user_data);
int nm_cmp_uint32_p_with_data (gconstpointer p_a, gconstpointer p_b, gpointer user_data);
int nm_cmp_int2ptr_p_with_data (gconstpointer p_a, gconstpointer p_b, gpointer user_data);

1275
tools/test-networkmanager-service.py
View file

File diff suppressed because it is too large Load diff