colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: rework printing of "capabilities" device details

Browse Source
This commit is contained in:
Thomas Haller
2018-04-29 19:13:57 +02:00
parent 2fc475ccdf
commit d6949a2924
30 changed files with 175 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
clients/cli/devices.c
View File

@@ -328,15 +328,58 @@ const NmcMetaGenericInfo *const metagen_device_detail_connections[_NMC_GENERIC_I
/*****************************************************************************/
const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[] = {
NMC_META_GENERIC ("NAME"), /* 0 */
NMC_META_GENERIC ("CARRIER-DETECT"), /* 1 */
NMC_META_GENERIC ("SPEED"), /* 2 */
NMC_META_GENERIC ("IS-SOFTWARE"), /* 3 */
NMC_META_GENERIC ("SRIOV"), /* 4 */
NULL,
static gconstpointer
_metagen_device_detail_capabilities_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
{
NMDevice *d = target;
NMDeviceCapabilities caps;
guint32 speed;
NMC_HANDLE_COLOR (NM_META_COLOR_NONE);
caps = nm_device_get_capabilities (d);
switch (info->info_type) {
case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT:
return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_CARRIER_DETECT), get_type);
case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED:
speed = 0;
if (NM_IS_DEVICE_ETHERNET (d)) {
/* Speed in Mb/s */
speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (d));
} else if (NM_IS_DEVICE_WIFI (d)) {
/* Speed in b/s */
speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (d));
speed /= 1000;
}
if (speed) {
if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
return (*out_to_free = g_strdup_printf (_("%u Mb/s"), (guint) speed));
return (*out_to_free = g_strdup_printf ("%u Mb/s", (guint) speed));
}
return nmc_meta_generic_get_str_i18n (N_("unknown"), get_type);
case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE:
return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_IS_SOFTWARE), get_type);
case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV:
return nmc_meta_generic_get_bool (NM_FLAGS_HAS (caps, NM_DEVICE_CAP_SRIOV), get_type);
default:
break;
}
g_return_val_if_reached (NULL);
}
const NmcMetaGenericInfo *const metagen_device_detail_capabilities[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_NUM + 1] = {
#define _METAGEN_DEVICE_DETAIL_CAPABILITIES(type, name) \
[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_capabilities_get_fcn)
_METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT, "CARRIER-DETECT"),
_METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED, "SPEED"),
_METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE, "IS-SOFTWARE"),
_METAGEN_DEVICE_DETAIL_CAPABILITIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV, "SRIOV"),
};
#define NMC_FIELDS_DEV_SHOW_CAP_COMMON "NAME,CARRIER-DETECT,SPEED,IS-SOFTWARE"
/*****************************************************************************/
const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[] = {
NMC_META_GENERIC ("NAME"), /* 0 */
@@ -441,7 +484,7 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_bluetooth[] = {
/* Available sections for 'device show' */
const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = {
NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_device_detail_general), /* 0 */
NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES", nmc_fields_dev_show_cap + 1), /* 1 */
NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES", metagen_device_detail_capabilities), /* 1 */
NMC_META_GENERIC_WITH_NESTED ("WIFI-PROPERTIES", nmc_fields_dev_show_wifi_prop + 1), /* 2 */
NMC_META_GENERIC_WITH_NESTED ("AP", nmc_fields_dev_wifi_list + 1), /* 3 */
NMC_META_GENERIC_WITH_NESTED ("WIRED-PROPERTIES", nmc_fields_dev_show_wired_prop + 1), /* 4 */
@@ -1289,9 +1332,6 @@ show_device_info (NMDevice *device, NmCli *nmc)
{
GError *error = NULL;
NMDeviceState state = NM_DEVICE_STATE_UNKNOWN;
NMDeviceCapabilities caps;
guint32 speed;
char *speed_str;
GArray *sections_array;
int k;
const char *fields_str = NULL;
@@ -1365,40 +1405,17 @@ show_device_info (NMDevice *device, NmCli *nmc)
continue;
}
if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_capabilities) {
gs_free char *f = section_fld ? g_strdup_printf ("CAPABILITIES.%s", section_fld) : NULL;
/* section CAPABILITIES */
if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[1]->name)) {
NMC_OUTPUT_DATA_DEFINE_SCOPED (out);
tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_cap;
out_indices = parse_output_fields (section_fld,
tmpl, FALSE, NULL, NULL);
arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES);
g_ptr_array_add (out.output_data, arr);
caps = nm_device_get_capabilities (device);
speed = 0;
if (NM_IS_DEVICE_ETHERNET (device)) {
/* Speed in Mb/s */
speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (device));
} else if (NM_IS_DEVICE_WIFI (device)) {
/* Speed in b/s */
speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (device));
speed /= 1000;
}
speed_str = speed ? g_strdup_printf (_("%u Mb/s"), speed) : g_strdup (_("unknown"));
arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX);
set_val_strc (arr, 0, nmc_fields_dev_show_sections[1]->name); /* "CAPABILITIES" */
set_val_strc (arr, 1, (caps & NM_DEVICE_CAP_CARRIER_DETECT) ? _("yes") : _("no"));
set_val_str (arr, 2, speed_str);
set_val_strc (arr, 3, (caps & NM_DEVICE_CAP_IS_SOFTWARE) ? _("yes") : _("no"));
set_val_strc (arr, 4, (caps & NM_DEVICE_CAP_SRIOV) ? _("yes") : _("no"));
g_ptr_array_add (out.output_data, arr);
print_data_prepare_width (out.output_data);
print_data (&nmc->nmc_config, out_indices, NULL, 0, &out);
nmc_print (&nmc->nmc_config,
(gpointer[]) { device, NULL },
NULL,
NMC_META_GENERIC_GROUP ("CAPABILITIES", metagen_device_detail_capabilities, N_("NAME")),
f,
NULL);
was_output = TRUE;
continue;
}
/* Wireless specific information */

