summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-06-14 15:17:55 +0200
committerThomas Haller <thaller@redhat.com>2018-06-14 15:45:34 +0200
commitfb5f555a543d15f4249f12d2b3231475bbf33b2f (patch)
tree497fdd3fef0b38e55ce9e9cb2f2ebc492224990c
parentbb20f2eb612a25c8a9b046d967c801a736f4dcc2 (diff)
downloadNetworkManager-fb5f555a543d15f4249f12d2b3231475bbf33b2f.tar.gz
clients/tests: add more tests printing wifi details in nmcli
-rw-r--r--clients/tests/test-client.check-on-disk/Makefile.am108
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-045.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-046.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-047.expected11
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-048.expected11
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-049.expected25
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-050.expected25
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-051.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-052.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-053.expected10
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-054.expected10
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-055.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-056.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-057.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-058.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-059.expected96
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-060.expected96
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-061.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-062.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-063.expected27
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-064.expected27
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-065.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-066.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-067.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-068.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-069.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-070.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-071.expected4
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-072.expected4
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-073.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-074.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-075.expected43
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-076.expected43
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-077.expected110
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-078.expected110
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-079.expected76
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-080.expected76
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-081.expected27
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-082.expected27
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-083.expected27
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-084.expected27
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-085.expected90
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-086.expected90
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-087.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-088.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-089.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-090.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-091.expected165
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-092.expected165
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-093.expected47
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-094.expected47
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-095.expected112
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-096.expected112
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-097.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-098.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-099.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-100.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-101.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-102.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-103.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-104.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-105.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-106.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-107.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-108.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-109.expected40
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-110.expected40
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-111.expected38
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-112.expected38
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-113.expected40
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-114.expected40
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-115.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-116.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-117.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-118.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-119.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-120.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-121.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-122.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-123.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-124.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-125.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-126.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-127.expected52
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-128.expected52
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-129.expected50
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-130.expected50
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-131.expected52
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-132.expected52
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-133.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-134.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-135.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-136.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-137.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-138.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-139.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-140.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-141.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-142.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-143.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-144.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-145.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-146.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-147.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-148.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-149.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-150.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-151.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-152.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-153.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-154.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-155.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-156.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-157.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-158.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-159.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-160.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-161.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-162.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-163.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-164.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-165.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-166.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-167.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-168.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-169.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-170.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-171.expected59
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-172.expected59
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-173.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-174.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-175.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-176.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-177.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-178.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-179.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-180.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-181.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-182.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-183.expected48
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-184.expected48
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-185.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-186.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-187.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-188.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-189.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-190.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-191.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-192.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-193.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-194.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-195.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-196.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-197.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-198.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-199.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-200.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-201.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-202.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-203.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-204.expected101
-rwxr-xr-xclients/tests/test-client.py15
162 files changed, 6454 insertions, 935 deletions
diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am
index 927776d401..298ca689ef 100644
--- a/clients/tests/test-client.check-on-disk/Makefile.am
+++ b/clients/tests/test-client.check-on-disk/Makefile.am
@@ -248,4 +248,112 @@ clients_tests_expected_files = \
clients/tests/test-client.check-on-disk/test_004-094.expected \
clients/tests/test-client.check-on-disk/test_004-095.expected \
clients/tests/test-client.check-on-disk/test_004-096.expected \
+ clients/tests/test-client.check-on-disk/test_004-097.expected \
+ clients/tests/test-client.check-on-disk/test_004-098.expected \
+ clients/tests/test-client.check-on-disk/test_004-099.expected \
+ clients/tests/test-client.check-on-disk/test_004-100.expected \
+ clients/tests/test-client.check-on-disk/test_004-101.expected \
+ clients/tests/test-client.check-on-disk/test_004-102.expected \
+ clients/tests/test-client.check-on-disk/test_004-103.expected \
+ clients/tests/test-client.check-on-disk/test_004-104.expected \
+ clients/tests/test-client.check-on-disk/test_004-105.expected \
+ clients/tests/test-client.check-on-disk/test_004-106.expected \
+ clients/tests/test-client.check-on-disk/test_004-107.expected \
+ clients/tests/test-client.check-on-disk/test_004-108.expected \
+ clients/tests/test-client.check-on-disk/test_004-109.expected \
+ clients/tests/test-client.check-on-disk/test_004-110.expected \
+ clients/tests/test-client.check-on-disk/test_004-111.expected \
+ clients/tests/test-client.check-on-disk/test_004-112.expected \
+ clients/tests/test-client.check-on-disk/test_004-113.expected \
+ clients/tests/test-client.check-on-disk/test_004-114.expected \
+ clients/tests/test-client.check-on-disk/test_004-115.expected \
+ clients/tests/test-client.check-on-disk/test_004-116.expected \
+ clients/tests/test-client.check-on-disk/test_004-117.expected \
+ clients/tests/test-client.check-on-disk/test_004-118.expected \
+ clients/tests/test-client.check-on-disk/test_004-119.expected \
+ clients/tests/test-client.check-on-disk/test_004-120.expected \
+ clients/tests/test-client.check-on-disk/test_004-121.expected \
+ clients/tests/test-client.check-on-disk/test_004-122.expected \
+ clients/tests/test-client.check-on-disk/test_004-123.expected \
+ clients/tests/test-client.check-on-disk/test_004-124.expected \
+ clients/tests/test-client.check-on-disk/test_004-125.expected \
+ clients/tests/test-client.check-on-disk/test_004-126.expected \
+ clients/tests/test-client.check-on-disk/test_004-127.expected \
+ clients/tests/test-client.check-on-disk/test_004-128.expected \
+ clients/tests/test-client.check-on-disk/test_004-129.expected \
+ clients/tests/test-client.check-on-disk/test_004-130.expected \
+ clients/tests/test-client.check-on-disk/test_004-131.expected \
+ clients/tests/test-client.check-on-disk/test_004-132.expected \
+ clients/tests/test-client.check-on-disk/test_004-133.expected \
+ clients/tests/test-client.check-on-disk/test_004-134.expected \
+ clients/tests/test-client.check-on-disk/test_004-135.expected \
+ clients/tests/test-client.check-on-disk/test_004-136.expected \
+ clients/tests/test-client.check-on-disk/test_004-137.expected \
+ clients/tests/test-client.check-on-disk/test_004-138.expected \
+ clients/tests/test-client.check-on-disk/test_004-139.expected \
+ clients/tests/test-client.check-on-disk/test_004-140.expected \
+ clients/tests/test-client.check-on-disk/test_004-141.expected \
+ clients/tests/test-client.check-on-disk/test_004-142.expected \
+ clients/tests/test-client.check-on-disk/test_004-143.expected \
+ clients/tests/test-client.check-on-disk/test_004-144.expected \
+ clients/tests/test-client.check-on-disk/test_004-145.expected \
+ clients/tests/test-client.check-on-disk/test_004-146.expected \
+ clients/tests/test-client.check-on-disk/test_004-147.expected \
+ clients/tests/test-client.check-on-disk/test_004-148.expected \
+ clients/tests/test-client.check-on-disk/test_004-149.expected \
+ clients/tests/test-client.check-on-disk/test_004-150.expected \
+ clients/tests/test-client.check-on-disk/test_004-151.expected \
+ clients/tests/test-client.check-on-disk/test_004-152.expected \
+ clients/tests/test-client.check-on-disk/test_004-153.expected \
+ clients/tests/test-client.check-on-disk/test_004-154.expected \
+ clients/tests/test-client.check-on-disk/test_004-155.expected \
+ clients/tests/test-client.check-on-disk/test_004-156.expected \
+ clients/tests/test-client.check-on-disk/test_004-157.expected \
+ clients/tests/test-client.check-on-disk/test_004-158.expected \
+ clients/tests/test-client.check-on-disk/test_004-159.expected \
+ clients/tests/test-client.check-on-disk/test_004-160.expected \
+ clients/tests/test-client.check-on-disk/test_004-161.expected \
+ clients/tests/test-client.check-on-disk/test_004-162.expected \
+ clients/tests/test-client.check-on-disk/test_004-163.expected \
+ clients/tests/test-client.check-on-disk/test_004-164.expected \
+ clients/tests/test-client.check-on-disk/test_004-165.expected \
+ clients/tests/test-client.check-on-disk/test_004-166.expected \
+ clients/tests/test-client.check-on-disk/test_004-167.expected \
+ clients/tests/test-client.check-on-disk/test_004-168.expected \
+ clients/tests/test-client.check-on-disk/test_004-169.expected \
+ clients/tests/test-client.check-on-disk/test_004-170.expected \
+ clients/tests/test-client.check-on-disk/test_004-171.expected \
+ clients/tests/test-client.check-on-disk/test_004-172.expected \
+ clients/tests/test-client.check-on-disk/test_004-173.expected \
+ clients/tests/test-client.check-on-disk/test_004-174.expected \
+ clients/tests/test-client.check-on-disk/test_004-175.expected \
+ clients/tests/test-client.check-on-disk/test_004-176.expected \
+ clients/tests/test-client.check-on-disk/test_004-177.expected \
+ clients/tests/test-client.check-on-disk/test_004-178.expected \
+ clients/tests/test-client.check-on-disk/test_004-179.expected \
+ clients/tests/test-client.check-on-disk/test_004-180.expected \
+ clients/tests/test-client.check-on-disk/test_004-181.expected \
+ clients/tests/test-client.check-on-disk/test_004-182.expected \
+ clients/tests/test-client.check-on-disk/test_004-183.expected \
+ clients/tests/test-client.check-on-disk/test_004-184.expected \
+ clients/tests/test-client.check-on-disk/test_004-185.expected \
+ clients/tests/test-client.check-on-disk/test_004-186.expected \
+ clients/tests/test-client.check-on-disk/test_004-187.expected \
+ clients/tests/test-client.check-on-disk/test_004-188.expected \
+ clients/tests/test-client.check-on-disk/test_004-189.expected \
+ clients/tests/test-client.check-on-disk/test_004-190.expected \
+ clients/tests/test-client.check-on-disk/test_004-191.expected \
+ clients/tests/test-client.check-on-disk/test_004-192.expected \
+ clients/tests/test-client.check-on-disk/test_004-193.expected \
+ clients/tests/test-client.check-on-disk/test_004-194.expected \
+ clients/tests/test-client.check-on-disk/test_004-195.expected \
+ clients/tests/test-client.check-on-disk/test_004-196.expected \
+ clients/tests/test-client.check-on-disk/test_004-197.expected \
+ clients/tests/test-client.check-on-disk/test_004-198.expected \
+ clients/tests/test-client.check-on-disk/test_004-199.expected \
+ clients/tests/test-client.check-on-disk/test_004-200.expected \
+ clients/tests/test-client.check-on-disk/test_004-201.expected \
+ clients/tests/test-client.check-on-disk/test_004-202.expected \
+ clients/tests/test-client.check-on-disk/test_004-203.expected \
+ clients/tests/test-client.check-on-disk/test_004-204.expected \
$(NULL)
diff --git a/clients/tests/test-client.check-on-disk/test_004-045.expected b/clients/tests/test-client.check-on-disk/test_004-045.expected
index f255a98f43..49a755e0af 100644
--- a/clients/tests/test-client.check-on-disk/test_004-045.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-045.expected
@@ -1,11 +1,18 @@
location: clients/tests/test-client.py:989:test_004()/45
-cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 568 bytes
+stdout: 472 bytes
>>>
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-046.expected b/clients/tests/test-client.check-on-disk/test_004-046.expected
index 40d0cdd270..10ea2ef053 100644
--- a/clients/tests/test-client.check-on-disk/test_004-046.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-046.expected
@@ -1,11 +1,18 @@
location: clients/tests/test-client.py:989:test_004()/46
-cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 586 bytes
+stdout: 522 bytes
>>>
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-047.expected b/clients/tests/test-client.check-on-disk/test_004-047.expected
index bb47fd1985..3b9c408644 100644
--- a/clients/tests/test-client.check-on-disk/test_004-047.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-047.expected
@@ -1,11 +1,18 @@
location: clients/tests/test-client.py:992:test_004()/47
-cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 568 bytes
+stdout: 1840 bytes
>>>
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-048.expected b/clients/tests/test-client.check-on-disk/test_004-048.expected
index fa09860b09..692bb4d79a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-048.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-048.expected
@@ -1,11 +1,18 @@
location: clients/tests/test-client.py:992:test_004()/48
-cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 586 bytes
+stdout: 1898 bytes
>>>
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-049.expected b/clients/tests/test-client.check-on-disk/test_004-049.expected
index b1272714ee..90ef5d50ff 100644
--- a/clients/tests/test-client.check-on-disk/test_004-049.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-049.expected
@@ -1,30 +1,11 @@
-location: clients/tests/test-client.py:987:test_004()/49
-cmd: $NMCLI --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:994:test_004()/49
+cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 2872 bytes
+stdout: 568 bytes
>>>
-===========================
- Wi-Fi scan list (wlan1)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
-
-===========================
- Wi-Fi scan list (wlan1)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-===========================
- Wi-Fi scan list (wlan0)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-050.expected b/clients/tests/test-client.check-on-disk/test_004-050.expected
index 493293ec6b..176fb88c18 100644
--- a/clients/tests/test-client.check-on-disk/test_004-050.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-050.expected
@@ -1,30 +1,11 @@
-location: clients/tests/test-client.py:987:test_004()/50
-cmd: $NMCLI --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:994:test_004()/50
+cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3100 bytes
+stdout: 586 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
-
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-051.expected b/clients/tests/test-client.check-on-disk/test_004-051.expected
index 63067e218a..feea91a70d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-051.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-051.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:989:test_004()/51
-cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:996:test_004()/51
+cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 962 bytes
+stdout: 138 bytes
>>>
-===========================
- Wi-Fi scan list (wlan0)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-052.expected b/clients/tests/test-client.check-on-disk/test_004-052.expected
index e75e5367c7..c522fb3a66 100644
--- a/clients/tests/test-client.check-on-disk/test_004-052.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-052.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:989:test_004()/52
-cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:996:test_004()/52
+cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1039 bytes
+stdout: 154 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-053.expected b/clients/tests/test-client.check-on-disk/test_004-053.expected
index d4712849dc..bedf7b1976 100644
--- a/clients/tests/test-client.check-on-disk/test_004-053.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-053.expected
@@ -1,14 +1,10 @@
-location: clients/tests/test-client.py:992:test_004()/53
-cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:999:test_004()/53
+cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 962 bytes
+stdout: 568 bytes
>>>
-===========================
- Wi-Fi scan list (wlan0)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-054.expected b/clients/tests/test-client.check-on-disk/test_004-054.expected
index 8704345c03..1039deaaae 100644
--- a/clients/tests/test-client.check-on-disk/test_004-054.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-054.expected
@@ -1,14 +1,10 @@
-location: clients/tests/test-client.py:992:test_004()/54
-cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:999:test_004()/54
+cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1039 bytes
+stdout: 586 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-055.expected b/clients/tests/test-client.check-on-disk/test_004-055.expected
index 9e7ceb705a..52ff6ac789 100644
--- a/clients/tests/test-client.check-on-disk/test_004-055.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-055.expected
@@ -1,15 +1,98 @@
-location: clients/tests/test-client.py:987:test_004()/55
-cmd: $NMCLI --terse -f ALL device wifi list
+location: clients/tests/test-client.py:1001:test_004()/55
+cmd: $NMCLI -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 1022 bytes
+stdout: 4600 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
-
-
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-056.expected b/clients/tests/test-client.check-on-disk/test_004-056.expected
index 5ee7800966..51c0b26dde 100644
--- a/clients/tests/test-client.check-on-disk/test_004-056.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-056.expected
@@ -1,15 +1,98 @@
-location: clients/tests/test-client.py:987:test_004()/56
-cmd: $NMCLI --terse -f ALL device wifi list
+location: clients/tests/test-client.py:1001:test_004()/56
+cmd: $NMCLI -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1070 bytes
+stdout: 4643 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
-
-
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-057.expected b/clients/tests/test-client.check-on-disk/test_004-057.expected
index 90ff19eb14..e1d0698a32 100644
--- a/clients/tests/test-client.check-on-disk/test_004-057.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-057.expected
@@ -1,10 +1,33 @@
-location: clients/tests/test-client.py:989:test_004()/57
-cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1003:test_004()/57
+cmd: $NMCLI -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 255 bytes
+stdout: 1363 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-058.expected b/clients/tests/test-client.check-on-disk/test_004-058.expected
index 248d15f865..00dea8d24b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-058.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-058.expected
@@ -1,10 +1,33 @@
-location: clients/tests/test-client.py:989:test_004()/58
-cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1003:test_004()/58
+cmd: $NMCLI -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 267 bytes
+stdout: 1364 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-059.expected b/clients/tests/test-client.check-on-disk/test_004-059.expected
index 06d6cc4fc6..348cb5bd27 100644
--- a/clients/tests/test-client.check-on-disk/test_004-059.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-059.expected
@@ -1,10 +1,98 @@
-location: clients/tests/test-client.py:992:test_004()/59
-cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1005:test_004()/59
+cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 255 bytes
+stdout: 4600 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-060.expected b/clients/tests/test-client.check-on-disk/test_004-060.expected
index 79b8f0b305..10214d1b01 100644
--- a/clients/tests/test-client.check-on-disk/test_004-060.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-060.expected
@@ -1,10 +1,98 @@
-location: clients/tests/test-client.py:992:test_004()/60
-cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1005:test_004()/60
+cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 267 bytes
+stdout: 4643 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-061.expected b/clients/tests/test-client.check-on-disk/test_004-061.expected
index c6dd590a4c..cc3e3fc602 100644
--- a/clients/tests/test-client.check-on-disk/test_004-061.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-061.expected
@@ -1,15 +1,27 @@
location: clients/tests/test-client.py:987:test_004()/61
-cmd: $NMCLI --mode tabular -f ALL device wifi list
+cmd: $NMCLI --pretty -f ALL device wifi list
lang: C
returncode: 0
-stdout: 1840 bytes
+stdout: 2872 bytes
>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
diff --git a/clients/tests/test-client.check-on-disk/test_004-062.expected b/clients/tests/test-client.check-on-disk/test_004-062.expected
index 3d3347a13f..b655f0dcb9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-062.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-062.expected
@@ -1,15 +1,27 @@
location: clients/tests/test-client.py:987:test_004()/62
-cmd: $NMCLI --mode tabular -f ALL device wifi list
+cmd: $NMCLI --pretty -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1898 bytes
+stdout: 3100 bytes
>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
diff --git a/clients/tests/test-client.check-on-disk/test_004-063.expected b/clients/tests/test-client.check-on-disk/test_004-063.expected
index 6ec5ff8a6e..73cf942f5b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-063.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-063.expected
@@ -1,11 +1,30 @@
location: clients/tests/test-client.py:989:test_004()/63
-cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI --pretty -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 568 bytes
+stdout: 996 bytes
>>>
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-064.expected b/clients/tests/test-client.check-on-disk/test_004-064.expected
index 7861f633f2..ba3ccb0d14 100644
--- a/clients/tests/test-client.check-on-disk/test_004-064.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-064.expected
@@ -1,11 +1,30 @@
location: clients/tests/test-client.py:989:test_004()/64
-cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI --pretty -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 586 bytes
+stdout: 1216 bytes
>>>
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-065.expected b/clients/tests/test-client.check-on-disk/test_004-065.expected
index c05ce5599f..7aa1971c4d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-065.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-065.expected
@@ -1,11 +1,30 @@
location: clients/tests/test-client.py:992:test_004()/65
-cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 568 bytes
+stdout: 2872 bytes
>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-066.expected b/clients/tests/test-client.check-on-disk/test_004-066.expected
index 29110b0a14..992842738a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-066.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-066.expected
@@ -1,11 +1,30 @@
location: clients/tests/test-client.py:992:test_004()/66
-cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 586 bytes
+stdout: 3100 bytes
>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-067.expected b/clients/tests/test-client.check-on-disk/test_004-067.expected
index b7e8cb6ba8..690021d59c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-067.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-067.expected
@@ -1,30 +1,15 @@
-location: clients/tests/test-client.py:987:test_004()/67
-cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:994:test_004()/67
+cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 2872 bytes
+stdout: 962 bytes
>>>
===========================
- Wi-Fi scan list (wlan1)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
-
-===========================
- Wi-Fi scan list (wlan1)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-===========================
Wi-Fi scan list (wlan0)
===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-068.expected b/clients/tests/test-client.check-on-disk/test_004-068.expected
index 4709b5eaa7..0d1446e112 100644
--- a/clients/tests/test-client.check-on-disk/test_004-068.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-068.expected
@@ -1,30 +1,15 @@
-location: clients/tests/test-client.py:987:test_004()/68
-cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:994:test_004()/68
+cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3100 bytes
+stdout: 1039 bytes
>>>
========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
-
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-========================================
Lista skanowania sieci Wi-Fi (wlan0)
========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-069.expected b/clients/tests/test-client.check-on-disk/test_004-069.expected
index 7535675e6f..a1d8c61f18 100644
--- a/clients/tests/test-client.check-on-disk/test_004-069.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-069.expected
@@ -1,15 +1,15 @@
-location: clients/tests/test-client.py:989:test_004()/69
-cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:996:test_004()/69
+cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 962 bytes
+stdout: 317 bytes
>>>
===========================
Wi-Fi scan list (wlan0)
===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-070.expected b/clients/tests/test-client.check-on-disk/test_004-070.expected
index 3f265290cc..8c6d1e02fb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-070.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-070.expected
@@ -1,15 +1,15 @@
-location: clients/tests/test-client.py:989:test_004()/70
-cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:996:test_004()/70
+cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1039 bytes
+stdout: 392 bytes
>>>
========================================
Lista skanowania sieci Wi-Fi (wlan0)
========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-071.expected b/clients/tests/test-client.check-on-disk/test_004-071.expected
index aa42faac51..04f2e45fa7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-071.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-071.expected
@@ -1,5 +1,5 @@
-location: clients/tests/test-client.py:992:test_004()/71
-cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:999:test_004()/71
+cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
stdout: 962 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-072.expected b/clients/tests/test-client.check-on-disk/test_004-072.expected
index 4c045f0342..c17f133746 100644
--- a/clients/tests/test-client.check-on-disk/test_004-072.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-072.expected
@@ -1,5 +1,5 @@
-location: clients/tests/test-client.py:992:test_004()/72
-cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:999:test_004()/72
+cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
stdout: 1039 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-073.expected b/clients/tests/test-client.check-on-disk/test_004-073.expected
index 146650b69e..1ccc53c218 100644
--- a/clients/tests/test-client.check-on-disk/test_004-073.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-073.expected
@@ -1,15 +1,112 @@
-location: clients/tests/test-client.py:987:test_004()/73
-cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
+location: clients/tests/test-client.py:1001:test_004()/73
+cmd: $NMCLI --pretty -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 1022 bytes
+stdout: 5691 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
-
-
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-074.expected b/clients/tests/test-client.check-on-disk/test_004-074.expected
index c17ffc4eaf..078b83a210 100644
--- a/clients/tests/test-client.check-on-disk/test_004-074.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-074.expected
@@ -1,15 +1,112 @@
-location: clients/tests/test-client.py:987:test_004()/74
-cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
+location: clients/tests/test-client.py:1001:test_004()/74
+cmd: $NMCLI --pretty -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1070 bytes
+stdout: 5741 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
-
-
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-075.expected b/clients/tests/test-client.check-on-disk/test_004-075.expected
index 97b49df6f9..b1326a2261 100644
--- a/clients/tests/test-client.check-on-disk/test_004-075.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-075.expected
@@ -1,10 +1,45 @@
-location: clients/tests/test-client.py:989:test_004()/75
-cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1003:test_004()/75
+cmd: $NMCLI --pretty -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 255 bytes
+stdout: 2294 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-076.expected b/clients/tests/test-client.check-on-disk/test_004-076.expected
index 880b572b4a..223b0af5a8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-076.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-076.expected
@@ -1,10 +1,45 @@
-location: clients/tests/test-client.py:989:test_004()/76
-cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1003:test_004()/76
+cmd: $NMCLI --pretty -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 267 bytes
+stdout: 2302 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (niedostępne)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-077.expected b/clients/tests/test-client.check-on-disk/test_004-077.expected
index 1d417944e1..c3ec751926 100644
--- a/clients/tests/test-client.check-on-disk/test_004-077.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-077.expected
@@ -1,10 +1,112 @@
-location: clients/tests/test-client.py:992:test_004()/77
-cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1005:test_004()/77
+cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 255 bytes
+stdout: 5691 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-078.expected b/clients/tests/test-client.check-on-disk/test_004-078.expected
index 18ccc293a0..258583ebb2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-078.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-078.expected
@@ -1,10 +1,112 @@
-location: clients/tests/test-client.py:992:test_004()/78
-cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1005:test_004()/78
+cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 267 bytes
+stdout: 5741 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-079.expected b/clients/tests/test-client.check-on-disk/test_004-079.expected
index d0a01ee22a..b752a9f57f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-079.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-079.expected
@@ -1,79 +1,15 @@
location: clients/tests/test-client.py:987:test_004()/79
-cmd: $NMCLI --mode multiline -f ALL device wifi list
+cmd: $NMCLI --terse -f ALL device wifi list
lang: C
returncode: 0
-stdout: 3722 bytes
+stdout: 1022 bytes
>>>
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-080.expected b/clients/tests/test-client.check-on-disk/test_004-080.expected
index 0ab22cee89..0a3d3eb89a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-080.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-080.expected
@@ -1,79 +1,15 @@
location: clients/tests/test-client.py:987:test_004()/80
-cmd: $NMCLI --mode multiline -f ALL device wifi list
+cmd: $NMCLI --terse -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3770 bytes
+stdout: 1070 bytes
>>>
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-081.expected b/clients/tests/test-client.check-on-disk/test_004-081.expected
index d0932a7a25..1caa36bb83 100644
--- a/clients/tests/test-client.check-on-disk/test_004-081.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-081.expected
@@ -1,26 +1,15 @@
location: clients/tests/test-client.py:989:test_004()/81
-cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI --terse -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 930 bytes
+stdout: 198 bytes
>>>
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+ :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2
+
+
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-082.expected b/clients/tests/test-client.check-on-disk/test_004-082.expected
index 07b2459c96..846abf89d3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-082.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-082.expected
@@ -1,26 +1,15 @@
location: clients/tests/test-client.py:989:test_004()/82
-cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI --terse -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 942 bytes
+stdout: 234 bytes
>>>
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+ :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2
+
+
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-083.expected b/clients/tests/test-client.check-on-disk/test_004-083.expected
index ff787c2430..dcccfdcc6e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-083.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-083.expected
@@ -1,26 +1,15 @@
location: clients/tests/test-client.py:992:test_004()/83
-cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 930 bytes
+stdout: 1022 bytes
>>>
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-084.expected b/clients/tests/test-client.check-on-disk/test_004-084.expected
index b43025a720..623b55c53f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-084.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-084.expected
@@ -1,26 +1,15 @@
location: clients/tests/test-client.py:992:test_004()/84
-cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 942 bytes
+stdout: 1070 bytes
>>>
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-085.expected b/clients/tests/test-client.check-on-disk/test_004-085.expected
index 1d491db1c9..62ee3ab369 100644
--- a/clients/tests/test-client.check-on-disk/test_004-085.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-085.expected
@@ -1,92 +1,10 @@
-location: clients/tests/test-client.py:987:test_004()/85
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:994:test_004()/85
+cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 4678 bytes
+stdout: 255 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan1)
-===============================================================================
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
--------------------------------------------------------------------------------
-
-===============================================================================
- Wi-Fi scan list (wlan1)
-===============================================================================
-
-===============================================================================
- Wi-Fi scan list (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
--------------------------------------------------------------------------------
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
--------------------------------------------------------------------------------
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-086.expected b/clients/tests/test-client.check-on-disk/test_004-086.expected
index 8989e1cba3..06b1e53d3d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-086.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-086.expected
@@ -1,92 +1,10 @@
-location: clients/tests/test-client.py:987:test_004()/86
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:994:test_004()/86
+cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4744 bytes
+stdout: 267 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan1)
-===============================================================================
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
--------------------------------------------------------------------------------
-
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan1)
-===============================================================================
-
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
--------------------------------------------------------------------------------
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
--------------------------------------------------------------------------------
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-087.expected b/clients/tests/test-client.check-on-disk/test_004-087.expected
index 70d0deb095..a07e684195 100644
--- a/clients/tests/test-client.check-on-disk/test_004-087.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-087.expected
@@ -1,30 +1,10 @@
-location: clients/tests/test-client.py:989:test_004()/87
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:996:test_004()/87
+cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 1222 bytes
+stdout: 49 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-088.expected b/clients/tests/test-client.check-on-disk/test_004-088.expected
index 04d0c19593..496bca5272 100644
--- a/clients/tests/test-client.check-on-disk/test_004-088.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-088.expected
@@ -1,30 +1,10 @@
-location: clients/tests/test-client.py:989:test_004()/88
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:996:test_004()/88
+cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1240 bytes
+stdout: 58 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-089.expected b/clients/tests/test-client.check-on-disk/test_004-089.expected
index 203cb9fcee..2c0dc48eca 100644
--- a/clients/tests/test-client.check-on-disk/test_004-089.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-089.expected
@@ -1,30 +1,10 @@
-location: clients/tests/test-client.py:992:test_004()/89
-cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:999:test_004()/89
+cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 1222 bytes
+stdout: 255 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-090.expected b/clients/tests/test-client.check-on-disk/test_004-090.expected
index 064054dad6..61158cc37f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-090.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-090.expected
@@ -1,30 +1,10 @@
-location: clients/tests/test-client.py:992:test_004()/90
-cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:999:test_004()/90
+cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1240 bytes
+stdout: 267 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-091.expected b/clients/tests/test-client.check-on-disk/test_004-091.expected
index 86032a3838..defcec34ba 100644
--- a/clients/tests/test-client.check-on-disk/test_004-091.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-091.expected
@@ -1,79 +1,98 @@
-location: clients/tests/test-client.py:987:test_004()/91
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+location: clients/tests/test-client.py:1001:test_004()/91
+cmd: $NMCLI --terse -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 1470 bytes
+stdout: 2467 bytes
>>>
-NAME:AP[1]
-SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:48
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
-
-
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
-NAME:AP[2]
-SSID:wlan0-ap-1
-SSID-HEX:776C616E302D61702D31
-BSSID:61:95:77:AC:1E:4C
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:81
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
-NAME:AP[3]
-SSID:wlan0-ap-3
-SSID-HEX:776C616E302D61702D33
-BSSID:9B:F6:B7:EC:97:76
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:55
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-092.expected b/clients/tests/test-client.check-on-disk/test_004-092.expected
index 32c077fba4..038ece7fbc 100644
--- a/clients/tests/test-client.check-on-disk/test_004-092.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-092.expected
@@ -1,79 +1,98 @@
-location: clients/tests/test-client.py:987:test_004()/92
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+location: clients/tests/test-client.py:1001:test_004()/92
+cmd: $NMCLI --terse -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1518 bytes
+stdout: 2510 bytes
>>>
-NAME:AP[1]
-SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:48
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
-
-
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
-NAME:AP[2]
-SSID:wlan0-ap-1
-SSID-HEX:776C616E302D61702D31
-BSSID:61:95:77:AC:1E:4C
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:81
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
-NAME:AP[3]
-SSID:wlan0-ap-3
-SSID-HEX:776C616E302D61702D33
-BSSID:9B:F6:B7:EC:97:76
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:55
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-093.expected b/clients/tests/test-client.check-on-disk/test_004-093.expected
index 2b59ea692e..e2f60bd4ef 100644
--- a/clients/tests/test-client.check-on-disk/test_004-093.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-093.expected
@@ -1,26 +1,33 @@
-location: clients/tests/test-client.py:989:test_004()/93
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1003:test_004()/93
+cmd: $NMCLI --terse -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 367 bytes
+stdout: 739 bytes
>>>
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-094.expected b/clients/tests/test-client.check-on-disk/test_004-094.expected
index 09119fd87d..c5d03f83fb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-094.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-094.expected
@@ -1,26 +1,33 @@
-location: clients/tests/test-client.py:989:test_004()/94
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1003:test_004()/94
+cmd: $NMCLI --terse -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 379 bytes
+stdout: 740 bytes
>>>
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-095.expected b/clients/tests/test-client.check-on-disk/test_004-095.expected
index f1df3b58b6..321f1dea3e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-095.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-095.expected
@@ -1,26 +1,98 @@
-location: clients/tests/test-client.py:992:test_004()/95
-cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1005:test_004()/95
+cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 367 bytes
+stdout: 2467 bytes
>>>
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-096.expected b/clients/tests/test-client.check-on-disk/test_004-096.expected
index 10a241fb21..6e144c2e52 100644
--- a/clients/tests/test-client.check-on-disk/test_004-096.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-096.expected
@@ -1,26 +1,98 @@
-location: clients/tests/test-client.py:992:test_004()/96
-cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:1005:test_004()/96
+cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 379 bytes
+stdout: 2510 bytes
>>>
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-097.expected b/clients/tests/test-client.check-on-disk/test_004-097.expected
new file mode 100644
index 0000000000..4bcefb3ddb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-097.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:987:test_004()/97
+cmd: $NMCLI --mode tabular -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 1840 bytes
+>>>
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-098.expected b/clients/tests/test-client.check-on-disk/test_004-098.expected
new file mode 100644
index 0000000000..9cbe1fe477
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-098.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:987:test_004()/98
+cmd: $NMCLI --mode tabular -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1898 bytes
+>>>
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-099.expected b/clients/tests/test-client.check-on-disk/test_004-099.expected
new file mode 100644
index 0000000000..7893806290
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-099.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:989:test_004()/99
+cmd: $NMCLI --mode tabular -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 472 bytes
+>>>
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-100.expected b/clients/tests/test-client.check-on-disk/test_004-100.expected
new file mode 100644
index 0000000000..6b4ff41100
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-100.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:989:test_004()/100
+cmd: $NMCLI --mode tabular -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 522 bytes
+>>>
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-101.expected b/clients/tests/test-client.check-on-disk/test_004-101.expected
new file mode 100644
index 0000000000..dcb97a21b9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-101.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:992:test_004()/101
+cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 1840 bytes
+>>>
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-102.expected b/clients/tests/test-client.check-on-disk/test_004-102.expected
new file mode 100644
index 0000000000..4b9d3698bf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-102.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:992:test_004()/102
+cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1898 bytes
+>>>
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-103.expected b/clients/tests/test-client.check-on-disk/test_004-103.expected
new file mode 100644
index 0000000000..6dd136dde6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-103.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:994:test_004()/103
+cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 568 bytes
+>>>
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-104.expected b/clients/tests/test-client.check-on-disk/test_004-104.expected
new file mode 100644
index 0000000000..42a29d3091
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-104.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:994:test_004()/104
+cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 586 bytes
+>>>
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-105.expected b/clients/tests/test-client.check-on-disk/test_004-105.expected
new file mode 100644
index 0000000000..0b1df3006c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-105.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:996:test_004()/105
+cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 138 bytes
+>>>
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-106.expected b/clients/tests/test-client.check-on-disk/test_004-106.expected
new file mode 100644
index 0000000000..87980dd283
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-106.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:996:test_004()/106
+cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 154 bytes
+>>>
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-107.expected b/clients/tests/test-client.check-on-disk/test_004-107.expected
new file mode 100644
index 0000000000..56420817a3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-107.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:999:test_004()/107
+cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 568 bytes
+>>>
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-108.expected b/clients/tests/test-client.check-on-disk/test_004-108.expected
new file mode 100644
index 0000000000..afc5556f30
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-108.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:999:test_004()/108
+cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 586 bytes
+>>>
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-109.expected b/clients/tests/test-client.check-on-disk/test_004-109.expected
new file mode 100644
index 0000000000..1b4871b42d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-109.expected
@@ -0,0 +1,40 @@
+location: clients/tests/test-client.py:1001:test_004()/109
+cmd: $NMCLI --mode tabular -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 2760 bytes
+>>>
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-110.expected b/clients/tests/test-client.check-on-disk/test_004-110.expected
new file mode 100644
index 0000000000..2936005605
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-110.expected
@@ -0,0 +1,40 @@
+location: clients/tests/test-client.py:1001:test_004()/110
+cmd: $NMCLI --mode tabular -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2813 bytes
+>>>
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-111.expected b/clients/tests/test-client.check-on-disk/test_004-111.expected
new file mode 100644
index 0000000000..70b39bf234
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-111.expected
@@ -0,0 +1,38 @@
+location: clients/tests/test-client.py:1003:test_004()/111
+cmd: $NMCLI --mode tabular -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 980 bytes
+>>>
+DEVICE
+wlan0
+
+TYPE
+wifi
+
+HWADDR
+13:E0:74:85:7C:D9
+
+MTU
+0
+
+STATE
+20 (unavailable)
+
+CONNECTION
+con-vpn-1
+
+CON-PATH
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-112.expected b/clients/tests/test-client.check-on-disk/test_004-112.expected
new file mode 100644
index 0000000000..f1f4bc0792
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-112.expected
@@ -0,0 +1,38 @@
+location: clients/tests/test-client.py:1003:test_004()/112
+cmd: $NMCLI --mode tabular -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 981 bytes
+>>>
+DEVICE
+wlan0
+
+TYPE
+wifi
+
+HWADDR
+13:E0:74:85:7C:D9
+
+MTU
+0
+
+STATE
+20 (niedostępne)
+
+CONNECTION
+con-vpn-1
+
+CON-PATH
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-113.expected b/clients/tests/test-client.check-on-disk/test_004-113.expected
new file mode 100644
index 0000000000..61a8effd22
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-113.expected
@@ -0,0 +1,40 @@
+location: clients/tests/test-client.py:1005:test_004()/113
+cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 2760 bytes
+>>>
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-114.expected b/clients/tests/test-client.check-on-disk/test_004-114.expected
new file mode 100644
index 0000000000..cbdf17e52b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-114.expected
@@ -0,0 +1,40 @@
+location: clients/tests/test-client.py:1005:test_004()/114
+cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2813 bytes
+>>>
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-115.expected b/clients/tests/test-client.check-on-disk/test_004-115.expected
new file mode 100644
index 0000000000..ed33302de7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-115.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:987:test_004()/115
+cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 2872 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-116.expected b/clients/tests/test-client.check-on-disk/test_004-116.expected
new file mode 100644
index 0000000000..ceb74f1e12
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-116.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:987:test_004()/116
+cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3100 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-117.expected b/clients/tests/test-client.check-on-disk/test_004-117.expected
new file mode 100644
index 0000000000..5383aeac1e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-117.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:989:test_004()/117
+cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 996 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-118.expected b/clients/tests/test-client.check-on-disk/test_004-118.expected
new file mode 100644
index 0000000000..966e39ee48
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-118.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:989:test_004()/118
+cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1216 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-119.expected b/clients/tests/test-client.check-on-disk/test_004-119.expected
new file mode 100644
index 0000000000..95393cabe0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-119.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:992:test_004()/119
+cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 2872 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-120.expected b/clients/tests/test-client.check-on-disk/test_004-120.expected
new file mode 100644
index 0000000000..5b0a852b0d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-120.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:992:test_004()/120
+cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3100 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-121.expected b/clients/tests/test-client.check-on-disk/test_004-121.expected
new file mode 100644
index 0000000000..90875169c2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-121.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:994:test_004()/121
+cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 962 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-122.expected b/clients/tests/test-client.check-on-disk/test_004-122.expected
new file mode 100644
index 0000000000..af6dc4fffd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-122.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:994:test_004()/122
+cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1039 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-123.expected b/clients/tests/test-client.check-on-disk/test_004-123.expected
new file mode 100644
index 0000000000..8878173aba
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-123.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:996:test_004()/123
+cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 317 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-124.expected b/clients/tests/test-client.check-on-disk/test_004-124.expected
new file mode 100644
index 0000000000..9d0d4ddb94
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-124.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:996:test_004()/124
+cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 392 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-125.expected b/clients/tests/test-client.check-on-disk/test_004-125.expected
new file mode 100644
index 0000000000..90e61e991e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-125.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:999:test_004()/125
+cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 962 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-126.expected b/clients/tests/test-client.check-on-disk/test_004-126.expected
new file mode 100644
index 0000000000..4ae9567d47
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-126.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:999:test_004()/126
+cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1039 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-127.expected b/clients/tests/test-client.check-on-disk/test_004-127.expected
new file mode 100644
index 0000000000..9856b027f9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-127.expected
@@ -0,0 +1,52 @@
+location: clients/tests/test-client.py:1001:test_004()/127
+cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 4148 bytes
+>>>
+==========================
+ Device details (wlan0)
+==========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+-----------------------------------------------------------
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+---------------------------------------------------------------------------
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+----------------------------------------------------------------------------
+AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+-----------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected
new file mode 100644
index 0000000000..4a49d9d72f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-128.expected
@@ -0,0 +1,52 @@
+location: clients/tests/test-client.py:1001:test_004()/128
+cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4246 bytes
+>>>
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+-----------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-129.expected b/clients/tests/test-client.check-on-disk/test_004-129.expected
new file mode 100644
index 0000000000..29bb34ed2a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-129.expected
@@ -0,0 +1,50 @@
+location: clients/tests/test-client.py:1003:test_004()/129
+cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 1554 bytes
+>>>
+==========================
+ Device details (wlan0)
+==========================
+DEVICE
+--------
+wlan0
+
+TYPE
+------
+wifi
+
+HWADDR
+-------------------
+13:E0:74:85:7C:D9
+
+MTU
+-----
+0
+
+STATE
+------------------
+20 (unavailable)
+
+CONNECTION
+------------
+con-vpn-1
+
+CON-PATH
+----------------------------------------------------
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-130.expected b/clients/tests/test-client.check-on-disk/test_004-130.expected
new file mode 100644
index 0000000000..6e4b4bc2e0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-130.expected
@@ -0,0 +1,50 @@
+location: clients/tests/test-client.py:1003:test_004()/130
+cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1584 bytes
+>>>
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+DEVICE
+--------
+wlan0
+
+TYPE
+------
+wifi
+
+HWADDR
+-------------------
+13:E0:74:85:7C:D9
+
+MTU
+-----
+0
+
+STATE
+------------------
+20 (niedostępne)
+
+CONNECTION
+------------
+con-vpn-1
+
+CON-PATH
+----------------------------------------------------
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-131.expected b/clients/tests/test-client.check-on-disk/test_004-131.expected
new file mode 100644
index 0000000000..38f0e05b78
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-131.expected
@@ -0,0 +1,52 @@
+location: clients/tests/test-client.py:1005:test_004()/131
+cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 4148 bytes
+>>>
+==========================
+ Device details (wlan0)
+==========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+-----------------------------------------------------------
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+---------------------------------------------------------------------------
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+----------------------------------------------------------------------------
+AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+-----------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected
new file mode 100644
index 0000000000..eed2a14550
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-132.expected
@@ -0,0 +1,52 @@
+location: clients/tests/test-client.py:1005:test_004()/132
+cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4246 bytes
+>>>
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+-----------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-133.expected b/clients/tests/test-client.check-on-disk/test_004-133.expected
new file mode 100644
index 0000000000..d5d9510bf7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-133.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:987:test_004()/133
+cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 1022 bytes
+>>>
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-134.expected b/clients/tests/test-client.check-on-disk/test_004-134.expected
new file mode 100644
index 0000000000..5b67347241
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-134.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:987:test_004()/134
+cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1070 bytes
+>>>
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-135.expected b/clients/tests/test-client.check-on-disk/test_004-135.expected
new file mode 100644
index 0000000000..4b24a7e284
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-135.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:989:test_004()/135
+cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 198 bytes
+>>>
+ :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2
+
+
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-136.expected b/clients/tests/test-client.check-on-disk/test_004-136.expected
new file mode 100644
index 0000000000..f96a3947a1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-136.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:989:test_004()/136
+cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 234 bytes
+>>>
+ :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2
+
+
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-137.expected b/clients/tests/test-client.check-on-disk/test_004-137.expected
new file mode 100644
index 0000000000..915024683a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-137.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:992:test_004()/137
+cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 1022 bytes
+>>>
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-138.expected b/clients/tests/test-client.check-on-disk/test_004-138.expected
new file mode 100644
index 0000000000..cd47ab0596
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-138.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:992:test_004()/138
+cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1070 bytes
+>>>
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-139.expected b/clients/tests/test-client.check-on-disk/test_004-139.expected
new file mode 100644
index 0000000000..6a01791e72
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-139.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:994:test_004()/139
+cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 255 bytes
+>>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-140.expected b/clients/tests/test-client.check-on-disk/test_004-140.expected
new file mode 100644
index 0000000000..d2af7ee6a3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-140.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:994:test_004()/140
+cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 267 bytes
+>>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-141.expected b/clients/tests/test-client.check-on-disk/test_004-141.expected
new file mode 100644
index 0000000000..69bcf78bca
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-141.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:996:test_004()/141
+cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 49 bytes
+>>>
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-142.expected b/clients/tests/test-client.check-on-disk/test_004-142.expected
new file mode 100644
index 0000000000..2a24301337
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-142.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:996:test_004()/142
+cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 58 bytes
+>>>
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-143.expected b/clients/tests/test-client.check-on-disk/test_004-143.expected
new file mode 100644
index 0000000000..aa6c281073
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-143.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:999:test_004()/143
+cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 255 bytes
+>>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-144.expected b/clients/tests/test-client.check-on-disk/test_004-144.expected
new file mode 100644
index 0000000000..e205144c9a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-144.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:999:test_004()/144
+cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 267 bytes
+>>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-145.expected b/clients/tests/test-client.check-on-disk/test_004-145.expected
new file mode 100644
index 0000000000..195041be5a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-145.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:1001:test_004()/145
+cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 1164 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+CAPABILITIES:no:unknown:no:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected
new file mode 100644
index 0000000000..7e29a812e5
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-146.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:1001:test_004()/146
+cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1207 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+CAPABILITIES:nie:nieznane:nie:nie
+WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
+AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-147.expected b/clients/tests/test-client.check-on-disk/test_004-147.expected
new file mode 100644
index 0000000000..fd2e802cdb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-147.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:1003:test_004()/147
+cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 446 bytes
+>>>
+wlan0
+wifi
+13\:E0\:74\:85\:7C\:D9
+0
+20 (unavailable)
+con-vpn-1
+/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-148.expected b/clients/tests/test-client.check-on-disk/test_004-148.expected
new file mode 100644
index 0000000000..9dbc0c5e2f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-148.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:1003:test_004()/148
+cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 447 bytes
+>>>
+wlan0
+wifi
+13\:E0\:74\:85\:7C\:D9
+0
+20 (niedostępne)
+con-vpn-1
+/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-149.expected b/clients/tests/test-client.check-on-disk/test_004-149.expected
new file mode 100644
index 0000000000..be196d2b86
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-149.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:1005:test_004()/149
+cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 1164 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+CAPABILITIES:no:unknown:no:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected
new file mode 100644
index 0000000000..411ece63e2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-150.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:1005:test_004()/150
+cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1207 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+CAPABILITIES:nie:nieznane:nie:nie
+WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
+AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-151.expected b/clients/tests/test-client.check-on-disk/test_004-151.expected
new file mode 100644
index 0000000000..464742abb9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-151.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:987:test_004()/151
+cmd: $NMCLI --mode multiline -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 3722 bytes
+>>>
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-152.expected b/clients/tests/test-client.check-on-disk/test_004-152.expected
new file mode 100644
index 0000000000..076b9ebd93
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-152.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:987:test_004()/152
+cmd: $NMCLI --mode multiline -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3770 bytes
+>>>
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-153.expected b/clients/tests/test-client.check-on-disk/test_004-153.expected
new file mode 100644
index 0000000000..160ff3d9dd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-153.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:989:test_004()/153
+cmd: $NMCLI --mode multiline -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 1478 bytes
+>>>
+IN-USE:
+SSID: wlan1-ap-4
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+
+
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+IN-USE:
+SSID: wlan0-ap-1
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+IN-USE:
+SSID: wlan0-ap-3
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-154.expected b/clients/tests/test-client.check-on-disk/test_004-154.expected
new file mode 100644
index 0000000000..2a8cb8a03d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-154.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:989:test_004()/154
+cmd: $NMCLI --mode multiline -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1514 bytes
+>>>
+IN-USE:
+SSID: wlan1-ap-4
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+
+
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+IN-USE:
+SSID: wlan0-ap-1
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+IN-USE:
+SSID: wlan0-ap-3
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-155.expected b/clients/tests/test-client.check-on-disk/test_004-155.expected
new file mode 100644
index 0000000000..c577deef45
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-155.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:992:test_004()/155
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 3722 bytes
+>>>
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-156.expected b/clients/tests/test-client.check-on-disk/test_004-156.expected
new file mode 100644
index 0000000000..dd4af1e6cb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-156.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:992:test_004()/156
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3770 bytes
+>>>
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-157.expected b/clients/tests/test-client.check-on-disk/test_004-157.expected
new file mode 100644
index 0000000000..0dff859493
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-157.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:994:test_004()/157
+cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 930 bytes
+>>>
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-158.expected b/clients/tests/test-client.check-on-disk/test_004-158.expected
new file mode 100644
index 0000000000..bcb5c685fd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-158.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:994:test_004()/158
+cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 942 bytes
+>>>
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-159.expected b/clients/tests/test-client.check-on-disk/test_004-159.expected
new file mode 100644
index 0000000000..096b15cf47
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-159.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:996:test_004()/159
+cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 369 bytes
+>>>
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-160.expected b/clients/tests/test-client.check-on-disk/test_004-160.expected
new file mode 100644
index 0000000000..c2a66ca433
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-160.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:996:test_004()/160
+cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 378 bytes
+>>>
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-161.expected b/clients/tests/test-client.check-on-disk/test_004-161.expected
new file mode 100644
index 0000000000..3efbf7b222
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-161.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:999:test_004()/161
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 930 bytes
+>>>
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-162.expected b/clients/tests/test-client.check-on-disk/test_004-162.expected
new file mode 100644
index 0000000000..094c7361b3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-162.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:999:test_004()/162
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 942 bytes
+>>>
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-163.expected b/clients/tests/test-client.check-on-disk/test_004-163.expected
new file mode 100644
index 0000000000..97071700c6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-163.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:1001:test_004()/163
+cmd: $NMCLI --mode multiline -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 4600 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-164.expected b/clients/tests/test-client.check-on-disk/test_004-164.expected
new file mode 100644
index 0000000000..0d7d4a94e2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-164.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:1001:test_004()/164
+cmd: $NMCLI --mode multiline -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4643 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-165.expected b/clients/tests/test-client.check-on-disk/test_004-165.expected
new file mode 100644
index 0000000000..835ee788d5
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-165.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:1003:test_004()/165
+cmd: $NMCLI --mode multiline -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 1363 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-166.expected b/clients/tests/test-client.check-on-disk/test_004-166.expected
new file mode 100644
index 0000000000..1cf58666f9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-166.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:1003:test_004()/166
+cmd: $NMCLI --mode multiline -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1364 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-167.expected b/clients/tests/test-client.check-on-disk/test_004-167.expected
new file mode 100644
index 0000000000..9b0da5af58
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-167.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:1005:test_004()/167
+cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 4600 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-168.expected b/clients/tests/test-client.check-on-disk/test_004-168.expected
new file mode 100644
index 0000000000..f069b3379d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-168.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:1005:test_004()/168
+cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4643 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-169.expected b/clients/tests/test-client.check-on-disk/test_004-169.expected
new file mode 100644
index 0000000000..f0910a637b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-169.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:987:test_004()/169
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 4678 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-170.expected b/clients/tests/test-client.check-on-disk/test_004-170.expected
new file mode 100644
index 0000000000..a831f2d07c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-170.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:987:test_004()/170
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4744 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-171.expected b/clients/tests/test-client.check-on-disk/test_004-171.expected
new file mode 100644
index 0000000000..078d09d933
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-171.expected
@@ -0,0 +1,59 @@
+location: clients/tests/test-client.py:989:test_004()/171
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 2434 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+IN-USE:
+SSID: wlan1-ap-4
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IN-USE:
+SSID: wlan0-ap-1
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IN-USE:
+SSID: wlan0-ap-3
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-172.expected b/clients/tests/test-client.check-on-disk/test_004-172.expected
new file mode 100644
index 0000000000..c84e585af0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-172.expected
@@ -0,0 +1,59 @@
+location: clients/tests/test-client.py:989:test_004()/172
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2488 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+IN-USE:
+SSID: wlan1-ap-4
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IN-USE:
+SSID: wlan0-ap-1
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IN-USE:
+SSID: wlan0-ap-3
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-173.expected b/clients/tests/test-client.check-on-disk/test_004-173.expected
new file mode 100644
index 0000000000..b8f66d367c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-173.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:992:test_004()/173
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 4678 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-174.expected b/clients/tests/test-client.check-on-disk/test_004-174.expected
new file mode 100644
index 0000000000..6c064b1f5b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-174.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:992:test_004()/174
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4744 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-175.expected b/clients/tests/test-client.check-on-disk/test_004-175.expected
new file mode 100644
index 0000000000..10895c8471
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-175.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:994:test_004()/175
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1222 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-176.expected b/clients/tests/test-client.check-on-disk/test_004-176.expected
new file mode 100644
index 0000000000..e010dab7b6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-176.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:994:test_004()/176
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1240 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-177.expected b/clients/tests/test-client.check-on-disk/test_004-177.expected
new file mode 100644
index 0000000000..48558f752b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-177.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:996:test_004()/177
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 661 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-178.expected b/clients/tests/test-client.check-on-disk/test_004-178.expected
new file mode 100644
index 0000000000..475ec97a00
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-178.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:996:test_004()/178
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 676 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-179.expected b/clients/tests/test-client.check-on-disk/test_004-179.expected
new file mode 100644
index 0000000000..a5490d5082
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-179.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:999:test_004()/179
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1222 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-180.expected b/clients/tests/test-client.check-on-disk/test_004-180.expected
new file mode 100644
index 0000000000..4121d31946
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-180.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:999:test_004()/180
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1240 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-181.expected b/clients/tests/test-client.check-on-disk/test_004-181.expected
new file mode 100644
index 0000000000..b06035abf6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-181.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:1001:test_004()/181
+cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 5691 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-182.expected b/clients/tests/test-client.check-on-disk/test_004-182.expected
new file mode 100644
index 0000000000..ba3faf8d73
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-182.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:1001:test_004()/182
+cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5741 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-183.expected b/clients/tests/test-client.check-on-disk/test_004-183.expected
new file mode 100644
index 0000000000..47e6409534
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-183.expected
@@ -0,0 +1,48 @@
+location: clients/tests/test-client.py:1003:test_004()/183
+cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 2294 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-184.expected b/clients/tests/test-client.check-on-disk/test_004-184.expected
new file mode 100644
index 0000000000..dce0b55313
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-184.expected
@@ -0,0 +1,48 @@
+location: clients/tests/test-client.py:1003:test_004()/184
+cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2302 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (niedostępne)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-185.expected b/clients/tests/test-client.check-on-disk/test_004-185.expected
new file mode 100644
index 0000000000..10507b66c4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-185.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:1005:test_004()/185
+cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 5691 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-186.expected b/clients/tests/test-client.check-on-disk/test_004-186.expected
new file mode 100644
index 0000000000..ff2cd4ba34
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-186.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:1005:test_004()/186
+cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5741 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-187.expected b/clients/tests/test-client.check-on-disk/test_004-187.expected
new file mode 100644
index 0000000000..994b3d7a98
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-187.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:987:test_004()/187
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 1470 bytes
+>>>
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+NAME:AP[2]
+SSID:wlan0-ap-1
+SSID-HEX:776C616E302D61702D31
+BSSID:61:95:77:AC:1E:4C
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
+NAME:AP[3]
+SSID:wlan0-ap-3
+SSID-HEX:776C616E302D61702D33
+BSSID:9B:F6:B7:EC:97:76
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-188.expected b/clients/tests/test-client.check-on-disk/test_004-188.expected
new file mode 100644
index 0000000000..9490da52fa
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-188.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:987:test_004()/188
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1518 bytes
+>>>
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+NAME:AP[2]
+SSID:wlan0-ap-1
+SSID-HEX:776C616E302D61702D31
+BSSID:61:95:77:AC:1E:4C
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
+NAME:AP[3]
+SSID:wlan0-ap-3
+SSID-HEX:776C616E302D61702D33
+BSSID:9B:F6:B7:EC:97:76
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-189.expected b/clients/tests/test-client.check-on-disk/test_004-189.expected
new file mode 100644
index 0000000000..1923d77bd0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-189.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:989:test_004()/189
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 390 bytes
+>>>
+IN-USE:
+SSID:wlan1-ap-4
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+
+
+IN-USE:
+SSID:wlan0-ap-2
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+IN-USE:
+SSID:wlan0-ap-1
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+IN-USE:
+SSID:wlan0-ap-3
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-190.expected b/clients/tests/test-client.check-on-disk/test_004-190.expected
new file mode 100644
index 0000000000..f6ff2dcee7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-190.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:989:test_004()/190
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 426 bytes
+>>>
+IN-USE:
+SSID:wlan1-ap-4
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+
+
+IN-USE:
+SSID:wlan0-ap-2
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+IN-USE:
+SSID:wlan0-ap-1
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+IN-USE:
+SSID:wlan0-ap-3
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-191.expected b/clients/tests/test-client.check-on-disk/test_004-191.expected
new file mode 100644
index 0000000000..ff93bf42d7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-191.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:992:test_004()/191
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 1470 bytes
+>>>
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+NAME:AP[2]
+SSID:wlan0-ap-1
+SSID-HEX:776C616E302D61702D31
+BSSID:61:95:77:AC:1E:4C
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
+NAME:AP[3]
+SSID:wlan0-ap-3
+SSID-HEX:776C616E302D61702D33
+BSSID:9B:F6:B7:EC:97:76
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-192.expected b/clients/tests/test-client.check-on-disk/test_004-192.expected
new file mode 100644
index 0000000000..3b98fb8e76
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-192.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:992:test_004()/192
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1518 bytes
+>>>
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+NAME:AP[2]
+SSID:wlan0-ap-1
+SSID-HEX:776C616E302D61702D31
+BSSID:61:95:77:AC:1E:4C
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
+NAME:AP[3]
+SSID:wlan0-ap-3
+SSID-HEX:776C616E302D61702D33
+BSSID:9B:F6:B7:EC:97:76
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-193.expected b/clients/tests/test-client.check-on-disk/test_004-193.expected
new file mode 100644
index 0000000000..dec360ccf2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-193.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:994:test_004()/193
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 367 bytes
+>>>
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-194.expected b/clients/tests/test-client.check-on-disk/test_004-194.expected
new file mode 100644
index 0000000000..d60131cf35
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-194.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:994:test_004()/194
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 379 bytes
+>>>
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-195.expected b/clients/tests/test-client.check-on-disk/test_004-195.expected
new file mode 100644
index 0000000000..0b720ed395
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-195.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:996:test_004()/195
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 97 bytes
+>>>
+IN-USE:
+SSID:wlan0-ap-2
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-196.expected b/clients/tests/test-client.check-on-disk/test_004-196.expected
new file mode 100644
index 0000000000..75798065cf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-196.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:996:test_004()/196
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 106 bytes
+>>>
+IN-USE:
+SSID:wlan0-ap-2
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-197.expected b/clients/tests/test-client.check-on-disk/test_004-197.expected
new file mode 100644
index 0000000000..86ae727019
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-197.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:999:test_004()/197
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 367 bytes
+>>>
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-198.expected b/clients/tests/test-client.check-on-disk/test_004-198.expected
new file mode 100644
index 0000000000..8c8501cb96
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-198.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:999:test_004()/198
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 379 bytes
+>>>
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-199.expected b/clients/tests/test-client.check-on-disk/test_004-199.expected
new file mode 100644
index 0000000000..d4a69a04d3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-199.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:1001:test_004()/199
+cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 2467 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-200.expected b/clients/tests/test-client.check-on-disk/test_004-200.expected
new file mode 100644
index 0000000000..0b3ddaa2fd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-200.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:1001:test_004()/200
+cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2510 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-201.expected b/clients/tests/test-client.check-on-disk/test_004-201.expected
new file mode 100644
index 0000000000..030273e296
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-201.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:1003:test_004()/201
+cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 739 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-202.expected b/clients/tests/test-client.check-on-disk/test_004-202.expected
new file mode 100644
index 0000000000..1113a46ea4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-202.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:1003:test_004()/202
+cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 740 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-203.expected b/clients/tests/test-client.check-on-disk/test_004-203.expected
new file mode 100644
index 0000000000..c9d8ca14ed
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-203.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:1005:test_004()/203
+cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 2467 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-204.expected b/clients/tests/test-client.check-on-disk/test_004-204.expected
new file mode 100644
index 0000000000..ad38961658
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-204.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:1005:test_004()/204
+cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2510 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
index 86a39cf339..b9a2d0c44a 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -683,7 +683,7 @@ class TestNmcli(NmTestBase):
def async_start(self):
# limit number parallel running jobs
- for async_job in self._async_jobs[0:10]:
+ for async_job in self._async_jobs[0:15]:
async_job.start()
def async_wait(self):
@@ -985,11 +985,24 @@ class TestNmcli(NmTestBase):
for mode in Util.iter_nmcli_output_modes():
self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'wifi', 'list' ],
replace_stdout = replace_stdout)
+ self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'wifi', 'list' ],
+ replace_stdout = replace_stdout)
+ self.call_nmcli_l(mode + ['-f', 'NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH',
+ 'device', 'wifi', 'list'],
+ replace_stdout = replace_stdout)
self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'],
replace_stdout = replace_stdout)
+ self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'],
+ replace_stdout = replace_stdout)
self.call_nmcli_l(mode + ['-f', 'NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH',
'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'],
replace_stdout = replace_stdout)
+ self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'show', 'wlan0' ],
+ replace_stdout = replace_stdout)
+ self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'show', 'wlan0' ],
+ replace_stdout = replace_stdout)
+ self.call_nmcli_l(mode + ['-f', 'GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS', 'device', 'show', 'wlan0' ],
+ replace_stdout = replace_stdout)
###############################################################################