2
clients/cli/devices.h
View File

@@ -37,7 +37,7 @@ NMMetaColor nmc_device_state_to_color (NMDeviceState state);
extern const NmcMetaGenericInfo *const metagen_device_status[];
extern const NmcMetaGenericInfo *const metagen_device_detail_general[];
extern const NmcMetaGenericInfo *const metagen_device_detail_connections[];
extern const NmcMetaGenericInfo *const nmc_fields_dev_show_cap[];
extern const NmcMetaGenericInfo *const metagen_device_detail_capabilities[];
extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wired_prop[];
extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wifi_prop[];
extern const NmcMetaGenericInfo *const nmc_fields_dev_show_wimax_prop[];

2
clients/cli/nmcli.c
View File

@@ -198,7 +198,7 @@ complete_fields (const char *option, const char *prefix)
complete_field (h, metagen_device_status);
complete_field (h, metagen_device_detail_general);
complete_field (h, metagen_device_detail_connections);
complete_field (h, nmc_fields_dev_show_cap);
complete_field (h, metagen_device_detail_capabilities);
complete_field (h, nmc_fields_dev_show_wired_prop);
complete_field (h, nmc_fields_dev_show_wifi_prop);
complete_field (h, nmc_fields_dev_show_wimax_prop);

6
clients/cli/utils.h
View File

@@ -202,6 +202,12 @@ typedef enum {
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_AVAILABLE_CONNECTIONS,
_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CONNECTIONS_NUM,
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_CARRIER_DETECT = 0,
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SPEED,
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_IS_SOFTWARE,
NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_SRIOV,
_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_CAPABILITIES_NUM,
} NmcGenericInfoType;
#define NMC_HANDLE_COLOR(color) \

10
clients/tests/test-client.check-on-disk/test_003-033.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:860:test_003()/33
cmd: $NMCLI -f ALL -t dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2035 bytes
stdout: 2030 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

10
clients/tests/test-client.check-on-disk/test_003-056.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:860:test_003()/56
cmd: $NMCLI -f ALL -t dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2035 bytes
stdout: 2030 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

10
clients/tests/test-client.check-on-disk/test_003-106.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/106
cmd: $NMCLI --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2035 bytes
stdout: 2030 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

10
clients/tests/test-client.check-on-disk/test_003-116.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/116
cmd: $NMCLI --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2035 bytes
stdout: 2030 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

4
clients/tests/test-client.check-on-disk/test_003-166.expected
View File

@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/166
cmd: $NMCLI --mode tabular --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1200 bytes
stdout: 1195 bytes
>>>
GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
CAPABILITIES:nie:100 Mb/s:nie:nie
CAPABILITIES:no:100 Mb/s:no:no
WIRED-PROPERTIES:wyłączone:
IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
DHCP4:

4
clients/tests/test-client.check-on-disk/test_003-176.expected
View File

@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/176
cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1200 bytes
stdout: 1195 bytes
>>>
GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
CAPABILITIES:nie:100 Mb/s:nie:nie
CAPABILITIES:no:100 Mb/s:no:no
WIRED-PROPERTIES:wyłączone:
IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
DHCP4:

10
clients/tests/test-client.check-on-disk/test_003-226.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/226
cmd: $NMCLI --mode multiline --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2035 bytes
stdout: 2030 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

10
clients/tests/test-client.check-on-disk/test_003-236.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/236
cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2035 bytes
stdout: 2030 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

10
clients/tests/test-client.check-on-disk/test_003-286.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/286
cmd: $NMCLI --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2055 bytes
stdout: 2050 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

10
clients/tests/test-client.check-on-disk/test_003-296.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/296
cmd: $NMCLI --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2055 bytes
stdout: 2050 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

4
clients/tests/test-client.check-on-disk/test_003-346.expected
View File

@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/346
cmd: $NMCLI --mode tabular --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1220 bytes
stdout: 1215 bytes
>>>
GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
CAPABILITIES:nie:100 Mb/s:nie:nie
CAPABILITIES:no:100 Mb/s:no:no
WIRED-PROPERTIES:wyłączone:
IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
DHCP4:

4
clients/tests/test-client.check-on-disk/test_003-356.expected
View File

@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:887:test_003()/356
cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1220 bytes
stdout: 1215 bytes
>>>
GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
CAPABILITIES:nie:100 Mb/s:nie:nie
CAPABILITIES:no:100 Mb/s:no:no
WIRED-PROPERTIES:wyłączone:
IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
DHCP4:

10
clients/tests/test-client.check-on-disk/test_003-406.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/406
cmd: $NMCLI --mode multiline --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2055 bytes
stdout: 2050 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

10
clients/tests/test-client.check-on-disk/test_003-416.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:887:test_003()/416
cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2055 bytes
stdout: 2050 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -28,10 +28,10 @@ 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:nie
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:100 Mb/s
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIRED-PROPERTIES.CARRIER:wyłączone
IP4.ADDRESS[1]:192.168.6.238/29
IP4.GATEWAY:

10
clients/tests/test-client.check-on-disk/test_004-128.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/128
cmd: $NMCLI --terse -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2511 bytes
stdout: 2507 bytes
>>>
GENERAL.DEVICE:wlan0
GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED:unknown
CAPABILITIES.CARRIER-DETECT:nie
CAPABILITIES.SPEED:nieznane
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:unknown
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIFI-PROPERTIES.WEP:tak
WIFI-PROPERTIES.WPA:tak
WIFI-PROPERTIES.WPA2:tak

10
clients/tests/test-client.check-on-disk/test_004-132.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/132
cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2511 bytes
stdout: 2507 bytes
>>>
GENERAL.DEVICE:wlan0
GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED:unknown
CAPABILITIES.CARRIER-DETECT:nie
CAPABILITIES.SPEED:nieznane
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:unknown
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIFI-PROPERTIES.WEP:tak
WIFI-PROPERTIES.WPA:tak
WIFI-PROPERTIES.WPA2:tak

10
clients/tests/test-client.check-on-disk/test_004-146.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/146
cmd: $NMCLI --terse --color yes -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2727 bytes
stdout: 2723 bytes
>>>
GENERAL.DEVICE:wlan0
GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED:unknown
CAPABILITIES.CARRIER-DETECT:nie
CAPABILITIES.SPEED:nieznane
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:unknown
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIFI-PROPERTIES.WEP:tak
WIFI-PROPERTIES.WPA:tak
WIFI-PROPERTIES.WPA2:tak

10
clients/tests/test-client.check-on-disk/test_004-150.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/150
cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2727 bytes
stdout: 2723 bytes
>>>
GENERAL.DEVICE:wlan0
GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED:unknown
CAPABILITIES.CARRIER-DETECT:nie
CAPABILITIES.SPEED:nieznane
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:unknown
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIFI-PROPERTIES.WEP:tak
WIFI-PROPERTIES.WPA:tak
WIFI-PROPERTIES.WPA2:tak

4
clients/tests/test-client.check-on-disk/test_004-236.expected
View File

@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:984:test_004()/236
cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1208 bytes
stdout: 1204 bytes
>>>
GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
CAPABILITIES:nie:nieznane:nie:nie
CAPABILITIES:no:unknown:no:no
WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2

4
clients/tests/test-client.check-on-disk/test_004-240.expected
View File

@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:988:test_004()/240
cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1208 bytes
stdout: 1204 bytes
>>>
GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
CAPABILITIES:nie:nieznane:nie:nie
CAPABILITIES:no:unknown:no:no
WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2

4
clients/tests/test-client.check-on-disk/test_004-254.expected
View File

@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:984:test_004()/254
cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1451 bytes
stdout: 1447 bytes
>>>
GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
CAPABILITIES:nie:nieznane:nie:nie
CAPABILITIES:no:unknown:no:no
WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2

4
clients/tests/test-client.check-on-disk/test_004-258.expected
View File

@@ -2,10 +2,10 @@ location: clients/tests/test-client.py:988:test_004()/258
cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 1451 bytes
stdout: 1447 bytes
>>>
GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
CAPABILITIES:nie:nieznane:nie:nie
CAPABILITIES:no:unknown:no:no
WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2

10
clients/tests/test-client.check-on-disk/test_004-344.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/344
cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2511 bytes
stdout: 2507 bytes
>>>
GENERAL.DEVICE:wlan0
GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED:unknown
CAPABILITIES.CARRIER-DETECT:nie
CAPABILITIES.SPEED:nieznane
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:unknown
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIFI-PROPERTIES.WEP:tak
WIFI-PROPERTIES.WPA:tak
WIFI-PROPERTIES.WPA2:tak

10
clients/tests/test-client.check-on-disk/test_004-348.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/348
cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2511 bytes
stdout: 2507 bytes
>>>
GENERAL.DEVICE:wlan0
GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED:unknown
CAPABILITIES.CARRIER-DETECT:nie
CAPABILITIES.SPEED:nieznane
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:unknown
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIFI-PROPERTIES.WEP:tak
WIFI-PROPERTIES.WPA:tak
WIFI-PROPERTIES.WPA2:tak

10
clients/tests/test-client.check-on-disk/test_004-362.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:984:test_004()/362
cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2727 bytes
stdout: 2723 bytes
>>>
GENERAL.DEVICE:wlan0
GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED:unknown
CAPABILITIES.CARRIER-DETECT:nie
CAPABILITIES.SPEED:nieznane
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:unknown
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIFI-PROPERTIES.WEP:tak
WIFI-PROPERTIES.WPA:tak
WIFI-PROPERTIES.WPA2:tak

10
clients/tests/test-client.check-on-disk/test_004-366.expected
View File

@@ -2,7 +2,7 @@ location: clients/tests/test-client.py:988:test_004()/366
cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
stdout: 2727 bytes
stdout: 2723 bytes
>>>
GENERAL.DEVICE:wlan0
GENERAL.TYPE:wifi
@@ -28,10 +28,10 @@ GENERAL.CONNECTION:con-vpn-1
GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED:unknown
CAPABILITIES.CARRIER-DETECT:nie
CAPABILITIES.SPEED:nieznane
CAPABILITIES.IS-SOFTWARE:nie
CAPABILITIES.SRIOV:nie
CAPABILITIES.CARRIER-DETECT:no
CAPABILITIES.SPEED:unknown
CAPABILITIES.IS-SOFTWARE:no
CAPABILITIES.SRIOV:no
WIFI-PROPERTIES.WEP:tak
WIFI-PROPERTIES.WPA:tak
WIFI-PROPERTIES.WPA2:tak