summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-06-21 16:51:43 +0200
committerThomas Haller <thaller@redhat.com>2018-06-24 14:19:06 +0200
commita7f61f4d2928191d224c4d7ac5ab900655fecd45 (patch)
tree2bafdf16ef90684d73488a59ff18781cbc2a74a7
parent4cb078f94442e1e3d4b4275bf579bac5e04d2c70 (diff)
downloadNetworkManager-th/clients-tests-colored.tar.gz
clients/tests: add tests for coloringth/clients-tests-colored
-rw-r--r--clients/tests/terminal-colors.d/nmcli.enable0
-rw-r--r--clients/tests/terminal-colors.d/nmcli.schem0
-rw-r--r--clients/tests/test-client.check-on-disk/Makefile.am360
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-001.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-002.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-003.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-004.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-005.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-006.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-007.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-008.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-009.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-010.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-011.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-012.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-013.expected43
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-014.expected43
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-015.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-016.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-017.expected43
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-018.expected43
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-019.expected32
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-020.expected32
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-021.expected55
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-022.expected55
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-023.expected74
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-024.expected74
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-025.expected59
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-026.expected59
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-027.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-028.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-029.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-030.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-031.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-032.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-033.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-034.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-035.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-036.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-037.expected63
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-038.expected63
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-039.expected63
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-040.expected63
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-041.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-042.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-043.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-044.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-001.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-002.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-003.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-004.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-005.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-006.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-007.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-008.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-009.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-010.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-011.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-012.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-013.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-014.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-015.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-016.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-017.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-018.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-019.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-020.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-021.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-022.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-023.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-024.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-001.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-002.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-003.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-004.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-005.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-006.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-007.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-008.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-009.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-010.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-011.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-012.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-013.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-014.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-015.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-016.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-017.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-018.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-019.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-020.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-021.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-022.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-023.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-024.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-025.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-026.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-027.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-028.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-029.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-030.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-031.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-032.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-033.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-034.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-035.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-036.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-037.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-038.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-039.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-040.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-041.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-042.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-043.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-044.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-045.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-046.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-047.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-048.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-049.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-050.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-051.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-052.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-053.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-054.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-055.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-056.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-057.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-058.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-059.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-060.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-061.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-062.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-063.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-064.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-065.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-066.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-067.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-068.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-069.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-070.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-071.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-072.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-073.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-074.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-075.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-076.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-077.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-078.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-079.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-080.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-081.expected228
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-082.expected228
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-083.expected200
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-084.expected200
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-085.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-086.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-087.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-088.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-089.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-090.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-091.expected146
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-092.expected146
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-093.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-094.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-095.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-096.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-097.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-098.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-099.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-100.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-101.expected146
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-102.expected146
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-103.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-104.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-105.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-106.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-107.expected10
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-108.expected10
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-109.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-110.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-111.expected116
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-112.expected116
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-113.expected103
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-114.expected103
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-115.expected69
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-116.expected69
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-117.expected71
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-118.expected71
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-119.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-120.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-121.expected130
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-122.expected130
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-123.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-124.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-125.expected84
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-126.expected84
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-127.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-128.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-129.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-130.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-131.expected146
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-132.expected146
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-133.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-134.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-135.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-136.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-137.expected75
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-138.expected75
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-139.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-140.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-141.expected146
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-142.expected146
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-143.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-144.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-145.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-146.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-147.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-148.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-149.expected11
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-150.expected11
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-151.expected49
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-152.expected49
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-153.expected48
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-154.expected48
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-155.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-156.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-157.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-158.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-159.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-160.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-161.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-162.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-163.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-164.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-165.expected80
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-166.expected80
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-167.expected10
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-168.expected10
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-169.expected7
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-170.expected7
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-171.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-172.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-173.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-174.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-175.expected69
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-176.expected69
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-177.expected71
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-178.expected71
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-179.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-180.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-181.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-182.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-183.expected100
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-184.expected100
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-185.expected84
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-186.expected84
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-187.expected75
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-188.expected75
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-189.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-190.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-191.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-192.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-193.expected107
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-194.expected107
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-195.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-196.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-197.expected77
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-198.expected77
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-199.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-200.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-201.expected131
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-202.expected131
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-203.expected110
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-204.expected110
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-205.expected80
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-206.expected80
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-207.expected73
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-208.expected73
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-209.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-210.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-211.expected131
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-212.expected131
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-213.expected97
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-214.expected97
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-215.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-216.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-217.expected133
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-218.expected133
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-219.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-220.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-221.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-222.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-223.expected116
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-224.expected116
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-225.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-226.expected127
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-227.expected66
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-228.expected66
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-229.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-230.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-231.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-232.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-233.expected85
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-234.expected85
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-235.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-236.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-237.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-238.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-239.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-240.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-241.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-242.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-243.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-244.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-245.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-246.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-247.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-248.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-249.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-250.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-251.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-252.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-253.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-254.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-255.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-256.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-257.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-258.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-259.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-260.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-261.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-262.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-263.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-264.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-265.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-266.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-267.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-268.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-269.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-270.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-271.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-272.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-273.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-274.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-275.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-276.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-277.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-278.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-279.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-280.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-281.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-282.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-283.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-284.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-285.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-286.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-287.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-288.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-289.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-290.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-291.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-292.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-293.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-294.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-295.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-296.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-297.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-298.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-299.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-300.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-301.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-302.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-303.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-304.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-305.expected35
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-306.expected35
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-307.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-308.expected17
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-309.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-310.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-311.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-312.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-313.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-314.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-315.expected35
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-316.expected35
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-317.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-318.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-319.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-320.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-321.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-322.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-323.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-324.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-325.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-326.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-327.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-328.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-329.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-330.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-331.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-332.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-333.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-334.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-335.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-336.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-337.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-338.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-339.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-340.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-341.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-342.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-343.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-344.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-345.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-346.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-347.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-348.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-349.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-350.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-351.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-352.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-353.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-354.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-355.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-356.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-357.expected72
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-358.expected72
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-359.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-360.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-361.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-362.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-363.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-364.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-365.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-366.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-367.expected72
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-368.expected72
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-369.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-370.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-371.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-372.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-373.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-374.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-375.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-376.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-377.expected79
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-378.expected79
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-379.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-380.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-381.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-382.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-383.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-384.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-385.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-386.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-387.expected79
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-388.expected79
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-389.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-390.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-391.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-392.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-393.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-394.expected31
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-395.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-396.expected78
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-397.expected72
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-398.expected72
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-399.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-400.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-401.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-402.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-403.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-404.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-405.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-406.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-407.expected72
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-408.expected72
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-409.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-410.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-411.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-412.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-413.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-414.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-415.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-416.expected67
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-001.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-002.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-003.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-004.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-005.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-006.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-007.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-008.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-009.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-010.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-011.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-012.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-013.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-014.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-015.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-016.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-017.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-018.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-019.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-020.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-021.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-022.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-023.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-024.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-025.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-026.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-027.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-028.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-029.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-030.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-031.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-032.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-033.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-034.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-035.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-036.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-037.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-038.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-039.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-040.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-041.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-042.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-043.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-044.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-045.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-046.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-047.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-048.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-049.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-050.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-051.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-052.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-053.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-054.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-055.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-056.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-057.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-058.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-059.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-060.expected2
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-061.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-062.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-063.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-064.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-065.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-066.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-067.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-068.expected12
-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.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-072.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-073.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-074.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-075.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-076.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-077.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-078.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-079.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-080.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-081.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-082.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-083.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-084.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-085.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-086.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-087.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-088.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-089.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-090.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-091.expected198
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-092.expected198
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-093.expected66
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-094.expected66
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-095.expected198
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-096.expected198
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-097.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-098.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-099.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-100.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-101.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-102.expected26
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-103.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-104.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-105.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-106.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-107.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-108.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-109.expected137
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-110.expected137
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-111.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-112.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-113.expected137
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-114.expected137
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-115.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-116.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-117.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-118.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-119.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-120.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-121.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-122.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-123.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-124.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-125.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-126.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-127.expected135
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-128.expected135
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-129.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-130.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-131.expected135
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-132.expected135
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-133.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-134.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-135.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-136.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-137.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-138.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-139.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-140.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-141.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-142.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-143.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-144.expected8
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-145.expected106
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-146.expected106
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-147.expected39
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-148.expected39
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-149.expected106
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-150.expected106
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-151.expected81
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-152.expected81
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-153.expected45
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-154.expected45
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-155.expected81
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-156.expected81
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-157.expected25
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-158.expected25
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-159.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-160.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-161.expected25
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-162.expected25
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-163.expected123
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-164.expected123
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-165.expected56
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-166.expected56
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-167.expected123
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-168.expected123
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-169.expected94
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-170.expected94
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-171.expected58
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-172.expected58
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-173.expected94
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-174.expected94
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-175.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-176.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-177.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-178.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-179.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-180.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-181.expected137
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-182.expected137
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-183.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-184.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-185.expected137
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-186.expected137
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-187.expected93
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-188.expected93
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-189.expected57
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-190.expected57
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-191.expected93
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-192.expected93
-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.expected135
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-200.expected135
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-201.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-202.expected68
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-203.expected135
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-204.expected135
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-205.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-206.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-207.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-208.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-209.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-210.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-211.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-212.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-213.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-214.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-215.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-216.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-217.expected52
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-218.expected52
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-219.expected50
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-220.expected50
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-221.expected52
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-222.expected52
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-223.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-224.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-225.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-226.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-227.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-228.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-229.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-230.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-231.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-232.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-233.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-234.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-235.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-236.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-237.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-238.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-239.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-240.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-241.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-242.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-243.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-244.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-245.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-246.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-247.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-248.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-249.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-250.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-251.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-252.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-253.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-254.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-255.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-256.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-257.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-258.expected23
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-259.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-260.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-261.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-262.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-263.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-264.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-265.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-266.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-267.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-268.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-269.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-270.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-271.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-272.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-273.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-274.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-275.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-276.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-277.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-278.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-279.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-280.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-281.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-282.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-283.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-284.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-285.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-286.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-287.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-288.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-289.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-290.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-291.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-292.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-293.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-294.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-295.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-296.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-297.expected59
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-298.expected59
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-299.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-300.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-301.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-302.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-303.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-304.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-305.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-306.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-307.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-308.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-309.expected48
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-310.expected48
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-311.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-312.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-313.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-314.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-315.expected59
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-316.expected59
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-317.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-318.expected95
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-319.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-320.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-321.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-322.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-323.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-324.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-325.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-326.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-327.expected48
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-328.expected48
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-329.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-330.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-331.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-332.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-333.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-334.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-335.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-336.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-337.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-338.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-339.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-340.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-341.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-342.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-343.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-344.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-345.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-346.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-347.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-348.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-349.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-350.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-351.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-352.expected46
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-353.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-354.expected82
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-355.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-356.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-357.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-358.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-359.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-360.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-361.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-362.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-363.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-364.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-365.expected101
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-366.expected101
-rwxr-xr-xclients/tests/test-client.py5
854 files changed, 25596 insertions, 9819 deletions
diff --git a/clients/tests/terminal-colors.d/nmcli.enable b/clients/tests/terminal-colors.d/nmcli.enable
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/clients/tests/terminal-colors.d/nmcli.enable
diff --git a/clients/tests/terminal-colors.d/nmcli.schem b/clients/tests/terminal-colors.d/nmcli.schem
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/clients/tests/terminal-colors.d/nmcli.schem
diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am
index 400b316a19..94d016b84b 100644
--- a/clients/tests/test-client.check-on-disk/Makefile.am
+++ b/clients/tests/test-client.check-on-disk/Makefile.am
@@ -28,6 +28,24 @@ clients_tests_expected_files = \
clients/tests/test-client.check-on-disk/test_001-024.expected \
clients/tests/test-client.check-on-disk/test_001-025.expected \
clients/tests/test-client.check-on-disk/test_001-026.expected \
+ clients/tests/test-client.check-on-disk/test_001-027.expected \
+ clients/tests/test-client.check-on-disk/test_001-028.expected \
+ clients/tests/test-client.check-on-disk/test_001-029.expected \
+ clients/tests/test-client.check-on-disk/test_001-030.expected \
+ clients/tests/test-client.check-on-disk/test_001-031.expected \
+ clients/tests/test-client.check-on-disk/test_001-032.expected \
+ clients/tests/test-client.check-on-disk/test_001-033.expected \
+ clients/tests/test-client.check-on-disk/test_001-034.expected \
+ clients/tests/test-client.check-on-disk/test_001-035.expected \
+ clients/tests/test-client.check-on-disk/test_001-036.expected \
+ clients/tests/test-client.check-on-disk/test_001-037.expected \
+ clients/tests/test-client.check-on-disk/test_001-038.expected \
+ clients/tests/test-client.check-on-disk/test_001-039.expected \
+ clients/tests/test-client.check-on-disk/test_001-040.expected \
+ clients/tests/test-client.check-on-disk/test_001-041.expected \
+ clients/tests/test-client.check-on-disk/test_001-042.expected \
+ clients/tests/test-client.check-on-disk/test_001-043.expected \
+ clients/tests/test-client.check-on-disk/test_001-044.expected \
clients/tests/test-client.check-on-disk/test_002-001.expected \
clients/tests/test-client.check-on-disk/test_002-002.expected \
clients/tests/test-client.check-on-disk/test_002-003.expected \
@@ -288,6 +306,186 @@ clients_tests_expected_files = \
clients/tests/test-client.check-on-disk/test_003-234.expected \
clients/tests/test-client.check-on-disk/test_003-235.expected \
clients/tests/test-client.check-on-disk/test_003-236.expected \
+ clients/tests/test-client.check-on-disk/test_003-237.expected \
+ clients/tests/test-client.check-on-disk/test_003-238.expected \
+ clients/tests/test-client.check-on-disk/test_003-239.expected \
+ clients/tests/test-client.check-on-disk/test_003-240.expected \
+ clients/tests/test-client.check-on-disk/test_003-241.expected \
+ clients/tests/test-client.check-on-disk/test_003-242.expected \
+ clients/tests/test-client.check-on-disk/test_003-243.expected \
+ clients/tests/test-client.check-on-disk/test_003-244.expected \
+ clients/tests/test-client.check-on-disk/test_003-245.expected \
+ clients/tests/test-client.check-on-disk/test_003-246.expected \
+ clients/tests/test-client.check-on-disk/test_003-247.expected \
+ clients/tests/test-client.check-on-disk/test_003-248.expected \
+ clients/tests/test-client.check-on-disk/test_003-249.expected \
+ clients/tests/test-client.check-on-disk/test_003-250.expected \
+ clients/tests/test-client.check-on-disk/test_003-251.expected \
+ clients/tests/test-client.check-on-disk/test_003-252.expected \
+ clients/tests/test-client.check-on-disk/test_003-253.expected \
+ clients/tests/test-client.check-on-disk/test_003-254.expected \
+ clients/tests/test-client.check-on-disk/test_003-255.expected \
+ clients/tests/test-client.check-on-disk/test_003-256.expected \
+ clients/tests/test-client.check-on-disk/test_003-257.expected \
+ clients/tests/test-client.check-on-disk/test_003-258.expected \
+ clients/tests/test-client.check-on-disk/test_003-259.expected \
+ clients/tests/test-client.check-on-disk/test_003-260.expected \
+ clients/tests/test-client.check-on-disk/test_003-261.expected \
+ clients/tests/test-client.check-on-disk/test_003-262.expected \
+ clients/tests/test-client.check-on-disk/test_003-263.expected \
+ clients/tests/test-client.check-on-disk/test_003-264.expected \
+ clients/tests/test-client.check-on-disk/test_003-265.expected \
+ clients/tests/test-client.check-on-disk/test_003-266.expected \
+ clients/tests/test-client.check-on-disk/test_003-267.expected \
+ clients/tests/test-client.check-on-disk/test_003-268.expected \
+ clients/tests/test-client.check-on-disk/test_003-269.expected \
+ clients/tests/test-client.check-on-disk/test_003-270.expected \
+ clients/tests/test-client.check-on-disk/test_003-271.expected \
+ clients/tests/test-client.check-on-disk/test_003-272.expected \
+ clients/tests/test-client.check-on-disk/test_003-273.expected \
+ clients/tests/test-client.check-on-disk/test_003-274.expected \
+ clients/tests/test-client.check-on-disk/test_003-275.expected \
+ clients/tests/test-client.check-on-disk/test_003-276.expected \
+ clients/tests/test-client.check-on-disk/test_003-277.expected \
+ clients/tests/test-client.check-on-disk/test_003-278.expected \
+ clients/tests/test-client.check-on-disk/test_003-279.expected \
+ clients/tests/test-client.check-on-disk/test_003-280.expected \
+ clients/tests/test-client.check-on-disk/test_003-281.expected \
+ clients/tests/test-client.check-on-disk/test_003-282.expected \
+ clients/tests/test-client.check-on-disk/test_003-283.expected \
+ clients/tests/test-client.check-on-disk/test_003-284.expected \
+ clients/tests/test-client.check-on-disk/test_003-285.expected \
+ clients/tests/test-client.check-on-disk/test_003-286.expected \
+ clients/tests/test-client.check-on-disk/test_003-287.expected \
+ clients/tests/test-client.check-on-disk/test_003-288.expected \
+ clients/tests/test-client.check-on-disk/test_003-289.expected \
+ clients/tests/test-client.check-on-disk/test_003-290.expected \
+ clients/tests/test-client.check-on-disk/test_003-291.expected \
+ clients/tests/test-client.check-on-disk/test_003-292.expected \
+ clients/tests/test-client.check-on-disk/test_003-293.expected \
+ clients/tests/test-client.check-on-disk/test_003-294.expected \
+ clients/tests/test-client.check-on-disk/test_003-295.expected \
+ clients/tests/test-client.check-on-disk/test_003-296.expected \
+ clients/tests/test-client.check-on-disk/test_003-297.expected \
+ clients/tests/test-client.check-on-disk/test_003-298.expected \
+ clients/tests/test-client.check-on-disk/test_003-299.expected \
+ clients/tests/test-client.check-on-disk/test_003-300.expected \
+ clients/tests/test-client.check-on-disk/test_003-301.expected \
+ clients/tests/test-client.check-on-disk/test_003-302.expected \
+ clients/tests/test-client.check-on-disk/test_003-303.expected \
+ clients/tests/test-client.check-on-disk/test_003-304.expected \
+ clients/tests/test-client.check-on-disk/test_003-305.expected \
+ clients/tests/test-client.check-on-disk/test_003-306.expected \
+ clients/tests/test-client.check-on-disk/test_003-307.expected \
+ clients/tests/test-client.check-on-disk/test_003-308.expected \
+ clients/tests/test-client.check-on-disk/test_003-309.expected \
+ clients/tests/test-client.check-on-disk/test_003-310.expected \
+ clients/tests/test-client.check-on-disk/test_003-311.expected \
+ clients/tests/test-client.check-on-disk/test_003-312.expected \
+ clients/tests/test-client.check-on-disk/test_003-313.expected \
+ clients/tests/test-client.check-on-disk/test_003-314.expected \
+ clients/tests/test-client.check-on-disk/test_003-315.expected \
+ clients/tests/test-client.check-on-disk/test_003-316.expected \
+ clients/tests/test-client.check-on-disk/test_003-317.expected \
+ clients/tests/test-client.check-on-disk/test_003-318.expected \
+ clients/tests/test-client.check-on-disk/test_003-319.expected \
+ clients/tests/test-client.check-on-disk/test_003-320.expected \
+ clients/tests/test-client.check-on-disk/test_003-321.expected \
+ clients/tests/test-client.check-on-disk/test_003-322.expected \
+ clients/tests/test-client.check-on-disk/test_003-323.expected \
+ clients/tests/test-client.check-on-disk/test_003-324.expected \
+ clients/tests/test-client.check-on-disk/test_003-325.expected \
+ clients/tests/test-client.check-on-disk/test_003-326.expected \
+ clients/tests/test-client.check-on-disk/test_003-327.expected \
+ clients/tests/test-client.check-on-disk/test_003-328.expected \
+ clients/tests/test-client.check-on-disk/test_003-329.expected \
+ clients/tests/test-client.check-on-disk/test_003-330.expected \
+ clients/tests/test-client.check-on-disk/test_003-331.expected \
+ clients/tests/test-client.check-on-disk/test_003-332.expected \
+ clients/tests/test-client.check-on-disk/test_003-333.expected \
+ clients/tests/test-client.check-on-disk/test_003-334.expected \
+ clients/tests/test-client.check-on-disk/test_003-335.expected \
+ clients/tests/test-client.check-on-disk/test_003-336.expected \
+ clients/tests/test-client.check-on-disk/test_003-337.expected \
+ clients/tests/test-client.check-on-disk/test_003-338.expected \
+ clients/tests/test-client.check-on-disk/test_003-339.expected \
+ clients/tests/test-client.check-on-disk/test_003-340.expected \
+ clients/tests/test-client.check-on-disk/test_003-341.expected \
+ clients/tests/test-client.check-on-disk/test_003-342.expected \
+ clients/tests/test-client.check-on-disk/test_003-343.expected \
+ clients/tests/test-client.check-on-disk/test_003-344.expected \
+ clients/tests/test-client.check-on-disk/test_003-345.expected \
+ clients/tests/test-client.check-on-disk/test_003-346.expected \
+ clients/tests/test-client.check-on-disk/test_003-347.expected \
+ clients/tests/test-client.check-on-disk/test_003-348.expected \
+ clients/tests/test-client.check-on-disk/test_003-349.expected \
+ clients/tests/test-client.check-on-disk/test_003-350.expected \
+ clients/tests/test-client.check-on-disk/test_003-351.expected \
+ clients/tests/test-client.check-on-disk/test_003-352.expected \
+ clients/tests/test-client.check-on-disk/test_003-353.expected \
+ clients/tests/test-client.check-on-disk/test_003-354.expected \
+ clients/tests/test-client.check-on-disk/test_003-355.expected \
+ clients/tests/test-client.check-on-disk/test_003-356.expected \
+ clients/tests/test-client.check-on-disk/test_003-357.expected \
+ clients/tests/test-client.check-on-disk/test_003-358.expected \
+ clients/tests/test-client.check-on-disk/test_003-359.expected \
+ clients/tests/test-client.check-on-disk/test_003-360.expected \
+ clients/tests/test-client.check-on-disk/test_003-361.expected \
+ clients/tests/test-client.check-on-disk/test_003-362.expected \
+ clients/tests/test-client.check-on-disk/test_003-363.expected \
+ clients/tests/test-client.check-on-disk/test_003-364.expected \
+ clients/tests/test-client.check-on-disk/test_003-365.expected \
+ clients/tests/test-client.check-on-disk/test_003-366.expected \
+ clients/tests/test-client.check-on-disk/test_003-367.expected \
+ clients/tests/test-client.check-on-disk/test_003-368.expected \
+ clients/tests/test-client.check-on-disk/test_003-369.expected \
+ clients/tests/test-client.check-on-disk/test_003-370.expected \
+ clients/tests/test-client.check-on-disk/test_003-371.expected \
+ clients/tests/test-client.check-on-disk/test_003-372.expected \
+ clients/tests/test-client.check-on-disk/test_003-373.expected \
+ clients/tests/test-client.check-on-disk/test_003-374.expected \
+ clients/tests/test-client.check-on-disk/test_003-375.expected \
+ clients/tests/test-client.check-on-disk/test_003-376.expected \
+ clients/tests/test-client.check-on-disk/test_003-377.expected \
+ clients/tests/test-client.check-on-disk/test_003-378.expected \
+ clients/tests/test-client.check-on-disk/test_003-379.expected \
+ clients/tests/test-client.check-on-disk/test_003-380.expected \
+ clients/tests/test-client.check-on-disk/test_003-381.expected \
+ clients/tests/test-client.check-on-disk/test_003-382.expected \
+ clients/tests/test-client.check-on-disk/test_003-383.expected \
+ clients/tests/test-client.check-on-disk/test_003-384.expected \
+ clients/tests/test-client.check-on-disk/test_003-385.expected \
+ clients/tests/test-client.check-on-disk/test_003-386.expected \
+ clients/tests/test-client.check-on-disk/test_003-387.expected \
+ clients/tests/test-client.check-on-disk/test_003-388.expected \
+ clients/tests/test-client.check-on-disk/test_003-389.expected \
+ clients/tests/test-client.check-on-disk/test_003-390.expected \
+ clients/tests/test-client.check-on-disk/test_003-391.expected \
+ clients/tests/test-client.check-on-disk/test_003-392.expected \
+ clients/tests/test-client.check-on-disk/test_003-393.expected \
+ clients/tests/test-client.check-on-disk/test_003-394.expected \
+ clients/tests/test-client.check-on-disk/test_003-395.expected \
+ clients/tests/test-client.check-on-disk/test_003-396.expected \
+ clients/tests/test-client.check-on-disk/test_003-397.expected \
+ clients/tests/test-client.check-on-disk/test_003-398.expected \
+ clients/tests/test-client.check-on-disk/test_003-399.expected \
+ clients/tests/test-client.check-on-disk/test_003-400.expected \
+ clients/tests/test-client.check-on-disk/test_003-401.expected \
+ clients/tests/test-client.check-on-disk/test_003-402.expected \
+ clients/tests/test-client.check-on-disk/test_003-403.expected \
+ clients/tests/test-client.check-on-disk/test_003-404.expected \
+ clients/tests/test-client.check-on-disk/test_003-405.expected \
+ clients/tests/test-client.check-on-disk/test_003-406.expected \
+ clients/tests/test-client.check-on-disk/test_003-407.expected \
+ clients/tests/test-client.check-on-disk/test_003-408.expected \
+ clients/tests/test-client.check-on-disk/test_003-409.expected \
+ clients/tests/test-client.check-on-disk/test_003-410.expected \
+ clients/tests/test-client.check-on-disk/test_003-411.expected \
+ clients/tests/test-client.check-on-disk/test_003-412.expected \
+ clients/tests/test-client.check-on-disk/test_003-413.expected \
+ clients/tests/test-client.check-on-disk/test_003-414.expected \
+ clients/tests/test-client.check-on-disk/test_003-415.expected \
+ clients/tests/test-client.check-on-disk/test_003-416.expected \
clients/tests/test-client.check-on-disk/test_004-001.expected \
clients/tests/test-client.check-on-disk/test_004-002.expected \
clients/tests/test-client.check-on-disk/test_004-003.expected \
@@ -492,4 +690,166 @@ clients_tests_expected_files = \
clients/tests/test-client.check-on-disk/test_004-202.expected \
clients/tests/test-client.check-on-disk/test_004-203.expected \
clients/tests/test-client.check-on-disk/test_004-204.expected \
+ clients/tests/test-client.check-on-disk/test_004-205.expected \
+ clients/tests/test-client.check-on-disk/test_004-206.expected \
+ clients/tests/test-client.check-on-disk/test_004-207.expected \
+ clients/tests/test-client.check-on-disk/test_004-208.expected \
+ clients/tests/test-client.check-on-disk/test_004-209.expected \
+ clients/tests/test-client.check-on-disk/test_004-210.expected \
+ clients/tests/test-client.check-on-disk/test_004-211.expected \
+ clients/tests/test-client.check-on-disk/test_004-212.expected \
+ clients/tests/test-client.check-on-disk/test_004-213.expected \
+ clients/tests/test-client.check-on-disk/test_004-214.expected \
+ clients/tests/test-client.check-on-disk/test_004-215.expected \
+ clients/tests/test-client.check-on-disk/test_004-216.expected \
+ clients/tests/test-client.check-on-disk/test_004-217.expected \
+ clients/tests/test-client.check-on-disk/test_004-218.expected \
+ clients/tests/test-client.check-on-disk/test_004-219.expected \
+ clients/tests/test-client.check-on-disk/test_004-220.expected \
+ clients/tests/test-client.check-on-disk/test_004-221.expected \
+ clients/tests/test-client.check-on-disk/test_004-222.expected \
+ clients/tests/test-client.check-on-disk/test_004-223.expected \
+ clients/tests/test-client.check-on-disk/test_004-224.expected \
+ clients/tests/test-client.check-on-disk/test_004-225.expected \
+ clients/tests/test-client.check-on-disk/test_004-226.expected \
+ clients/tests/test-client.check-on-disk/test_004-227.expected \
+ clients/tests/test-client.check-on-disk/test_004-228.expected \
+ clients/tests/test-client.check-on-disk/test_004-229.expected \
+ clients/tests/test-client.check-on-disk/test_004-230.expected \
+ clients/tests/test-client.check-on-disk/test_004-231.expected \
+ clients/tests/test-client.check-on-disk/test_004-232.expected \
+ clients/tests/test-client.check-on-disk/test_004-233.expected \
+ clients/tests/test-client.check-on-disk/test_004-234.expected \
+ clients/tests/test-client.check-on-disk/test_004-235.expected \
+ clients/tests/test-client.check-on-disk/test_004-236.expected \
+ clients/tests/test-client.check-on-disk/test_004-237.expected \
+ clients/tests/test-client.check-on-disk/test_004-238.expected \
+ clients/tests/test-client.check-on-disk/test_004-239.expected \
+ clients/tests/test-client.check-on-disk/test_004-240.expected \
+ clients/tests/test-client.check-on-disk/test_004-241.expected \
+ clients/tests/test-client.check-on-disk/test_004-242.expected \
+ clients/tests/test-client.check-on-disk/test_004-243.expected \
+ clients/tests/test-client.check-on-disk/test_004-244.expected \
+ clients/tests/test-client.check-on-disk/test_004-245.expected \
+ clients/tests/test-client.check-on-disk/test_004-246.expected \
+ clients/tests/test-client.check-on-disk/test_004-247.expected \
+ clients/tests/test-client.check-on-disk/test_004-248.expected \
+ clients/tests/test-client.check-on-disk/test_004-249.expected \
+ clients/tests/test-client.check-on-disk/test_004-250.expected \
+ clients/tests/test-client.check-on-disk/test_004-251.expected \
+ clients/tests/test-client.check-on-disk/test_004-252.expected \
+ clients/tests/test-client.check-on-disk/test_004-253.expected \
+ clients/tests/test-client.check-on-disk/test_004-254.expected \
+ clients/tests/test-client.check-on-disk/test_004-255.expected \
+ clients/tests/test-client.check-on-disk/test_004-256.expected \
+ clients/tests/test-client.check-on-disk/test_004-257.expected \
+ clients/tests/test-client.check-on-disk/test_004-258.expected \
+ clients/tests/test-client.check-on-disk/test_004-259.expected \
+ clients/tests/test-client.check-on-disk/test_004-260.expected \
+ clients/tests/test-client.check-on-disk/test_004-261.expected \
+ clients/tests/test-client.check-on-disk/test_004-262.expected \
+ clients/tests/test-client.check-on-disk/test_004-263.expected \
+ clients/tests/test-client.check-on-disk/test_004-264.expected \
+ clients/tests/test-client.check-on-disk/test_004-265.expected \
+ clients/tests/test-client.check-on-disk/test_004-266.expected \
+ clients/tests/test-client.check-on-disk/test_004-267.expected \
+ clients/tests/test-client.check-on-disk/test_004-268.expected \
+ clients/tests/test-client.check-on-disk/test_004-269.expected \
+ clients/tests/test-client.check-on-disk/test_004-270.expected \
+ clients/tests/test-client.check-on-disk/test_004-271.expected \
+ clients/tests/test-client.check-on-disk/test_004-272.expected \
+ clients/tests/test-client.check-on-disk/test_004-273.expected \
+ clients/tests/test-client.check-on-disk/test_004-274.expected \
+ clients/tests/test-client.check-on-disk/test_004-275.expected \
+ clients/tests/test-client.check-on-disk/test_004-276.expected \
+ clients/tests/test-client.check-on-disk/test_004-277.expected \
+ clients/tests/test-client.check-on-disk/test_004-278.expected \
+ clients/tests/test-client.check-on-disk/test_004-279.expected \
+ clients/tests/test-client.check-on-disk/test_004-280.expected \
+ clients/tests/test-client.check-on-disk/test_004-281.expected \
+ clients/tests/test-client.check-on-disk/test_004-282.expected \
+ clients/tests/test-client.check-on-disk/test_004-283.expected \
+ clients/tests/test-client.check-on-disk/test_004-284.expected \
+ clients/tests/test-client.check-on-disk/test_004-285.expected \
+ clients/tests/test-client.check-on-disk/test_004-286.expected \
+ clients/tests/test-client.check-on-disk/test_004-287.expected \
+ clients/tests/test-client.check-on-disk/test_004-288.expected \
+ clients/tests/test-client.check-on-disk/test_004-289.expected \
+ clients/tests/test-client.check-on-disk/test_004-290.expected \
+ clients/tests/test-client.check-on-disk/test_004-291.expected \
+ clients/tests/test-client.check-on-disk/test_004-292.expected \
+ clients/tests/test-client.check-on-disk/test_004-293.expected \
+ clients/tests/test-client.check-on-disk/test_004-294.expected \
+ clients/tests/test-client.check-on-disk/test_004-295.expected \
+ clients/tests/test-client.check-on-disk/test_004-296.expected \
+ clients/tests/test-client.check-on-disk/test_004-297.expected \
+ clients/tests/test-client.check-on-disk/test_004-298.expected \
+ clients/tests/test-client.check-on-disk/test_004-299.expected \
+ clients/tests/test-client.check-on-disk/test_004-300.expected \
+ clients/tests/test-client.check-on-disk/test_004-301.expected \
+ clients/tests/test-client.check-on-disk/test_004-302.expected \
+ clients/tests/test-client.check-on-disk/test_004-303.expected \
+ clients/tests/test-client.check-on-disk/test_004-304.expected \
+ clients/tests/test-client.check-on-disk/test_004-305.expected \
+ clients/tests/test-client.check-on-disk/test_004-306.expected \
+ clients/tests/test-client.check-on-disk/test_004-307.expected \
+ clients/tests/test-client.check-on-disk/test_004-308.expected \
+ clients/tests/test-client.check-on-disk/test_004-309.expected \
+ clients/tests/test-client.check-on-disk/test_004-310.expected \
+ clients/tests/test-client.check-on-disk/test_004-311.expected \
+ clients/tests/test-client.check-on-disk/test_004-312.expected \
+ clients/tests/test-client.check-on-disk/test_004-313.expected \
+ clients/tests/test-client.check-on-disk/test_004-314.expected \
+ clients/tests/test-client.check-on-disk/test_004-315.expected \
+ clients/tests/test-client.check-on-disk/test_004-316.expected \
+ clients/tests/test-client.check-on-disk/test_004-317.expected \
+ clients/tests/test-client.check-on-disk/test_004-318.expected \
+ clients/tests/test-client.check-on-disk/test_004-319.expected \
+ clients/tests/test-client.check-on-disk/test_004-320.expected \
+ clients/tests/test-client.check-on-disk/test_004-321.expected \
+ clients/tests/test-client.check-on-disk/test_004-322.expected \
+ clients/tests/test-client.check-on-disk/test_004-323.expected \
+ clients/tests/test-client.check-on-disk/test_004-324.expected \
+ clients/tests/test-client.check-on-disk/test_004-325.expected \
+ clients/tests/test-client.check-on-disk/test_004-326.expected \
+ clients/tests/test-client.check-on-disk/test_004-327.expected \
+ clients/tests/test-client.check-on-disk/test_004-328.expected \
+ clients/tests/test-client.check-on-disk/test_004-329.expected \
+ clients/tests/test-client.check-on-disk/test_004-330.expected \
+ clients/tests/test-client.check-on-disk/test_004-331.expected \
+ clients/tests/test-client.check-on-disk/test_004-332.expected \
+ clients/tests/test-client.check-on-disk/test_004-333.expected \
+ clients/tests/test-client.check-on-disk/test_004-334.expected \
+ clients/tests/test-client.check-on-disk/test_004-335.expected \
+ clients/tests/test-client.check-on-disk/test_004-336.expected \
+ clients/tests/test-client.check-on-disk/test_004-337.expected \
+ clients/tests/test-client.check-on-disk/test_004-338.expected \
+ clients/tests/test-client.check-on-disk/test_004-339.expected \
+ clients/tests/test-client.check-on-disk/test_004-340.expected \
+ clients/tests/test-client.check-on-disk/test_004-341.expected \
+ clients/tests/test-client.check-on-disk/test_004-342.expected \
+ clients/tests/test-client.check-on-disk/test_004-343.expected \
+ clients/tests/test-client.check-on-disk/test_004-344.expected \
+ clients/tests/test-client.check-on-disk/test_004-345.expected \
+ clients/tests/test-client.check-on-disk/test_004-346.expected \
+ clients/tests/test-client.check-on-disk/test_004-347.expected \
+ clients/tests/test-client.check-on-disk/test_004-348.expected \
+ clients/tests/test-client.check-on-disk/test_004-349.expected \
+ clients/tests/test-client.check-on-disk/test_004-350.expected \
+ clients/tests/test-client.check-on-disk/test_004-351.expected \
+ clients/tests/test-client.check-on-disk/test_004-352.expected \
+ clients/tests/test-client.check-on-disk/test_004-353.expected \
+ clients/tests/test-client.check-on-disk/test_004-354.expected \
+ clients/tests/test-client.check-on-disk/test_004-355.expected \
+ clients/tests/test-client.check-on-disk/test_004-356.expected \
+ clients/tests/test-client.check-on-disk/test_004-357.expected \
+ clients/tests/test-client.check-on-disk/test_004-358.expected \
+ clients/tests/test-client.check-on-disk/test_004-359.expected \
+ clients/tests/test-client.check-on-disk/test_004-360.expected \
+ clients/tests/test-client.check-on-disk/test_004-361.expected \
+ clients/tests/test-client.check-on-disk/test_004-362.expected \
+ clients/tests/test-client.check-on-disk/test_004-363.expected \
+ clients/tests/test-client.check-on-disk/test_004-364.expected \
+ clients/tests/test-client.check-on-disk/test_004-365.expected \
+ clients/tests/test-client.check-on-disk/test_004-366.expected \
$(NULL)
diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected
index 8762038812..05483ea931 100644
--- a/clients/tests/test-client.check-on-disk/test_001-001.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-001.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:752:test_001()/1
+location: clients/tests/test-client.py:755:test_001()/1
cmd: $NMCLI
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-002.expected b/clients/tests/test-client.check-on-disk/test_001-002.expected
index 7d995122be..9b0c896fc4 100644
--- a/clients/tests/test-client.check-on-disk/test_001-002.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-002.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:752:test_001()/2
+location: clients/tests/test-client.py:755:test_001()/2
cmd: $NMCLI
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-003.expected b/clients/tests/test-client.check-on-disk/test_001-003.expected
index 1378170e26..9a74222ee4 100644
--- a/clients/tests/test-client.check-on-disk/test_001-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-003.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:754:test_001()/3
+location: clients/tests/test-client.py:757:test_001()/3
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: C
returncode: 10
diff --git a/clients/tests/test-client.check-on-disk/test_001-004.expected b/clients/tests/test-client.check-on-disk/test_001-004.expected
index 3826df4538..850155c564 100644
--- a/clients/tests/test-client.check-on-disk/test_001-004.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-004.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:754:test_001()/4
+location: clients/tests/test-client.py:757:test_001()/4
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: pl_PL.UTF-8
returncode: 10
diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected
index 0ce8a62646..ae15bcc331 100644
--- a/clients/tests/test-client.check-on-disk/test_001-005.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-005.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:756:test_001()/5
+location: clients/tests/test-client.py:759:test_001()/5
cmd: $NMCLI c s
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected
index 52665c266d..dc09ff75f1 100644
--- a/clients/tests/test-client.check-on-disk/test_001-006.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-006.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:756:test_001()/6
+location: clients/tests/test-client.py:759:test_001()/6
cmd: $NMCLI c s
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected
index c5b269f0db..75436478ef 100644
--- a/clients/tests/test-client.check-on-disk/test_001-007.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-007.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:758:test_001()/7
+location: clients/tests/test-client.py:761:test_001()/7
cmd: $NMCLI bogus s
lang: C
returncode: 2
diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected
index b7f5f04d76..8bdb38b7c9 100644
--- a/clients/tests/test-client.check-on-disk/test_001-008.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-008.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:758:test_001()/8
+location: clients/tests/test-client.py:761:test_001()/8
cmd: $NMCLI bogus s
lang: pl_PL.UTF-8
returncode: 2
diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected
index c762e51c2b..df3baaa13a 100644
--- a/clients/tests/test-client.check-on-disk/test_001-009.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-009.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:761:test_001()/9
+location: clients/tests/test-client.py:764:test_001()/9
cmd: $NMCLI general permissions
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected
index 677d7429b5..1772ba8130 100644
--- a/clients/tests/test-client.check-on-disk/test_001-010.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-010.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:761:test_001()/10
+location: clients/tests/test-client.py:764:test_001()/10
cmd: $NMCLI general permissions
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected
index 757a19cb1f..90de83d05d 100644
--- a/clients/tests/test-client.check-on-disk/test_001-011.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-011.expected
@@ -1,27 +1,23 @@
-location: clients/tests/test-client.py:761:test_001()/11
-cmd: $NMCLI --pretty general permissions
+location: clients/tests/test-client.py:764:test_001()/11
+cmd: $NMCLI --color yes general permissions
lang: C
returncode: 0
-stdout: 1472 bytes
+stdout: 1392 bytes
>>>
-==============================
- NetworkManager permissions
-==============================
PERMISSION VALUE
----------------------------------------------------------------------------------------------------------
-org.freedesktop.NetworkManager.enable-disable-network yes
-org.freedesktop.NetworkManager.enable-disable-wifi yes
-org.freedesktop.NetworkManager.enable-disable-wwan yes
-org.freedesktop.NetworkManager.enable-disable-wimax yes
-org.freedesktop.NetworkManager.sleep-wake no
-org.freedesktop.NetworkManager.network-control yes
-org.freedesktop.NetworkManager.wifi.share.protected yes
-org.freedesktop.NetworkManager.wifi.share.open yes
-org.freedesktop.NetworkManager.settings.modify.system yes
-org.freedesktop.NetworkManager.settings.modify.own yes
-org.freedesktop.NetworkManager.settings.modify.hostname yes
-org.freedesktop.NetworkManager.settings.modify.global-dns no
-org.freedesktop.NetworkManager.reload no
+org.freedesktop.NetworkManager.enable-disable-network yes
+org.freedesktop.NetworkManager.enable-disable-wifi yes
+org.freedesktop.NetworkManager.enable-disable-wwan yes
+org.freedesktop.NetworkManager.enable-disable-wimax yes
+org.freedesktop.NetworkManager.sleep-wake no
+org.freedesktop.NetworkManager.network-control yes
+org.freedesktop.NetworkManager.wifi.share.protected yes
+org.freedesktop.NetworkManager.wifi.share.open yes
+org.freedesktop.NetworkManager.settings.modify.system yes
+org.freedesktop.NetworkManager.settings.modify.own yes
+org.freedesktop.NetworkManager.settings.modify.hostname yes
+org.freedesktop.NetworkManager.settings.modify.global-dns no
+org.freedesktop.NetworkManager.reload no
org.freedesktop.NetworkManager.checkpoint-rollback unknown
org.freedesktop.NetworkManager.enable-disable-statistics unknown
org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown
diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected
index 6cca955c70..c3121b0b51 100644
--- a/clients/tests/test-client.check-on-disk/test_001-012.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-012.expected
@@ -1,27 +1,23 @@
-location: clients/tests/test-client.py:761:test_001()/12
-cmd: $NMCLI --pretty general permissions
+location: clients/tests/test-client.py:764:test_001()/12
+cmd: $NMCLI --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1519 bytes
+stdout: 1409 bytes
>>>
-=====================================
- Uprawnienia usługi NetworkManager
-=====================================
PERMISSION VALUE
------------------------------------------------------------------------------------------------------------------
-org.freedesktop.NetworkManager.enable-disable-network tak
-org.freedesktop.NetworkManager.enable-disable-wifi tak
-org.freedesktop.NetworkManager.enable-disable-wwan tak
-org.freedesktop.NetworkManager.enable-disable-wimax tak
-org.freedesktop.NetworkManager.sleep-wake nie
-org.freedesktop.NetworkManager.network-control tak
-org.freedesktop.NetworkManager.wifi.share.protected tak
-org.freedesktop.NetworkManager.wifi.share.open tak
-org.freedesktop.NetworkManager.settings.modify.system tak
-org.freedesktop.NetworkManager.settings.modify.own tak
-org.freedesktop.NetworkManager.settings.modify.hostname tak
-org.freedesktop.NetworkManager.settings.modify.global-dns nie
-org.freedesktop.NetworkManager.reload nie
+org.freedesktop.NetworkManager.enable-disable-network tak
+org.freedesktop.NetworkManager.enable-disable-wifi tak
+org.freedesktop.NetworkManager.enable-disable-wwan tak
+org.freedesktop.NetworkManager.enable-disable-wimax tak
+org.freedesktop.NetworkManager.sleep-wake nie
+org.freedesktop.NetworkManager.network-control tak
+org.freedesktop.NetworkManager.wifi.share.protected tak
+org.freedesktop.NetworkManager.wifi.share.open tak
+org.freedesktop.NetworkManager.settings.modify.system tak
+org.freedesktop.NetworkManager.settings.modify.own tak
+org.freedesktop.NetworkManager.settings.modify.hostname tak
+org.freedesktop.NetworkManager.settings.modify.global-dns nie
+org.freedesktop.NetworkManager.reload nie
org.freedesktop.NetworkManager.checkpoint-rollback nieznane
org.freedesktop.NetworkManager.enable-disable-statistics nieznane
org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane
diff --git a/clients/tests/test-client.check-on-disk/test_001-013.expected b/clients/tests/test-client.check-on-disk/test_001-013.expected
index 82241f0e69..293e90fb03 100644
--- a/clients/tests/test-client.check-on-disk/test_001-013.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-013.expected
@@ -1,25 +1,30 @@
-location: clients/tests/test-client.py:761:test_001()/13
-cmd: $NMCLI --terse general permissions
+location: clients/tests/test-client.py:764:test_001()/13
+cmd: $NMCLI --pretty general permissions
lang: C
returncode: 0
-stdout: 899 bytes
+stdout: 1472 bytes
>>>
-org.freedesktop.NetworkManager.enable-disable-network:yes
-org.freedesktop.NetworkManager.enable-disable-wifi:yes
-org.freedesktop.NetworkManager.enable-disable-wwan:yes
-org.freedesktop.NetworkManager.enable-disable-wimax:yes
-org.freedesktop.NetworkManager.sleep-wake:no
-org.freedesktop.NetworkManager.network-control:yes
-org.freedesktop.NetworkManager.wifi.share.protected:yes
-org.freedesktop.NetworkManager.wifi.share.open:yes
-org.freedesktop.NetworkManager.settings.modify.system:yes
-org.freedesktop.NetworkManager.settings.modify.own:yes
-org.freedesktop.NetworkManager.settings.modify.hostname:yes
-org.freedesktop.NetworkManager.settings.modify.global-dns:no
-org.freedesktop.NetworkManager.reload:no
-org.freedesktop.NetworkManager.checkpoint-rollback:unknown
-org.freedesktop.NetworkManager.enable-disable-statistics:unknown
-org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+==============================
+ NetworkManager permissions
+==============================
+PERMISSION VALUE
+---------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network yes
+org.freedesktop.NetworkManager.enable-disable-wifi yes
+org.freedesktop.NetworkManager.enable-disable-wwan yes
+org.freedesktop.NetworkManager.enable-disable-wimax yes
+org.freedesktop.NetworkManager.sleep-wake no
+org.freedesktop.NetworkManager.network-control yes
+org.freedesktop.NetworkManager.wifi.share.protected yes
+org.freedesktop.NetworkManager.wifi.share.open yes
+org.freedesktop.NetworkManager.settings.modify.system yes
+org.freedesktop.NetworkManager.settings.modify.own yes
+org.freedesktop.NetworkManager.settings.modify.hostname yes
+org.freedesktop.NetworkManager.settings.modify.global-dns no
+org.freedesktop.NetworkManager.reload no
+org.freedesktop.NetworkManager.checkpoint-rollback unknown
+org.freedesktop.NetworkManager.enable-disable-statistics unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-014.expected b/clients/tests/test-client.check-on-disk/test_001-014.expected
index f77108c97a..e667026886 100644
--- a/clients/tests/test-client.check-on-disk/test_001-014.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-014.expected
@@ -1,25 +1,30 @@
-location: clients/tests/test-client.py:761:test_001()/14
-cmd: $NMCLI --terse general permissions
+location: clients/tests/test-client.py:764:test_001()/14
+cmd: $NMCLI --pretty general permissions
lang: pl_PL.UTF-8
returncode: 0
-stdout: 899 bytes
+stdout: 1519 bytes
>>>
-org.freedesktop.NetworkManager.enable-disable-network:yes
-org.freedesktop.NetworkManager.enable-disable-wifi:yes
-org.freedesktop.NetworkManager.enable-disable-wwan:yes
-org.freedesktop.NetworkManager.enable-disable-wimax:yes
-org.freedesktop.NetworkManager.sleep-wake:no
-org.freedesktop.NetworkManager.network-control:yes
-org.freedesktop.NetworkManager.wifi.share.protected:yes
-org.freedesktop.NetworkManager.wifi.share.open:yes
-org.freedesktop.NetworkManager.settings.modify.system:yes
-org.freedesktop.NetworkManager.settings.modify.own:yes
-org.freedesktop.NetworkManager.settings.modify.hostname:yes
-org.freedesktop.NetworkManager.settings.modify.global-dns:no
-org.freedesktop.NetworkManager.reload:no
-org.freedesktop.NetworkManager.checkpoint-rollback:unknown
-org.freedesktop.NetworkManager.enable-disable-statistics:unknown
-org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+=====================================
+ Uprawnienia usługi NetworkManager
+=====================================
+PERMISSION VALUE
+-----------------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network tak
+org.freedesktop.NetworkManager.enable-disable-wifi tak
+org.freedesktop.NetworkManager.enable-disable-wwan tak
+org.freedesktop.NetworkManager.enable-disable-wimax tak
+org.freedesktop.NetworkManager.sleep-wake nie
+org.freedesktop.NetworkManager.network-control tak
+org.freedesktop.NetworkManager.wifi.share.protected tak
+org.freedesktop.NetworkManager.wifi.share.open tak
+org.freedesktop.NetworkManager.settings.modify.system tak
+org.freedesktop.NetworkManager.settings.modify.own tak
+org.freedesktop.NetworkManager.settings.modify.hostname tak
+org.freedesktop.NetworkManager.settings.modify.global-dns nie
+org.freedesktop.NetworkManager.reload nie
+org.freedesktop.NetworkManager.checkpoint-rollback nieznane
+org.freedesktop.NetworkManager.enable-disable-statistics nieznane
+org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-015.expected b/clients/tests/test-client.check-on-disk/test_001-015.expected
index a7dc531619..9a4736013c 100644
--- a/clients/tests/test-client.check-on-disk/test_001-015.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-015.expected
@@ -1,23 +1,27 @@
-location: clients/tests/test-client.py:761:test_001()/15
-cmd: $NMCLI --mode tabular general permissions
+location: clients/tests/test-client.py:764:test_001()/15
+cmd: $NMCLI --pretty --color yes general permissions
lang: C
returncode: 0
-stdout: 1275 bytes
+stdout: 1589 bytes
>>>
+==============================
+ NetworkManager permissions
+==============================
PERMISSION VALUE
-org.freedesktop.NetworkManager.enable-disable-network yes
-org.freedesktop.NetworkManager.enable-disable-wifi yes
-org.freedesktop.NetworkManager.enable-disable-wwan yes
-org.freedesktop.NetworkManager.enable-disable-wimax yes
-org.freedesktop.NetworkManager.sleep-wake no
-org.freedesktop.NetworkManager.network-control yes
-org.freedesktop.NetworkManager.wifi.share.protected yes
-org.freedesktop.NetworkManager.wifi.share.open yes
-org.freedesktop.NetworkManager.settings.modify.system yes
-org.freedesktop.NetworkManager.settings.modify.own yes
-org.freedesktop.NetworkManager.settings.modify.hostname yes
-org.freedesktop.NetworkManager.settings.modify.global-dns no
-org.freedesktop.NetworkManager.reload no
+---------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network yes
+org.freedesktop.NetworkManager.enable-disable-wifi yes
+org.freedesktop.NetworkManager.enable-disable-wwan yes
+org.freedesktop.NetworkManager.enable-disable-wimax yes
+org.freedesktop.NetworkManager.sleep-wake no
+org.freedesktop.NetworkManager.network-control yes
+org.freedesktop.NetworkManager.wifi.share.protected yes
+org.freedesktop.NetworkManager.wifi.share.open yes
+org.freedesktop.NetworkManager.settings.modify.system yes
+org.freedesktop.NetworkManager.settings.modify.own yes
+org.freedesktop.NetworkManager.settings.modify.hostname yes
+org.freedesktop.NetworkManager.settings.modify.global-dns no
+org.freedesktop.NetworkManager.reload no
org.freedesktop.NetworkManager.checkpoint-rollback unknown
org.freedesktop.NetworkManager.enable-disable-statistics unknown
org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown
diff --git a/clients/tests/test-client.check-on-disk/test_001-016.expected b/clients/tests/test-client.check-on-disk/test_001-016.expected
index 4bb5a26707..3346ee5d7a 100644
--- a/clients/tests/test-client.check-on-disk/test_001-016.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-016.expected
@@ -1,23 +1,27 @@
-location: clients/tests/test-client.py:761:test_001()/16
-cmd: $NMCLI --mode tabular general permissions
+location: clients/tests/test-client.py:764:test_001()/16
+cmd: $NMCLI --pretty --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1292 bytes
+stdout: 1636 bytes
>>>
+=====================================
+ Uprawnienia usługi NetworkManager
+=====================================
PERMISSION VALUE
-org.freedesktop.NetworkManager.enable-disable-network tak
-org.freedesktop.NetworkManager.enable-disable-wifi tak
-org.freedesktop.NetworkManager.enable-disable-wwan tak
-org.freedesktop.NetworkManager.enable-disable-wimax tak
-org.freedesktop.NetworkManager.sleep-wake nie
-org.freedesktop.NetworkManager.network-control tak
-org.freedesktop.NetworkManager.wifi.share.protected tak
-org.freedesktop.NetworkManager.wifi.share.open tak
-org.freedesktop.NetworkManager.settings.modify.system tak
-org.freedesktop.NetworkManager.settings.modify.own tak
-org.freedesktop.NetworkManager.settings.modify.hostname tak
-org.freedesktop.NetworkManager.settings.modify.global-dns nie
-org.freedesktop.NetworkManager.reload nie
+-----------------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network tak
+org.freedesktop.NetworkManager.enable-disable-wifi tak
+org.freedesktop.NetworkManager.enable-disable-wwan tak
+org.freedesktop.NetworkManager.enable-disable-wimax tak
+org.freedesktop.NetworkManager.sleep-wake nie
+org.freedesktop.NetworkManager.network-control tak
+org.freedesktop.NetworkManager.wifi.share.protected tak
+org.freedesktop.NetworkManager.wifi.share.open tak
+org.freedesktop.NetworkManager.settings.modify.system tak
+org.freedesktop.NetworkManager.settings.modify.own tak
+org.freedesktop.NetworkManager.settings.modify.hostname tak
+org.freedesktop.NetworkManager.settings.modify.global-dns nie
+org.freedesktop.NetworkManager.reload nie
org.freedesktop.NetworkManager.checkpoint-rollback nieznane
org.freedesktop.NetworkManager.enable-disable-statistics nieznane
org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane
diff --git a/clients/tests/test-client.check-on-disk/test_001-017.expected b/clients/tests/test-client.check-on-disk/test_001-017.expected
index c6010f4d8d..fed310f0ec 100644
--- a/clients/tests/test-client.check-on-disk/test_001-017.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-017.expected
@@ -1,30 +1,25 @@
-location: clients/tests/test-client.py:761:test_001()/17
-cmd: $NMCLI --mode tabular --pretty general permissions
+location: clients/tests/test-client.py:764:test_001()/17
+cmd: $NMCLI --terse general permissions
lang: C
returncode: 0
-stdout: 1472 bytes
+stdout: 899 bytes
>>>
-==============================
- NetworkManager permissions
-==============================
-PERMISSION VALUE
----------------------------------------------------------------------------------------------------------
-org.freedesktop.NetworkManager.enable-disable-network yes
-org.freedesktop.NetworkManager.enable-disable-wifi yes
-org.freedesktop.NetworkManager.enable-disable-wwan yes
-org.freedesktop.NetworkManager.enable-disable-wimax yes
-org.freedesktop.NetworkManager.sleep-wake no
-org.freedesktop.NetworkManager.network-control yes
-org.freedesktop.NetworkManager.wifi.share.protected yes
-org.freedesktop.NetworkManager.wifi.share.open yes
-org.freedesktop.NetworkManager.settings.modify.system yes
-org.freedesktop.NetworkManager.settings.modify.own yes
-org.freedesktop.NetworkManager.settings.modify.hostname yes
-org.freedesktop.NetworkManager.settings.modify.global-dns no
-org.freedesktop.NetworkManager.reload no
-org.freedesktop.NetworkManager.checkpoint-rollback unknown
-org.freedesktop.NetworkManager.enable-disable-statistics unknown
-org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-018.expected b/clients/tests/test-client.check-on-disk/test_001-018.expected
index 6d594751aa..60488802d7 100644
--- a/clients/tests/test-client.check-on-disk/test_001-018.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-018.expected
@@ -1,30 +1,25 @@
-location: clients/tests/test-client.py:761:test_001()/18
-cmd: $NMCLI --mode tabular --pretty general permissions
+location: clients/tests/test-client.py:764:test_001()/18
+cmd: $NMCLI --terse general permissions
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1519 bytes
+stdout: 899 bytes
>>>
-=====================================
- Uprawnienia usługi NetworkManager
-=====================================
-PERMISSION VALUE
------------------------------------------------------------------------------------------------------------------
-org.freedesktop.NetworkManager.enable-disable-network tak
-org.freedesktop.NetworkManager.enable-disable-wifi tak
-org.freedesktop.NetworkManager.enable-disable-wwan tak
-org.freedesktop.NetworkManager.enable-disable-wimax tak
-org.freedesktop.NetworkManager.sleep-wake nie
-org.freedesktop.NetworkManager.network-control tak
-org.freedesktop.NetworkManager.wifi.share.protected tak
-org.freedesktop.NetworkManager.wifi.share.open tak
-org.freedesktop.NetworkManager.settings.modify.system tak
-org.freedesktop.NetworkManager.settings.modify.own tak
-org.freedesktop.NetworkManager.settings.modify.hostname tak
-org.freedesktop.NetworkManager.settings.modify.global-dns nie
-org.freedesktop.NetworkManager.reload nie
-org.freedesktop.NetworkManager.checkpoint-rollback nieznane
-org.freedesktop.NetworkManager.enable-disable-statistics nieznane
-org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-019.expected b/clients/tests/test-client.check-on-disk/test_001-019.expected
index c2d8fa0ec7..920728bb40 100644
--- a/clients/tests/test-client.check-on-disk/test_001-019.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-019.expected
@@ -1,22 +1,22 @@
-location: clients/tests/test-client.py:761:test_001()/19
-cmd: $NMCLI --mode tabular --terse general permissions
+location: clients/tests/test-client.py:764:test_001()/19
+cmd: $NMCLI --terse --color yes general permissions
lang: C
returncode: 0
-stdout: 899 bytes
+stdout: 1016 bytes
>>>
-org.freedesktop.NetworkManager.enable-disable-network:yes
-org.freedesktop.NetworkManager.enable-disable-wifi:yes
-org.freedesktop.NetworkManager.enable-disable-wwan:yes
-org.freedesktop.NetworkManager.enable-disable-wimax:yes
-org.freedesktop.NetworkManager.sleep-wake:no
-org.freedesktop.NetworkManager.network-control:yes
-org.freedesktop.NetworkManager.wifi.share.protected:yes
-org.freedesktop.NetworkManager.wifi.share.open:yes
-org.freedesktop.NetworkManager.settings.modify.system:yes
-org.freedesktop.NetworkManager.settings.modify.own:yes
-org.freedesktop.NetworkManager.settings.modify.hostname:yes
-org.freedesktop.NetworkManager.settings.modify.global-dns:no
-org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
org.freedesktop.NetworkManager.checkpoint-rollback:unknown
org.freedesktop.NetworkManager.enable-disable-statistics:unknown
org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
diff --git a/clients/tests/test-client.check-on-disk/test_001-020.expected b/clients/tests/test-client.check-on-disk/test_001-020.expected
index b64e923378..365b36ab56 100644
--- a/clients/tests/test-client.check-on-disk/test_001-020.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-020.expected
@@ -1,22 +1,22 @@
-location: clients/tests/test-client.py:761:test_001()/20
-cmd: $NMCLI --mode tabular --terse general permissions
+location: clients/tests/test-client.py:764:test_001()/20
+cmd: $NMCLI --terse --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
-stdout: 899 bytes
+stdout: 1016 bytes
>>>
-org.freedesktop.NetworkManager.enable-disable-network:yes
-org.freedesktop.NetworkManager.enable-disable-wifi:yes
-org.freedesktop.NetworkManager.enable-disable-wwan:yes
-org.freedesktop.NetworkManager.enable-disable-wimax:yes
-org.freedesktop.NetworkManager.sleep-wake:no
-org.freedesktop.NetworkManager.network-control:yes
-org.freedesktop.NetworkManager.wifi.share.protected:yes
-org.freedesktop.NetworkManager.wifi.share.open:yes
-org.freedesktop.NetworkManager.settings.modify.system:yes
-org.freedesktop.NetworkManager.settings.modify.own:yes
-org.freedesktop.NetworkManager.settings.modify.hostname:yes
-org.freedesktop.NetworkManager.settings.modify.global-dns:no
-org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
org.freedesktop.NetworkManager.checkpoint-rollback:unknown
org.freedesktop.NetworkManager.enable-disable-statistics:unknown
org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
diff --git a/clients/tests/test-client.check-on-disk/test_001-021.expected b/clients/tests/test-client.check-on-disk/test_001-021.expected
index 5320e86506..f8c8ffa19f 100644
--- a/clients/tests/test-client.check-on-disk/test_001-021.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-021.expected
@@ -1,41 +1,26 @@
-location: clients/tests/test-client.py:761:test_001()/21
-cmd: $NMCLI --mode multiline general permissions
+location: clients/tests/test-client.py:764:test_001()/21
+cmd: $NMCLI --mode tabular general permissions
lang: C
returncode: 0
-stdout: 2179 bytes
+stdout: 1275 bytes
>>>
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.sleep-wake
-VALUE: no
-PERMISSION: org.freedesktop.NetworkManager.network-control
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
-VALUE: yes
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
-VALUE: no
-PERMISSION: org.freedesktop.NetworkManager.reload
-VALUE: no
-PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
-VALUE: unknown
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
-VALUE: unknown
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
-VALUE: unknown
+PERMISSION VALUE
+org.freedesktop.NetworkManager.enable-disable-network yes
+org.freedesktop.NetworkManager.enable-disable-wifi yes
+org.freedesktop.NetworkManager.enable-disable-wwan yes
+org.freedesktop.NetworkManager.enable-disable-wimax yes
+org.freedesktop.NetworkManager.sleep-wake no
+org.freedesktop.NetworkManager.network-control yes
+org.freedesktop.NetworkManager.wifi.share.protected yes
+org.freedesktop.NetworkManager.wifi.share.open yes
+org.freedesktop.NetworkManager.settings.modify.system yes
+org.freedesktop.NetworkManager.settings.modify.own yes
+org.freedesktop.NetworkManager.settings.modify.hostname yes
+org.freedesktop.NetworkManager.settings.modify.global-dns no
+org.freedesktop.NetworkManager.reload no
+org.freedesktop.NetworkManager.checkpoint-rollback unknown
+org.freedesktop.NetworkManager.enable-disable-statistics unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-022.expected b/clients/tests/test-client.check-on-disk/test_001-022.expected
index ba9c8e4d99..03f5ceffad 100644
--- a/clients/tests/test-client.check-on-disk/test_001-022.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-022.expected
@@ -1,41 +1,26 @@
-location: clients/tests/test-client.py:761:test_001()/22
-cmd: $NMCLI --mode multiline general permissions
+location: clients/tests/test-client.py:764:test_001()/22
+cmd: $NMCLI --mode tabular general permissions
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2185 bytes
+stdout: 1292 bytes
>>>
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.sleep-wake
-VALUE: nie
-PERMISSION: org.freedesktop.NetworkManager.network-control
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
-VALUE: tak
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
-VALUE: nie
-PERMISSION: org.freedesktop.NetworkManager.reload
-VALUE: nie
-PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
-VALUE: nieznane
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
-VALUE: nieznane
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
-VALUE: nieznane
+PERMISSION VALUE
+org.freedesktop.NetworkManager.enable-disable-network tak
+org.freedesktop.NetworkManager.enable-disable-wifi tak
+org.freedesktop.NetworkManager.enable-disable-wwan tak
+org.freedesktop.NetworkManager.enable-disable-wimax tak
+org.freedesktop.NetworkManager.sleep-wake nie
+org.freedesktop.NetworkManager.network-control tak
+org.freedesktop.NetworkManager.wifi.share.protected tak
+org.freedesktop.NetworkManager.wifi.share.open tak
+org.freedesktop.NetworkManager.settings.modify.system tak
+org.freedesktop.NetworkManager.settings.modify.own tak
+org.freedesktop.NetworkManager.settings.modify.hostname tak
+org.freedesktop.NetworkManager.settings.modify.global-dns nie
+org.freedesktop.NetworkManager.reload nie
+org.freedesktop.NetworkManager.checkpoint-rollback nieznane
+org.freedesktop.NetworkManager.enable-disable-statistics nieznane
+org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-023.expected b/clients/tests/test-client.check-on-disk/test_001-023.expected
index ffcc9cb8e2..426831d171 100644
--- a/clients/tests/test-client.check-on-disk/test_001-023.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-023.expected
@@ -1,60 +1,26 @@
-location: clients/tests/test-client.py:761:test_001()/23
-cmd: $NMCLI --mode multiline --pretty general permissions
+location: clients/tests/test-client.py:764:test_001()/23
+cmd: $NMCLI --mode tabular --color yes general permissions
lang: C
returncode: 0
-stdout: 3672 bytes
+stdout: 1392 bytes
>>>
-===============================================================================
- NetworkManager permissions
-===============================================================================
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.sleep-wake
-VALUE: no
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.network-control
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
-VALUE: yes
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
-VALUE: no
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.reload
-VALUE: no
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
-VALUE: unknown
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
-VALUE: unknown
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
-VALUE: unknown
--------------------------------------------------------------------------------
+PERMISSION VALUE
+org.freedesktop.NetworkManager.enable-disable-network yes
+org.freedesktop.NetworkManager.enable-disable-wifi yes
+org.freedesktop.NetworkManager.enable-disable-wwan yes
+org.freedesktop.NetworkManager.enable-disable-wimax yes
+org.freedesktop.NetworkManager.sleep-wake no
+org.freedesktop.NetworkManager.network-control yes
+org.freedesktop.NetworkManager.wifi.share.protected yes
+org.freedesktop.NetworkManager.wifi.share.open yes
+org.freedesktop.NetworkManager.settings.modify.system yes
+org.freedesktop.NetworkManager.settings.modify.own yes
+org.freedesktop.NetworkManager.settings.modify.hostname yes
+org.freedesktop.NetworkManager.settings.modify.global-dns no
+org.freedesktop.NetworkManager.reload no
+org.freedesktop.NetworkManager.checkpoint-rollback unknown
+org.freedesktop.NetworkManager.enable-disable-statistics unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-024.expected b/clients/tests/test-client.check-on-disk/test_001-024.expected
index a14523d8ea..eae545cea8 100644
--- a/clients/tests/test-client.check-on-disk/test_001-024.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-024.expected
@@ -1,60 +1,26 @@
-location: clients/tests/test-client.py:761:test_001()/24
-cmd: $NMCLI --mode multiline --pretty general permissions
+location: clients/tests/test-client.py:764:test_001()/24
+cmd: $NMCLI --mode tabular --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3683 bytes
+stdout: 1409 bytes
>>>
-===============================================================================
- Uprawnienia usługi NetworkManager
-===============================================================================
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.sleep-wake
-VALUE: nie
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.network-control
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
-VALUE: tak
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
-VALUE: nie
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.reload
-VALUE: nie
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
-VALUE: nieznane
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
-VALUE: nieznane
--------------------------------------------------------------------------------
-PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
-VALUE: nieznane
--------------------------------------------------------------------------------
+PERMISSION VALUE
+org.freedesktop.NetworkManager.enable-disable-network tak
+org.freedesktop.NetworkManager.enable-disable-wifi tak
+org.freedesktop.NetworkManager.enable-disable-wwan tak
+org.freedesktop.NetworkManager.enable-disable-wimax tak
+org.freedesktop.NetworkManager.sleep-wake nie
+org.freedesktop.NetworkManager.network-control tak
+org.freedesktop.NetworkManager.wifi.share.protected tak
+org.freedesktop.NetworkManager.wifi.share.open tak
+org.freedesktop.NetworkManager.settings.modify.system tak
+org.freedesktop.NetworkManager.settings.modify.own tak
+org.freedesktop.NetworkManager.settings.modify.hostname tak
+org.freedesktop.NetworkManager.settings.modify.global-dns nie
+org.freedesktop.NetworkManager.reload nie
+org.freedesktop.NetworkManager.checkpoint-rollback nieznane
+org.freedesktop.NetworkManager.enable-disable-statistics nieznane
+org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-025.expected b/clients/tests/test-client.check-on-disk/test_001-025.expected
index 1c8ee11f35..870db04e29 100644
--- a/clients/tests/test-client.check-on-disk/test_001-025.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-025.expected
@@ -1,41 +1,30 @@
-location: clients/tests/test-client.py:761:test_001()/25
-cmd: $NMCLI --mode multiline --terse general permissions
+location: clients/tests/test-client.py:764:test_001()/25
+cmd: $NMCLI --mode tabular --pretty general permissions
lang: C
returncode: 0
-stdout: 1171 bytes
+stdout: 1472 bytes
>>>
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.sleep-wake
-VALUE:no
-PERMISSION:org.freedesktop.NetworkManager.network-control
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.wifi.share.open
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.settings.modify.system
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.settings.modify.own
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns
-VALUE:no
-PERMISSION:org.freedesktop.NetworkManager.reload
-VALUE:no
-PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback
-VALUE:unknown
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
-VALUE:unknown
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
-VALUE:unknown
+==============================
+ NetworkManager permissions
+==============================
+PERMISSION VALUE
+---------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network yes
+org.freedesktop.NetworkManager.enable-disable-wifi yes
+org.freedesktop.NetworkManager.enable-disable-wwan yes
+org.freedesktop.NetworkManager.enable-disable-wimax yes
+org.freedesktop.NetworkManager.sleep-wake no
+org.freedesktop.NetworkManager.network-control yes
+org.freedesktop.NetworkManager.wifi.share.protected yes
+org.freedesktop.NetworkManager.wifi.share.open yes
+org.freedesktop.NetworkManager.settings.modify.system yes
+org.freedesktop.NetworkManager.settings.modify.own yes
+org.freedesktop.NetworkManager.settings.modify.hostname yes
+org.freedesktop.NetworkManager.settings.modify.global-dns no
+org.freedesktop.NetworkManager.reload no
+org.freedesktop.NetworkManager.checkpoint-rollback unknown
+org.freedesktop.NetworkManager.enable-disable-statistics unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-026.expected b/clients/tests/test-client.check-on-disk/test_001-026.expected
index 2c11a85db7..16c94f48ca 100644
--- a/clients/tests/test-client.check-on-disk/test_001-026.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-026.expected
@@ -1,41 +1,30 @@
-location: clients/tests/test-client.py:761:test_001()/26
-cmd: $NMCLI --mode multiline --terse general permissions
+location: clients/tests/test-client.py:764:test_001()/26
+cmd: $NMCLI --mode tabular --pretty general permissions
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1171 bytes
+stdout: 1519 bytes
>>>
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.sleep-wake
-VALUE:no
-PERMISSION:org.freedesktop.NetworkManager.network-control
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.wifi.share.open
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.settings.modify.system
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.settings.modify.own
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname
-VALUE:yes
-PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns
-VALUE:no
-PERMISSION:org.freedesktop.NetworkManager.reload
-VALUE:no
-PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback
-VALUE:unknown
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
-VALUE:unknown
-PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
-VALUE:unknown
+=====================================
+ Uprawnienia usługi NetworkManager
+=====================================
+PERMISSION VALUE
+-----------------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network tak
+org.freedesktop.NetworkManager.enable-disable-wifi tak
+org.freedesktop.NetworkManager.enable-disable-wwan tak
+org.freedesktop.NetworkManager.enable-disable-wimax tak
+org.freedesktop.NetworkManager.sleep-wake nie
+org.freedesktop.NetworkManager.network-control tak
+org.freedesktop.NetworkManager.wifi.share.protected tak
+org.freedesktop.NetworkManager.wifi.share.open tak
+org.freedesktop.NetworkManager.settings.modify.system tak
+org.freedesktop.NetworkManager.settings.modify.own tak
+org.freedesktop.NetworkManager.settings.modify.hostname tak
+org.freedesktop.NetworkManager.settings.modify.global-dns nie
+org.freedesktop.NetworkManager.reload nie
+org.freedesktop.NetworkManager.checkpoint-rollback nieznane
+org.freedesktop.NetworkManager.enable-disable-statistics nieznane
+org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_001-027.expected b/clients/tests/test-client.check-on-disk/test_001-027.expected
new file mode 100644
index 0000000000..1685734141
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-027.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:764:test_001()/27
+cmd: $NMCLI --mode tabular --pretty --color yes general permissions
+lang: C
+returncode: 0
+stdout: 1589 bytes
+>>>
+==============================
+ NetworkManager permissions
+==============================
+PERMISSION VALUE
+---------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network yes
+org.freedesktop.NetworkManager.enable-disable-wifi yes
+org.freedesktop.NetworkManager.enable-disable-wwan yes
+org.freedesktop.NetworkManager.enable-disable-wimax yes
+org.freedesktop.NetworkManager.sleep-wake no
+org.freedesktop.NetworkManager.network-control yes
+org.freedesktop.NetworkManager.wifi.share.protected yes
+org.freedesktop.NetworkManager.wifi.share.open yes
+org.freedesktop.NetworkManager.settings.modify.system yes
+org.freedesktop.NetworkManager.settings.modify.own yes
+org.freedesktop.NetworkManager.settings.modify.hostname yes
+org.freedesktop.NetworkManager.settings.modify.global-dns no
+org.freedesktop.NetworkManager.reload no
+org.freedesktop.NetworkManager.checkpoint-rollback unknown
+org.freedesktop.NetworkManager.enable-disable-statistics unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-028.expected b/clients/tests/test-client.check-on-disk/test_001-028.expected
new file mode 100644
index 0000000000..ab59498636
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-028.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:764:test_001()/28
+cmd: $NMCLI --mode tabular --pretty --color yes general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1636 bytes
+>>>
+=====================================
+ Uprawnienia usługi NetworkManager
+=====================================
+PERMISSION VALUE
+-----------------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network tak
+org.freedesktop.NetworkManager.enable-disable-wifi tak
+org.freedesktop.NetworkManager.enable-disable-wwan tak
+org.freedesktop.NetworkManager.enable-disable-wimax tak
+org.freedesktop.NetworkManager.sleep-wake nie
+org.freedesktop.NetworkManager.network-control tak
+org.freedesktop.NetworkManager.wifi.share.protected tak
+org.freedesktop.NetworkManager.wifi.share.open tak
+org.freedesktop.NetworkManager.settings.modify.system tak
+org.freedesktop.NetworkManager.settings.modify.own tak
+org.freedesktop.NetworkManager.settings.modify.hostname tak
+org.freedesktop.NetworkManager.settings.modify.global-dns nie
+org.freedesktop.NetworkManager.reload nie
+org.freedesktop.NetworkManager.checkpoint-rollback nieznane
+org.freedesktop.NetworkManager.enable-disable-statistics nieznane
+org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-029.expected b/clients/tests/test-client.check-on-disk/test_001-029.expected
new file mode 100644
index 0000000000..67c1cee618
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-029.expected
@@ -0,0 +1,28 @@
+location: clients/tests/test-client.py:764:test_001()/29
+cmd: $NMCLI --mode tabular --terse general permissions
+lang: C
+returncode: 0
+stdout: 899 bytes
+>>>
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-030.expected b/clients/tests/test-client.check-on-disk/test_001-030.expected
new file mode 100644
index 0000000000..e05db135f7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-030.expected
@@ -0,0 +1,28 @@
+location: clients/tests/test-client.py:764:test_001()/30
+cmd: $NMCLI --mode tabular --terse general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 899 bytes
+>>>
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-031.expected b/clients/tests/test-client.check-on-disk/test_001-031.expected
new file mode 100644
index 0000000000..11e9ff21a6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-031.expected
@@ -0,0 +1,28 @@
+location: clients/tests/test-client.py:764:test_001()/31
+cmd: $NMCLI --mode tabular --terse --color yes general permissions
+lang: C
+returncode: 0
+stdout: 1016 bytes
+>>>
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-032.expected b/clients/tests/test-client.check-on-disk/test_001-032.expected
new file mode 100644
index 0000000000..f3cd99743a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-032.expected
@@ -0,0 +1,28 @@
+location: clients/tests/test-client.py:764:test_001()/32
+cmd: $NMCLI --mode tabular --terse --color yes general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1016 bytes
+>>>
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-033.expected b/clients/tests/test-client.check-on-disk/test_001-033.expected
new file mode 100644
index 0000000000..3a92b4777d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-033.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:764:test_001()/33
+cmd: $NMCLI --mode multiline general permissions
+lang: C
+returncode: 0
+stdout: 2179 bytes
+>>>
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.sleep-wake
+VALUE: no
+PERMISSION: org.freedesktop.NetworkManager.network-control
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE: no
+PERMISSION: org.freedesktop.NetworkManager.reload
+VALUE: no
+PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE: unknown
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE: unknown
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE: unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-034.expected b/clients/tests/test-client.check-on-disk/test_001-034.expected
new file mode 100644
index 0000000000..993dcebed7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-034.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:764:test_001()/34
+cmd: $NMCLI --mode multiline general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2185 bytes
+>>>
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.sleep-wake
+VALUE: nie
+PERMISSION: org.freedesktop.NetworkManager.network-control
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE: nie
+PERMISSION: org.freedesktop.NetworkManager.reload
+VALUE: nie
+PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE: nieznane
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE: nieznane
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE: nieznane
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-035.expected b/clients/tests/test-client.check-on-disk/test_001-035.expected
new file mode 100644
index 0000000000..4e904a1980
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-035.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:764:test_001()/35
+cmd: $NMCLI --mode multiline --color yes general permissions
+lang: C
+returncode: 0
+stdout: 2296 bytes
+>>>
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.sleep-wake
+VALUE: no
+PERMISSION: org.freedesktop.NetworkManager.network-control
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE: yes
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE: no
+PERMISSION: org.freedesktop.NetworkManager.reload
+VALUE: no
+PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE: unknown
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE: unknown
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE: unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-036.expected b/clients/tests/test-client.check-on-disk/test_001-036.expected
new file mode 100644
index 0000000000..65a781e182
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-036.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:764:test_001()/36
+cmd: $NMCLI --mode multiline --color yes general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2302 bytes
+>>>
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.sleep-wake
+VALUE: nie
+PERMISSION: org.freedesktop.NetworkManager.network-control
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE: tak
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE: nie
+PERMISSION: org.freedesktop.NetworkManager.reload
+VALUE: nie
+PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE: nieznane
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE: nieznane
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE: nieznane
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-037.expected b/clients/tests/test-client.check-on-disk/test_001-037.expected
new file mode 100644
index 0000000000..c47d2ffc14
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-037.expected
@@ -0,0 +1,63 @@
+location: clients/tests/test-client.py:764:test_001()/37
+cmd: $NMCLI --mode multiline --pretty general permissions
+lang: C
+returncode: 0
+stdout: 3672 bytes
+>>>
+===============================================================================
+ NetworkManager permissions
+===============================================================================
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.sleep-wake
+VALUE: no
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.network-control
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE: no
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.reload
+VALUE: no
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE: unknown
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE: unknown
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE: unknown
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-038.expected b/clients/tests/test-client.check-on-disk/test_001-038.expected
new file mode 100644
index 0000000000..f45ac7f4bd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-038.expected
@@ -0,0 +1,63 @@
+location: clients/tests/test-client.py:764:test_001()/38
+cmd: $NMCLI --mode multiline --pretty general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3683 bytes
+>>>
+===============================================================================
+ Uprawnienia usługi NetworkManager
+===============================================================================
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.sleep-wake
+VALUE: nie
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.network-control
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE: nie
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.reload
+VALUE: nie
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE: nieznane
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE: nieznane
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE: nieznane
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-039.expected b/clients/tests/test-client.check-on-disk/test_001-039.expected
new file mode 100644
index 0000000000..3a0c35db8b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-039.expected
@@ -0,0 +1,63 @@
+location: clients/tests/test-client.py:764:test_001()/39
+cmd: $NMCLI --mode multiline --pretty --color yes general permissions
+lang: C
+returncode: 0
+stdout: 3789 bytes
+>>>
+===============================================================================
+ NetworkManager permissions
+===============================================================================
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.sleep-wake
+VALUE: no
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.network-control
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE: yes
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE: no
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.reload
+VALUE: no
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE: unknown
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE: unknown
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE: unknown
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-040.expected b/clients/tests/test-client.check-on-disk/test_001-040.expected
new file mode 100644
index 0000000000..057d27232f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-040.expected
@@ -0,0 +1,63 @@
+location: clients/tests/test-client.py:764:test_001()/40
+cmd: $NMCLI --mode multiline --pretty --color yes general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3800 bytes
+>>>
+===============================================================================
+ Uprawnienia usługi NetworkManager
+===============================================================================
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-network
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.sleep-wake
+VALUE: nie
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.network-control
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.protected
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.wifi.share.open
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.system
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.own
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE: tak
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE: nie
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.reload
+VALUE: nie
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE: nieznane
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE: nieznane
+-------------------------------------------------------------------------------
+PERMISSION: org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE: nieznane
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-041.expected b/clients/tests/test-client.check-on-disk/test_001-041.expected
new file mode 100644
index 0000000000..99fd6fc947
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-041.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:764:test_001()/41
+cmd: $NMCLI --mode multiline --terse general permissions
+lang: C
+returncode: 0
+stdout: 1171 bytes
+>>>
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.sleep-wake
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.network-control
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.open
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.system
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.own
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.reload
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-042.expected b/clients/tests/test-client.check-on-disk/test_001-042.expected
new file mode 100644
index 0000000000..40e9170784
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-042.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:764:test_001()/42
+cmd: $NMCLI --mode multiline --terse general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1171 bytes
+>>>
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.sleep-wake
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.network-control
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.open
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.system
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.own
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.reload
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-043.expected b/clients/tests/test-client.check-on-disk/test_001-043.expected
new file mode 100644
index 0000000000..a51f357d60
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-043.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:764:test_001()/43
+cmd: $NMCLI --mode multiline --terse --color yes general permissions
+lang: C
+returncode: 0
+stdout: 1288 bytes
+>>>
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.sleep-wake
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.network-control
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.open
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.system
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.own
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.reload
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-044.expected b/clients/tests/test-client.check-on-disk/test_001-044.expected
new file mode 100644
index 0000000000..a6f79c9d47
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-044.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:764:test_001()/44
+cmd: $NMCLI --mode multiline --terse --color yes general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1288 bytes
+>>>
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.sleep-wake
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.network-control
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.open
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.system
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.own
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.reload
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-001.expected b/clients/tests/test-client.check-on-disk/test_002-001.expected
index c952c9c992..70fe6961ba 100644
--- a/clients/tests/test-client.check-on-disk/test_002-001.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-001.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:766:test_002()/1
+location: clients/tests/test-client.py:769:test_002()/1
cmd: $NMCLI d
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-002.expected b/clients/tests/test-client.check-on-disk/test_002-002.expected
index 6b244d5eac..3177caf7c7 100644
--- a/clients/tests/test-client.check-on-disk/test_002-002.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-002.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:766:test_002()/2
+location: clients/tests/test-client.py:769:test_002()/2
cmd: $NMCLI d
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected
index f406aa70ae..7dd5531201 100644
--- a/clients/tests/test-client.check-on-disk/test_002-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-003.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:768:test_002()/3
+location: clients/tests/test-client.py:771:test_002()/3
cmd: $NMCLI -f all d
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected
index b1cfa7ae84..b33ab8c3d7 100644
--- a/clients/tests/test-client.check-on-disk/test_002-004.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-004.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:768:test_002()/4
+location: clients/tests/test-client.py:771:test_002()/4
cmd: $NMCLI -f all d
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected
index 144b39089c..75eddf5993 100644
--- a/clients/tests/test-client.check-on-disk/test_002-005.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-005.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:770:test_002()/5
+location: clients/tests/test-client.py:773:test_002()/5
cmd: $NMCLI
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected
index f1a229bac6..3e31a151f2 100644
--- a/clients/tests/test-client.check-on-disk/test_002-006.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-006.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:770:test_002()/6
+location: clients/tests/test-client.py:773:test_002()/6
cmd: $NMCLI
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected
index e522a6bce4..54d7fda02f 100644
--- a/clients/tests/test-client.check-on-disk/test_002-007.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-007.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:772:test_002()/7
+location: clients/tests/test-client.py:775:test_002()/7
cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected
index 9fb89b1a83..e1cf26e130 100644
--- a/clients/tests/test-client.check-on-disk/test_002-008.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-008.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:772:test_002()/8
+location: clients/tests/test-client.py:775:test_002()/8
cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected
index 6db902aac6..749e484cfa 100644
--- a/clients/tests/test-client.check-on-disk/test_002-009.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-009.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:773:test_002()/9
+location: clients/tests/test-client.py:776:test_002()/9
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected
index fac540eace..1ca08eac07 100644
--- a/clients/tests/test-client.check-on-disk/test_002-010.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-010.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:773:test_002()/10
+location: clients/tests/test-client.py:776:test_002()/10
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected
index 1e7952d4fd..d5d5097011 100644
--- a/clients/tests/test-client.check-on-disk/test_002-011.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-011.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:774:test_002()/11
+location: clients/tests/test-client.py:777:test_002()/11
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected
index 8476e6934c..79f68f1c67 100644
--- a/clients/tests/test-client.check-on-disk/test_002-012.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-012.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:774:test_002()/12
+location: clients/tests/test-client.py:777:test_002()/12
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected
index 58e2204883..ad49477ccd 100644
--- a/clients/tests/test-client.check-on-disk/test_002-013.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-013.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:775:test_002()/13
+location: clients/tests/test-client.py:778:test_002()/13
cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected
index 6d8126d6f2..14af8ed750 100644
--- a/clients/tests/test-client.check-on-disk/test_002-014.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-014.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:775:test_002()/14
+location: clients/tests/test-client.py:778:test_002()/14
cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected
index 3806f6b373..423ea2c6a3 100644
--- a/clients/tests/test-client.check-on-disk/test_002-015.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-015.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:776:test_002()/15
+location: clients/tests/test-client.py:779:test_002()/15
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected
index 8eab14576e..27a0d4a642 100644
--- a/clients/tests/test-client.check-on-disk/test_002-016.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-016.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:776:test_002()/16
+location: clients/tests/test-client.py:779:test_002()/16
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected
index f0119718ea..dc1dd2a527 100644
--- a/clients/tests/test-client.check-on-disk/test_002-017.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-017.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:777:test_002()/17
+location: clients/tests/test-client.py:780:test_002()/17
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected
index 61528cb9c9..6308ae39dc 100644
--- a/clients/tests/test-client.check-on-disk/test_002-018.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-018.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:777:test_002()/18
+location: clients/tests/test-client.py:780:test_002()/18
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected
index a45f657ac0..ecc50f9f18 100644
--- a/clients/tests/test-client.check-on-disk/test_002-019.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-019.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:779:test_002()/19
+location: clients/tests/test-client.py:782:test_002()/19
cmd: $NMCLI -f ALL d wifi
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected
index cabc853dae..81164f55d2 100644
--- a/clients/tests/test-client.check-on-disk/test_002-020.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-020.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:779:test_002()/20
+location: clients/tests/test-client.py:782:test_002()/20
cmd: $NMCLI -f ALL d wifi
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected
index fd5c1542c8..85a6262629 100644
--- a/clients/tests/test-client.check-on-disk/test_002-021.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-021.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:781:test_002()/21
+location: clients/tests/test-client.py:784:test_002()/21
cmd: $NMCLI c
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected
index cea22e1d26..f0de2a1ae8 100644
--- a/clients/tests/test-client.check-on-disk/test_002-022.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-022.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:781:test_002()/22
+location: clients/tests/test-client.py:784:test_002()/22
cmd: $NMCLI c
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected
index 60b138d338..7eefdc183a 100644
--- a/clients/tests/test-client.check-on-disk/test_002-023.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-023.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:783:test_002()/23
+location: clients/tests/test-client.py:786:test_002()/23
cmd: $NMCLI c s con-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected
index 2527453fd2..576f00a9c3 100644
--- a/clients/tests/test-client.check-on-disk/test_002-024.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-024.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:783:test_002()/24
+location: clients/tests/test-client.py:786:test_002()/24
cmd: $NMCLI c s con-1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected
index a83e8adf18..220608dac4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-001.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-001.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:793:test_003()/1
+location: clients/tests/test-client.py:796:test_003()/1
cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-002.expected b/clients/tests/test-client.check-on-disk/test_003-002.expected
index fe5b3d79f1..ba2a858b4f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-002.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-002.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:796:test_003()/2
+location: clients/tests/test-client.py:799:test_003()/2
cmd: $NMCLI c s
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-003.expected b/clients/tests/test-client.check-on-disk/test_003-003.expected
index ef70c51625..a6f1a6c9f3 100644
--- a/clients/tests/test-client.check-on-disk/test_003-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-003.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:796:test_003()/3
+location: clients/tests/test-client.py:799:test_003()/3
cmd: $NMCLI c s
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected
index 74844be802..714ce08268 100644
--- a/clients/tests/test-client.check-on-disk/test_003-004.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-004.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:801:test_003()/4
+location: clients/tests/test-client.py:804:test_003()/4
cmd: $NMCLI c add type ethernet ifname '*'
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected
index 1a116f0eac..1efd225f6b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-005.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-005.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:804:test_003()/5
+location: clients/tests/test-client.py:807:test_003()/5
cmd: $NMCLI c s
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected
index 592b92e3a3..6c03d44359 100644
--- a/clients/tests/test-client.check-on-disk/test_003-006.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-006.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:804:test_003()/6
+location: clients/tests/test-client.py:807:test_003()/6
cmd: $NMCLI c s
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected
index 44ad709740..0bc3568ea4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-007.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-007.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:807:test_003()/7
+location: clients/tests/test-client.py:810:test_003()/7
cmd: $NMCLI -f ALL c s
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected
index d9933f37e7..2e2bdf0493 100644
--- a/clients/tests/test-client.check-on-disk/test_003-008.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-008.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:807:test_003()/8
+location: clients/tests/test-client.py:810:test_003()/8
cmd: $NMCLI -f ALL c s
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected
index 5eb0bcaefc..213a84081a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-009.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-009.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:811:test_003()/9
+location: clients/tests/test-client.py:814:test_003()/9
cmd: $NMCLI --complete-args -f ALL c s ''
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected
index 97792be69c..5aec69901e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-010.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-010.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:811:test_003()/10
+location: clients/tests/test-client.py:814:test_003()/10
cmd: $NMCLI --complete-args -f ALL c s ''
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected
index 2e7928755b..5435fc2eff 100644
--- a/clients/tests/test-client.check-on-disk/test_003-011.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-011.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:824:test_003()/11
+location: clients/tests/test-client.py:827:test_003()/11
cmd: $NMCLI con up ethernet ifname eth0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected
index 0902837e0c..84f6d3e386 100644
--- a/clients/tests/test-client.check-on-disk/test_003-012.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-012.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:827:test_003()/12
+location: clients/tests/test-client.py:830:test_003()/12
cmd: $NMCLI con
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected
index 458cfde515..20d5fddff3 100644
--- a/clients/tests/test-client.check-on-disk/test_003-013.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-013.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:827:test_003()/13
+location: clients/tests/test-client.py:830:test_003()/13
cmd: $NMCLI con
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected
index 10a90feea1..3ec9c97257 100644
--- a/clients/tests/test-client.check-on-disk/test_003-014.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-014.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:830:test_003()/14
+location: clients/tests/test-client.py:833:test_003()/14
cmd: $NMCLI -f ALL con
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected
index ea80926ddb..1305e41ffa 100644
--- a/clients/tests/test-client.check-on-disk/test_003-015.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-015.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:830:test_003()/15
+location: clients/tests/test-client.py:833:test_003()/15
cmd: $NMCLI -f ALL con
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected
index b68edc98d8..0d876a40a7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-016.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-016.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:833:test_003()/16
+location: clients/tests/test-client.py:836:test_003()/16
cmd: $NMCLI -f ALL con s -a
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected
index aa621f28ba..ebbecb7740 100644
--- a/clients/tests/test-client.check-on-disk/test_003-017.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-017.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:833:test_003()/17
+location: clients/tests/test-client.py:836:test_003()/17
cmd: $NMCLI -f ALL con s -a
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected
index 3d99a00051..e67910bfbb 100644
--- a/clients/tests/test-client.check-on-disk/test_003-018.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-018.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:836:test_003()/18
+location: clients/tests/test-client.py:839:test_003()/18
cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected
index aabab1546c..aad5005ad7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-019.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-019.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:836:test_003()/19
+location: clients/tests/test-client.py:839:test_003()/19
cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected
index 5575cca52e..2aef21dd9f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-020.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-020.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:839:test_003()/20
+location: clients/tests/test-client.py:842:test_003()/20
cmd: $NMCLI -f UUID,NAME con s --active
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected
index 4ff536cc96..66a16f8f80 100644
--- a/clients/tests/test-client.check-on-disk/test_003-021.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-021.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:839:test_003()/21
+location: clients/tests/test-client.py:842:test_003()/21
cmd: $NMCLI -f UUID,NAME con s --active
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected
index 18c83c0a88..66d220c02a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-022.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-022.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:842:test_003()/22
+location: clients/tests/test-client.py:845:test_003()/22
cmd: $NMCLI -f ALL con s ethernet
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected
index 9479645049..e1c17a655f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-023.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-023.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:842:test_003()/23
+location: clients/tests/test-client.py:845:test_003()/23
cmd: $NMCLI -f ALL con s ethernet
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected
index cf69887490..04040f2fa2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-024.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-024.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:845:test_003()/24
+location: clients/tests/test-client.py:848:test_003()/24
cmd: $NMCLI -f GENERAL.STATE con s ethernet
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected
index 8e0eef21a1..4ac2a3e362 100644
--- a/clients/tests/test-client.check-on-disk/test_003-025.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-025.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:845:test_003()/25
+location: clients/tests/test-client.py:848:test_003()/25
cmd: $NMCLI -f GENERAL.STATE con s ethernet
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected
index c6639a345d..3889b24c15 100644
--- a/clients/tests/test-client.check-on-disk/test_003-026.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-026.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:848:test_003()/26
+location: clients/tests/test-client.py:851:test_003()/26
cmd: $NMCLI con s ethernet
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected
index ad84cdb1fe..cb93f0084d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-027.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-027.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:848:test_003()/27
+location: clients/tests/test-client.py:851:test_003()/27
cmd: $NMCLI con s ethernet
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected
index c3f04638d2..fabf145379 100644
--- a/clients/tests/test-client.check-on-disk/test_003-028.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-028.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:851:test_003()/28
+location: clients/tests/test-client.py:854:test_003()/28
cmd: $NMCLI -f ALL dev s eth0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected
index 106886304c..8fb46e9ab4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-029.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-029.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:851:test_003()/29
+location: clients/tests/test-client.py:854:test_003()/29
cmd: $NMCLI -f ALL dev s eth0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected
index b9b9ad23f1..f1cbde6948 100644
--- a/clients/tests/test-client.check-on-disk/test_003-030.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-030.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:854:test_003()/30
+location: clients/tests/test-client.py:857:test_003()/30
cmd: $NMCLI -f ALL dev show eth0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected
index 29485ead13..1b72213135 100644
--- a/clients/tests/test-client.check-on-disk/test_003-031.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-031.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:854:test_003()/31
+location: clients/tests/test-client.py:857:test_003()/31
cmd: $NMCLI -f ALL dev show eth0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected
index 8ce56ad7eb..7d48972fc4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-032.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-032.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:857:test_003()/32
+location: clients/tests/test-client.py:860:test_003()/32
cmd: $NMCLI -f ALL -t dev show eth0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected
index 9b9ca5e1ea..9097c18898 100644
--- a/clients/tests/test-client.check-on-disk/test_003-033.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-033.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:857:test_003()/33
+location: clients/tests/test-client.py:860:test_003()/33
cmd: $NMCLI -f ALL -t dev show eth0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected
index ab807e0d4a..90ddd7950e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-034.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-034.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:824:test_003()/34
+location: clients/tests/test-client.py:827:test_003()/34
cmd: $NMCLI con up ethernet ifname eth1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected
index b1b6093256..9bbb7bc86a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-035.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-035.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:827:test_003()/35
+location: clients/tests/test-client.py:830:test_003()/35
cmd: $NMCLI con
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected
index 8cf42cf9bb..a986a2f3cc 100644
--- a/clients/tests/test-client.check-on-disk/test_003-036.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-036.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:827:test_003()/36
+location: clients/tests/test-client.py:830:test_003()/36
cmd: $NMCLI con
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected
index 2eebd4a442..f1c9665df9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-037.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-037.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:830:test_003()/37
+location: clients/tests/test-client.py:833:test_003()/37
cmd: $NMCLI -f ALL con
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected
index a6b4b45987..252dd6c7d4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-038.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-038.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:830:test_003()/38
+location: clients/tests/test-client.py:833:test_003()/38
cmd: $NMCLI -f ALL con
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected
index 337735b1f1..faa26ee053 100644
--- a/clients/tests/test-client.check-on-disk/test_003-039.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-039.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:833:test_003()/39
+location: clients/tests/test-client.py:836:test_003()/39
cmd: $NMCLI -f ALL con s -a
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected
index 97be1db4c8..e0e0403745 100644
--- a/clients/tests/test-client.check-on-disk/test_003-040.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-040.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:833:test_003()/40
+location: clients/tests/test-client.py:836:test_003()/40
cmd: $NMCLI -f ALL con s -a
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected
index 1fa2aa6f1f..3ddd18659b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-041.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-041.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:836:test_003()/41
+location: clients/tests/test-client.py:839:test_003()/41
cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected
index df90c8f530..0a3bb7fca1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-042.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-042.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:836:test_003()/42
+location: clients/tests/test-client.py:839:test_003()/42
cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected
index afbe5ad28c..d11eefe4a7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-043.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-043.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:839:test_003()/43
+location: clients/tests/test-client.py:842:test_003()/43
cmd: $NMCLI -f UUID,NAME con s --active
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected
index 260cab5394..6d57c4499d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-044.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-044.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:839:test_003()/44
+location: clients/tests/test-client.py:842:test_003()/44
cmd: $NMCLI -f UUID,NAME con s --active
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected
index bd8a830650..436284d526 100644
--- a/clients/tests/test-client.check-on-disk/test_003-045.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-045.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:842:test_003()/45
+location: clients/tests/test-client.py:845:test_003()/45
cmd: $NMCLI -f ALL con s ethernet
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected
index a5dad0081b..8f0dcfa75a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-046.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-046.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:842:test_003()/46
+location: clients/tests/test-client.py:845:test_003()/46
cmd: $NMCLI -f ALL con s ethernet
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected
index 0e555c1023..1b80990c94 100644
--- a/clients/tests/test-client.check-on-disk/test_003-047.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-047.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:845:test_003()/47
+location: clients/tests/test-client.py:848:test_003()/47
cmd: $NMCLI -f GENERAL.STATE con s ethernet
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected
index 60f33d7172..3eda98c648 100644
--- a/clients/tests/test-client.check-on-disk/test_003-048.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-048.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:845:test_003()/48
+location: clients/tests/test-client.py:848:test_003()/48
cmd: $NMCLI -f GENERAL.STATE con s ethernet
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected
index 30f80a576e..3cd73e5a9d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-049.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-049.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:848:test_003()/49
+location: clients/tests/test-client.py:851:test_003()/49
cmd: $NMCLI con s ethernet
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected
index 892e7a8bb0..187ff13fc3 100644
--- a/clients/tests/test-client.check-on-disk/test_003-050.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-050.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:848:test_003()/50
+location: clients/tests/test-client.py:851:test_003()/50
cmd: $NMCLI con s ethernet
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected
index 2f2e7b11b8..af822fb88b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-051.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-051.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:851:test_003()/51
+location: clients/tests/test-client.py:854:test_003()/51
cmd: $NMCLI -f ALL dev s eth0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected
index b9c637da5a..118e15dd09 100644
--- a/clients/tests/test-client.check-on-disk/test_003-052.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-052.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:851:test_003()/52
+location: clients/tests/test-client.py:854:test_003()/52
cmd: $NMCLI -f ALL dev s eth0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected
index 70ff8521a8..57563e1343 100644
--- a/clients/tests/test-client.check-on-disk/test_003-053.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-053.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:854:test_003()/53
+location: clients/tests/test-client.py:857:test_003()/53
cmd: $NMCLI -f ALL dev show eth0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected
index 9faf56e719..219d57f719 100644
--- a/clients/tests/test-client.check-on-disk/test_003-054.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-054.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:854:test_003()/54
+location: clients/tests/test-client.py:857:test_003()/54
cmd: $NMCLI -f ALL dev show eth0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected
index be42aa0c86..5518745d2e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-055.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-055.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:857:test_003()/55
+location: clients/tests/test-client.py:860:test_003()/55
cmd: $NMCLI -f ALL -t dev show eth0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected
index 021c75c59b..6d761c8ad0 100644
--- a/clients/tests/test-client.check-on-disk/test_003-056.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-056.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:857:test_003()/56
+location: clients/tests/test-client.py:860:test_003()/56
cmd: $NMCLI -f ALL -t dev show eth0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected
index 1e9f0061d2..d5a8f3b385 100644
--- a/clients/tests/test-client.check-on-disk/test_003-057.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-057.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:872:test_003()/57
+location: clients/tests/test-client.py:875:test_003()/57
cmd: $NMCLI -f ALL con
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected
index b3abce066f..4afb9a3528 100644
--- a/clients/tests/test-client.check-on-disk/test_003-058.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-058.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:872:test_003()/58
+location: clients/tests/test-client.py:875:test_003()/58
cmd: $NMCLI -f ALL con
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected
index 944ef20116..5c1d16475d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-059.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-059.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:875:test_003()/59
+location: clients/tests/test-client.py:878:test_003()/59
cmd: $NMCLI -f UUID,TYPE con
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected
index 355ff66d1a..c5b5f0e27b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-060.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-060.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:875:test_003()/60
+location: clients/tests/test-client.py:878:test_003()/60
cmd: $NMCLI -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected
index d74517be32..23d1cd4bd1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-061.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-061.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:878:test_003()/61
+location: clients/tests/test-client.py:881:test_003()/61
cmd: $NMCLI con s ethernet
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected
index bbd78c78ca..89e7675033 100644
--- a/clients/tests/test-client.check-on-disk/test_003-062.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-062.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:878:test_003()/62
+location: clients/tests/test-client.py:881:test_003()/62
cmd: $NMCLI con s ethernet
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected
index 1661815199..08adb3e5e8 100644
--- a/clients/tests/test-client.check-on-disk/test_003-063.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-063.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:881:test_003()/63
+location: clients/tests/test-client.py:884:test_003()/63
cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected
index d84e6d893d..d9ac9561f3 100644
--- a/clients/tests/test-client.check-on-disk/test_003-064.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-064.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:881:test_003()/64
+location: clients/tests/test-client.py:884:test_003()/64
cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected
index 436fcaef40..a796f5d27f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-065.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-065.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:884:test_003()/65
+location: clients/tests/test-client.py:887:test_003()/65
cmd: $NMCLI -f all dev show eth0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected
index a42374ddfd..ecd1d5b5c9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-066.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-066.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:884:test_003()/66
+location: clients/tests/test-client.py:887:test_003()/66
cmd: $NMCLI -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected
index 465ef3d73e..7e3fb82926 100644
--- a/clients/tests/test-client.check-on-disk/test_003-067.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-067.expected
@@ -1,16 +1,12 @@
-location: clients/tests/test-client.py:872:test_003()/67
-cmd: $NMCLI --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/67
+cmd: $NMCLI --color yes -f ALL con
lang: C
returncode: 0
-stdout: 2092 bytes
+stdout: 1885 bytes
>>>
-======================================
- NetworkManager connection profiles
-======================================
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected
index a0e8e04843..78f2bbc534 100644
--- a/clients/tests/test-client.check-on-disk/test_003-068.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-068.expected
@@ -1,16 +1,12 @@
-location: clients/tests/test-client.py:872:test_003()/68
-cmd: $NMCLI --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/68
+cmd: $NMCLI --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2124 bytes
+stdout: 1895 bytes
>>>
-==========================================
- Profile połączeń usługi NetworkManager
-==========================================
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected
index 5e4510f2e7..5914803aaa 100644
--- a/clients/tests/test-client.check-on-disk/test_003-069.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-069.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:875:test_003()/69
-cmd: $NMCLI --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/69
+cmd: $NMCLI --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 394 bytes
+stdout: 210 bytes
>>>
-======================================
- NetworkManager connection profiles
-======================================
UUID TYPE
---------------------------------------------------------------------------------------
-UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected
index 66bb6f2ef6..c9f40d36a9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-070.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-070.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:875:test_003()/70
-cmd: $NMCLI --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/70
+cmd: $NMCLI --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 414 bytes
+stdout: 210 bytes
>>>
-==========================================
- Profile połączeń usługi NetworkManager
-==========================================
UUID TYPE
-------------------------------------------------------------------------------------------
-UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected
index 5319cd7e3f..2470b37243 100644
--- a/clients/tests/test-client.check-on-disk/test_003-071.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-071.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:878:test_003()/71
-cmd: $NMCLI --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/71
+cmd: $NMCLI --color yes con s ethernet
lang: C
returncode: 0
-stdout: 6136 bytes
+stdout: 4891 bytes
>>>
-===============================================================================
- Connection profile details (ethernet)
-===============================================================================
connection.id: ethernet
connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
connection.stable-id: --
@@ -28,7 +25,6 @@ connection.gateway-ping-timeout: 0
connection.metered: unknown
connection.lldp: default
connection.mdns: -1 (default)
--------------------------------------------------------------------------------
802-3-ethernet.port: --
802-3-ethernet.speed: 0
802-3-ethernet.duplex: --
@@ -43,7 +39,6 @@ connection.mdns: -1 (default)
802-3-ethernet.s390-options: --
802-3-ethernet.wake-on-lan: default
802-3-ethernet.wake-on-lan-password: --
--------------------------------------------------------------------------------
ipv4.method: auto
ipv4.dns: --
ipv4.dns-search: --
@@ -64,7 +59,6 @@ ipv4.dhcp-fqdn: --
ipv4.never-default: no
ipv4.may-fail: yes
ipv4.dad-timeout: -1 (default)
--------------------------------------------------------------------------------
ipv6.method: auto
ipv6.dns: --
ipv6.dns-search: --
@@ -85,15 +79,10 @@ ipv6.dhcp-duid: --
ipv6.dhcp-send-hostname: yes
ipv6.dhcp-hostname: --
ipv6.token: --
--------------------------------------------------------------------------------
proxy.method: none
proxy.browser-only: no
proxy.pac-url: --
proxy.pac-script: --
--------------------------------------------------------------------------------
-===============================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
GENERAL.NAME: ethernet
GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES: eth1
@@ -106,11 +95,7 @@ GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveCo
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
GENERAL.ZONE: --
GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
-===============================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
GENERAL.NAME: ethernet
GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES: eth0
@@ -123,7 +108,6 @@ GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveCo
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
GENERAL.ZONE: --
GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected
index e0617be493..5c643aeafd 100644
--- a/clients/tests/test-client.check-on-disk/test_003-072.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-072.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:878:test_003()/72
-cmd: $NMCLI --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/72
+cmd: $NMCLI --color yes con s ethernet
lang: pl_PL.UTF-8
returncode: 0
-stdout: 6182 bytes
+stdout: 4918 bytes
>>>
-===============================================================================
- Szczegóły profilu połączenia (ethernet)
-===============================================================================
connection.id: ethernet
connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
connection.stable-id: --
@@ -28,7 +25,6 @@ connection.gateway-ping-timeout: 0
connection.metered: nieznane
connection.lldp: default
connection.mdns: -1 (default)
--------------------------------------------------------------------------------
802-3-ethernet.port: --
802-3-ethernet.speed: 0
802-3-ethernet.duplex: --
@@ -43,7 +39,6 @@ connection.mdns: -1 (default)
802-3-ethernet.s390-options: --
802-3-ethernet.wake-on-lan: default
802-3-ethernet.wake-on-lan-password: --
--------------------------------------------------------------------------------
ipv4.method: auto
ipv4.dns: --
ipv4.dns-search: --
@@ -64,7 +59,6 @@ ipv4.dhcp-fqdn: --
ipv4.never-default: nie
ipv4.may-fail: tak
ipv4.dad-timeout: -1 (default)
--------------------------------------------------------------------------------
ipv6.method: auto
ipv6.dns: --
ipv6.dns-search: --
@@ -85,15 +79,10 @@ ipv6.dhcp-duid: --
ipv6.dhcp-send-hostname: tak
ipv6.dhcp-hostname: --
ipv6.token: --
--------------------------------------------------------------------------------
proxy.method: none
proxy.browser-only: nie
proxy.pac-url: --
proxy.pac-script: --
--------------------------------------------------------------------------------
-===============================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
GENERAL.NAME: ethernet
GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES: eth1
@@ -106,11 +95,7 @@ GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveCo
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
GENERAL.ZONE: --
GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
-===============================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
GENERAL.NAME: ethernet
GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES: eth0
@@ -123,7 +108,6 @@ GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveCo
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
GENERAL.ZONE: --
GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected
index 019a6a3bd1..1fed6802aa 100644
--- a/clients/tests/test-client.check-on-disk/test_003-073.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-073.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:881:test_003()/73
-cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/73
+cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 5158 bytes
+stdout: 4226 bytes
>>>
-===============================================================================
- Connection profile details (ethernet)
-===============================================================================
connection.id: ethernet
connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
connection.stable-id: --
@@ -28,7 +25,6 @@ connection.gateway-ping-timeout: 0
connection.metered: unknown
connection.lldp: default
connection.mdns: -1 (default)
--------------------------------------------------------------------------------
802-3-ethernet.port: --
802-3-ethernet.speed: 0
802-3-ethernet.duplex: --
@@ -43,7 +39,6 @@ connection.mdns: -1 (default)
802-3-ethernet.s390-options: --
802-3-ethernet.wake-on-lan: default
802-3-ethernet.wake-on-lan-password: --
--------------------------------------------------------------------------------
ipv4.method: auto
ipv4.dns: --
ipv4.dns-search: --
@@ -64,7 +59,6 @@ ipv4.dhcp-fqdn: --
ipv4.never-default: no
ipv4.may-fail: yes
ipv4.dad-timeout: -1 (default)
--------------------------------------------------------------------------------
ipv6.method: auto
ipv6.dns: --
ipv6.dns-search: --
@@ -85,15 +79,10 @@ ipv6.dhcp-duid: --
ipv6.dhcp-send-hostname: yes
ipv6.dhcp-hostname: --
ipv6.token: --
--------------------------------------------------------------------------------
proxy.method: none
proxy.browser-only: no
proxy.pac-url: --
proxy.pac-script: --
--------------------------------------------------------------------------------
-===============================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
GENERAL.NAME: ethernet
GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES: eth0
@@ -106,7 +95,6 @@ GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveCo
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
GENERAL.ZONE: --
GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected
index dd2afbe8d8..49416603ad 100644
--- a/clients/tests/test-client.check-on-disk/test_003-074.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-074.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:881:test_003()/74
-cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/74
+cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 5193 bytes
+stdout: 4249 bytes
>>>
-===============================================================================
- Szczegóły profilu połączenia (ethernet)
-===============================================================================
connection.id: ethernet
connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
connection.stable-id: --
@@ -28,7 +25,6 @@ connection.gateway-ping-timeout: 0
connection.metered: nieznane
connection.lldp: default
connection.mdns: -1 (default)
--------------------------------------------------------------------------------
802-3-ethernet.port: --
802-3-ethernet.speed: 0
802-3-ethernet.duplex: --
@@ -43,7 +39,6 @@ connection.mdns: -1 (default)
802-3-ethernet.s390-options: --
802-3-ethernet.wake-on-lan: default
802-3-ethernet.wake-on-lan-password: --
--------------------------------------------------------------------------------
ipv4.method: auto
ipv4.dns: --
ipv4.dns-search: --
@@ -64,7 +59,6 @@ ipv4.dhcp-fqdn: --
ipv4.never-default: nie
ipv4.may-fail: tak
ipv4.dad-timeout: -1 (default)
--------------------------------------------------------------------------------
ipv6.method: auto
ipv6.dns: --
ipv6.dns-search: --
@@ -85,15 +79,10 @@ ipv6.dhcp-duid: --
ipv6.dhcp-send-hostname: tak
ipv6.dhcp-hostname: --
ipv6.token: --
--------------------------------------------------------------------------------
proxy.method: none
proxy.browser-only: nie
proxy.pac-url: --
proxy.pac-script: --
--------------------------------------------------------------------------------
-===============================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
GENERAL.NAME: ethernet
GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES: eth0
@@ -106,7 +95,6 @@ GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveCo
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
GENERAL.ZONE: --
GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected
index 3758125947..716b49f5ae 100644
--- a/clients/tests/test-client.check-on-disk/test_003-075.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-075.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:884:test_003()/75
-cmd: $NMCLI --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/75
+cmd: $NMCLI --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 4090 bytes
+stdout: 3239 bytes
>>>
-===============================================================================
- Device details (eth0)
-===============================================================================
GENERAL.DEVICE: eth0
GENERAL.TYPE: ethernet
GENERAL.NM-TYPE: NMDeviceEthernet
@@ -31,14 +28,11 @@ GENERAL.CONNECTION: ethernet
GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
GENERAL.METERED: unknown
--------------------------------------------------------------------------------
CAPABILITIES.CARRIER-DETECT: no
CAPABILITIES.SPEED: 100 Mb/s
CAPABILITIES.IS-SOFTWARE: no
CAPABILITIES.SRIOV: no
--------------------------------------------------------------------------------
WIRED-PROPERTIES.CARRIER: off
--------------------------------------------------------------------------------
IP4.ADDRESS[1]: 192.168.6.238/29
IP4.GATEWAY: --
IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
@@ -47,8 +41,6 @@ IP4.DNS[1]: 192.168.213.113
IP4.DOMAIN[1]: sear4.foo4.bar
IP4.WINS[1]: 192.168.156.115
IP4.WINS[2]: 192.168.8.33
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
@@ -59,17 +51,14 @@ IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
IP6.DOMAIN[1]: sear6.fo.x.y
IP6.DOMAIN[2]: sear6.foo4.bar
--------------------------------------------------------------------------------
DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
--------------------------------------------------------------------------------
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected
index d8302d88c7..e6d504e3ff 100644
--- a/clients/tests/test-client.check-on-disk/test_003-076.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-076.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:884:test_003()/76
-cmd: $NMCLI --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/76
+cmd: $NMCLI --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4119 bytes
+stdout: 3262 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (eth0)
-===============================================================================
GENERAL.DEVICE: eth0
GENERAL.TYPE: ethernet
GENERAL.NM-TYPE: NMDeviceEthernet
@@ -31,14 +28,11 @@ GENERAL.CONNECTION: ethernet
GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
GENERAL.METERED: nieznane
--------------------------------------------------------------------------------
CAPABILITIES.CARRIER-DETECT: nie
CAPABILITIES.SPEED: 100 Mb/s
CAPABILITIES.IS-SOFTWARE: nie
CAPABILITIES.SRIOV: nie
--------------------------------------------------------------------------------
WIRED-PROPERTIES.CARRIER: wyłączone
--------------------------------------------------------------------------------
IP4.ADDRESS[1]: 192.168.6.238/29
IP4.GATEWAY: --
IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
@@ -47,8 +41,6 @@ IP4.DNS[1]: 192.168.213.113
IP4.DOMAIN[1]: sear4.foo4.bar
IP4.WINS[1]: 192.168.156.115
IP4.WINS[2]: 192.168.8.33
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
@@ -59,17 +51,14 @@ IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
IP6.DOMAIN[1]: sear6.fo.x.y
IP6.DOMAIN[2]: sear6.foo4.bar
--------------------------------------------------------------------------------
DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
--------------------------------------------------------------------------------
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected
index 76c3e37518..d88f390202 100644
--- a/clients/tests/test-client.check-on-disk/test_003-077.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-077.expected
@@ -1,13 +1,18 @@
-location: clients/tests/test-client.py:872:test_003()/77
-cmd: $NMCLI --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/77
+cmd: $NMCLI --pretty -f ALL con
lang: C
returncode: 0
-stdout: 871 bytes
+stdout: 2092 bytes
>>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
-con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
-con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+======================================
+ NetworkManager connection profiles
+======================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected
index ec2cdd9f7d..a0f5d5ecd1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-078.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-078.expected
@@ -1,13 +1,18 @@
-location: clients/tests/test-client.py:872:test_003()/78
-cmd: $NMCLI --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/78
+cmd: $NMCLI --pretty -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 871 bytes
+stdout: 2124 bytes
>>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
-con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
-con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected
index 6305445597..99ac8bc5e9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-079.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-079.expected
@@ -1,12 +1,17 @@
-location: clients/tests/test-client.py:875:test_003()/79
-cmd: $NMCLI --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/79
+cmd: $NMCLI --pretty -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 156 bytes
+stdout: 394 bytes
>>>
-UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
-5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+======================================
+ NetworkManager connection profiles
+======================================
+UUID TYPE
+--------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-080.expected b/clients/tests/test-client.check-on-disk/test_003-080.expected
index 73e520172f..129b66831d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-080.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-080.expected
@@ -1,12 +1,17 @@
-location: clients/tests/test-client.py:875:test_003()/80
-cmd: $NMCLI --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/80
+cmd: $NMCLI --pretty -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 156 bytes
+stdout: 414 bytes
>>>
-UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
-5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+UUID TYPE
+------------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-081.expected b/clients/tests/test-client.check-on-disk/test_003-081.expected
index ab97df24ab..4d85a894b9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-081.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-081.expected
@@ -1,113 +1,129 @@
-location: clients/tests/test-client.py:878:test_003()/81
-cmd: $NMCLI --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/81
+cmd: $NMCLI --pretty con s ethernet
lang: C
returncode: 0
-stdout: 2579 bytes
+stdout: 6136 bytes
>>>
-connection.id:ethernet
-connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id:
-connection.type:802-3-ethernet
-connection.interface-name:
-connection.autoconnect:yes
-connection.autoconnect-priority:0
-connection.autoconnect-retries:-1
-connection.auth-retries:-1
-connection.timestamp:0
-connection.read-only:no
-connection.permissions:
-connection.zone:
-connection.master:
-connection.slave-type:
-connection.autoconnect-slaves:-1
-connection.secondaries:
-connection.gateway-ping-timeout:0
-connection.metered:unknown
-connection.lldp:default
-connection.mdns:-1
-802-3-ethernet.port:
-802-3-ethernet.speed:0
-802-3-ethernet.duplex:
-802-3-ethernet.auto-negotiate:no
-802-3-ethernet.mac-address:
-802-3-ethernet.cloned-mac-address:
-802-3-ethernet.generate-mac-address-mask:
-802-3-ethernet.mac-address-blacklist:
-802-3-ethernet.mtu:auto
-802-3-ethernet.s390-subchannels:
-802-3-ethernet.s390-nettype:
-802-3-ethernet.s390-options:
-802-3-ethernet.wake-on-lan:default
-802-3-ethernet.wake-on-lan-password:
-ipv4.method:auto
-ipv4.dns:
-ipv4.dns-search:
-ipv4.dns-options:
-ipv4.dns-priority:0
-ipv4.addresses:
-ipv4.gateway:
-ipv4.routes:
-ipv4.route-metric:-1
-ipv4.route-table:0
-ipv4.ignore-auto-routes:no
-ipv4.ignore-auto-dns:no
-ipv4.dhcp-client-id:
-ipv4.dhcp-timeout:0
-ipv4.dhcp-send-hostname:yes
-ipv4.dhcp-hostname:
-ipv4.dhcp-fqdn:
-ipv4.never-default:no
-ipv4.may-fail:yes
-ipv4.dad-timeout:-1
-ipv6.method:auto
-ipv6.dns:
-ipv6.dns-search:
-ipv6.dns-options:
-ipv6.dns-priority:0
-ipv6.addresses:
-ipv6.gateway:
-ipv6.routes:
-ipv6.route-metric:-1
-ipv6.route-table:0
-ipv6.ignore-auto-routes:no
-ipv6.ignore-auto-dns:no
-ipv6.never-default:no
-ipv6.may-fail:yes
-ipv6.ip6-privacy:-1
-ipv6.addr-gen-mode:stable-privacy
-ipv6.dhcp-duid:
-ipv6.dhcp-send-hostname:yes
-ipv6.dhcp-hostname:
-ipv6.token:
-proxy.method:none
-proxy.browser-only:no
-proxy.pac-url:
-proxy.pac-script:
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth1
-GENERAL.STATE:activated
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+===============================================================================
+ Connection profile details (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: activated
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-082.expected b/clients/tests/test-client.check-on-disk/test_003-082.expected
index 7a5322e1ab..508c7b2e63 100644
--- a/clients/tests/test-client.check-on-disk/test_003-082.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-082.expected
@@ -1,113 +1,129 @@
-location: clients/tests/test-client.py:878:test_003()/82
-cmd: $NMCLI --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/82
+cmd: $NMCLI --pretty con s ethernet
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2579 bytes
+stdout: 6182 bytes
>>>
-connection.id:ethernet
-connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id:
-connection.type:802-3-ethernet
-connection.interface-name:
-connection.autoconnect:yes
-connection.autoconnect-priority:0
-connection.autoconnect-retries:-1
-connection.auth-retries:-1
-connection.timestamp:0
-connection.read-only:no
-connection.permissions:
-connection.zone:
-connection.master:
-connection.slave-type:
-connection.autoconnect-slaves:-1
-connection.secondaries:
-connection.gateway-ping-timeout:0
-connection.metered:unknown
-connection.lldp:default
-connection.mdns:-1
-802-3-ethernet.port:
-802-3-ethernet.speed:0
-802-3-ethernet.duplex:
-802-3-ethernet.auto-negotiate:no
-802-3-ethernet.mac-address:
-802-3-ethernet.cloned-mac-address:
-802-3-ethernet.generate-mac-address-mask:
-802-3-ethernet.mac-address-blacklist:
-802-3-ethernet.mtu:auto
-802-3-ethernet.s390-subchannels:
-802-3-ethernet.s390-nettype:
-802-3-ethernet.s390-options:
-802-3-ethernet.wake-on-lan:default
-802-3-ethernet.wake-on-lan-password:
-ipv4.method:auto
-ipv4.dns:
-ipv4.dns-search:
-ipv4.dns-options:
-ipv4.dns-priority:0
-ipv4.addresses:
-ipv4.gateway:
-ipv4.routes:
-ipv4.route-metric:-1
-ipv4.route-table:0
-ipv4.ignore-auto-routes:no
-ipv4.ignore-auto-dns:no
-ipv4.dhcp-client-id:
-ipv4.dhcp-timeout:0
-ipv4.dhcp-send-hostname:yes
-ipv4.dhcp-hostname:
-ipv4.dhcp-fqdn:
-ipv4.never-default:no
-ipv4.may-fail:yes
-ipv4.dad-timeout:-1
-ipv6.method:auto
-ipv6.dns:
-ipv6.dns-search:
-ipv6.dns-options:
-ipv6.dns-priority:0
-ipv6.addresses:
-ipv6.gateway:
-ipv6.routes:
-ipv6.route-metric:-1
-ipv6.route-table:0
-ipv6.ignore-auto-routes:no
-ipv6.ignore-auto-dns:no
-ipv6.never-default:no
-ipv6.may-fail:yes
-ipv6.ip6-privacy:-1
-ipv6.addr-gen-mode:stable-privacy
-ipv6.dhcp-duid:
-ipv6.dhcp-send-hostname:yes
-ipv6.dhcp-hostname:
-ipv6.token:
-proxy.method:none
-proxy.browser-only:no
-proxy.pac-url:
-proxy.pac-script:
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth1
-GENERAL.STATE:activated
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+===============================================================================
+ Szczegóły profilu połączenia (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: aktywowano
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-083.expected b/clients/tests/test-client.check-on-disk/test_003-083.expected
index 7f08e37933..5253939cca 100644
--- a/clients/tests/test-client.check-on-disk/test_003-083.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-083.expected
@@ -1,100 +1,112 @@
-location: clients/tests/test-client.py:881:test_003()/83
-cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/83
+cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 2211 bytes
+stdout: 5158 bytes
>>>
-connection.id:ethernet
-connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id:
-connection.type:802-3-ethernet
-connection.interface-name:
-connection.autoconnect:yes
-connection.autoconnect-priority:0
-connection.autoconnect-retries:-1
-connection.auth-retries:-1
-connection.timestamp:0
-connection.read-only:no
-connection.permissions:
-connection.zone:
-connection.master:
-connection.slave-type:
-connection.autoconnect-slaves:-1
-connection.secondaries:
-connection.gateway-ping-timeout:0
-connection.metered:unknown
-connection.lldp:default
-connection.mdns:-1
-802-3-ethernet.port:
-802-3-ethernet.speed:0
-802-3-ethernet.duplex:
-802-3-ethernet.auto-negotiate:no
-802-3-ethernet.mac-address:
-802-3-ethernet.cloned-mac-address:
-802-3-ethernet.generate-mac-address-mask:
-802-3-ethernet.mac-address-blacklist:
-802-3-ethernet.mtu:auto
-802-3-ethernet.s390-subchannels:
-802-3-ethernet.s390-nettype:
-802-3-ethernet.s390-options:
-802-3-ethernet.wake-on-lan:default
-802-3-ethernet.wake-on-lan-password:
-ipv4.method:auto
-ipv4.dns:
-ipv4.dns-search:
-ipv4.dns-options:
-ipv4.dns-priority:0
-ipv4.addresses:
-ipv4.gateway:
-ipv4.routes:
-ipv4.route-metric:-1
-ipv4.route-table:0
-ipv4.ignore-auto-routes:no
-ipv4.ignore-auto-dns:no
-ipv4.dhcp-client-id:
-ipv4.dhcp-timeout:0
-ipv4.dhcp-send-hostname:yes
-ipv4.dhcp-hostname:
-ipv4.dhcp-fqdn:
-ipv4.never-default:no
-ipv4.may-fail:yes
-ipv4.dad-timeout:-1
-ipv6.method:auto
-ipv6.dns:
-ipv6.dns-search:
-ipv6.dns-options:
-ipv6.dns-priority:0
-ipv6.addresses:
-ipv6.gateway:
-ipv6.routes:
-ipv6.route-metric:-1
-ipv6.route-table:0
-ipv6.ignore-auto-routes:no
-ipv6.ignore-auto-dns:no
-ipv6.never-default:no
-ipv6.may-fail:yes
-ipv6.ip6-privacy:-1
-ipv6.addr-gen-mode:stable-privacy
-ipv6.dhcp-duid:
-ipv6.dhcp-send-hostname:yes
-ipv6.dhcp-hostname:
-ipv6.token:
-proxy.method:none
-proxy.browser-only:no
-proxy.pac-url:
-proxy.pac-script:
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+===============================================================================
+ Connection profile details (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-084.expected b/clients/tests/test-client.check-on-disk/test_003-084.expected
index 45d67b9ccb..1698a80a9c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-084.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-084.expected
@@ -1,100 +1,112 @@
-location: clients/tests/test-client.py:881:test_003()/84
-cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/84
+cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2211 bytes
+stdout: 5193 bytes
>>>
-connection.id:ethernet
-connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id:
-connection.type:802-3-ethernet
-connection.interface-name:
-connection.autoconnect:yes
-connection.autoconnect-priority:0
-connection.autoconnect-retries:-1
-connection.auth-retries:-1
-connection.timestamp:0
-connection.read-only:no
-connection.permissions:
-connection.zone:
-connection.master:
-connection.slave-type:
-connection.autoconnect-slaves:-1
-connection.secondaries:
-connection.gateway-ping-timeout:0
-connection.metered:unknown
-connection.lldp:default
-connection.mdns:-1
-802-3-ethernet.port:
-802-3-ethernet.speed:0
-802-3-ethernet.duplex:
-802-3-ethernet.auto-negotiate:no
-802-3-ethernet.mac-address:
-802-3-ethernet.cloned-mac-address:
-802-3-ethernet.generate-mac-address-mask:
-802-3-ethernet.mac-address-blacklist:
-802-3-ethernet.mtu:auto
-802-3-ethernet.s390-subchannels:
-802-3-ethernet.s390-nettype:
-802-3-ethernet.s390-options:
-802-3-ethernet.wake-on-lan:default
-802-3-ethernet.wake-on-lan-password:
-ipv4.method:auto
-ipv4.dns:
-ipv4.dns-search:
-ipv4.dns-options:
-ipv4.dns-priority:0
-ipv4.addresses:
-ipv4.gateway:
-ipv4.routes:
-ipv4.route-metric:-1
-ipv4.route-table:0
-ipv4.ignore-auto-routes:no
-ipv4.ignore-auto-dns:no
-ipv4.dhcp-client-id:
-ipv4.dhcp-timeout:0
-ipv4.dhcp-send-hostname:yes
-ipv4.dhcp-hostname:
-ipv4.dhcp-fqdn:
-ipv4.never-default:no
-ipv4.may-fail:yes
-ipv4.dad-timeout:-1
-ipv6.method:auto
-ipv6.dns:
-ipv6.dns-search:
-ipv6.dns-options:
-ipv6.dns-priority:0
-ipv6.addresses:
-ipv6.gateway:
-ipv6.routes:
-ipv6.route-metric:-1
-ipv6.route-table:0
-ipv6.ignore-auto-routes:no
-ipv6.ignore-auto-dns:no
-ipv6.never-default:no
-ipv6.may-fail:yes
-ipv6.ip6-privacy:-1
-ipv6.addr-gen-mode:stable-privacy
-ipv6.dhcp-duid:
-ipv6.dhcp-send-hostname:yes
-ipv6.dhcp-hostname:
-ipv6.token:
-proxy.method:none
-proxy.browser-only:no
-proxy.pac-url:
-proxy.pac-script:
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+===============================================================================
+ Szczegóły profilu połączenia (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-085.expected b/clients/tests/test-client.check-on-disk/test_003-085.expected
index c672926d13..d1d072e91d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-085.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-085.expected
@@ -1,64 +1,75 @@
-location: clients/tests/test-client.py:884:test_003()/85
-cmd: $NMCLI --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/85
+cmd: $NMCLI --pretty -f all dev show eth0
lang: C
returncode: 0
-stdout: 2011 bytes
+stdout: 4090 bytes
>>>
-GENERAL.DEVICE:eth0
-GENERAL.TYPE:ethernet
-GENERAL.NM-TYPE:NMDeviceEthernet
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:C0:61:AE:26:4D:D7
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/eth0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:ethernet
-GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIRED-PROPERTIES.CARRIER:off
-IP4.ADDRESS[1]:192.168.6.238/29
-IP4.GATEWAY:
-IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]:192.168.213.113
-IP4.DOMAIN[1]:sear4.foo4.bar
-IP4.WINS[1]:192.168.156.115
-IP4.WINS[2]:192.168.8.33
-IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]:sear6.fo.x.y
-IP6.DOMAIN[2]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+===============================================================================
+ Device details (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: off
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-086.expected b/clients/tests/test-client.check-on-disk/test_003-086.expected
index 0d13df04ce..4bc2628ce1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-086.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-086.expected
@@ -1,64 +1,75 @@
-location: clients/tests/test-client.py:884:test_003()/86
-cmd: $NMCLI --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/86
+cmd: $NMCLI --pretty -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2034 bytes
+stdout: 4119 bytes
>>>
-GENERAL.DEVICE:eth0
-GENERAL.TYPE:ethernet
-GENERAL.NM-TYPE:NMDeviceEthernet
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:C0:61:AE:26:4D:D7
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
-GENERAL.UDI:/sys/devices/virtual/eth0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:nie
-GENERAL.NM-MANAGED:tak
-GENERAL.AUTOCONNECT:tak
-GENERAL.FIRMWARE-MISSING:nie
-GENERAL.NM-PLUGIN-MISSING:nie
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:ethernet
-GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
-WIRED-PROPERTIES.CARRIER:wyłączone
-IP4.ADDRESS[1]:192.168.6.238/29
-IP4.GATEWAY:
-IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]:192.168.213.113
-IP4.DOMAIN[1]:sear4.foo4.bar
-IP4.WINS[1]:192.168.156.115
-IP4.WINS[2]:192.168.8.33
-IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]:sear6.fo.x.y
-IP6.DOMAIN[2]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+===============================================================================
+ Informacje o urządzeniu (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: wyłączone
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-087.expected b/clients/tests/test-client.check-on-disk/test_003-087.expected
index 4563844a6d..e3a141ad27 100644
--- a/clients/tests/test-client.check-on-disk/test_003-087.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-087.expected
@@ -1,12 +1,16 @@
-location: clients/tests/test-client.py:872:test_003()/87
-cmd: $NMCLI --mode tabular -f ALL con
+location: clients/tests/test-client.py:875:test_003()/87
+cmd: $NMCLI --pretty --color yes -f ALL con
lang: C
returncode: 0
-stdout: 1615 bytes
+stdout: 2362 bytes
>>>
+======================================
+ NetworkManager connection profiles
+======================================
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-088.expected b/clients/tests/test-client.check-on-disk/test_003-088.expected
index eafa556f78..51318418d6 100644
--- a/clients/tests/test-client.check-on-disk/test_003-088.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-088.expected
@@ -1,12 +1,16 @@
-location: clients/tests/test-client.py:872:test_003()/88
-cmd: $NMCLI --mode tabular -f ALL con
+location: clients/tests/test-client.py:875:test_003()/88
+cmd: $NMCLI --pretty --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1625 bytes
+stdout: 2394 bytes
>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-089.expected b/clients/tests/test-client.check-on-disk/test_003-089.expected
index 48c7ee5b32..a586c1c6ea 100644
--- a/clients/tests/test-client.check-on-disk/test_003-089.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-089.expected
@@ -1,11 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/89
-cmd: $NMCLI --mode tabular -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/89
+cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 192 bytes
+stdout: 412 bytes
>>>
+======================================
+ NetworkManager connection profiles
+======================================
UUID TYPE
-UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+--------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-090.expected b/clients/tests/test-client.check-on-disk/test_003-090.expected
index 2eaf7785f3..e8a4d55ae7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-090.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-090.expected
@@ -1,11 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/90
-cmd: $NMCLI --mode tabular -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/90
+cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 192 bytes
+stdout: 432 bytes
>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
UUID TYPE
-UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+------------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-091.expected b/clients/tests/test-client.check-on-disk/test_003-091.expected
index 38ca027bbb..8d30d708f4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-091.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-091.expected
@@ -1,31 +1,129 @@
-location: clients/tests/test-client.py:878:test_003()/91
-cmd: $NMCLI --mode tabular con s ethernet
+location: clients/tests/test-client.py:881:test_003()/91
+cmd: $NMCLI --pretty --color yes con s ethernet
lang: C
returncode: 0
-stdout: 3208 bytes
+stdout: 6136 bytes
>>>
-name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
-connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
-
-name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
-802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
-ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
-ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
-
-name method browser-only pac-url pac-script
-proxy none no -- --
-
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
-
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+===============================================================================
+ Connection profile details (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: activated
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-092.expected b/clients/tests/test-client.check-on-disk/test_003-092.expected
index 1007a62693..d4d378edf1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-092.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-092.expected
@@ -1,31 +1,129 @@
-location: clients/tests/test-client.py:878:test_003()/92
-cmd: $NMCLI --mode tabular con s ethernet
+location: clients/tests/test-client.py:881:test_003()/92
+cmd: $NMCLI --pretty --color yes con s ethernet
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3232 bytes
+stdout: 6182 bytes
>>>
-name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
-connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
-
-name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
-802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
-ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
-ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
-
-name method browser-only pac-url pac-script
-proxy none nie -- --
-
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
-
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+===============================================================================
+ Szczegóły profilu połączenia (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: aktywowano
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-093.expected b/clients/tests/test-client.check-on-disk/test_003-093.expected
index 34ed7a22b7..ae68f2d12b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-093.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-093.expected
@@ -1,27 +1,112 @@
-location: clients/tests/test-client.py:881:test_003()/93
-cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/93
+cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 2726 bytes
+stdout: 5158 bytes
>>>
-name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
-connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
-
-name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
-802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
-ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
-ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
-
-name method browser-only pac-url pac-script
-proxy none no -- --
-
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
+===============================================================================
+ Connection profile details (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-094.expected b/clients/tests/test-client.check-on-disk/test_003-094.expected
index e577fe689f..4f8b5bebc0 100644
--- a/clients/tests/test-client.check-on-disk/test_003-094.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-094.expected
@@ -1,27 +1,112 @@
-location: clients/tests/test-client.py:881:test_003()/94
-cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/94
+cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2748 bytes
+stdout: 5193 bytes
>>>
-name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
-connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
-
-name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
-802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
-ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
-ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
-
-name method browser-only pac-url pac-script
-proxy none nie -- --
-
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
+===============================================================================
+ Szczegóły profilu połączenia (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-095.expected b/clients/tests/test-client.check-on-disk/test_003-095.expected
index 7c869f8cad..cb96535c53 100644
--- a/clients/tests/test-client.check-on-disk/test_003-095.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-095.expected
@@ -1,32 +1,75 @@
-location: clients/tests/test-client.py:884:test_003()/95
-cmd: $NMCLI --mode tabular -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/95
+cmd: $NMCLI --pretty --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 2721 bytes
+stdout: 4090 bytes
>>>
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
-GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-CAPABILITIES no 100 Mb/s no no
-
-NAME CARRIER S390-SUBCHANNELS
-WIRED-PROPERTIES off --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
-
-GROUP OPTION
-DHCP4 --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
-
-GROUP OPTION
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+===============================================================================
+ Device details (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: off
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-096.expected b/clients/tests/test-client.check-on-disk/test_003-096.expected
index 0d17fadf6f..ce71e0ee0b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-096.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-096.expected
@@ -1,32 +1,75 @@
-location: clients/tests/test-client.py:884:test_003()/96
-cmd: $NMCLI --mode tabular -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/96
+cmd: $NMCLI --pretty --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2742 bytes
+stdout: 4119 bytes
>>>
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
-GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-CAPABILITIES nie 100 Mb/s nie nie
-
-NAME CARRIER S390-SUBCHANNELS
-WIRED-PROPERTIES wyłączone --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
-
-GROUP OPTION
-DHCP4 --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
-
-GROUP OPTION
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+===============================================================================
+ Informacje o urządzeniu (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: wyłączone
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-097.expected b/clients/tests/test-client.check-on-disk/test_003-097.expected
index 17204f7f4b..c826579019 100644
--- a/clients/tests/test-client.check-on-disk/test_003-097.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-097.expected
@@ -1,18 +1,13 @@
-location: clients/tests/test-client.py:872:test_003()/97
-cmd: $NMCLI --mode tabular --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/97
+cmd: $NMCLI --terse -f ALL con
lang: C
returncode: 0
-stdout: 2092 bytes
+stdout: 871 bytes
>>>
-======================================
- NetworkManager connection profiles
-======================================
-NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
-con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
-con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-098.expected b/clients/tests/test-client.check-on-disk/test_003-098.expected
index b6c099066a..da3adcdb38 100644
--- a/clients/tests/test-client.check-on-disk/test_003-098.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-098.expected
@@ -1,18 +1,13 @@
-location: clients/tests/test-client.py:872:test_003()/98
-cmd: $NMCLI --mode tabular --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/98
+cmd: $NMCLI --terse -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2124 bytes
+stdout: 871 bytes
>>>
-==========================================
- Profile połączeń usługi NetworkManager
-==========================================
-NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
-con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
-con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-099.expected b/clients/tests/test-client.check-on-disk/test_003-099.expected
index 80552c4e30..e4d739acc5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-099.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-099.expected
@@ -1,17 +1,12 @@
-location: clients/tests/test-client.py:875:test_003()/99
-cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/99
+cmd: $NMCLI --terse -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 394 bytes
+stdout: 156 bytes
>>>
-======================================
- NetworkManager connection profiles
-======================================
-UUID TYPE
---------------------------------------------------------------------------------------
-UUID-ethernet-REPLACED-REPLACED-REPL ethernet
-5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-100.expected b/clients/tests/test-client.check-on-disk/test_003-100.expected
index 371855c740..078d9b067f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-100.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-100.expected
@@ -1,17 +1,12 @@
-location: clients/tests/test-client.py:875:test_003()/100
-cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/100
+cmd: $NMCLI --terse -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 414 bytes
+stdout: 156 bytes
>>>
-==========================================
- Profile połączeń usługi NetworkManager
-==========================================
-UUID TYPE
-------------------------------------------------------------------------------------------
-UUID-ethernet-REPLACED-REPLACED-REPL ethernet
-5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-101.expected b/clients/tests/test-client.check-on-disk/test_003-101.expected
index 702c767177..aba8bc96a1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-101.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-101.expected
@@ -1,47 +1,113 @@
-location: clients/tests/test-client.py:878:test_003()/101
-cmd: $NMCLI --mode tabular --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/101
+cmd: $NMCLI --terse con s ethernet
lang: C
returncode: 0
-stdout: 5361 bytes
+stdout: 2579 bytes
>>>
-=========================================
- Connection profile details (ethernet)
-=========================================
-name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
-
-name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
-
-name method browser-only pac-url pac-script
---------------------------------------------------
-proxy none no -- --
-
-======================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-======================================================================
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
-
-======================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-======================================================================
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth1
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-102.expected b/clients/tests/test-client.check-on-disk/test_003-102.expected
index 87886bff09..9e320bf408 100644
--- a/clients/tests/test-client.check-on-disk/test_003-102.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-102.expected
@@ -1,47 +1,113 @@
-location: clients/tests/test-client.py:878:test_003()/102
-cmd: $NMCLI --mode tabular --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/102
+cmd: $NMCLI --terse con s ethernet
lang: pl_PL.UTF-8
returncode: 0
-stdout: 5445 bytes
+stdout: 2579 bytes
>>>
-===========================================
- Szczegóły profilu połączenia (ethernet)
-===========================================
-name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
-
-name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
-
-name method browser-only pac-url pac-script
---------------------------------------------------
-proxy none nie -- --
-
-===========================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===========================================================================
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
-
-===========================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===========================================================================
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth1
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-103.expected b/clients/tests/test-client.check-on-disk/test_003-103.expected
index ef47cbee2c..62adea53d5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-103.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-103.expected
@@ -1,39 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/103
-cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/103
+cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 4427 bytes
+stdout: 2211 bytes
>>>
-=========================================
- Connection profile details (ethernet)
-=========================================
-name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
-
-name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
-
-name method browser-only pac-url pac-script
---------------------------------------------------
-proxy none no -- --
-
-======================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-======================================================================
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-104.expected b/clients/tests/test-client.check-on-disk/test_003-104.expected
index 785b5225bc..0ed93275d4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-104.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-104.expected
@@ -1,39 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/104
-cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/104
+cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4489 bytes
+stdout: 2211 bytes
>>>
-===========================================
- Szczegóły profilu połączenia (ethernet)
-===========================================
-name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
-
-name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
-
-name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
-
-name method browser-only pac-url pac-script
---------------------------------------------------
-proxy none nie -- --
-
-===========================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===========================================================================
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-105.expected b/clients/tests/test-client.check-on-disk/test_003-105.expected
index 5b03c2eca9..0584ee5bfd 100644
--- a/clients/tests/test-client.check-on-disk/test_003-105.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-105.expected
@@ -1,43 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/105
-cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/105
+cmd: $NMCLI --terse -f all dev show eth0
lang: C
returncode: 0
-stdout: 4162 bytes
+stdout: 2011 bytes
>>>
-=========================
- Device details (eth0)
-=========================
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-------------------------------------------------------------
-CAPABILITIES no 100 Mb/s no no
-
-NAME CARRIER S390-SUBCHANNELS
----------------------------------------------
-WIRED-PROPERTIES off --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
-
-GROUP OPTION
----------------
-DHCP4 --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
-
-GROUP OPTION
---------------------------------------------------------------------------------------------------
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIRED-PROPERTIES.CARRIER:off
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-106.expected b/clients/tests/test-client.check-on-disk/test_003-106.expected
index 09ed1d96b0..64c73ef297 100644
--- a/clients/tests/test-client.check-on-disk/test_003-106.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-106.expected
@@ -1,43 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/106
-cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/106
+cmd: $NMCLI --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4220 bytes
+stdout: 2034 bytes
>>>
-==================================
- Informacje o urządzeniu (eth0)
-==================================
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-------------------------------------------------------------
-CAPABILITIES nie 100 Mb/s nie nie
-
-NAME CARRIER S390-SUBCHANNELS
------------------------------------------------
-WIRED-PROPERTIES wyłączone --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
-
-GROUP OPTION
----------------
-DHCP4 --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
-
-GROUP OPTION
---------------------------------------------------------------------------------------------------
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIRED-PROPERTIES.CARRIER:wyłączone
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-107.expected b/clients/tests/test-client.check-on-disk/test_003-107.expected
index 4c4bb9f01b..3058213a78 100644
--- a/clients/tests/test-client.check-on-disk/test_003-107.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-107.expected
@@ -1,11 +1,11 @@
-location: clients/tests/test-client.py:872:test_003()/107
-cmd: $NMCLI --mode tabular --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/107
+cmd: $NMCLI --terse --color yes -f ALL con
lang: C
returncode: 0
-stdout: 871 bytes
+stdout: 1141 bytes
>>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-108.expected b/clients/tests/test-client.check-on-disk/test_003-108.expected
index de7742c7c5..3cfc2117fb 100644
--- a/clients/tests/test-client.check-on-disk/test_003-108.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-108.expected
@@ -1,11 +1,11 @@
-location: clients/tests/test-client.py:872:test_003()/108
-cmd: $NMCLI --mode tabular --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/108
+cmd: $NMCLI --terse --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 871 bytes
+stdout: 1141 bytes
>>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-109.expected b/clients/tests/test-client.check-on-disk/test_003-109.expected
index 02c1988b2d..c839194025 100644
--- a/clients/tests/test-client.check-on-disk/test_003-109.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-109.expected
@@ -1,10 +1,10 @@
-location: clients/tests/test-client.py:875:test_003()/109
-cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/109
+cmd: $NMCLI --terse --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 156 bytes
+stdout: 174 bytes
>>>
-UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-110.expected b/clients/tests/test-client.check-on-disk/test_003-110.expected
index e41390a1a8..5e560eb7b5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-110.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-110.expected
@@ -1,10 +1,10 @@
-location: clients/tests/test-client.py:875:test_003()/110
-cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/110
+cmd: $NMCLI --terse --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 156 bytes
+stdout: 174 bytes
>>>
-UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-111.expected b/clients/tests/test-client.check-on-disk/test_003-111.expected
index d247f597d8..62e7697255 100644
--- a/clients/tests/test-client.check-on-disk/test_003-111.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-111.expected
@@ -1,17 +1,113 @@
-location: clients/tests/test-client.py:878:test_003()/111
-cmd: $NMCLI --mode tabular --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/111
+cmd: $NMCLI --terse --color yes con s ethernet
lang: C
returncode: 0
-stdout: 666 bytes
+stdout: 2579 bytes
>>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
-802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
-ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
-proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth1
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-112.expected b/clients/tests/test-client.check-on-disk/test_003-112.expected
index 7984cdb3c1..965f4ae568 100644
--- a/clients/tests/test-client.check-on-disk/test_003-112.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-112.expected
@@ -1,17 +1,113 @@
-location: clients/tests/test-client.py:878:test_003()/112
-cmd: $NMCLI --mode tabular --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/112
+cmd: $NMCLI --terse --color yes con s ethernet
lang: pl_PL.UTF-8
returncode: 0
-stdout: 666 bytes
+stdout: 2579 bytes
>>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
-802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
-ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
-proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth1
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-113.expected b/clients/tests/test-client.check-on-disk/test_003-113.expected
index f19a2cf307..ec84b26ea6 100644
--- a/clients/tests/test-client.check-on-disk/test_003-113.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-113.expected
@@ -1,15 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/113
-cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/113
+cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 479 bytes
+stdout: 2211 bytes
>>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
-802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
-ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
-proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-114.expected b/clients/tests/test-client.check-on-disk/test_003-114.expected
index 804c0887c0..38957fab86 100644
--- a/clients/tests/test-client.check-on-disk/test_003-114.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-114.expected
@@ -1,15 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/114
-cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/114
+cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 479 bytes
+stdout: 2211 bytes
>>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
-802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
-ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
-proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-115.expected b/clients/tests/test-client.check-on-disk/test_003-115.expected
index 5cefe3d759..6959b62a98 100644
--- a/clients/tests/test-client.check-on-disk/test_003-115.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-115.expected
@@ -1,17 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/115
-cmd: $NMCLI --mode tabular --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/115
+cmd: $NMCLI --terse --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 1176 bytes
+stdout: 2011 bytes
>>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
-CAPABILITIES:no:100 Mb/s:no:no
-WIRED-PROPERTIES:off:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
-DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIRED-PROPERTIES.CARRIER:off
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-116.expected b/clients/tests/test-client.check-on-disk/test_003-116.expected
index 361f55dab6..0616d5e1e7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-116.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-116.expected
@@ -1,17 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/116
-cmd: $NMCLI --mode tabular --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/116
+cmd: $NMCLI --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1199 bytes
+stdout: 2034 bytes
>>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
-CAPABILITIES:nie:100 Mb/s:nie:nie
-WIRED-PROPERTIES:wyłączone:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
-DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIRED-PROPERTIES.CARRIER:wyłączone
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-117.expected b/clients/tests/test-client.check-on-disk/test_003-117.expected
index 48249a19fd..5b306f06c6 100644
--- a/clients/tests/test-client.check-on-disk/test_003-117.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-117.expected
@@ -1,69 +1,14 @@
-location: clients/tests/test-client.py:872:test_003()/117
-cmd: $NMCLI --mode multiline -f ALL con
+location: clients/tests/test-client.py:875:test_003()/117
+cmd: $NMCLI --mode tabular -f ALL con
lang: C
returncode: 0
-stdout: 3267 bytes
+stdout: 1615 bytes
>>>
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: yes
-DEVICE: eth1
-STATE: activated
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: yes
-DEVICE: eth0
-STATE: deactivating
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
-NAME: con-1
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
-ACTIVE: no
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-1
-NAME: con-xx1
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
-ACTIVE: no
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-xx1
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-118.expected b/clients/tests/test-client.check-on-disk/test_003-118.expected
index ada7c594a3..a25d9f378c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-118.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-118.expected
@@ -1,69 +1,14 @@
-location: clients/tests/test-client.py:872:test_003()/118
-cmd: $NMCLI --mode multiline -f ALL con
+location: clients/tests/test-client.py:875:test_003()/118
+cmd: $NMCLI --mode tabular -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3276 bytes
+stdout: 1625 bytes
>>>
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: tak
-DEVICE: eth1
-STATE: aktywowano
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: tak
-DEVICE: eth0
-STATE: dezaktywowanie
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
-NAME: con-1
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
-ACTIVE: nie
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-1
-NAME: con-xx1
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
-ACTIVE: nie
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-xx1
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-119.expected b/clients/tests/test-client.check-on-disk/test_003-119.expected
index 44e441cefb..e813b48c69 100644
--- a/clients/tests/test-client.check-on-disk/test_003-119.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-119.expected
@@ -1,15 +1,13 @@
-location: clients/tests/test-client.py:875:test_003()/119
-cmd: $NMCLI --mode multiline -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/119
+cmd: $NMCLI --mode tabular -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 378 bytes
+stdout: 192 bytes
>>>
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
+UUID TYPE
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-120.expected b/clients/tests/test-client.check-on-disk/test_003-120.expected
index ec4ae00158..ea96e0a1e2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-120.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-120.expected
@@ -1,15 +1,13 @@
-location: clients/tests/test-client.py:875:test_003()/120
-cmd: $NMCLI --mode multiline -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/120
+cmd: $NMCLI --mode tabular -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 378 bytes
+stdout: 192 bytes
>>>
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
+UUID TYPE
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-121.expected b/clients/tests/test-client.check-on-disk/test_003-121.expected
index 3a65e9edd4..f32beef4f3 100644
--- a/clients/tests/test-client.check-on-disk/test_003-121.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-121.expected
@@ -1,113 +1,31 @@
-location: clients/tests/test-client.py:878:test_003()/121
-cmd: $NMCLI --mode multiline con s ethernet
+location: clients/tests/test-client.py:881:test_003()/121
+cmd: $NMCLI --mode tabular con s ethernet
lang: C
returncode: 0
-stdout: 4891 bytes
+stdout: 3208 bytes
>>>
-connection.id: ethernet
-connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id: --
-connection.type: 802-3-ethernet
-connection.interface-name: --
-connection.autoconnect: yes
-connection.autoconnect-priority: 0
-connection.autoconnect-retries: -1 (default)
-connection.auth-retries: -1
-connection.timestamp: 0
-connection.read-only: no
-connection.permissions: --
-connection.zone: --
-connection.master: --
-connection.slave-type: --
-connection.autoconnect-slaves: -1 (default)
-connection.secondaries: --
-connection.gateway-ping-timeout: 0
-connection.metered: unknown
-connection.lldp: default
-connection.mdns: -1 (default)
-802-3-ethernet.port: --
-802-3-ethernet.speed: 0
-802-3-ethernet.duplex: --
-802-3-ethernet.auto-negotiate: no
-802-3-ethernet.mac-address: --
-802-3-ethernet.cloned-mac-address: --
-802-3-ethernet.generate-mac-address-mask:--
-802-3-ethernet.mac-address-blacklist: --
-802-3-ethernet.mtu: auto
-802-3-ethernet.s390-subchannels: --
-802-3-ethernet.s390-nettype: --
-802-3-ethernet.s390-options: --
-802-3-ethernet.wake-on-lan: default
-802-3-ethernet.wake-on-lan-password: --
-ipv4.method: auto
-ipv4.dns: --
-ipv4.dns-search: --
-ipv4.dns-options: ""
-ipv4.dns-priority: 0
-ipv4.addresses: --
-ipv4.gateway: --
-ipv4.routes: --
-ipv4.route-metric: -1
-ipv4.route-table: 0 (unspec)
-ipv4.ignore-auto-routes: no
-ipv4.ignore-auto-dns: no
-ipv4.dhcp-client-id: --
-ipv4.dhcp-timeout: 0 (default)
-ipv4.dhcp-send-hostname: yes
-ipv4.dhcp-hostname: --
-ipv4.dhcp-fqdn: --
-ipv4.never-default: no
-ipv4.may-fail: yes
-ipv4.dad-timeout: -1 (default)
-ipv6.method: auto
-ipv6.dns: --
-ipv6.dns-search: --
-ipv6.dns-options: ""
-ipv6.dns-priority: 0
-ipv6.addresses: --
-ipv6.gateway: --
-ipv6.routes: --
-ipv6.route-metric: -1
-ipv6.route-table: 0 (unspec)
-ipv6.ignore-auto-routes: no
-ipv6.ignore-auto-dns: no
-ipv6.never-default: no
-ipv6.may-fail: yes
-ipv6.ip6-privacy: -1 (unknown)
-ipv6.addr-gen-mode: stable-privacy
-ipv6.dhcp-duid: --
-ipv6.dhcp-send-hostname: yes
-ipv6.dhcp-hostname: --
-ipv6.token: --
-proxy.method: none
-proxy.browser-only: no
-proxy.pac-url: --
-proxy.pac-script: --
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth1
-GENERAL.STATE: activated
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
+
+name method browser-only pac-url pac-script
+proxy none no -- --
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: deactivating
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-122.expected b/clients/tests/test-client.check-on-disk/test_003-122.expected
index 948b3519ed..c4210e154c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-122.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-122.expected
@@ -1,113 +1,31 @@
-location: clients/tests/test-client.py:878:test_003()/122
-cmd: $NMCLI --mode multiline con s ethernet
+location: clients/tests/test-client.py:881:test_003()/122
+cmd: $NMCLI --mode tabular con s ethernet
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4918 bytes
+stdout: 3232 bytes
>>>
-connection.id: ethernet
-connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id: --
-connection.type: 802-3-ethernet
-connection.interface-name: --
-connection.autoconnect: tak
-connection.autoconnect-priority: 0
-connection.autoconnect-retries: -1 (default)
-connection.auth-retries: -1
-connection.timestamp: 0
-connection.read-only: nie
-connection.permissions: --
-connection.zone: --
-connection.master: --
-connection.slave-type: --
-connection.autoconnect-slaves: -1 (default)
-connection.secondaries: --
-connection.gateway-ping-timeout: 0
-connection.metered: nieznane
-connection.lldp: default
-connection.mdns: -1 (default)
-802-3-ethernet.port: --
-802-3-ethernet.speed: 0
-802-3-ethernet.duplex: --
-802-3-ethernet.auto-negotiate: nie
-802-3-ethernet.mac-address: --
-802-3-ethernet.cloned-mac-address: --
-802-3-ethernet.generate-mac-address-mask:--
-802-3-ethernet.mac-address-blacklist: --
-802-3-ethernet.mtu: automatyczne
-802-3-ethernet.s390-subchannels: --
-802-3-ethernet.s390-nettype: --
-802-3-ethernet.s390-options: --
-802-3-ethernet.wake-on-lan: default
-802-3-ethernet.wake-on-lan-password: --
-ipv4.method: auto
-ipv4.dns: --
-ipv4.dns-search: --
-ipv4.dns-options: ""
-ipv4.dns-priority: 0
-ipv4.addresses: --
-ipv4.gateway: --
-ipv4.routes: --
-ipv4.route-metric: -1
-ipv4.route-table: 0 (unspec)
-ipv4.ignore-auto-routes: nie
-ipv4.ignore-auto-dns: nie
-ipv4.dhcp-client-id: --
-ipv4.dhcp-timeout: 0 (default)
-ipv4.dhcp-send-hostname: tak
-ipv4.dhcp-hostname: --
-ipv4.dhcp-fqdn: --
-ipv4.never-default: nie
-ipv4.may-fail: tak
-ipv4.dad-timeout: -1 (default)
-ipv6.method: auto
-ipv6.dns: --
-ipv6.dns-search: --
-ipv6.dns-options: ""
-ipv6.dns-priority: 0
-ipv6.addresses: --
-ipv6.gateway: --
-ipv6.routes: --
-ipv6.route-metric: -1
-ipv6.route-table: 0 (unspec)
-ipv6.ignore-auto-routes: nie
-ipv6.ignore-auto-dns: nie
-ipv6.never-default: nie
-ipv6.may-fail: tak
-ipv6.ip6-privacy: -1 (unknown)
-ipv6.addr-gen-mode: stable-privacy
-ipv6.dhcp-duid: --
-ipv6.dhcp-send-hostname: tak
-ipv6.dhcp-hostname: --
-ipv6.token: --
-proxy.method: none
-proxy.browser-only: nie
-proxy.pac-url: --
-proxy.pac-script: --
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth1
-GENERAL.STATE: aktywowano
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
+
+name method browser-only pac-url pac-script
+proxy none nie -- --
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: dezaktywowanie
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-123.expected b/clients/tests/test-client.check-on-disk/test_003-123.expected
index 510ada2335..107b1f74e4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-123.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-123.expected
@@ -1,100 +1,27 @@
-location: clients/tests/test-client.py:881:test_003()/123
-cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/123
+cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 4226 bytes
+stdout: 2726 bytes
>>>
-connection.id: ethernet
-connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id: --
-connection.type: 802-3-ethernet
-connection.interface-name: --
-connection.autoconnect: yes
-connection.autoconnect-priority: 0
-connection.autoconnect-retries: -1 (default)
-connection.auth-retries: -1
-connection.timestamp: 0
-connection.read-only: no
-connection.permissions: --
-connection.zone: --
-connection.master: --
-connection.slave-type: --
-connection.autoconnect-slaves: -1 (default)
-connection.secondaries: --
-connection.gateway-ping-timeout: 0
-connection.metered: unknown
-connection.lldp: default
-connection.mdns: -1 (default)
-802-3-ethernet.port: --
-802-3-ethernet.speed: 0
-802-3-ethernet.duplex: --
-802-3-ethernet.auto-negotiate: no
-802-3-ethernet.mac-address: --
-802-3-ethernet.cloned-mac-address: --
-802-3-ethernet.generate-mac-address-mask:--
-802-3-ethernet.mac-address-blacklist: --
-802-3-ethernet.mtu: auto
-802-3-ethernet.s390-subchannels: --
-802-3-ethernet.s390-nettype: --
-802-3-ethernet.s390-options: --
-802-3-ethernet.wake-on-lan: default
-802-3-ethernet.wake-on-lan-password: --
-ipv4.method: auto
-ipv4.dns: --
-ipv4.dns-search: --
-ipv4.dns-options: ""
-ipv4.dns-priority: 0
-ipv4.addresses: --
-ipv4.gateway: --
-ipv4.routes: --
-ipv4.route-metric: -1
-ipv4.route-table: 0 (unspec)
-ipv4.ignore-auto-routes: no
-ipv4.ignore-auto-dns: no
-ipv4.dhcp-client-id: --
-ipv4.dhcp-timeout: 0 (default)
-ipv4.dhcp-send-hostname: yes
-ipv4.dhcp-hostname: --
-ipv4.dhcp-fqdn: --
-ipv4.never-default: no
-ipv4.may-fail: yes
-ipv4.dad-timeout: -1 (default)
-ipv6.method: auto
-ipv6.dns: --
-ipv6.dns-search: --
-ipv6.dns-options: ""
-ipv6.dns-priority: 0
-ipv6.addresses: --
-ipv6.gateway: --
-ipv6.routes: --
-ipv6.route-metric: -1
-ipv6.route-table: 0 (unspec)
-ipv6.ignore-auto-routes: no
-ipv6.ignore-auto-dns: no
-ipv6.never-default: no
-ipv6.may-fail: yes
-ipv6.ip6-privacy: -1 (unknown)
-ipv6.addr-gen-mode: stable-privacy
-ipv6.dhcp-duid: --
-ipv6.dhcp-send-hostname: yes
-ipv6.dhcp-hostname: --
-ipv6.token: --
-proxy.method: none
-proxy.browser-only: no
-proxy.pac-url: --
-proxy.pac-script: --
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: deactivating
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
+
+name method browser-only pac-url pac-script
+proxy none no -- --
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-124.expected b/clients/tests/test-client.check-on-disk/test_003-124.expected
index ae791be626..6d8f43442d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-124.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-124.expected
@@ -1,100 +1,27 @@
-location: clients/tests/test-client.py:881:test_003()/124
-cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/124
+cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4249 bytes
+stdout: 2748 bytes
>>>
-connection.id: ethernet
-connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id: --
-connection.type: 802-3-ethernet
-connection.interface-name: --
-connection.autoconnect: tak
-connection.autoconnect-priority: 0
-connection.autoconnect-retries: -1 (default)
-connection.auth-retries: -1
-connection.timestamp: 0
-connection.read-only: nie
-connection.permissions: --
-connection.zone: --
-connection.master: --
-connection.slave-type: --
-connection.autoconnect-slaves: -1 (default)
-connection.secondaries: --
-connection.gateway-ping-timeout: 0
-connection.metered: nieznane
-connection.lldp: default
-connection.mdns: -1 (default)
-802-3-ethernet.port: --
-802-3-ethernet.speed: 0
-802-3-ethernet.duplex: --
-802-3-ethernet.auto-negotiate: nie
-802-3-ethernet.mac-address: --
-802-3-ethernet.cloned-mac-address: --
-802-3-ethernet.generate-mac-address-mask:--
-802-3-ethernet.mac-address-blacklist: --
-802-3-ethernet.mtu: automatyczne
-802-3-ethernet.s390-subchannels: --
-802-3-ethernet.s390-nettype: --
-802-3-ethernet.s390-options: --
-802-3-ethernet.wake-on-lan: default
-802-3-ethernet.wake-on-lan-password: --
-ipv4.method: auto
-ipv4.dns: --
-ipv4.dns-search: --
-ipv4.dns-options: ""
-ipv4.dns-priority: 0
-ipv4.addresses: --
-ipv4.gateway: --
-ipv4.routes: --
-ipv4.route-metric: -1
-ipv4.route-table: 0 (unspec)
-ipv4.ignore-auto-routes: nie
-ipv4.ignore-auto-dns: nie
-ipv4.dhcp-client-id: --
-ipv4.dhcp-timeout: 0 (default)
-ipv4.dhcp-send-hostname: tak
-ipv4.dhcp-hostname: --
-ipv4.dhcp-fqdn: --
-ipv4.never-default: nie
-ipv4.may-fail: tak
-ipv4.dad-timeout: -1 (default)
-ipv6.method: auto
-ipv6.dns: --
-ipv6.dns-search: --
-ipv6.dns-options: ""
-ipv6.dns-priority: 0
-ipv6.addresses: --
-ipv6.gateway: --
-ipv6.routes: --
-ipv6.route-metric: -1
-ipv6.route-table: 0 (unspec)
-ipv6.ignore-auto-routes: nie
-ipv6.ignore-auto-dns: nie
-ipv6.never-default: nie
-ipv6.may-fail: tak
-ipv6.ip6-privacy: -1 (unknown)
-ipv6.addr-gen-mode: stable-privacy
-ipv6.dhcp-duid: --
-ipv6.dhcp-send-hostname: tak
-ipv6.dhcp-hostname: --
-ipv6.token: --
-proxy.method: none
-proxy.browser-only: nie
-proxy.pac-url: --
-proxy.pac-script: --
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: dezaktywowanie
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
+
+name method browser-only pac-url pac-script
+proxy none nie -- --
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-125.expected b/clients/tests/test-client.check-on-disk/test_003-125.expected
index 6571d64a73..37cf783f9b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-125.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-125.expected
@@ -1,64 +1,32 @@
-location: clients/tests/test-client.py:884:test_003()/125
-cmd: $NMCLI --mode multiline -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/125
+cmd: $NMCLI --mode tabular -f all dev show eth0
lang: C
returncode: 0
-stdout: 3239 bytes
+stdout: 2721 bytes
>>>
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: unknown
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
-WIRED-PROPERTIES.CARRIER: off
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no 100 Mb/s no no
+
+NAME CARRIER S390-SUBCHANNELS
+WIRED-PROPERTIES off --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-126.expected b/clients/tests/test-client.check-on-disk/test_003-126.expected
index f3a0e6c0dc..272334357e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-126.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-126.expected
@@ -1,64 +1,32 @@
-location: clients/tests/test-client.py:884:test_003()/126
-cmd: $NMCLI --mode multiline -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/126
+cmd: $NMCLI --mode tabular -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3262 bytes
+stdout: 2742 bytes
>>>
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: nieznane
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
-WIRED-PROPERTIES.CARRIER: wyłączone
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie 100 Mb/s nie nie
+
+NAME CARRIER S390-SUBCHANNELS
+WIRED-PROPERTIES wyłączone --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-127.expected b/clients/tests/test-client.check-on-disk/test_003-127.expected
index 60bd217d11..37df8e2f02 100644
--- a/clients/tests/test-client.check-on-disk/test_003-127.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-127.expected
@@ -1,76 +1,14 @@
-location: clients/tests/test-client.py:872:test_003()/127
-cmd: $NMCLI --mode multiline --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/127
+cmd: $NMCLI --mode tabular --color yes -f ALL con
lang: C
returncode: 0
-stdout: 3804 bytes
+stdout: 1885 bytes
>>>
-===============================================================================
- NetworkManager connection profiles
-===============================================================================
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: yes
-DEVICE: eth1
-STATE: activated
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: yes
-DEVICE: eth0
-STATE: deactivating
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
-NAME: con-1
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
-ACTIVE: no
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-1
--------------------------------------------------------------------------------
-NAME: con-xx1
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
-ACTIVE: no
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-xx1
--------------------------------------------------------------------------------
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-128.expected b/clients/tests/test-client.check-on-disk/test_003-128.expected
index 47f18a93cb..30cc27e6e8 100644
--- a/clients/tests/test-client.check-on-disk/test_003-128.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-128.expected
@@ -1,76 +1,14 @@
-location: clients/tests/test-client.py:872:test_003()/128
-cmd: $NMCLI --mode multiline --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/128
+cmd: $NMCLI --mode tabular --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3819 bytes
+stdout: 1895 bytes
>>>
-===============================================================================
- Profile połączeń usługi NetworkManager
-===============================================================================
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: tak
-DEVICE: eth1
-STATE: aktywowano
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: tak
-DEVICE: eth0
-STATE: dezaktywowanie
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
-NAME: con-1
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
-ACTIVE: nie
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-1
--------------------------------------------------------------------------------
-NAME: con-xx1
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
-ACTIVE: nie
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-xx1
--------------------------------------------------------------------------------
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-129.expected b/clients/tests/test-client.check-on-disk/test_003-129.expected
index e499f0155a..982851e912 100644
--- a/clients/tests/test-client.check-on-disk/test_003-129.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-129.expected
@@ -1,21 +1,13 @@
-location: clients/tests/test-client.py:875:test_003()/129
-cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/129
+cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 835 bytes
+stdout: 210 bytes
>>>
-===============================================================================
- NetworkManager connection profiles
-===============================================================================
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
--------------------------------------------------------------------------------
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
--------------------------------------------------------------------------------
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
--------------------------------------------------------------------------------
+UUID TYPE
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-130.expected b/clients/tests/test-client.check-on-disk/test_003-130.expected
index abdf035b45..75ecc15a3d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-130.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-130.expected
@@ -1,21 +1,13 @@
-location: clients/tests/test-client.py:875:test_003()/130
-cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/130
+cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 841 bytes
+stdout: 210 bytes
>>>
-===============================================================================
- Profile połączeń usługi NetworkManager
-===============================================================================
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
--------------------------------------------------------------------------------
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
--------------------------------------------------------------------------------
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
--------------------------------------------------------------------------------
+UUID TYPE
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-131.expected b/clients/tests/test-client.check-on-disk/test_003-131.expected
index 5d983001a6..96211927e5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-131.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-131.expected
@@ -1,129 +1,31 @@
-location: clients/tests/test-client.py:878:test_003()/131
-cmd: $NMCLI --mode multiline --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/131
+cmd: $NMCLI --mode tabular --color yes con s ethernet
lang: C
returncode: 0
-stdout: 6136 bytes
+stdout: 3208 bytes
>>>
-===============================================================================
- Connection profile details (ethernet)
-===============================================================================
-connection.id: ethernet
-connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id: --
-connection.type: 802-3-ethernet
-connection.interface-name: --
-connection.autoconnect: yes
-connection.autoconnect-priority: 0
-connection.autoconnect-retries: -1 (default)
-connection.auth-retries: -1
-connection.timestamp: 0
-connection.read-only: no
-connection.permissions: --
-connection.zone: --
-connection.master: --
-connection.slave-type: --
-connection.autoconnect-slaves: -1 (default)
-connection.secondaries: --
-connection.gateway-ping-timeout: 0
-connection.metered: unknown
-connection.lldp: default
-connection.mdns: -1 (default)
--------------------------------------------------------------------------------
-802-3-ethernet.port: --
-802-3-ethernet.speed: 0
-802-3-ethernet.duplex: --
-802-3-ethernet.auto-negotiate: no
-802-3-ethernet.mac-address: --
-802-3-ethernet.cloned-mac-address: --
-802-3-ethernet.generate-mac-address-mask:--
-802-3-ethernet.mac-address-blacklist: --
-802-3-ethernet.mtu: auto
-802-3-ethernet.s390-subchannels: --
-802-3-ethernet.s390-nettype: --
-802-3-ethernet.s390-options: --
-802-3-ethernet.wake-on-lan: default
-802-3-ethernet.wake-on-lan-password: --
--------------------------------------------------------------------------------
-ipv4.method: auto
-ipv4.dns: --
-ipv4.dns-search: --
-ipv4.dns-options: ""
-ipv4.dns-priority: 0
-ipv4.addresses: --
-ipv4.gateway: --
-ipv4.routes: --
-ipv4.route-metric: -1
-ipv4.route-table: 0 (unspec)
-ipv4.ignore-auto-routes: no
-ipv4.ignore-auto-dns: no
-ipv4.dhcp-client-id: --
-ipv4.dhcp-timeout: 0 (default)
-ipv4.dhcp-send-hostname: yes
-ipv4.dhcp-hostname: --
-ipv4.dhcp-fqdn: --
-ipv4.never-default: no
-ipv4.may-fail: yes
-ipv4.dad-timeout: -1 (default)
--------------------------------------------------------------------------------
-ipv6.method: auto
-ipv6.dns: --
-ipv6.dns-search: --
-ipv6.dns-options: ""
-ipv6.dns-priority: 0
-ipv6.addresses: --
-ipv6.gateway: --
-ipv6.routes: --
-ipv6.route-metric: -1
-ipv6.route-table: 0 (unspec)
-ipv6.ignore-auto-routes: no
-ipv6.ignore-auto-dns: no
-ipv6.never-default: no
-ipv6.may-fail: yes
-ipv6.ip6-privacy: -1 (unknown)
-ipv6.addr-gen-mode: stable-privacy
-ipv6.dhcp-duid: --
-ipv6.dhcp-send-hostname: yes
-ipv6.dhcp-hostname: --
-ipv6.token: --
--------------------------------------------------------------------------------
-proxy.method: none
-proxy.browser-only: no
-proxy.pac-url: --
-proxy.pac-script: --
--------------------------------------------------------------------------------
-===============================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth1
-GENERAL.STATE: activated
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
+
+name method browser-only pac-url pac-script
+proxy none no -- --
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-===============================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: deactivating
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-132.expected b/clients/tests/test-client.check-on-disk/test_003-132.expected
index b2212cc841..0142761944 100644
--- a/clients/tests/test-client.check-on-disk/test_003-132.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-132.expected
@@ -1,129 +1,31 @@
-location: clients/tests/test-client.py:878:test_003()/132
-cmd: $NMCLI --mode multiline --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/132
+cmd: $NMCLI --mode tabular --color yes con s ethernet
lang: pl_PL.UTF-8
returncode: 0
-stdout: 6182 bytes
+stdout: 3232 bytes
>>>
-===============================================================================
- Szczegóły profilu połączenia (ethernet)
-===============================================================================
-connection.id: ethernet
-connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id: --
-connection.type: 802-3-ethernet
-connection.interface-name: --
-connection.autoconnect: tak
-connection.autoconnect-priority: 0
-connection.autoconnect-retries: -1 (default)
-connection.auth-retries: -1
-connection.timestamp: 0
-connection.read-only: nie
-connection.permissions: --
-connection.zone: --
-connection.master: --
-connection.slave-type: --
-connection.autoconnect-slaves: -1 (default)
-connection.secondaries: --
-connection.gateway-ping-timeout: 0
-connection.metered: nieznane
-connection.lldp: default
-connection.mdns: -1 (default)
--------------------------------------------------------------------------------
-802-3-ethernet.port: --
-802-3-ethernet.speed: 0
-802-3-ethernet.duplex: --
-802-3-ethernet.auto-negotiate: nie
-802-3-ethernet.mac-address: --
-802-3-ethernet.cloned-mac-address: --
-802-3-ethernet.generate-mac-address-mask:--
-802-3-ethernet.mac-address-blacklist: --
-802-3-ethernet.mtu: automatyczne
-802-3-ethernet.s390-subchannels: --
-802-3-ethernet.s390-nettype: --
-802-3-ethernet.s390-options: --
-802-3-ethernet.wake-on-lan: default
-802-3-ethernet.wake-on-lan-password: --
--------------------------------------------------------------------------------
-ipv4.method: auto
-ipv4.dns: --
-ipv4.dns-search: --
-ipv4.dns-options: ""
-ipv4.dns-priority: 0
-ipv4.addresses: --
-ipv4.gateway: --
-ipv4.routes: --
-ipv4.route-metric: -1
-ipv4.route-table: 0 (unspec)
-ipv4.ignore-auto-routes: nie
-ipv4.ignore-auto-dns: nie
-ipv4.dhcp-client-id: --
-ipv4.dhcp-timeout: 0 (default)
-ipv4.dhcp-send-hostname: tak
-ipv4.dhcp-hostname: --
-ipv4.dhcp-fqdn: --
-ipv4.never-default: nie
-ipv4.may-fail: tak
-ipv4.dad-timeout: -1 (default)
--------------------------------------------------------------------------------
-ipv6.method: auto
-ipv6.dns: --
-ipv6.dns-search: --
-ipv6.dns-options: ""
-ipv6.dns-priority: 0
-ipv6.addresses: --
-ipv6.gateway: --
-ipv6.routes: --
-ipv6.route-metric: -1
-ipv6.route-table: 0 (unspec)
-ipv6.ignore-auto-routes: nie
-ipv6.ignore-auto-dns: nie
-ipv6.never-default: nie
-ipv6.may-fail: tak
-ipv6.ip6-privacy: -1 (unknown)
-ipv6.addr-gen-mode: stable-privacy
-ipv6.dhcp-duid: --
-ipv6.dhcp-send-hostname: tak
-ipv6.dhcp-hostname: --
-ipv6.token: --
--------------------------------------------------------------------------------
-proxy.method: none
-proxy.browser-only: nie
-proxy.pac-url: --
-proxy.pac-script: --
--------------------------------------------------------------------------------
-===============================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth1
-GENERAL.STATE: aktywowano
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
+
+name method browser-only pac-url pac-script
+proxy none nie -- --
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-===============================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: dezaktywowanie
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-133.expected b/clients/tests/test-client.check-on-disk/test_003-133.expected
index 93471bcacc..d4c31a75ca 100644
--- a/clients/tests/test-client.check-on-disk/test_003-133.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-133.expected
@@ -1,112 +1,27 @@
-location: clients/tests/test-client.py:881:test_003()/133
-cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/133
+cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 5158 bytes
+stdout: 2726 bytes
>>>
-===============================================================================
- Connection profile details (ethernet)
-===============================================================================
-connection.id: ethernet
-connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id: --
-connection.type: 802-3-ethernet
-connection.interface-name: --
-connection.autoconnect: yes
-connection.autoconnect-priority: 0
-connection.autoconnect-retries: -1 (default)
-connection.auth-retries: -1
-connection.timestamp: 0
-connection.read-only: no
-connection.permissions: --
-connection.zone: --
-connection.master: --
-connection.slave-type: --
-connection.autoconnect-slaves: -1 (default)
-connection.secondaries: --
-connection.gateway-ping-timeout: 0
-connection.metered: unknown
-connection.lldp: default
-connection.mdns: -1 (default)
--------------------------------------------------------------------------------
-802-3-ethernet.port: --
-802-3-ethernet.speed: 0
-802-3-ethernet.duplex: --
-802-3-ethernet.auto-negotiate: no
-802-3-ethernet.mac-address: --
-802-3-ethernet.cloned-mac-address: --
-802-3-ethernet.generate-mac-address-mask:--
-802-3-ethernet.mac-address-blacklist: --
-802-3-ethernet.mtu: auto
-802-3-ethernet.s390-subchannels: --
-802-3-ethernet.s390-nettype: --
-802-3-ethernet.s390-options: --
-802-3-ethernet.wake-on-lan: default
-802-3-ethernet.wake-on-lan-password: --
--------------------------------------------------------------------------------
-ipv4.method: auto
-ipv4.dns: --
-ipv4.dns-search: --
-ipv4.dns-options: ""
-ipv4.dns-priority: 0
-ipv4.addresses: --
-ipv4.gateway: --
-ipv4.routes: --
-ipv4.route-metric: -1
-ipv4.route-table: 0 (unspec)
-ipv4.ignore-auto-routes: no
-ipv4.ignore-auto-dns: no
-ipv4.dhcp-client-id: --
-ipv4.dhcp-timeout: 0 (default)
-ipv4.dhcp-send-hostname: yes
-ipv4.dhcp-hostname: --
-ipv4.dhcp-fqdn: --
-ipv4.never-default: no
-ipv4.may-fail: yes
-ipv4.dad-timeout: -1 (default)
--------------------------------------------------------------------------------
-ipv6.method: auto
-ipv6.dns: --
-ipv6.dns-search: --
-ipv6.dns-options: ""
-ipv6.dns-priority: 0
-ipv6.addresses: --
-ipv6.gateway: --
-ipv6.routes: --
-ipv6.route-metric: -1
-ipv6.route-table: 0 (unspec)
-ipv6.ignore-auto-routes: no
-ipv6.ignore-auto-dns: no
-ipv6.never-default: no
-ipv6.may-fail: yes
-ipv6.ip6-privacy: -1 (unknown)
-ipv6.addr-gen-mode: stable-privacy
-ipv6.dhcp-duid: --
-ipv6.dhcp-send-hostname: yes
-ipv6.dhcp-hostname: --
-ipv6.token: --
--------------------------------------------------------------------------------
-proxy.method: none
-proxy.browser-only: no
-proxy.pac-url: --
-proxy.pac-script: --
--------------------------------------------------------------------------------
-===============================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: deactivating
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
+
+name method browser-only pac-url pac-script
+proxy none no -- --
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-134.expected b/clients/tests/test-client.check-on-disk/test_003-134.expected
index bbae01ab1d..548070d635 100644
--- a/clients/tests/test-client.check-on-disk/test_003-134.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-134.expected
@@ -1,112 +1,27 @@
-location: clients/tests/test-client.py:881:test_003()/134
-cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/134
+cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 5193 bytes
+stdout: 2748 bytes
>>>
-===============================================================================
- Szczegóły profilu połączenia (ethernet)
-===============================================================================
-connection.id: ethernet
-connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id: --
-connection.type: 802-3-ethernet
-connection.interface-name: --
-connection.autoconnect: tak
-connection.autoconnect-priority: 0
-connection.autoconnect-retries: -1 (default)
-connection.auth-retries: -1
-connection.timestamp: 0
-connection.read-only: nie
-connection.permissions: --
-connection.zone: --
-connection.master: --
-connection.slave-type: --
-connection.autoconnect-slaves: -1 (default)
-connection.secondaries: --
-connection.gateway-ping-timeout: 0
-connection.metered: nieznane
-connection.lldp: default
-connection.mdns: -1 (default)
--------------------------------------------------------------------------------
-802-3-ethernet.port: --
-802-3-ethernet.speed: 0
-802-3-ethernet.duplex: --
-802-3-ethernet.auto-negotiate: nie
-802-3-ethernet.mac-address: --
-802-3-ethernet.cloned-mac-address: --
-802-3-ethernet.generate-mac-address-mask:--
-802-3-ethernet.mac-address-blacklist: --
-802-3-ethernet.mtu: automatyczne
-802-3-ethernet.s390-subchannels: --
-802-3-ethernet.s390-nettype: --
-802-3-ethernet.s390-options: --
-802-3-ethernet.wake-on-lan: default
-802-3-ethernet.wake-on-lan-password: --
--------------------------------------------------------------------------------
-ipv4.method: auto
-ipv4.dns: --
-ipv4.dns-search: --
-ipv4.dns-options: ""
-ipv4.dns-priority: 0
-ipv4.addresses: --
-ipv4.gateway: --
-ipv4.routes: --
-ipv4.route-metric: -1
-ipv4.route-table: 0 (unspec)
-ipv4.ignore-auto-routes: nie
-ipv4.ignore-auto-dns: nie
-ipv4.dhcp-client-id: --
-ipv4.dhcp-timeout: 0 (default)
-ipv4.dhcp-send-hostname: tak
-ipv4.dhcp-hostname: --
-ipv4.dhcp-fqdn: --
-ipv4.never-default: nie
-ipv4.may-fail: tak
-ipv4.dad-timeout: -1 (default)
--------------------------------------------------------------------------------
-ipv6.method: auto
-ipv6.dns: --
-ipv6.dns-search: --
-ipv6.dns-options: ""
-ipv6.dns-priority: 0
-ipv6.addresses: --
-ipv6.gateway: --
-ipv6.routes: --
-ipv6.route-metric: -1
-ipv6.route-table: 0 (unspec)
-ipv6.ignore-auto-routes: nie
-ipv6.ignore-auto-dns: nie
-ipv6.never-default: nie
-ipv6.may-fail: tak
-ipv6.ip6-privacy: -1 (unknown)
-ipv6.addr-gen-mode: stable-privacy
-ipv6.dhcp-duid: --
-ipv6.dhcp-send-hostname: tak
-ipv6.dhcp-hostname: --
-ipv6.token: --
--------------------------------------------------------------------------------
-proxy.method: none
-proxy.browser-only: nie
-proxy.pac-url: --
-proxy.pac-script: --
--------------------------------------------------------------------------------
-===============================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: dezaktywowanie
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
+
+name method browser-only pac-url pac-script
+proxy none nie -- --
+
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-135.expected b/clients/tests/test-client.check-on-disk/test_003-135.expected
index bd139f1787..a38dc41882 100644
--- a/clients/tests/test-client.check-on-disk/test_003-135.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-135.expected
@@ -1,75 +1,32 @@
-location: clients/tests/test-client.py:884:test_003()/135
-cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/135
+cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 4090 bytes
+stdout: 2721 bytes
>>>
-===============================================================================
- Device details (eth0)
-===============================================================================
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: unknown
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
--------------------------------------------------------------------------------
-WIRED-PROPERTIES.CARRIER: off
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
--------------------------------------------------------------------------------
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no 100 Mb/s no no
+
+NAME CARRIER S390-SUBCHANNELS
+WIRED-PROPERTIES off --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-136.expected b/clients/tests/test-client.check-on-disk/test_003-136.expected
index 84b6d8b5f2..ca80f4b2e2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-136.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-136.expected
@@ -1,75 +1,32 @@
-location: clients/tests/test-client.py:884:test_003()/136
-cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/136
+cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4119 bytes
+stdout: 2742 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (eth0)
-===============================================================================
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
--------------------------------------------------------------------------------
-WIRED-PROPERTIES.CARRIER: wyłączone
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
--------------------------------------------------------------------------------
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie 100 Mb/s nie nie
+
+NAME CARRIER S390-SUBCHANNELS
+WIRED-PROPERTIES wyłączone --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-137.expected b/clients/tests/test-client.check-on-disk/test_003-137.expected
index a86df1d765..e99d50fa89 100644
--- a/clients/tests/test-client.check-on-disk/test_003-137.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-137.expected
@@ -1,69 +1,18 @@
-location: clients/tests/test-client.py:872:test_003()/137
-cmd: $NMCLI --mode multiline --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/137
+cmd: $NMCLI --mode tabular --pretty -f ALL con
lang: C
returncode: 0
-stdout: 1427 bytes
+stdout: 2092 bytes
>>>
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE:yes
-DEVICE:eth0
-STATE:deactivating
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
-NAME:con-1
-UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1
-ACTIVE:no
-DEVICE:
-STATE:
-ACTIVE-PATH:
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/con-1
-NAME:con-xx1
-UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2
-ACTIVE:no
-DEVICE:
-STATE:
-ACTIVE-PATH:
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/con-xx1
+======================================
+ NetworkManager connection profiles
+======================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-138.expected b/clients/tests/test-client.check-on-disk/test_003-138.expected
index c60c67aff3..c8a1b722de 100644
--- a/clients/tests/test-client.check-on-disk/test_003-138.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-138.expected
@@ -1,69 +1,18 @@
-location: clients/tests/test-client.py:872:test_003()/138
-cmd: $NMCLI --mode multiline --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/138
+cmd: $NMCLI --mode tabular --pretty -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1427 bytes
+stdout: 2124 bytes
>>>
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE:yes
-DEVICE:eth0
-STATE:deactivating
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
-NAME:con-1
-UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1
-ACTIVE:no
-DEVICE:
-STATE:
-ACTIVE-PATH:
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/con-1
-NAME:con-xx1
-UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE:802-3-ethernet
-TIMESTAMP:0
-TIMESTAMP-REAL:never
-AUTOCONNECT:yes
-AUTOCONNECT-PRIORITY:0
-READONLY:no
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2
-ACTIVE:no
-DEVICE:
-STATE:
-ACTIVE-PATH:
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/con-xx1
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-139.expected b/clients/tests/test-client.check-on-disk/test_003-139.expected
index 809432bd13..97d1ee310a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-139.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-139.expected
@@ -1,15 +1,17 @@
-location: clients/tests/test-client.py:875:test_003()/139
-cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/139
+cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 186 bytes
+stdout: 394 bytes
>>>
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE:802-3-ethernet
-UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE:802-3-ethernet
+======================================
+ NetworkManager connection profiles
+======================================
+UUID TYPE
+--------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-140.expected b/clients/tests/test-client.check-on-disk/test_003-140.expected
index f33d59edf3..227ec2ee55 100644
--- a/clients/tests/test-client.check-on-disk/test_003-140.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-140.expected
@@ -1,15 +1,17 @@
-location: clients/tests/test-client.py:875:test_003()/140
-cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/140
+cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 186 bytes
+stdout: 414 bytes
>>>
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE:802-3-ethernet
-UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE:802-3-ethernet
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+UUID TYPE
+------------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-141.expected b/clients/tests/test-client.check-on-disk/test_003-141.expected
index e8d7c9fb4c..7e0a63bf60 100644
--- a/clients/tests/test-client.check-on-disk/test_003-141.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-141.expected
@@ -1,113 +1,47 @@
-location: clients/tests/test-client.py:878:test_003()/141
-cmd: $NMCLI --mode multiline --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/141
+cmd: $NMCLI --mode tabular --pretty con s ethernet
lang: C
returncode: 0
-stdout: 2579 bytes
+stdout: 5361 bytes
>>>
-connection.id:ethernet
-connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id:
-connection.type:802-3-ethernet
-connection.interface-name:
-connection.autoconnect:yes
-connection.autoconnect-priority:0
-connection.autoconnect-retries:-1
-connection.auth-retries:-1
-connection.timestamp:0
-connection.read-only:no
-connection.permissions:
-connection.zone:
-connection.master:
-connection.slave-type:
-connection.autoconnect-slaves:-1
-connection.secondaries:
-connection.gateway-ping-timeout:0
-connection.metered:unknown
-connection.lldp:default
-connection.mdns:-1
-802-3-ethernet.port:
-802-3-ethernet.speed:0
-802-3-ethernet.duplex:
-802-3-ethernet.auto-negotiate:no
-802-3-ethernet.mac-address:
-802-3-ethernet.cloned-mac-address:
-802-3-ethernet.generate-mac-address-mask:
-802-3-ethernet.mac-address-blacklist:
-802-3-ethernet.mtu:auto
-802-3-ethernet.s390-subchannels:
-802-3-ethernet.s390-nettype:
-802-3-ethernet.s390-options:
-802-3-ethernet.wake-on-lan:default
-802-3-ethernet.wake-on-lan-password:
-ipv4.method:auto
-ipv4.dns:
-ipv4.dns-search:
-ipv4.dns-options:
-ipv4.dns-priority:0
-ipv4.addresses:
-ipv4.gateway:
-ipv4.routes:
-ipv4.route-metric:-1
-ipv4.route-table:0
-ipv4.ignore-auto-routes:no
-ipv4.ignore-auto-dns:no
-ipv4.dhcp-client-id:
-ipv4.dhcp-timeout:0
-ipv4.dhcp-send-hostname:yes
-ipv4.dhcp-hostname:
-ipv4.dhcp-fqdn:
-ipv4.never-default:no
-ipv4.may-fail:yes
-ipv4.dad-timeout:-1
-ipv6.method:auto
-ipv6.dns:
-ipv6.dns-search:
-ipv6.dns-options:
-ipv6.dns-priority:0
-ipv6.addresses:
-ipv6.gateway:
-ipv6.routes:
-ipv6.route-metric:-1
-ipv6.route-table:0
-ipv6.ignore-auto-routes:no
-ipv6.ignore-auto-dns:no
-ipv6.never-default:no
-ipv6.may-fail:yes
-ipv6.ip6-privacy:-1
-ipv6.addr-gen-mode:stable-privacy
-ipv6.dhcp-duid:
-ipv6.dhcp-send-hostname:yes
-ipv6.dhcp-hostname:
-ipv6.token:
-proxy.method:none
-proxy.browser-only:no
-proxy.pac-url:
-proxy.pac-script:
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth1
-GENERAL.STATE:activated
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+=========================================
+ Connection profile details (ethernet)
+=========================================
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
+
+name method browser-only pac-url pac-script
+--------------------------------------------------
+proxy none no -- --
+
+======================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+======================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+======================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+======================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-142.expected b/clients/tests/test-client.check-on-disk/test_003-142.expected
index 8991be7aea..5c7c80a787 100644
--- a/clients/tests/test-client.check-on-disk/test_003-142.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-142.expected
@@ -1,113 +1,47 @@
-location: clients/tests/test-client.py:878:test_003()/142
-cmd: $NMCLI --mode multiline --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/142
+cmd: $NMCLI --mode tabular --pretty con s ethernet
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2579 bytes
+stdout: 5445 bytes
>>>
-connection.id:ethernet
-connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id:
-connection.type:802-3-ethernet
-connection.interface-name:
-connection.autoconnect:yes
-connection.autoconnect-priority:0
-connection.autoconnect-retries:-1
-connection.auth-retries:-1
-connection.timestamp:0
-connection.read-only:no
-connection.permissions:
-connection.zone:
-connection.master:
-connection.slave-type:
-connection.autoconnect-slaves:-1
-connection.secondaries:
-connection.gateway-ping-timeout:0
-connection.metered:unknown
-connection.lldp:default
-connection.mdns:-1
-802-3-ethernet.port:
-802-3-ethernet.speed:0
-802-3-ethernet.duplex:
-802-3-ethernet.auto-negotiate:no
-802-3-ethernet.mac-address:
-802-3-ethernet.cloned-mac-address:
-802-3-ethernet.generate-mac-address-mask:
-802-3-ethernet.mac-address-blacklist:
-802-3-ethernet.mtu:auto
-802-3-ethernet.s390-subchannels:
-802-3-ethernet.s390-nettype:
-802-3-ethernet.s390-options:
-802-3-ethernet.wake-on-lan:default
-802-3-ethernet.wake-on-lan-password:
-ipv4.method:auto
-ipv4.dns:
-ipv4.dns-search:
-ipv4.dns-options:
-ipv4.dns-priority:0
-ipv4.addresses:
-ipv4.gateway:
-ipv4.routes:
-ipv4.route-metric:-1
-ipv4.route-table:0
-ipv4.ignore-auto-routes:no
-ipv4.ignore-auto-dns:no
-ipv4.dhcp-client-id:
-ipv4.dhcp-timeout:0
-ipv4.dhcp-send-hostname:yes
-ipv4.dhcp-hostname:
-ipv4.dhcp-fqdn:
-ipv4.never-default:no
-ipv4.may-fail:yes
-ipv4.dad-timeout:-1
-ipv6.method:auto
-ipv6.dns:
-ipv6.dns-search:
-ipv6.dns-options:
-ipv6.dns-priority:0
-ipv6.addresses:
-ipv6.gateway:
-ipv6.routes:
-ipv6.route-metric:-1
-ipv6.route-table:0
-ipv6.ignore-auto-routes:no
-ipv6.ignore-auto-dns:no
-ipv6.never-default:no
-ipv6.may-fail:yes
-ipv6.ip6-privacy:-1
-ipv6.addr-gen-mode:stable-privacy
-ipv6.dhcp-duid:
-ipv6.dhcp-send-hostname:yes
-ipv6.dhcp-hostname:
-ipv6.token:
-proxy.method:none
-proxy.browser-only:no
-proxy.pac-url:
-proxy.pac-script:
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth1
-GENERAL.STATE:activated
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+===========================================
+ Szczegóły profilu połączenia (ethernet)
+===========================================
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
+
+name method browser-only pac-url pac-script
+--------------------------------------------------
+proxy none nie -- --
+
+===========================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===========================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+===========================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===========================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-143.expected b/clients/tests/test-client.check-on-disk/test_003-143.expected
index 322daaa248..9ab4909743 100644
--- a/clients/tests/test-client.check-on-disk/test_003-143.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-143.expected
@@ -1,100 +1,39 @@
-location: clients/tests/test-client.py:881:test_003()/143
-cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/143
+cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 2211 bytes
+stdout: 4427 bytes
>>>
-connection.id:ethernet
-connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id:
-connection.type:802-3-ethernet
-connection.interface-name:
-connection.autoconnect:yes
-connection.autoconnect-priority:0
-connection.autoconnect-retries:-1
-connection.auth-retries:-1
-connection.timestamp:0
-connection.read-only:no
-connection.permissions:
-connection.zone:
-connection.master:
-connection.slave-type:
-connection.autoconnect-slaves:-1
-connection.secondaries:
-connection.gateway-ping-timeout:0
-connection.metered:unknown
-connection.lldp:default
-connection.mdns:-1
-802-3-ethernet.port:
-802-3-ethernet.speed:0
-802-3-ethernet.duplex:
-802-3-ethernet.auto-negotiate:no
-802-3-ethernet.mac-address:
-802-3-ethernet.cloned-mac-address:
-802-3-ethernet.generate-mac-address-mask:
-802-3-ethernet.mac-address-blacklist:
-802-3-ethernet.mtu:auto
-802-3-ethernet.s390-subchannels:
-802-3-ethernet.s390-nettype:
-802-3-ethernet.s390-options:
-802-3-ethernet.wake-on-lan:default
-802-3-ethernet.wake-on-lan-password:
-ipv4.method:auto
-ipv4.dns:
-ipv4.dns-search:
-ipv4.dns-options:
-ipv4.dns-priority:0
-ipv4.addresses:
-ipv4.gateway:
-ipv4.routes:
-ipv4.route-metric:-1
-ipv4.route-table:0
-ipv4.ignore-auto-routes:no
-ipv4.ignore-auto-dns:no
-ipv4.dhcp-client-id:
-ipv4.dhcp-timeout:0
-ipv4.dhcp-send-hostname:yes
-ipv4.dhcp-hostname:
-ipv4.dhcp-fqdn:
-ipv4.never-default:no
-ipv4.may-fail:yes
-ipv4.dad-timeout:-1
-ipv6.method:auto
-ipv6.dns:
-ipv6.dns-search:
-ipv6.dns-options:
-ipv6.dns-priority:0
-ipv6.addresses:
-ipv6.gateway:
-ipv6.routes:
-ipv6.route-metric:-1
-ipv6.route-table:0
-ipv6.ignore-auto-routes:no
-ipv6.ignore-auto-dns:no
-ipv6.never-default:no
-ipv6.may-fail:yes
-ipv6.ip6-privacy:-1
-ipv6.addr-gen-mode:stable-privacy
-ipv6.dhcp-duid:
-ipv6.dhcp-send-hostname:yes
-ipv6.dhcp-hostname:
-ipv6.token:
-proxy.method:none
-proxy.browser-only:no
-proxy.pac-url:
-proxy.pac-script:
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+=========================================
+ Connection profile details (ethernet)
+=========================================
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
+
+name method browser-only pac-url pac-script
+--------------------------------------------------
+proxy none no -- --
+
+======================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+======================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-144.expected b/clients/tests/test-client.check-on-disk/test_003-144.expected
index 8336f36a47..d296f42504 100644
--- a/clients/tests/test-client.check-on-disk/test_003-144.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-144.expected
@@ -1,100 +1,39 @@
-location: clients/tests/test-client.py:881:test_003()/144
-cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/144
+cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2211 bytes
+stdout: 4489 bytes
>>>
-connection.id:ethernet
-connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
-connection.stable-id:
-connection.type:802-3-ethernet
-connection.interface-name:
-connection.autoconnect:yes
-connection.autoconnect-priority:0
-connection.autoconnect-retries:-1
-connection.auth-retries:-1
-connection.timestamp:0
-connection.read-only:no
-connection.permissions:
-connection.zone:
-connection.master:
-connection.slave-type:
-connection.autoconnect-slaves:-1
-connection.secondaries:
-connection.gateway-ping-timeout:0
-connection.metered:unknown
-connection.lldp:default
-connection.mdns:-1
-802-3-ethernet.port:
-802-3-ethernet.speed:0
-802-3-ethernet.duplex:
-802-3-ethernet.auto-negotiate:no
-802-3-ethernet.mac-address:
-802-3-ethernet.cloned-mac-address:
-802-3-ethernet.generate-mac-address-mask:
-802-3-ethernet.mac-address-blacklist:
-802-3-ethernet.mtu:auto
-802-3-ethernet.s390-subchannels:
-802-3-ethernet.s390-nettype:
-802-3-ethernet.s390-options:
-802-3-ethernet.wake-on-lan:default
-802-3-ethernet.wake-on-lan-password:
-ipv4.method:auto
-ipv4.dns:
-ipv4.dns-search:
-ipv4.dns-options:
-ipv4.dns-priority:0
-ipv4.addresses:
-ipv4.gateway:
-ipv4.routes:
-ipv4.route-metric:-1
-ipv4.route-table:0
-ipv4.ignore-auto-routes:no
-ipv4.ignore-auto-dns:no
-ipv4.dhcp-client-id:
-ipv4.dhcp-timeout:0
-ipv4.dhcp-send-hostname:yes
-ipv4.dhcp-hostname:
-ipv4.dhcp-fqdn:
-ipv4.never-default:no
-ipv4.may-fail:yes
-ipv4.dad-timeout:-1
-ipv6.method:auto
-ipv6.dns:
-ipv6.dns-search:
-ipv6.dns-options:
-ipv6.dns-priority:0
-ipv6.addresses:
-ipv6.gateway:
-ipv6.routes:
-ipv6.route-metric:-1
-ipv6.route-table:0
-ipv6.ignore-auto-routes:no
-ipv6.ignore-auto-dns:no
-ipv6.never-default:no
-ipv6.may-fail:yes
-ipv6.ip6-privacy:-1
-ipv6.addr-gen-mode:stable-privacy
-ipv6.dhcp-duid:
-ipv6.dhcp-send-hostname:yes
-ipv6.dhcp-hostname:
-ipv6.token:
-proxy.method:none
-proxy.browser-only:no
-proxy.pac-url:
-proxy.pac-script:
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+===========================================
+ Szczegóły profilu połączenia (ethernet)
+===========================================
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
+
+name method browser-only pac-url pac-script
+--------------------------------------------------
+proxy none nie -- --
+
+===========================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===========================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-145.expected b/clients/tests/test-client.check-on-disk/test_003-145.expected
index 25d3bb86e1..261b4e4291 100644
--- a/clients/tests/test-client.check-on-disk/test_003-145.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-145.expected
@@ -1,64 +1,43 @@
-location: clients/tests/test-client.py:884:test_003()/145
-cmd: $NMCLI --mode multiline --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/145
+cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
lang: C
returncode: 0
-stdout: 2011 bytes
+stdout: 4162 bytes
>>>
-GENERAL.DEVICE:eth0
-GENERAL.TYPE:ethernet
-GENERAL.NM-TYPE:NMDeviceEthernet
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:C0:61:AE:26:4D:D7
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/eth0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:ethernet
-GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIRED-PROPERTIES.CARRIER:off
-IP4.ADDRESS[1]:192.168.6.238/29
-IP4.GATEWAY:
-IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]:192.168.213.113
-IP4.DOMAIN[1]:sear4.foo4.bar
-IP4.WINS[1]:192.168.156.115
-IP4.WINS[2]:192.168.8.33
-IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]:sear6.fo.x.y
-IP6.DOMAIN[2]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+=========================
+ Device details (eth0)
+=========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES no 100 Mb/s no no
+
+NAME CARRIER S390-SUBCHANNELS
+---------------------------------------------
+WIRED-PROPERTIES off --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+---------------
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-146.expected b/clients/tests/test-client.check-on-disk/test_003-146.expected
index 5a0267fc92..907f56bd7f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-146.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-146.expected
@@ -1,64 +1,43 @@
-location: clients/tests/test-client.py:884:test_003()/146
-cmd: $NMCLI --mode multiline --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/146
+cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2034 bytes
+stdout: 4220 bytes
>>>
-GENERAL.DEVICE:eth0
-GENERAL.TYPE:ethernet
-GENERAL.NM-TYPE:NMDeviceEthernet
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:C0:61:AE:26:4D:D7
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
-GENERAL.UDI:/sys/devices/virtual/eth0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:nie
-GENERAL.NM-MANAGED:tak
-GENERAL.AUTOCONNECT:tak
-GENERAL.FIRMWARE-MISSING:nie
-GENERAL.NM-PLUGIN-MISSING:nie
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:ethernet
-GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
-WIRED-PROPERTIES.CARRIER:wyłączone
-IP4.ADDRESS[1]:192.168.6.238/29
-IP4.GATEWAY:
-IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]:192.168.213.113
-IP4.DOMAIN[1]:sear4.foo4.bar
-IP4.WINS[1]:192.168.156.115
-IP4.WINS[2]:192.168.8.33
-IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]:sear6.fo.x.y
-IP6.DOMAIN[2]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+==================================
+ Informacje o urządzeniu (eth0)
+==================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie 100 Mb/s nie nie
+
+NAME CARRIER S390-SUBCHANNELS
+-----------------------------------------------
+WIRED-PROPERTIES wyłączone --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+---------------
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-147.expected b/clients/tests/test-client.check-on-disk/test_003-147.expected
index 75e35694b3..4adc1c4f7e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-147.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-147.expected
@@ -1,12 +1,16 @@
-location: clients/tests/test-client.py:872:test_003()/147
-cmd: $NMCLI -f ALL con
+location: clients/tests/test-client.py:875:test_003()/147
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
lang: C
returncode: 0
-stdout: 1615 bytes
+stdout: 2362 bytes
>>>
+======================================
+ NetworkManager connection profiles
+======================================
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-148.expected b/clients/tests/test-client.check-on-disk/test_003-148.expected
index 71643516aa..34f871a136 100644
--- a/clients/tests/test-client.check-on-disk/test_003-148.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-148.expected
@@ -1,12 +1,16 @@
-location: clients/tests/test-client.py:872:test_003()/148
-cmd: $NMCLI -f ALL con
+location: clients/tests/test-client.py:875:test_003()/148
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1625 bytes
+stdout: 2394 bytes
>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-149.expected b/clients/tests/test-client.check-on-disk/test_003-149.expected
index dfd2494c0f..66a05249de 100644
--- a/clients/tests/test-client.check-on-disk/test_003-149.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-149.expected
@@ -1,10 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/149
-cmd: $NMCLI -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/149
+cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 144 bytes
+stdout: 412 bytes
>>>
+======================================
+ NetworkManager connection profiles
+======================================
UUID TYPE
+--------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-150.expected b/clients/tests/test-client.check-on-disk/test_003-150.expected
index cc70aa686c..317d2b20ab 100644
--- a/clients/tests/test-client.check-on-disk/test_003-150.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-150.expected
@@ -1,10 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/150
-cmd: $NMCLI -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/150
+cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 144 bytes
+stdout: 432 bytes
>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
UUID TYPE
+------------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-151.expected b/clients/tests/test-client.check-on-disk/test_003-151.expected
index ef63f8d65c..9d3beb1440 100644
--- a/clients/tests/test-client.check-on-disk/test_003-151.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-151.expected
@@ -1,13 +1,50 @@
-location: clients/tests/test-client.py:878:test_003()/151
-cmd: $NMCLI con s ethernet
+location: clients/tests/test-client.py:881:test_003()/151
+cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 5361 bytes
>>>
+=========================================
+ Connection profile details (ethernet)
+=========================================
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
+
+name method browser-only pac-url pac-script
+--------------------------------------------------
+proxy none no -- --
+
+======================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+======================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 activated no no -- no /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+======================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+======================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-152.expected b/clients/tests/test-client.check-on-disk/test_003-152.expected
index d783e36de4..fe51c88f8d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-152.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-152.expected
@@ -1,13 +1,50 @@
-location: clients/tests/test-client.py:878:test_003()/152
-cmd: $NMCLI con s ethernet
+location: clients/tests/test-client.py:881:test_003()/152
+cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 5445 bytes
>>>
+===========================================
+ Szczegóły profilu połączenia (ethernet)
+===========================================
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
+
+name method browser-only pac-url pac-script
+--------------------------------------------------
+proxy none nie -- --
+
+===========================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===========================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth1 aktywowano nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/2 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+===========================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===========================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-153.expected b/clients/tests/test-client.check-on-disk/test_003-153.expected
index 2ae2f12d12..3f4517799d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-153.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-153.expected
@@ -1,21 +1,39 @@
-location: clients/tests/test-client.py:881:test_003()/153
-cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/153
+cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 667 bytes
+stdout: 4427 bytes
>>>
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: deactivating
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
+=========================================
+ Connection profile details (ethernet)
+=========================================
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- yes 0 -1 (default) -1 0 no -- -- -- -- -1 (default) -- 0 unknown default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+802-3-ethernet -- 0 -- no -- -- -- -- auto -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no -- 0 (default) yes -- -- no yes -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) no no no yes -1 (unknown) stable-privacy -- yes -- --
+
+name method browser-only pac-url pac-script
+--------------------------------------------------
+proxy none no -- --
+
+======================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+======================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-154.expected b/clients/tests/test-client.check-on-disk/test_003-154.expected
index a05e4deee3..ae7c6dce2d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-154.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-154.expected
@@ -1,21 +1,39 @@
-location: clients/tests/test-client.py:881:test_003()/154
-cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/154
+cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 672 bytes
+stdout: 4489 bytes
>>>
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: dezaktywowanie
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
+===========================================
+ Szczegóły profilu połączenia (ethernet)
+===========================================
+name id uuid stable-id type interface-name autoconnect autoconnect-priority autoconnect-retries auth-retries timestamp read-only permissions zone master slave-type autoconnect-slaves secondaries gateway-ping-timeout metered lldp mdns
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+connection ethernet UUID-ethernet-REPLACED-REPLACED-REPL -- 802-3-ethernet -- tak 0 -1 (default) -1 0 nie -- -- -- -- -1 (default) -- 0 nieznane default -1 (default)
+
+name port speed duplex auto-negotiate mac-address cloned-mac-address generate-mac-address-mask mac-address-blacklist mtu s390-subchannels s390-nettype s390-options wake-on-lan wake-on-lan-password
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+802-3-ethernet -- 0 -- nie -- -- -- -- automatyczne -- -- -- default --
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns dhcp-client-id dhcp-timeout dhcp-send-hostname dhcp-hostname dhcp-fqdn never-default may-fail dad-timeout
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie -- 0 (default) tak -- -- nie tak -1 (default)
+
+name method dns dns-search dns-options dns-priority addresses gateway routes route-metric route-table ignore-auto-routes ignore-auto-dns never-default may-fail ip6-privacy addr-gen-mode dhcp-duid dhcp-send-hostname dhcp-hostname token
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6 auto -- -- "" 0 -- -- -- -1 0 (unspec) nie nie nie tak -1 (unknown) stable-privacy -- tak -- --
+
+name method browser-only pac-url pac-script
+--------------------------------------------------
+proxy none nie -- --
+
+===========================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===========================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-155.expected b/clients/tests/test-client.check-on-disk/test_003-155.expected
index 1720ea8310..3d5acebafb 100644
--- a/clients/tests/test-client.check-on-disk/test_003-155.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-155.expected
@@ -1,64 +1,43 @@
-location: clients/tests/test-client.py:884:test_003()/155
-cmd: $NMCLI -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/155
+cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 3207 bytes
+stdout: 4162 bytes
>>>
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: unknown
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
-WIRED-PROPERTIES.CARRIER: off
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+=========================
+ Device details (eth0)
+=========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES no 100 Mb/s no no
+
+NAME CARRIER S390-SUBCHANNELS
+---------------------------------------------
+WIRED-PROPERTIES off --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+---------------
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-156.expected b/clients/tests/test-client.check-on-disk/test_003-156.expected
index ea261fa33b..a7008caee1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-156.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-156.expected
@@ -1,64 +1,43 @@
-location: clients/tests/test-client.py:884:test_003()/156
-cmd: $NMCLI -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/156
+cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3230 bytes
+stdout: 4220 bytes
>>>
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: nieznane
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
-WIRED-PROPERTIES.CARRIER: wyłączone
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+==================================
+ Informacje o urządzeniu (eth0)
+==================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie 100 Mb/s nie nie
+
+NAME CARRIER S390-SUBCHANNELS
+-----------------------------------------------
+WIRED-PROPERTIES wyłączone --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+---------------
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-157.expected b/clients/tests/test-client.check-on-disk/test_003-157.expected
index 4440ce6d74..15ecd16d99 100644
--- a/clients/tests/test-client.check-on-disk/test_003-157.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-157.expected
@@ -1,18 +1,13 @@
-location: clients/tests/test-client.py:872:test_003()/157
-cmd: $NMCLI --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/157
+cmd: $NMCLI --mode tabular --terse -f ALL con
lang: C
returncode: 0
-stdout: 2092 bytes
+stdout: 871 bytes
>>>
-======================================
- NetworkManager connection profiles
-======================================
-NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
-con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
-con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-158.expected b/clients/tests/test-client.check-on-disk/test_003-158.expected
index 7b9cb75857..e258523aa1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-158.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-158.expected
@@ -1,18 +1,13 @@
-location: clients/tests/test-client.py:872:test_003()/158
-cmd: $NMCLI --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/158
+cmd: $NMCLI --mode tabular --terse -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2124 bytes
+stdout: 871 bytes
>>>
-==========================================
- Profile połączeń usługi NetworkManager
-==========================================
-NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
-con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
-con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-159.expected b/clients/tests/test-client.check-on-disk/test_003-159.expected
index 6e27ea94b0..28778674a8 100644
--- a/clients/tests/test-client.check-on-disk/test_003-159.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-159.expected
@@ -1,16 +1,12 @@
-location: clients/tests/test-client.py:875:test_003()/159
-cmd: $NMCLI --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/159
+cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 346 bytes
+stdout: 156 bytes
>>>
-======================================
- NetworkManager connection profiles
-======================================
-UUID TYPE
---------------------------------------------------------------------------------------
-5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-160.expected b/clients/tests/test-client.check-on-disk/test_003-160.expected
index 97c3e9651f..38d25f5497 100644
--- a/clients/tests/test-client.check-on-disk/test_003-160.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-160.expected
@@ -1,16 +1,12 @@
-location: clients/tests/test-client.py:875:test_003()/160
-cmd: $NMCLI --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/160
+cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 366 bytes
+stdout: 156 bytes
>>>
-==========================================
- Profile połączeń usługi NetworkManager
-==========================================
-UUID TYPE
-------------------------------------------------------------------------------------------
-5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-161.expected b/clients/tests/test-client.check-on-disk/test_003-161.expected
index 1ffbe3c5b5..dc835d0bac 100644
--- a/clients/tests/test-client.check-on-disk/test_003-161.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-161.expected
@@ -1,13 +1,20 @@
-location: clients/tests/test-client.py:878:test_003()/161
-cmd: $NMCLI --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/161
+cmd: $NMCLI --mode tabular --terse con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 666 bytes
>>>
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
+802-3-ethernet::0::no:::::auto::::default:
+ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
+ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
+proxy:none:no::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-162.expected b/clients/tests/test-client.check-on-disk/test_003-162.expected
index 0e6e976cbc..f15ac75d76 100644
--- a/clients/tests/test-client.check-on-disk/test_003-162.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-162.expected
@@ -1,13 +1,20 @@
-location: clients/tests/test-client.py:878:test_003()/162
-cmd: $NMCLI --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/162
+cmd: $NMCLI --mode tabular --terse con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 666 bytes
>>>
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
+802-3-ethernet::0::no:::::auto::::default:
+ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
+ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
+proxy:none:no::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-163.expected b/clients/tests/test-client.check-on-disk/test_003-163.expected
index 46ce151431..e637173bc3 100644
--- a/clients/tests/test-client.check-on-disk/test_003-163.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-163.expected
@@ -1,28 +1,15 @@
-location: clients/tests/test-client.py:881:test_003()/163
-cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/163
+cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 1193 bytes
+stdout: 479 bytes
>>>
-===============================================================================
- Connection profile details
-===============================================================================
-===============================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: deactivating
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
+802-3-ethernet::0::no:::::auto::::default:
+ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
+ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
+proxy:none:no::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-164.expected b/clients/tests/test-client.check-on-disk/test_003-164.expected
index 921b529fb6..dc9875cae5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-164.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-164.expected
@@ -1,28 +1,15 @@
-location: clients/tests/test-client.py:881:test_003()/164
-cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/164
+cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1210 bytes
+stdout: 479 bytes
>>>
-===============================================================================
- Szczegóły profilu połączenia
-===============================================================================
-===============================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: dezaktywowanie
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
+802-3-ethernet::0::no:::::auto::::default:
+ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
+ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
+proxy:none:no::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-165.expected b/clients/tests/test-client.check-on-disk/test_003-165.expected
index b8dd50f9e5..dad2481920 100644
--- a/clients/tests/test-client.check-on-disk/test_003-165.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-165.expected
@@ -1,75 +1,17 @@
-location: clients/tests/test-client.py:884:test_003()/165
-cmd: $NMCLI --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/165
+cmd: $NMCLI --mode tabular --terse -f all dev show eth0
lang: C
returncode: 0
-stdout: 4058 bytes
+stdout: 1176 bytes
>>>
-===============================================================================
- Device details (eth0)
-===============================================================================
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: unknown
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
--------------------------------------------------------------------------------
-WIRED-PROPERTIES.CARRIER: off
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
--------------------------------------------------------------------------------
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+CAPABILITIES:no:100 Mb/s:no:no
+WIRED-PROPERTIES:off:
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
+DHCP4:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-166.expected b/clients/tests/test-client.check-on-disk/test_003-166.expected
index eb026a04dd..d48062d5db 100644
--- a/clients/tests/test-client.check-on-disk/test_003-166.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-166.expected
@@ -1,75 +1,17 @@
-location: clients/tests/test-client.py:884:test_003()/166
-cmd: $NMCLI --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/166
+cmd: $NMCLI --mode tabular --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4087 bytes
+stdout: 1199 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (eth0)
-===============================================================================
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
--------------------------------------------------------------------------------
-WIRED-PROPERTIES.CARRIER: wyłączone
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
--------------------------------------------------------------------------------
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
+CAPABILITIES:nie:100 Mb/s:nie:nie
+WIRED-PROPERTIES:wyłączone:
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
+DHCP4:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-167.expected b/clients/tests/test-client.check-on-disk/test_003-167.expected
index d8712e2836..8dad4f6546 100644
--- a/clients/tests/test-client.check-on-disk/test_003-167.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-167.expected
@@ -1,11 +1,11 @@
-location: clients/tests/test-client.py:872:test_003()/167
-cmd: $NMCLI --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/167
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
lang: C
returncode: 0
-stdout: 847 bytes
+stdout: 1141 bytes
>>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-168.expected b/clients/tests/test-client.check-on-disk/test_003-168.expected
index fca693494f..f1c4e1edbd 100644
--- a/clients/tests/test-client.check-on-disk/test_003-168.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-168.expected
@@ -1,11 +1,11 @@
-location: clients/tests/test-client.py:872:test_003()/168
-cmd: $NMCLI --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/168
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 847 bytes
+stdout: 1141 bytes
>>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
diff --git a/clients/tests/test-client.check-on-disk/test_003-169.expected b/clients/tests/test-client.check-on-disk/test_003-169.expected
index c7a8b5560e..98d489e486 100644
--- a/clients/tests/test-client.check-on-disk/test_003-169.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-169.expected
@@ -1,9 +1,10 @@
-location: clients/tests/test-client.py:875:test_003()/169
-cmd: $NMCLI --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/169
+cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 104 bytes
+stdout: 174 bytes
>>>
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-170.expected b/clients/tests/test-client.check-on-disk/test_003-170.expected
index fa7cb7fd03..33e0867536 100644
--- a/clients/tests/test-client.check-on-disk/test_003-170.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-170.expected
@@ -1,9 +1,10 @@
-location: clients/tests/test-client.py:875:test_003()/170
-cmd: $NMCLI --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/170
+cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 104 bytes
+stdout: 174 bytes
>>>
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-171.expected b/clients/tests/test-client.check-on-disk/test_003-171.expected
index 8e2867ae9a..983733377d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-171.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-171.expected
@@ -1,13 +1,20 @@
-location: clients/tests/test-client.py:878:test_003()/171
-cmd: $NMCLI --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/171
+cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 666 bytes
>>>
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
+802-3-ethernet::0::no:::::auto::::default:
+ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
+ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
+proxy:none:no::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-172.expected b/clients/tests/test-client.check-on-disk/test_003-172.expected
index 8c1d0ef5b5..d78af4fbf4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-172.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-172.expected
@@ -1,13 +1,20 @@
-location: clients/tests/test-client.py:878:test_003()/172
-cmd: $NMCLI --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/172
+cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 666 bytes
>>>
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
+802-3-ethernet::0::no:::::auto::::default:
+ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
+ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
+proxy:none:no::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-173.expected b/clients/tests/test-client.check-on-disk/test_003-173.expected
index 3d57f196cb..152f89ac6c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-173.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-173.expected
@@ -1,21 +1,15 @@
-location: clients/tests/test-client.py:881:test_003()/173
-cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/173
+cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 370 bytes
+stdout: 479 bytes
>>>
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
+802-3-ethernet::0::no:::::auto::::default:
+ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
+ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
+proxy:none:no::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-174.expected b/clients/tests/test-client.check-on-disk/test_003-174.expected
index 0c375f7e2c..a8fb33e192 100644
--- a/clients/tests/test-client.check-on-disk/test_003-174.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-174.expected
@@ -1,21 +1,15 @@
-location: clients/tests/test-client.py:881:test_003()/174
-cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/174
+cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 370 bytes
+stdout: 479 bytes
>>>
-GENERAL.NAME:ethernet
-GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES:eth0
-GENERAL.STATE:deactivating
-GENERAL.DEFAULT:no
-GENERAL.DEFAULT6:no
-GENERAL.SPEC-OBJECT:
-GENERAL.VPN:no
-GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:
-GENERAL.MASTER-PATH:
+connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:-1:0:no:::::-1::0:unknown:default:-1
+802-3-ethernet::0::no:::::auto::::default:
+ipv4:auto::: :0::::-1:0:no:no::0:yes:::no:yes:-1
+ipv6:auto::: :0::::-1:0:no:no:no:yes:-1:stable-privacy::yes::
+proxy:none:no::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-175.expected b/clients/tests/test-client.check-on-disk/test_003-175.expected
index 3a5c017210..2489ec8b44 100644
--- a/clients/tests/test-client.check-on-disk/test_003-175.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-175.expected
@@ -1,64 +1,17 @@
-location: clients/tests/test-client.py:884:test_003()/175
-cmd: $NMCLI --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/175
+cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 1979 bytes
+stdout: 1176 bytes
>>>
-GENERAL.DEVICE:eth0
-GENERAL.TYPE:ethernet
-GENERAL.NM-TYPE:NMDeviceEthernet
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:C0:61:AE:26:4D:D7
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/eth0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:ethernet
-GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIRED-PROPERTIES.CARRIER:off
-IP4.ADDRESS[1]:192.168.6.238/29
-IP4.GATEWAY:
-IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]:192.168.213.113
-IP4.DOMAIN[1]:sear4.foo4.bar
-IP4.WINS[1]:192.168.156.115
-IP4.WINS[2]:192.168.8.33
-IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]:sear6.fo.x.y
-IP6.DOMAIN[2]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+CAPABILITIES:no:100 Mb/s:no:no
+WIRED-PROPERTIES:off:
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
+DHCP4:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-176.expected b/clients/tests/test-client.check-on-disk/test_003-176.expected
index f152d29333..c15224d5ce 100644
--- a/clients/tests/test-client.check-on-disk/test_003-176.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-176.expected
@@ -1,64 +1,17 @@
-location: clients/tests/test-client.py:884:test_003()/176
-cmd: $NMCLI --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/176
+cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2002 bytes
+stdout: 1199 bytes
>>>
-GENERAL.DEVICE:eth0
-GENERAL.TYPE:ethernet
-GENERAL.NM-TYPE:NMDeviceEthernet
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:C0:61:AE:26:4D:D7
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
-GENERAL.UDI:/sys/devices/virtual/eth0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:nie
-GENERAL.NM-MANAGED:tak
-GENERAL.AUTOCONNECT:tak
-GENERAL.FIRMWARE-MISSING:nie
-GENERAL.NM-PLUGIN-MISSING:nie
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:ethernet
-GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED:nieznane
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:100 Mb/s
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
-WIRED-PROPERTIES.CARRIER:wyłączone
-IP4.ADDRESS[1]:192.168.6.238/29
-IP4.GATEWAY:
-IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]:192.168.213.113
-IP4.DOMAIN[1]:sear4.foo4.bar
-IP4.WINS[1]:192.168.156.115
-IP4.WINS[2]:192.168.8.33
-IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]:sear6.fo.x.y
-IP6.DOMAIN[2]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
+CAPABILITIES:nie:100 Mb/s:nie:nie
+WIRED-PROPERTIES:wyłączone:
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
+DHCP4:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-177.expected b/clients/tests/test-client.check-on-disk/test_003-177.expected
index f59a7c0c66..291903cffe 100644
--- a/clients/tests/test-client.check-on-disk/test_003-177.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-177.expected
@@ -1,14 +1,69 @@
-location: clients/tests/test-client.py:872:test_003()/177
-cmd: $NMCLI --mode tabular -f ALL con
+location: clients/tests/test-client.py:875:test_003()/177
+cmd: $NMCLI --mode multiline -f ALL con
lang: C
returncode: 0
-stdout: 1615 bytes
+stdout: 3267 bytes
>>>
-NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
-con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
-con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth1
+STATE: activated
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth0
+STATE: deactivating
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-178.expected b/clients/tests/test-client.check-on-disk/test_003-178.expected
index 0e00648fee..42268e646a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-178.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-178.expected
@@ -1,14 +1,69 @@
-location: clients/tests/test-client.py:872:test_003()/178
-cmd: $NMCLI --mode tabular -f ALL con
+location: clients/tests/test-client.py:875:test_003()/178
+cmd: $NMCLI --mode multiline -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1625 bytes
+stdout: 3276 bytes
>>>
-NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
-con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
-con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth1
+STATE: aktywowano
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth0
+STATE: dezaktywowanie
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-179.expected b/clients/tests/test-client.check-on-disk/test_003-179.expected
index d02438740f..a32f4a80f2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-179.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-179.expected
@@ -1,12 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/179
-cmd: $NMCLI --mode tabular -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/179
+cmd: $NMCLI --mode multiline -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 144 bytes
+stdout: 378 bytes
>>>
-UUID TYPE
-5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-180.expected b/clients/tests/test-client.check-on-disk/test_003-180.expected
index 1aae735b16..aad4fa32f5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-180.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-180.expected
@@ -1,12 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/180
-cmd: $NMCLI --mode tabular -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/180
+cmd: $NMCLI --mode multiline -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 144 bytes
+stdout: 378 bytes
>>>
-UUID TYPE
-5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-181.expected b/clients/tests/test-client.check-on-disk/test_003-181.expected
index be82a6578a..b3291074cf 100644
--- a/clients/tests/test-client.check-on-disk/test_003-181.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-181.expected
@@ -1,13 +1,116 @@
-location: clients/tests/test-client.py:878:test_003()/181
-cmd: $NMCLI --mode tabular con s ethernet
+location: clients/tests/test-client.py:881:test_003()/181
+cmd: $NMCLI --mode multiline con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 4891 bytes
>>>
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: activated
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-182.expected b/clients/tests/test-client.check-on-disk/test_003-182.expected
index 0d05182b11..12ee0ad7ca 100644
--- a/clients/tests/test-client.check-on-disk/test_003-182.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-182.expected
@@ -1,13 +1,116 @@
-location: clients/tests/test-client.py:878:test_003()/182
-cmd: $NMCLI --mode tabular con s ethernet
+location: clients/tests/test-client.py:881:test_003()/182
+cmd: $NMCLI --mode multiline con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 4918 bytes
>>>
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: aktywowano
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-183.expected b/clients/tests/test-client.check-on-disk/test_003-183.expected
index b6f3428ab9..c1277be437 100644
--- a/clients/tests/test-client.check-on-disk/test_003-183.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-183.expected
@@ -1,12 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/183
-cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/183
+cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 487 bytes
+stdout: 4226 bytes
>>>
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-184.expected b/clients/tests/test-client.check-on-disk/test_003-184.expected
index 50c60f2616..826ae9718b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-184.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-184.expected
@@ -1,12 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/184
-cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/184
+cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 491 bytes
+stdout: 4249 bytes
>>>
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-185.expected b/clients/tests/test-client.check-on-disk/test_003-185.expected
index 3a2a70a3ce..fc9874f9ce 100644
--- a/clients/tests/test-client.check-on-disk/test_003-185.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-185.expected
@@ -1,32 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/185
-cmd: $NMCLI --mode tabular -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/185
+cmd: $NMCLI --mode multiline -f all dev show eth0
lang: C
returncode: 0
-stdout: 2657 bytes
+stdout: 3239 bytes
>>>
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
-GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-CAPABILITIES no 100 Mb/s no no
-
-NAME CARRIER S390-SUBCHANNELS
-WIRED-PROPERTIES off --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
-
-GROUP OPTION
-DHCP4 --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
-
-GROUP OPTION
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIRED-PROPERTIES.CARRIER: off
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-186.expected b/clients/tests/test-client.check-on-disk/test_003-186.expected
index f0c17f6341..5a52f7ebb9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-186.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-186.expected
@@ -1,32 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/186
-cmd: $NMCLI --mode tabular -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/186
+cmd: $NMCLI --mode multiline -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2678 bytes
+stdout: 3262 bytes
>>>
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
-GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-CAPABILITIES nie 100 Mb/s nie nie
-
-NAME CARRIER S390-SUBCHANNELS
-WIRED-PROPERTIES wyłączone --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
-
-GROUP OPTION
-DHCP4 --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
-
-GROUP OPTION
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIRED-PROPERTIES.CARRIER: wyłączone
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-187.expected b/clients/tests/test-client.check-on-disk/test_003-187.expected
index 446e307784..481c243224 100644
--- a/clients/tests/test-client.check-on-disk/test_003-187.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-187.expected
@@ -1,18 +1,69 @@
-location: clients/tests/test-client.py:872:test_003()/187
-cmd: $NMCLI --mode tabular --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/187
+cmd: $NMCLI --mode multiline --color yes -f ALL con
lang: C
returncode: 0
-stdout: 2092 bytes
+stdout: 3537 bytes
>>>
-======================================
- NetworkManager connection profiles
-======================================
-NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
-con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
-con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth1
+STATE: activated
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth0
+STATE: deactivating
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-188.expected b/clients/tests/test-client.check-on-disk/test_003-188.expected
index 8978365a89..2a694a063a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-188.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-188.expected
@@ -1,18 +1,69 @@
-location: clients/tests/test-client.py:872:test_003()/188
-cmd: $NMCLI --mode tabular --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/188
+cmd: $NMCLI --mode multiline --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2124 bytes
+stdout: 3546 bytes
>>>
-==========================================
- Profile połączeń usługi NetworkManager
-==========================================
-NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
-ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
-con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
-con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth1
+STATE: aktywowano
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth0
+STATE: dezaktywowanie
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-189.expected b/clients/tests/test-client.check-on-disk/test_003-189.expected
index c88dc9c54c..57c837289b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-189.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-189.expected
@@ -1,16 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/189
-cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/189
+cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 346 bytes
+stdout: 396 bytes
>>>
-======================================
- NetworkManager connection profiles
-======================================
-UUID TYPE
---------------------------------------------------------------------------------------
-5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-190.expected b/clients/tests/test-client.check-on-disk/test_003-190.expected
index 220a121e13..ebd1f87e02 100644
--- a/clients/tests/test-client.check-on-disk/test_003-190.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-190.expected
@@ -1,16 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/190
-cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/190
+cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 366 bytes
+stdout: 396 bytes
>>>
-==========================================
- Profile połączeń usługi NetworkManager
-==========================================
-UUID TYPE
-------------------------------------------------------------------------------------------
-5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-191.expected b/clients/tests/test-client.check-on-disk/test_003-191.expected
index bb35a0ff22..be63812f8a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-191.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-191.expected
@@ -1,13 +1,116 @@
-location: clients/tests/test-client.py:878:test_003()/191
-cmd: $NMCLI --mode tabular --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/191
+cmd: $NMCLI --mode multiline --color yes con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 4891 bytes
>>>
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: activated
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-192.expected b/clients/tests/test-client.check-on-disk/test_003-192.expected
index b42225e801..18ab8457f1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-192.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-192.expected
@@ -1,13 +1,116 @@
-location: clients/tests/test-client.py:878:test_003()/192
-cmd: $NMCLI --mode tabular --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/192
+cmd: $NMCLI --mode multiline --color yes con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 4918 bytes
>>>
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: aktywowano
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-193.expected b/clients/tests/test-client.check-on-disk/test_003-193.expected
index 4eb918d438..6a170a473b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-193.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-193.expected
@@ -1,19 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/193
-cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/193
+cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 1033 bytes
+stdout: 4226 bytes
>>>
-==============================
- Connection profile details
-==============================
-======================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-======================================================================
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-194.expected b/clients/tests/test-client.check-on-disk/test_003-194.expected
index 619b40563b..4606264bbc 100644
--- a/clients/tests/test-client.check-on-disk/test_003-194.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-194.expected
@@ -1,19 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/194
-cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/194
+cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1068 bytes
+stdout: 4249 bytes
>>>
-================================
- Szczegóły profilu połączenia
-================================
-===========================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===========================================================================
-GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
-
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-195.expected b/clients/tests/test-client.check-on-disk/test_003-195.expected
index fb7b81ff91..26ef687866 100644
--- a/clients/tests/test-client.check-on-disk/test_003-195.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-195.expected
@@ -1,43 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/195
-cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/195
+cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 4066 bytes
+stdout: 3239 bytes
>>>
-=========================
- Device details (eth0)
-=========================
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-------------------------------------------------------------
-CAPABILITIES no 100 Mb/s no no
-
-NAME CARRIER S390-SUBCHANNELS
----------------------------------------------
-WIRED-PROPERTIES off --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
-
-GROUP OPTION
----------------
-DHCP4 --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
-
-GROUP OPTION
---------------------------------------------------------------------------------------------------
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIRED-PROPERTIES.CARRIER: off
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-196.expected b/clients/tests/test-client.check-on-disk/test_003-196.expected
index c781cb038d..ebc6f5750b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-196.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-196.expected
@@ -1,43 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/196
-cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/196
+cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4124 bytes
+stdout: 3262 bytes
>>>
-==================================
- Informacje o urządzeniu (eth0)
-==================================
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-------------------------------------------------------------
-CAPABILITIES nie 100 Mb/s nie nie
-
-NAME CARRIER S390-SUBCHANNELS
------------------------------------------------
-WIRED-PROPERTIES wyłączone --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
-
-GROUP OPTION
----------------
-DHCP4 --
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
-
-GROUP OPTION
---------------------------------------------------------------------------------------------------
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIRED-PROPERTIES.CARRIER: wyłączone
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-197.expected b/clients/tests/test-client.check-on-disk/test_003-197.expected
index f0b62b21a8..ddae8a7a13 100644
--- a/clients/tests/test-client.check-on-disk/test_003-197.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-197.expected
@@ -1,13 +1,76 @@
-location: clients/tests/test-client.py:872:test_003()/197
-cmd: $NMCLI --mode tabular --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/197
+cmd: $NMCLI --mode multiline --pretty -f ALL con
lang: C
returncode: 0
-stdout: 847 bytes
+stdout: 3804 bytes
>>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
-con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
-con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+===============================================================================
+ NetworkManager connection profiles
+===============================================================================
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth1
+STATE: activated
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth0
+STATE: deactivating
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+-------------------------------------------------------------------------------
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-198.expected b/clients/tests/test-client.check-on-disk/test_003-198.expected
index fb745e252b..a71813f5a2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-198.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-198.expected
@@ -1,13 +1,76 @@
-location: clients/tests/test-client.py:872:test_003()/198
-cmd: $NMCLI --mode tabular --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/198
+cmd: $NMCLI --mode multiline --pretty -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 847 bytes
+stdout: 3819 bytes
>>>
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
-ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
-con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
-con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+===============================================================================
+ Profile połączeń usługi NetworkManager
+===============================================================================
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth1
+STATE: aktywowano
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth0
+STATE: dezaktywowanie
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+-------------------------------------------------------------------------------
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-199.expected b/clients/tests/test-client.check-on-disk/test_003-199.expected
index 300425778c..09a813707d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-199.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-199.expected
@@ -1,11 +1,21 @@
-location: clients/tests/test-client.py:875:test_003()/199
-cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/199
+cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 104 bytes
+stdout: 835 bytes
>>>
-5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+===============================================================================
+ NetworkManager connection profiles
+===============================================================================
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+-------------------------------------------------------------------------------
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+-------------------------------------------------------------------------------
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-200.expected b/clients/tests/test-client.check-on-disk/test_003-200.expected
index 2a6336c5af..39b145cf9e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-200.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-200.expected
@@ -1,11 +1,21 @@
-location: clients/tests/test-client.py:875:test_003()/200
-cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/200
+cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 104 bytes
+stdout: 841 bytes
>>>
-5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
-UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+===============================================================================
+ Profile połączeń usługi NetworkManager
+===============================================================================
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+-------------------------------------------------------------------------------
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+-------------------------------------------------------------------------------
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-201.expected b/clients/tests/test-client.check-on-disk/test_003-201.expected
index d4f6904ee9..d596acaa24 100644
--- a/clients/tests/test-client.check-on-disk/test_003-201.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-201.expected
@@ -1,13 +1,132 @@
-location: clients/tests/test-client.py:878:test_003()/201
-cmd: $NMCLI --mode tabular --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/201
+cmd: $NMCLI --mode multiline --pretty con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 6136 bytes
>>>
+===============================================================================
+ Connection profile details (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: activated
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-202.expected b/clients/tests/test-client.check-on-disk/test_003-202.expected
index b219736cc9..07ca7e85c4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-202.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-202.expected
@@ -1,13 +1,132 @@
-location: clients/tests/test-client.py:878:test_003()/202
-cmd: $NMCLI --mode tabular --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/202
+cmd: $NMCLI --mode multiline --pretty con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 6182 bytes
>>>
+===============================================================================
+ Szczegóły profilu połączenia (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: aktywowano
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-203.expected b/clients/tests/test-client.check-on-disk/test_003-203.expected
index a9cd59019e..ba6dc9680c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-203.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-203.expected
@@ -1,10 +1,112 @@
-location: clients/tests/test-client.py:881:test_003()/203
-cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/203
+cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 189 bytes
+stdout: 5158 bytes
>>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+===============================================================================
+ Connection profile details (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-204.expected b/clients/tests/test-client.check-on-disk/test_003-204.expected
index aaf90b2791..cf4c819a86 100644
--- a/clients/tests/test-client.check-on-disk/test_003-204.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-204.expected
@@ -1,10 +1,112 @@
-location: clients/tests/test-client.py:881:test_003()/204
-cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/204
+cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 189 bytes
+stdout: 5193 bytes
>>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+===============================================================================
+ Szczegóły profilu połączenia (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-205.expected b/clients/tests/test-client.check-on-disk/test_003-205.expected
index 8d97fd2ad0..1747f10795 100644
--- a/clients/tests/test-client.check-on-disk/test_003-205.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-205.expected
@@ -1,17 +1,75 @@
-location: clients/tests/test-client.py:884:test_003()/205
-cmd: $NMCLI --mode tabular --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/205
+cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
lang: C
returncode: 0
-stdout: 1144 bytes
+stdout: 4090 bytes
>>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
-CAPABILITIES:no:100 Mb/s:no:no
-WIRED-PROPERTIES:off:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
-DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+===============================================================================
+ Device details (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: off
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-206.expected b/clients/tests/test-client.check-on-disk/test_003-206.expected
index 10f95d8e2f..46588a495e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-206.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-206.expected
@@ -1,17 +1,75 @@
-location: clients/tests/test-client.py:884:test_003()/206
-cmd: $NMCLI --mode tabular --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/206
+cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1167 bytes
+stdout: 4119 bytes
>>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
-CAPABILITIES:nie:100 Mb/s:nie:nie
-WIRED-PROPERTIES:wyłączone:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
-DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+===============================================================================
+ Informacje o urządzeniu (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: wyłączone
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-207.expected b/clients/tests/test-client.check-on-disk/test_003-207.expected
index c8d9a54337..1d510e8ae1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-207.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-207.expected
@@ -1,39 +1,44 @@
-location: clients/tests/test-client.py:872:test_003()/207
-cmd: $NMCLI --mode multiline -f ALL con
+location: clients/tests/test-client.py:875:test_003()/207
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
lang: C
returncode: 0
-stdout: 3263 bytes
+stdout: 4074 bytes
>>>
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: --
-TIMESTAMP-REAL: --
-AUTOCONNECT: --
-AUTOCONNECT-PRIORITY: --
-READONLY: --
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: yes
-DEVICE: eth1
-STATE: activated
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: --
-TIMESTAMP-REAL: --
-AUTOCONNECT: --
-AUTOCONNECT-PRIORITY: --
-READONLY: --
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: yes
-DEVICE: eth0
-STATE: deactivating
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
+===============================================================================
+ NetworkManager connection profiles
+===============================================================================
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth1
+STATE: activated
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth0
+STATE: deactivating
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
NAME: con-1
UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
TYPE: ethernet
@@ -49,6 +54,7 @@ STATE: --
ACTIVE-PATH: --
SLAVE: --
FILENAME: /etc/NetworkManager/system-connections/con-1
+-------------------------------------------------------------------------------
NAME: con-xx1
UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
TYPE: ethernet
@@ -64,6 +70,7 @@ STATE: --
ACTIVE-PATH: --
SLAVE: --
FILENAME: /etc/NetworkManager/system-connections/con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-208.expected b/clients/tests/test-client.check-on-disk/test_003-208.expected
index 43bbf589de..173c833090 100644
--- a/clients/tests/test-client.check-on-disk/test_003-208.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-208.expected
@@ -1,39 +1,44 @@
-location: clients/tests/test-client.py:872:test_003()/208
-cmd: $NMCLI --mode multiline -f ALL con
+location: clients/tests/test-client.py:875:test_003()/208
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3270 bytes
+stdout: 4089 bytes
>>>
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: --
-TIMESTAMP-REAL: --
-AUTOCONNECT: --
-AUTOCONNECT-PRIORITY: --
-READONLY: --
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: tak
-DEVICE: eth1
-STATE: aktywowano
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: --
-TIMESTAMP-REAL: --
-AUTOCONNECT: --
-AUTOCONNECT-PRIORITY: --
-READONLY: --
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: tak
-DEVICE: eth0
-STATE: dezaktywowanie
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
+===============================================================================
+ Profile połączeń usługi NetworkManager
+===============================================================================
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth1
+STATE: aktywowano
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth0
+STATE: dezaktywowanie
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
NAME: con-1
UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
TYPE: ethernet
@@ -49,6 +54,7 @@ STATE: --
ACTIVE-PATH: --
SLAVE: --
FILENAME: /etc/NetworkManager/system-connections/con-1
+-------------------------------------------------------------------------------
NAME: con-xx1
UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
TYPE: ethernet
@@ -64,6 +70,7 @@ STATE: --
ACTIVE-PATH: --
SLAVE: --
FILENAME: /etc/NetworkManager/system-connections/con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-209.expected b/clients/tests/test-client.check-on-disk/test_003-209.expected
index d97425ad96..aefd61cece 100644
--- a/clients/tests/test-client.check-on-disk/test_003-209.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-209.expected
@@ -1,13 +1,21 @@
-location: clients/tests/test-client.py:875:test_003()/209
-cmd: $NMCLI --mode multiline -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/209
+cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 252 bytes
+stdout: 853 bytes
>>>
+===============================================================================
+ NetworkManager connection profiles
+===============================================================================
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+-------------------------------------------------------------------------------
UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
TYPE: ethernet
+-------------------------------------------------------------------------------
UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
TYPE: ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-210.expected b/clients/tests/test-client.check-on-disk/test_003-210.expected
index 881a443466..c6247f738c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-210.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-210.expected
@@ -1,13 +1,21 @@
-location: clients/tests/test-client.py:875:test_003()/210
-cmd: $NMCLI --mode multiline -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/210
+cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 252 bytes
+stdout: 859 bytes
>>>
+===============================================================================
+ Profile połączeń usługi NetworkManager
+===============================================================================
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+-------------------------------------------------------------------------------
UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
TYPE: ethernet
+-------------------------------------------------------------------------------
UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
TYPE: ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-211.expected b/clients/tests/test-client.check-on-disk/test_003-211.expected
index 4a9a5b0d1d..6e5b5fcdba 100644
--- a/clients/tests/test-client.check-on-disk/test_003-211.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-211.expected
@@ -1,13 +1,132 @@
-location: clients/tests/test-client.py:878:test_003()/211
-cmd: $NMCLI --mode multiline con s ethernet
+location: clients/tests/test-client.py:881:test_003()/211
+cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 6136 bytes
>>>
+===============================================================================
+ Connection profile details (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: activated
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-212.expected b/clients/tests/test-client.check-on-disk/test_003-212.expected
index a965c8f0c4..bbc9cab404 100644
--- a/clients/tests/test-client.check-on-disk/test_003-212.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-212.expected
@@ -1,13 +1,132 @@
-location: clients/tests/test-client.py:878:test_003()/212
-cmd: $NMCLI --mode multiline con s ethernet
+location: clients/tests/test-client.py:881:test_003()/212
+cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 6182 bytes
>>>
+===============================================================================
+ Szczegóły profilu połączenia (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth1
+GENERAL.STATE: aktywowano
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-213.expected b/clients/tests/test-client.check-on-disk/test_003-213.expected
index 7934ce2cbf..ecf56685c6 100644
--- a/clients/tests/test-client.check-on-disk/test_003-213.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-213.expected
@@ -1,9 +1,99 @@
-location: clients/tests/test-client.py:881:test_003()/213
-cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/213
+cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 667 bytes
+stdout: 5158 bytes
>>>
+===============================================================================
+ Connection profile details (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: yes
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: no
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: unknown
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: no
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: auto
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: no
+ipv4.ignore-auto-dns: no
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: yes
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: no
+ipv4.may-fail: yes
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: no
+ipv6.ignore-auto-dns: no
+ipv6.never-default: no
+ipv6.may-fail: yes
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: yes
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: no
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
GENERAL.NAME: ethernet
GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES: eth0
@@ -16,6 +106,7 @@ GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveCo
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
GENERAL.ZONE: --
GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-214.expected b/clients/tests/test-client.check-on-disk/test_003-214.expected
index ea0e26c409..a1b706f32d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-214.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-214.expected
@@ -1,9 +1,99 @@
-location: clients/tests/test-client.py:881:test_003()/214
-cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/214
+cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 672 bytes
+stdout: 5193 bytes
>>>
+===============================================================================
+ Szczegóły profilu połączenia (ethernet)
+===============================================================================
+connection.id: ethernet
+connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id: --
+connection.type: 802-3-ethernet
+connection.interface-name: --
+connection.autoconnect: tak
+connection.autoconnect-priority: 0
+connection.autoconnect-retries: -1 (default)
+connection.auth-retries: -1
+connection.timestamp: 0
+connection.read-only: nie
+connection.permissions: --
+connection.zone: --
+connection.master: --
+connection.slave-type: --
+connection.autoconnect-slaves: -1 (default)
+connection.secondaries: --
+connection.gateway-ping-timeout: 0
+connection.metered: nieznane
+connection.lldp: default
+connection.mdns: -1 (default)
+-------------------------------------------------------------------------------
+802-3-ethernet.port: --
+802-3-ethernet.speed: 0
+802-3-ethernet.duplex: --
+802-3-ethernet.auto-negotiate: nie
+802-3-ethernet.mac-address: --
+802-3-ethernet.cloned-mac-address: --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist: --
+802-3-ethernet.mtu: automatyczne
+802-3-ethernet.s390-subchannels: --
+802-3-ethernet.s390-nettype: --
+802-3-ethernet.s390-options: --
+802-3-ethernet.wake-on-lan: default
+802-3-ethernet.wake-on-lan-password: --
+-------------------------------------------------------------------------------
+ipv4.method: auto
+ipv4.dns: --
+ipv4.dns-search: --
+ipv4.dns-options: ""
+ipv4.dns-priority: 0
+ipv4.addresses: --
+ipv4.gateway: --
+ipv4.routes: --
+ipv4.route-metric: -1
+ipv4.route-table: 0 (unspec)
+ipv4.ignore-auto-routes: nie
+ipv4.ignore-auto-dns: nie
+ipv4.dhcp-client-id: --
+ipv4.dhcp-timeout: 0 (default)
+ipv4.dhcp-send-hostname: tak
+ipv4.dhcp-hostname: --
+ipv4.dhcp-fqdn: --
+ipv4.never-default: nie
+ipv4.may-fail: tak
+ipv4.dad-timeout: -1 (default)
+-------------------------------------------------------------------------------
+ipv6.method: auto
+ipv6.dns: --
+ipv6.dns-search: --
+ipv6.dns-options: ""
+ipv6.dns-priority: 0
+ipv6.addresses: --
+ipv6.gateway: --
+ipv6.routes: --
+ipv6.route-metric: -1
+ipv6.route-table: 0 (unspec)
+ipv6.ignore-auto-routes: nie
+ipv6.ignore-auto-dns: nie
+ipv6.never-default: nie
+ipv6.may-fail: tak
+ipv6.ip6-privacy: -1 (unknown)
+ipv6.addr-gen-mode: stable-privacy
+ipv6.dhcp-duid: --
+ipv6.dhcp-send-hostname: tak
+ipv6.dhcp-hostname: --
+ipv6.token: --
+-------------------------------------------------------------------------------
+proxy.method: none
+proxy.browser-only: nie
+proxy.pac-url: --
+proxy.pac-script: --
+-------------------------------------------------------------------------------
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
GENERAL.NAME: ethernet
GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES: eth0
@@ -16,6 +106,7 @@ GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveCo
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
GENERAL.ZONE: --
GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-215.expected b/clients/tests/test-client.check-on-disk/test_003-215.expected
index 1a3b4c211e..5a469be289 100644
--- a/clients/tests/test-client.check-on-disk/test_003-215.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-215.expected
@@ -1,9 +1,12 @@
-location: clients/tests/test-client.py:884:test_003()/215
-cmd: $NMCLI --mode multiline -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/215
+cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 3207 bytes
+stdout: 4090 bytes
>>>
+===============================================================================
+ Device details (eth0)
+===============================================================================
GENERAL.DEVICE: eth0
GENERAL.TYPE: ethernet
GENERAL.NM-TYPE: NMDeviceEthernet
@@ -28,11 +31,14 @@ GENERAL.CONNECTION: ethernet
GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
CAPABILITIES.CARRIER-DETECT: no
CAPABILITIES.SPEED: 100 Mb/s
CAPABILITIES.IS-SOFTWARE: no
CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
WIRED-PROPERTIES.CARRIER: off
+-------------------------------------------------------------------------------
IP4.ADDRESS[1]: 192.168.6.238/29
IP4.GATEWAY: --
IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
@@ -41,6 +47,8 @@ IP4.DNS[1]: 192.168.213.113
IP4.DOMAIN[1]: sear4.foo4.bar
IP4.WINS[1]: 192.168.156.115
IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
@@ -51,14 +59,17 @@ IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
IP6.DOMAIN[1]: sear6.fo.x.y
IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-216.expected b/clients/tests/test-client.check-on-disk/test_003-216.expected
index 128df23c47..f55025a65f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-216.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-216.expected
@@ -1,9 +1,12 @@
-location: clients/tests/test-client.py:884:test_003()/216
-cmd: $NMCLI --mode multiline -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/216
+cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3230 bytes
+stdout: 4119 bytes
>>>
+===============================================================================
+ Informacje o urządzeniu (eth0)
+===============================================================================
GENERAL.DEVICE: eth0
GENERAL.TYPE: ethernet
GENERAL.NM-TYPE: NMDeviceEthernet
@@ -28,11 +31,14 @@ GENERAL.CONNECTION: ethernet
GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
CAPABILITIES.CARRIER-DETECT: nie
CAPABILITIES.SPEED: 100 Mb/s
CAPABILITIES.IS-SOFTWARE: nie
CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
WIRED-PROPERTIES.CARRIER: wyłączone
+-------------------------------------------------------------------------------
IP4.ADDRESS[1]: 192.168.6.238/29
IP4.GATEWAY: --
IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
@@ -41,6 +47,8 @@ IP4.DNS[1]: 192.168.213.113
IP4.DOMAIN[1]: sear4.foo4.bar
IP4.WINS[1]: 192.168.156.115
IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
@@ -51,14 +59,17 @@ IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
IP6.DOMAIN[1]: sear6.fo.x.y
IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-217.expected b/clients/tests/test-client.check-on-disk/test_003-217.expected
index 62efdd6022..fd597f6233 100644
--- a/clients/tests/test-client.check-on-disk/test_003-217.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-217.expected
@@ -1,76 +1,69 @@
-location: clients/tests/test-client.py:872:test_003()/217
-cmd: $NMCLI --mode multiline --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/217
+cmd: $NMCLI --mode multiline --terse -f ALL con
lang: C
returncode: 0
-stdout: 3800 bytes
+stdout: 1427 bytes
>>>
-===============================================================================
- NetworkManager connection profiles
-===============================================================================
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: --
-TIMESTAMP-REAL: --
-AUTOCONNECT: --
-AUTOCONNECT-PRIORITY: --
-READONLY: --
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: yes
-DEVICE: eth1
-STATE: activated
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: --
-TIMESTAMP-REAL: --
-AUTOCONNECT: --
-AUTOCONNECT-PRIORITY: --
-READONLY: --
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: yes
-DEVICE: eth0
-STATE: deactivating
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
-NAME: con-1
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
-ACTIVE: no
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-1
--------------------------------------------------------------------------------
-NAME: con-xx1
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: never
-AUTOCONNECT: yes
-AUTOCONNECT-PRIORITY: 0
-READONLY: no
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
-ACTIVE: no
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-xx1
--------------------------------------------------------------------------------
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:con-1
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-1
+NAME:con-xx1
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-218.expected b/clients/tests/test-client.check-on-disk/test_003-218.expected
index 64f2e2cb08..7de9301182 100644
--- a/clients/tests/test-client.check-on-disk/test_003-218.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-218.expected
@@ -1,76 +1,69 @@
-location: clients/tests/test-client.py:872:test_003()/218
-cmd: $NMCLI --mode multiline --pretty -f ALL con
+location: clients/tests/test-client.py:875:test_003()/218
+cmd: $NMCLI --mode multiline --terse -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3813 bytes
+stdout: 1427 bytes
>>>
-===============================================================================
- Profile połączeń usługi NetworkManager
-===============================================================================
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: --
-TIMESTAMP-REAL: --
-AUTOCONNECT: --
-AUTOCONNECT-PRIORITY: --
-READONLY: --
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: tak
-DEVICE: eth1
-STATE: aktywowano
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
-NAME: ethernet
-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE: ethernet
-TIMESTAMP: --
-TIMESTAMP-REAL: --
-AUTOCONNECT: --
-AUTOCONNECT-PRIORITY: --
-READONLY: --
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE: tak
-DEVICE: eth0
-STATE: dezaktywowanie
-ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/ethernet
--------------------------------------------------------------------------------
-NAME: con-1
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
-ACTIVE: nie
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-1
--------------------------------------------------------------------------------
-NAME: con-xx1
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
-TIMESTAMP: 0
-TIMESTAMP-REAL: nigdy
-AUTOCONNECT: tak
-AUTOCONNECT-PRIORITY: 0
-READONLY: nie
-DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
-ACTIVE: nie
-DEVICE: --
-STATE: --
-ACTIVE-PATH: --
-SLAVE: --
-FILENAME: /etc/NetworkManager/system-connections/con-xx1
--------------------------------------------------------------------------------
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:con-1
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-1
+NAME:con-xx1
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-219.expected b/clients/tests/test-client.check-on-disk/test_003-219.expected
index 534123b27b..fc347073d0 100644
--- a/clients/tests/test-client.check-on-disk/test_003-219.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-219.expected
@@ -1,18 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/219
-cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/219
+cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 629 bytes
+stdout: 186 bytes
>>>
-===============================================================================
- NetworkManager connection profiles
-===============================================================================
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
--------------------------------------------------------------------------------
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
--------------------------------------------------------------------------------
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-220.expected b/clients/tests/test-client.check-on-disk/test_003-220.expected
index 7488269400..5607ac7f6f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-220.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-220.expected
@@ -1,18 +1,15 @@
-location: clients/tests/test-client.py:875:test_003()/220
-cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/220
+cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 635 bytes
+stdout: 186 bytes
>>>
-===============================================================================
- Profile połączeń usługi NetworkManager
-===============================================================================
-UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
-TYPE: ethernet
--------------------------------------------------------------------------------
-UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
-TYPE: ethernet
--------------------------------------------------------------------------------
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-221.expected b/clients/tests/test-client.check-on-disk/test_003-221.expected
index 6fb77eb65b..1cb0d97509 100644
--- a/clients/tests/test-client.check-on-disk/test_003-221.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-221.expected
@@ -1,13 +1,116 @@
-location: clients/tests/test-client.py:878:test_003()/221
-cmd: $NMCLI --mode multiline --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/221
+cmd: $NMCLI --mode multiline --terse con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 2579 bytes
>>>
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth1
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-222.expected b/clients/tests/test-client.check-on-disk/test_003-222.expected
index 73fb608a6e..6b809f04cb 100644
--- a/clients/tests/test-client.check-on-disk/test_003-222.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-222.expected
@@ -1,13 +1,116 @@
-location: clients/tests/test-client.py:878:test_003()/222
-cmd: $NMCLI --mode multiline --pretty con s ethernet
+location: clients/tests/test-client.py:881:test_003()/222
+cmd: $NMCLI --mode multiline --terse con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 2579 bytes
>>>
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth1
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-223.expected b/clients/tests/test-client.check-on-disk/test_003-223.expected
index 545b1a8002..8dfdb88a49 100644
--- a/clients/tests/test-client.check-on-disk/test_003-223.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-223.expected
@@ -1,28 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/223
-cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/223
+cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 1193 bytes
+stdout: 2211 bytes
>>>
-===============================================================================
- Connection profile details
-===============================================================================
-===============================================================================
- Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: deactivating
-GENERAL.DEFAULT: no
-GENERAL.DEFAULT6: no
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: no
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-224.expected b/clients/tests/test-client.check-on-disk/test_003-224.expected
index ddb577604b..6aa7c90088 100644
--- a/clients/tests/test-client.check-on-disk/test_003-224.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-224.expected
@@ -1,28 +1,100 @@
-location: clients/tests/test-client.py:881:test_003()/224
-cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/224
+cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1210 bytes
+stdout: 2211 bytes
>>>
-===============================================================================
- Szczegóły profilu połączenia
-===============================================================================
-===============================================================================
- Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
-===============================================================================
-GENERAL.NAME: ethernet
-GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.DEVICES: eth0
-GENERAL.STATE: dezaktywowanie
-GENERAL.DEFAULT: nie
-GENERAL.DEFAULT6: nie
-GENERAL.SPEC-OBJECT: --
-GENERAL.VPN: nie
-GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE: --
-GENERAL.MASTER-PATH: --
--------------------------------------------------------------------------------
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-225.expected b/clients/tests/test-client.check-on-disk/test_003-225.expected
index a11a5742e6..e06086509f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-225.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-225.expected
@@ -1,75 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/225
-cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/225
+cmd: $NMCLI --mode multiline --terse -f all dev show eth0
lang: C
returncode: 0
-stdout: 4058 bytes
+stdout: 2011 bytes
>>>
-===============================================================================
- Device details (eth0)
-===============================================================================
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: unknown
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
--------------------------------------------------------------------------------
-WIRED-PROPERTIES.CARRIER: off
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
--------------------------------------------------------------------------------
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIRED-PROPERTIES.CARRIER:off
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-226.expected b/clients/tests/test-client.check-on-disk/test_003-226.expected
index 62c6f6b5a7..2ac0c19f66 100644
--- a/clients/tests/test-client.check-on-disk/test_003-226.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-226.expected
@@ -1,75 +1,64 @@
-location: clients/tests/test-client.py:884:test_003()/226
-cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/226
+cmd: $NMCLI --mode multiline --terse -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4087 bytes
+stdout: 2034 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (eth0)
-===============================================================================
-GENERAL.DEVICE: eth0
-GENERAL.TYPE: ethernet
-GENERAL.NM-TYPE: NMDeviceEthernet
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: C0:61:AE:26:4D:D7
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/eth0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: ethernet
-GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
-GENERAL.METERED: nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: 100 Mb/s
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
--------------------------------------------------------------------------------
-WIRED-PROPERTIES.CARRIER: wyłączone
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.6.238/29
-IP4.GATEWAY: --
-IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
-IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
-IP4.DNS[1]: 192.168.213.113
-IP4.DOMAIN[1]: sear4.foo4.bar
-IP4.WINS[1]: 192.168.156.115
-IP4.WINS[2]: 192.168.8.33
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
-IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
-IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
-IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
-IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
-IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
-IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
-IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
-IP6.DOMAIN[1]: sear6.fo.x.y
-IP6.DOMAIN[2]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
-DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
-DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
--------------------------------------------------------------------------------
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIRED-PROPERTIES.CARRIER:wyłączone
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-227.expected b/clients/tests/test-client.check-on-disk/test_003-227.expected
index 89e60a9dcc..4737a26d41 100644
--- a/clients/tests/test-client.check-on-disk/test_003-227.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-227.expected
@@ -1,39 +1,39 @@
-location: clients/tests/test-client.py:872:test_003()/227
-cmd: $NMCLI --mode multiline --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/227
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
lang: C
returncode: 0
-stdout: 1403 bytes
+stdout: 1697 bytes
>>>
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:
-TIMESTAMP-REAL:
-AUTOCONNECT:
-AUTOCONNECT-PRIORITY:
-READONLY:
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:
-TIMESTAMP-REAL:
-AUTOCONNECT:
-AUTOCONNECT-PRIORITY:
-READONLY:
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE:yes
-DEVICE:eth0
-STATE:deactivating
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
NAME:con-1
UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
TYPE:802-3-ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-228.expected b/clients/tests/test-client.check-on-disk/test_003-228.expected
index b1e2bbd934..fbc5fc73d1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-228.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-228.expected
@@ -1,39 +1,39 @@
-location: clients/tests/test-client.py:872:test_003()/228
-cmd: $NMCLI --mode multiline --terse -f ALL con
+location: clients/tests/test-client.py:875:test_003()/228
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1403 bytes
+stdout: 1697 bytes
>>>
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:
-TIMESTAMP-REAL:
-AUTOCONNECT:
-AUTOCONNECT-PRIORITY:
-READONLY:
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE:yes
-DEVICE:eth1
-STATE:activated
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
-NAME:ethernet
-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
-TYPE:802-3-ethernet
-TIMESTAMP:
-TIMESTAMP-REAL:
-AUTOCONNECT:
-AUTOCONNECT-PRIORITY:
-READONLY:
-DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
-ACTIVE:yes
-DEVICE:eth0
-STATE:deactivating
-ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
-FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
NAME:con-1
UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
TYPE:802-3-ethernet
diff --git a/clients/tests/test-client.check-on-disk/test_003-229.expected b/clients/tests/test-client.check-on-disk/test_003-229.expected
index a7c6d57478..4c53bbb3d5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-229.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-229.expected
@@ -1,9 +1,11 @@
-location: clients/tests/test-client.py:875:test_003()/229
-cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/229
+cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
lang: C
returncode: 0
-stdout: 124 bytes
+stdout: 204 bytes
>>>
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
TYPE:802-3-ethernet
UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
diff --git a/clients/tests/test-client.check-on-disk/test_003-230.expected b/clients/tests/test-client.check-on-disk/test_003-230.expected
index 010dfea6ba..6f5043671a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-230.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-230.expected
@@ -1,9 +1,11 @@
-location: clients/tests/test-client.py:875:test_003()/230
-cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
+location: clients/tests/test-client.py:878:test_003()/230
+cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
lang: pl_PL.UTF-8
returncode: 0
-stdout: 124 bytes
+stdout: 204 bytes
>>>
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
TYPE:802-3-ethernet
UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
diff --git a/clients/tests/test-client.check-on-disk/test_003-231.expected b/clients/tests/test-client.check-on-disk/test_003-231.expected
index 86f906397e..f95fed1a03 100644
--- a/clients/tests/test-client.check-on-disk/test_003-231.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-231.expected
@@ -1,13 +1,116 @@
-location: clients/tests/test-client.py:878:test_003()/231
-cmd: $NMCLI --mode multiline --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/231
+cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
lang: C
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 2579 bytes
>>>
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth1
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
-stderr: 46 bytes
+stderr: 0 bytes
>>>
-Error: ethernet - no such connection profile.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-232.expected b/clients/tests/test-client.check-on-disk/test_003-232.expected
index bdfda052b4..7cd88f78d2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-232.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-232.expected
@@ -1,13 +1,116 @@
-location: clients/tests/test-client.py:878:test_003()/232
-cmd: $NMCLI --mode multiline --terse con s ethernet
+location: clients/tests/test-client.py:881:test_003()/232
+cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
lang: pl_PL.UTF-8
-returncode: 10
-stdout: 0 bytes
+returncode: 0
+stdout: 2579 bytes
>>>
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth1
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
<<<
-stderr: 58 bytes
+stderr: 0 bytes
>>>
-Błąd: ethernet — nie ma takiego profilu połączenia.
<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-233.expected b/clients/tests/test-client.check-on-disk/test_003-233.expected
index fb2a502ac8..876e0bd09b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-233.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-233.expected
@@ -1,9 +1,88 @@
-location: clients/tests/test-client.py:881:test_003()/233
-cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/233
+cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: C
returncode: 0
-stdout: 370 bytes
+stdout: 2211 bytes
>>>
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
GENERAL.NAME:ethernet
GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES:eth0
diff --git a/clients/tests/test-client.check-on-disk/test_003-234.expected b/clients/tests/test-client.check-on-disk/test_003-234.expected
index 20154057a2..d3b7410cb4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-234.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-234.expected
@@ -1,9 +1,88 @@
-location: clients/tests/test-client.py:881:test_003()/234
-cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+location: clients/tests/test-client.py:884:test_003()/234
+cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
lang: pl_PL.UTF-8
returncode: 0
-stdout: 370 bytes
+stdout: 2211 bytes
>>>
+connection.id:ethernet
+connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:
+connection.type:802-3-ethernet
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+802-3-ethernet.port:
+802-3-ethernet.speed:0
+802-3-ethernet.duplex:
+802-3-ethernet.auto-negotiate:no
+802-3-ethernet.mac-address:
+802-3-ethernet.cloned-mac-address:
+802-3-ethernet.generate-mac-address-mask:
+802-3-ethernet.mac-address-blacklist:
+802-3-ethernet.mtu:auto
+802-3-ethernet.s390-subchannels:
+802-3-ethernet.s390-nettype:
+802-3-ethernet.s390-options:
+802-3-ethernet.wake-on-lan:default
+802-3-ethernet.wake-on-lan-password:
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options:
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options:
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
GENERAL.NAME:ethernet
GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
GENERAL.DEVICES:eth0
diff --git a/clients/tests/test-client.check-on-disk/test_003-235.expected b/clients/tests/test-client.check-on-disk/test_003-235.expected
index 541462f1de..883d38021e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-235.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-235.expected
@@ -1,8 +1,8 @@
-location: clients/tests/test-client.py:884:test_003()/235
-cmd: $NMCLI --mode multiline --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/235
+cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
lang: C
returncode: 0
-stdout: 1979 bytes
+stdout: 2011 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -58,7 +58,7 @@ DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-236.expected b/clients/tests/test-client.check-on-disk/test_003-236.expected
index 77f04330e7..cbe7107064 100644
--- a/clients/tests/test-client.check-on-disk/test_003-236.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-236.expected
@@ -1,8 +1,8 @@
-location: clients/tests/test-client.py:884:test_003()/236
-cmd: $NMCLI --mode multiline --terse -f all dev show eth0
+location: clients/tests/test-client.py:887:test_003()/236
+cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2002 bytes
+stdout: 2034 bytes
>>>
GENERAL.DEVICE:eth0
GENERAL.TYPE:ethernet
@@ -58,7 +58,7 @@ DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-237.expected b/clients/tests/test-client.check-on-disk/test_003-237.expected
new file mode 100644
index 0000000000..29c092cd7e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-237.expected
@@ -0,0 +1,17 @@
+location: clients/tests/test-client.py:875:test_003()/237
+cmd: $NMCLI -f ALL con
+lang: C
+returncode: 0
+stdout: 1615 bytes
+>>>
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-238.expected b/clients/tests/test-client.check-on-disk/test_003-238.expected
new file mode 100644
index 0000000000..1a2ddcecd9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-238.expected
@@ -0,0 +1,17 @@
+location: clients/tests/test-client.py:875:test_003()/238
+cmd: $NMCLI -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1625 bytes
+>>>
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-239.expected b/clients/tests/test-client.check-on-disk/test_003-239.expected
new file mode 100644
index 0000000000..0427f9ae28
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-239.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:878:test_003()/239
+cmd: $NMCLI -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 144 bytes
+>>>
+UUID TYPE
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-240.expected b/clients/tests/test-client.check-on-disk/test_003-240.expected
new file mode 100644
index 0000000000..4e840b6d31
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-240.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:878:test_003()/240
+cmd: $NMCLI -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 144 bytes
+>>>
+UUID TYPE
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-241.expected b/clients/tests/test-client.check-on-disk/test_003-241.expected
new file mode 100644
index 0000000000..74e19b9700
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-241.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/241
+cmd: $NMCLI con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-242.expected b/clients/tests/test-client.check-on-disk/test_003-242.expected
new file mode 100644
index 0000000000..bad43aec38
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-242.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/242
+cmd: $NMCLI con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-243.expected b/clients/tests/test-client.check-on-disk/test_003-243.expected
new file mode 100644
index 0000000000..cdc41a9539
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-243.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/243
+cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 667 bytes
+>>>
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-244.expected b/clients/tests/test-client.check-on-disk/test_003-244.expected
new file mode 100644
index 0000000000..12e7dd3583
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-244.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/244
+cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 672 bytes
+>>>
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-245.expected b/clients/tests/test-client.check-on-disk/test_003-245.expected
new file mode 100644
index 0000000000..431da8d800
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-245.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/245
+cmd: $NMCLI -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 3207 bytes
+>>>
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIRED-PROPERTIES.CARRIER: off
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-246.expected b/clients/tests/test-client.check-on-disk/test_003-246.expected
new file mode 100644
index 0000000000..869ac95e40
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-246.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/246
+cmd: $NMCLI -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3230 bytes
+>>>
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIRED-PROPERTIES.CARRIER: wyłączone
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-247.expected b/clients/tests/test-client.check-on-disk/test_003-247.expected
new file mode 100644
index 0000000000..61bbc1b031
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-247.expected
@@ -0,0 +1,17 @@
+location: clients/tests/test-client.py:875:test_003()/247
+cmd: $NMCLI --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 1885 bytes
+>>>
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-248.expected b/clients/tests/test-client.check-on-disk/test_003-248.expected
new file mode 100644
index 0000000000..2705775614
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-248.expected
@@ -0,0 +1,17 @@
+location: clients/tests/test-client.py:875:test_003()/248
+cmd: $NMCLI --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1895 bytes
+>>>
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-249.expected b/clients/tests/test-client.check-on-disk/test_003-249.expected
new file mode 100644
index 0000000000..4dfc56ab36
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-249.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:878:test_003()/249
+cmd: $NMCLI --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 144 bytes
+>>>
+UUID TYPE
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-250.expected b/clients/tests/test-client.check-on-disk/test_003-250.expected
new file mode 100644
index 0000000000..6aeb3e18da
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-250.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:878:test_003()/250
+cmd: $NMCLI --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 144 bytes
+>>>
+UUID TYPE
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-251.expected b/clients/tests/test-client.check-on-disk/test_003-251.expected
new file mode 100644
index 0000000000..013a29efd1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-251.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/251
+cmd: $NMCLI --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-252.expected b/clients/tests/test-client.check-on-disk/test_003-252.expected
new file mode 100644
index 0000000000..19837cec02
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-252.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/252
+cmd: $NMCLI --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-253.expected b/clients/tests/test-client.check-on-disk/test_003-253.expected
new file mode 100644
index 0000000000..e8c6c503f8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-253.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/253
+cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 667 bytes
+>>>
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-254.expected b/clients/tests/test-client.check-on-disk/test_003-254.expected
new file mode 100644
index 0000000000..449d868fe8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-254.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/254
+cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 672 bytes
+>>>
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-255.expected b/clients/tests/test-client.check-on-disk/test_003-255.expected
new file mode 100644
index 0000000000..e0f60685ed
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-255.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/255
+cmd: $NMCLI --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 3207 bytes
+>>>
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIRED-PROPERTIES.CARRIER: off
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-256.expected b/clients/tests/test-client.check-on-disk/test_003-256.expected
new file mode 100644
index 0000000000..edc0a18a19
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-256.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/256
+cmd: $NMCLI --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3230 bytes
+>>>
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIRED-PROPERTIES.CARRIER: wyłączone
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-257.expected b/clients/tests/test-client.check-on-disk/test_003-257.expected
new file mode 100644
index 0000000000..b003b7db7a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-257.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:875:test_003()/257
+cmd: $NMCLI --pretty -f ALL con
+lang: C
+returncode: 0
+stdout: 2092 bytes
+>>>
+======================================
+ NetworkManager connection profiles
+======================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-258.expected b/clients/tests/test-client.check-on-disk/test_003-258.expected
new file mode 100644
index 0000000000..c99b63e087
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-258.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:875:test_003()/258
+cmd: $NMCLI --pretty -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2124 bytes
+>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-259.expected b/clients/tests/test-client.check-on-disk/test_003-259.expected
new file mode 100644
index 0000000000..0893c18ebb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-259.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:878:test_003()/259
+cmd: $NMCLI --pretty -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 346 bytes
+>>>
+======================================
+ NetworkManager connection profiles
+======================================
+UUID TYPE
+--------------------------------------------------------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-260.expected b/clients/tests/test-client.check-on-disk/test_003-260.expected
new file mode 100644
index 0000000000..2f9e0bfd83
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-260.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:878:test_003()/260
+cmd: $NMCLI --pretty -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 366 bytes
+>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+UUID TYPE
+------------------------------------------------------------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-261.expected b/clients/tests/test-client.check-on-disk/test_003-261.expected
new file mode 100644
index 0000000000..2ce2a3e3c1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-261.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/261
+cmd: $NMCLI --pretty con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-262.expected b/clients/tests/test-client.check-on-disk/test_003-262.expected
new file mode 100644
index 0000000000..8e5a437c8a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-262.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/262
+cmd: $NMCLI --pretty con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-263.expected b/clients/tests/test-client.check-on-disk/test_003-263.expected
new file mode 100644
index 0000000000..8ab9c0e2a8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-263.expected
@@ -0,0 +1,31 @@
+location: clients/tests/test-client.py:884:test_003()/263
+cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 1193 bytes
+>>>
+===============================================================================
+ Connection profile details
+===============================================================================
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-264.expected b/clients/tests/test-client.check-on-disk/test_003-264.expected
new file mode 100644
index 0000000000..b0b037081e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-264.expected
@@ -0,0 +1,31 @@
+location: clients/tests/test-client.py:884:test_003()/264
+cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1210 bytes
+>>>
+===============================================================================
+ Szczegóły profilu połączenia
+===============================================================================
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-265.expected b/clients/tests/test-client.check-on-disk/test_003-265.expected
new file mode 100644
index 0000000000..01a2b6681e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-265.expected
@@ -0,0 +1,78 @@
+location: clients/tests/test-client.py:887:test_003()/265
+cmd: $NMCLI --pretty -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 4058 bytes
+>>>
+===============================================================================
+ Device details (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: off
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-266.expected b/clients/tests/test-client.check-on-disk/test_003-266.expected
new file mode 100644
index 0000000000..1568ca81e2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-266.expected
@@ -0,0 +1,78 @@
+location: clients/tests/test-client.py:887:test_003()/266
+cmd: $NMCLI --pretty -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4087 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: wyłączone
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-267.expected b/clients/tests/test-client.check-on-disk/test_003-267.expected
new file mode 100644
index 0000000000..d9198157da
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-267.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:875:test_003()/267
+cmd: $NMCLI --pretty --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 2362 bytes
+>>>
+======================================
+ NetworkManager connection profiles
+======================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-268.expected b/clients/tests/test-client.check-on-disk/test_003-268.expected
new file mode 100644
index 0000000000..c3ee616b9a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-268.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:875:test_003()/268
+cmd: $NMCLI --pretty --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2394 bytes
+>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-269.expected b/clients/tests/test-client.check-on-disk/test_003-269.expected
new file mode 100644
index 0000000000..b762b55d2f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-269.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:878:test_003()/269
+cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 346 bytes
+>>>
+======================================
+ NetworkManager connection profiles
+======================================
+UUID TYPE
+--------------------------------------------------------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-270.expected b/clients/tests/test-client.check-on-disk/test_003-270.expected
new file mode 100644
index 0000000000..edaee3a0fe
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-270.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:878:test_003()/270
+cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 366 bytes
+>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+UUID TYPE
+------------------------------------------------------------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-271.expected b/clients/tests/test-client.check-on-disk/test_003-271.expected
new file mode 100644
index 0000000000..c15bfe3014
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-271.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/271
+cmd: $NMCLI --pretty --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-272.expected b/clients/tests/test-client.check-on-disk/test_003-272.expected
new file mode 100644
index 0000000000..a1e1fecf4c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-272.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/272
+cmd: $NMCLI --pretty --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-273.expected b/clients/tests/test-client.check-on-disk/test_003-273.expected
new file mode 100644
index 0000000000..66c73067b9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-273.expected
@@ -0,0 +1,31 @@
+location: clients/tests/test-client.py:884:test_003()/273
+cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 1193 bytes
+>>>
+===============================================================================
+ Connection profile details
+===============================================================================
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-274.expected b/clients/tests/test-client.check-on-disk/test_003-274.expected
new file mode 100644
index 0000000000..a41d0c6f81
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-274.expected
@@ -0,0 +1,31 @@
+location: clients/tests/test-client.py:884:test_003()/274
+cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1210 bytes
+>>>
+===============================================================================
+ Szczegóły profilu połączenia
+===============================================================================
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-275.expected b/clients/tests/test-client.check-on-disk/test_003-275.expected
new file mode 100644
index 0000000000..519ade4c37
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-275.expected
@@ -0,0 +1,78 @@
+location: clients/tests/test-client.py:887:test_003()/275
+cmd: $NMCLI --pretty --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 4058 bytes
+>>>
+===============================================================================
+ Device details (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: off
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-276.expected b/clients/tests/test-client.check-on-disk/test_003-276.expected
new file mode 100644
index 0000000000..f86ede56d0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-276.expected
@@ -0,0 +1,78 @@
+location: clients/tests/test-client.py:887:test_003()/276
+cmd: $NMCLI --pretty --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4087 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: wyłączone
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-277.expected b/clients/tests/test-client.check-on-disk/test_003-277.expected
new file mode 100644
index 0000000000..af96de0ef9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-277.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:875:test_003()/277
+cmd: $NMCLI --terse -f ALL con
+lang: C
+returncode: 0
+stdout: 847 bytes
+>>>
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-278.expected b/clients/tests/test-client.check-on-disk/test_003-278.expected
new file mode 100644
index 0000000000..711c4b5cc0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-278.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:875:test_003()/278
+cmd: $NMCLI --terse -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 847 bytes
+>>>
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-279.expected b/clients/tests/test-client.check-on-disk/test_003-279.expected
new file mode 100644
index 0000000000..ad501747d6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-279.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:878:test_003()/279
+cmd: $NMCLI --terse -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 104 bytes
+>>>
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-280.expected b/clients/tests/test-client.check-on-disk/test_003-280.expected
new file mode 100644
index 0000000000..24702a787a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-280.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:878:test_003()/280
+cmd: $NMCLI --terse -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 104 bytes
+>>>
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-281.expected b/clients/tests/test-client.check-on-disk/test_003-281.expected
new file mode 100644
index 0000000000..1cf3c51409
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-281.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/281
+cmd: $NMCLI --terse con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-282.expected b/clients/tests/test-client.check-on-disk/test_003-282.expected
new file mode 100644
index 0000000000..4f86fbb5d6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-282.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/282
+cmd: $NMCLI --terse con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-283.expected b/clients/tests/test-client.check-on-disk/test_003-283.expected
new file mode 100644
index 0000000000..e6e3d4a9d3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-283.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/283
+cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 370 bytes
+>>>
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-284.expected b/clients/tests/test-client.check-on-disk/test_003-284.expected
new file mode 100644
index 0000000000..0ee8a9dffc
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-284.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/284
+cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 370 bytes
+>>>
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-285.expected b/clients/tests/test-client.check-on-disk/test_003-285.expected
new file mode 100644
index 0000000000..5ecbf8c785
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-285.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/285
+cmd: $NMCLI --terse -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 1979 bytes
+>>>
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIRED-PROPERTIES.CARRIER:off
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-286.expected b/clients/tests/test-client.check-on-disk/test_003-286.expected
new file mode 100644
index 0000000000..5a82b745dc
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-286.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/286
+cmd: $NMCLI --terse -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2002 bytes
+>>>
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIRED-PROPERTIES.CARRIER:wyłączone
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-287.expected b/clients/tests/test-client.check-on-disk/test_003-287.expected
new file mode 100644
index 0000000000..b5795c9851
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-287.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:875:test_003()/287
+cmd: $NMCLI --terse --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 1117 bytes
+>>>
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-288.expected b/clients/tests/test-client.check-on-disk/test_003-288.expected
new file mode 100644
index 0000000000..b4aef5aeee
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-288.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:875:test_003()/288
+cmd: $NMCLI --terse --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1117 bytes
+>>>
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-289.expected b/clients/tests/test-client.check-on-disk/test_003-289.expected
new file mode 100644
index 0000000000..97ede147d1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-289.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:878:test_003()/289
+cmd: $NMCLI --terse --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 104 bytes
+>>>
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-290.expected b/clients/tests/test-client.check-on-disk/test_003-290.expected
new file mode 100644
index 0000000000..93758e4014
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-290.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:878:test_003()/290
+cmd: $NMCLI --terse --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 104 bytes
+>>>
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-291.expected b/clients/tests/test-client.check-on-disk/test_003-291.expected
new file mode 100644
index 0000000000..f38f5f6db1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-291.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/291
+cmd: $NMCLI --terse --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-292.expected b/clients/tests/test-client.check-on-disk/test_003-292.expected
new file mode 100644
index 0000000000..a468ca160f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-292.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/292
+cmd: $NMCLI --terse --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-293.expected b/clients/tests/test-client.check-on-disk/test_003-293.expected
new file mode 100644
index 0000000000..0f9b435172
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-293.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/293
+cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 370 bytes
+>>>
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-294.expected b/clients/tests/test-client.check-on-disk/test_003-294.expected
new file mode 100644
index 0000000000..e3ad77fcb6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-294.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/294
+cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 370 bytes
+>>>
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-295.expected b/clients/tests/test-client.check-on-disk/test_003-295.expected
new file mode 100644
index 0000000000..0280d7bf08
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-295.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/295
+cmd: $NMCLI --terse --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 1979 bytes
+>>>
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIRED-PROPERTIES.CARRIER:off
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-296.expected b/clients/tests/test-client.check-on-disk/test_003-296.expected
new file mode 100644
index 0000000000..92c01051ad
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-296.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/296
+cmd: $NMCLI --terse --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2002 bytes
+>>>
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIRED-PROPERTIES.CARRIER:wyłączone
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-297.expected b/clients/tests/test-client.check-on-disk/test_003-297.expected
new file mode 100644
index 0000000000..135e708a1f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-297.expected
@@ -0,0 +1,17 @@
+location: clients/tests/test-client.py:875:test_003()/297
+cmd: $NMCLI --mode tabular -f ALL con
+lang: C
+returncode: 0
+stdout: 1615 bytes
+>>>
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-298.expected b/clients/tests/test-client.check-on-disk/test_003-298.expected
new file mode 100644
index 0000000000..4a7a9ae0bb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-298.expected
@@ -0,0 +1,17 @@
+location: clients/tests/test-client.py:875:test_003()/298
+cmd: $NMCLI --mode tabular -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1625 bytes
+>>>
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-299.expected b/clients/tests/test-client.check-on-disk/test_003-299.expected
new file mode 100644
index 0000000000..c5e53ed873
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-299.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:878:test_003()/299
+cmd: $NMCLI --mode tabular -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 144 bytes
+>>>
+UUID TYPE
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-300.expected b/clients/tests/test-client.check-on-disk/test_003-300.expected
new file mode 100644
index 0000000000..b3d0a4119f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-300.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:878:test_003()/300
+cmd: $NMCLI --mode tabular -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 144 bytes
+>>>
+UUID TYPE
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-301.expected b/clients/tests/test-client.check-on-disk/test_003-301.expected
new file mode 100644
index 0000000000..67e12683d6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-301.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/301
+cmd: $NMCLI --mode tabular con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-302.expected b/clients/tests/test-client.check-on-disk/test_003-302.expected
new file mode 100644
index 0000000000..ae44d5a07e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-302.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/302
+cmd: $NMCLI --mode tabular con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-303.expected b/clients/tests/test-client.check-on-disk/test_003-303.expected
new file mode 100644
index 0000000000..5f6f37ad7f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-303.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:884:test_003()/303
+cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 487 bytes
+>>>
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-304.expected b/clients/tests/test-client.check-on-disk/test_003-304.expected
new file mode 100644
index 0000000000..0b285ae4e8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-304.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:884:test_003()/304
+cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 491 bytes
+>>>
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-305.expected b/clients/tests/test-client.check-on-disk/test_003-305.expected
new file mode 100644
index 0000000000..58655007c9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-305.expected
@@ -0,0 +1,35 @@
+location: clients/tests/test-client.py:887:test_003()/305
+cmd: $NMCLI --mode tabular -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 2657 bytes
+>>>
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no 100 Mb/s no no
+
+NAME CARRIER S390-SUBCHANNELS
+WIRED-PROPERTIES off --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-306.expected b/clients/tests/test-client.check-on-disk/test_003-306.expected
new file mode 100644
index 0000000000..8019429636
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-306.expected
@@ -0,0 +1,35 @@
+location: clients/tests/test-client.py:887:test_003()/306
+cmd: $NMCLI --mode tabular -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2678 bytes
+>>>
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie 100 Mb/s nie nie
+
+NAME CARRIER S390-SUBCHANNELS
+WIRED-PROPERTIES wyłączone --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-307.expected b/clients/tests/test-client.check-on-disk/test_003-307.expected
new file mode 100644
index 0000000000..e5feba686f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-307.expected
@@ -0,0 +1,17 @@
+location: clients/tests/test-client.py:875:test_003()/307
+cmd: $NMCLI --mode tabular --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 1885 bytes
+>>>
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-308.expected b/clients/tests/test-client.check-on-disk/test_003-308.expected
new file mode 100644
index 0000000000..0c0f6407f0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-308.expected
@@ -0,0 +1,17 @@
+location: clients/tests/test-client.py:875:test_003()/308
+cmd: $NMCLI --mode tabular --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1895 bytes
+>>>
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-309.expected b/clients/tests/test-client.check-on-disk/test_003-309.expected
new file mode 100644
index 0000000000..0a3a011590
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-309.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:878:test_003()/309
+cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 144 bytes
+>>>
+UUID TYPE
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-310.expected b/clients/tests/test-client.check-on-disk/test_003-310.expected
new file mode 100644
index 0000000000..c0a3c43d24
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-310.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:878:test_003()/310
+cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 144 bytes
+>>>
+UUID TYPE
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-311.expected b/clients/tests/test-client.check-on-disk/test_003-311.expected
new file mode 100644
index 0000000000..3428378afe
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-311.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/311
+cmd: $NMCLI --mode tabular --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-312.expected b/clients/tests/test-client.check-on-disk/test_003-312.expected
new file mode 100644
index 0000000000..6f257369ef
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-312.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/312
+cmd: $NMCLI --mode tabular --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-313.expected b/clients/tests/test-client.check-on-disk/test_003-313.expected
new file mode 100644
index 0000000000..c2e486820b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-313.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:884:test_003()/313
+cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 487 bytes
+>>>
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-314.expected b/clients/tests/test-client.check-on-disk/test_003-314.expected
new file mode 100644
index 0000000000..620e672eb2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-314.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:884:test_003()/314
+cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 491 bytes
+>>>
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-315.expected b/clients/tests/test-client.check-on-disk/test_003-315.expected
new file mode 100644
index 0000000000..4e9ba3a5d2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-315.expected
@@ -0,0 +1,35 @@
+location: clients/tests/test-client.py:887:test_003()/315
+cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 2657 bytes
+>>>
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no 100 Mb/s no no
+
+NAME CARRIER S390-SUBCHANNELS
+WIRED-PROPERTIES off --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-316.expected b/clients/tests/test-client.check-on-disk/test_003-316.expected
new file mode 100644
index 0000000000..4ae92c6ebc
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-316.expected
@@ -0,0 +1,35 @@
+location: clients/tests/test-client.py:887:test_003()/316
+cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2678 bytes
+>>>
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie 100 Mb/s nie nie
+
+NAME CARRIER S390-SUBCHANNELS
+WIRED-PROPERTIES wyłączone --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-317.expected b/clients/tests/test-client.check-on-disk/test_003-317.expected
new file mode 100644
index 0000000000..697bbea4d9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-317.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:875:test_003()/317
+cmd: $NMCLI --mode tabular --pretty -f ALL con
+lang: C
+returncode: 0
+stdout: 2092 bytes
+>>>
+======================================
+ NetworkManager connection profiles
+======================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-318.expected b/clients/tests/test-client.check-on-disk/test_003-318.expected
new file mode 100644
index 0000000000..ead0ecaddf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-318.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:875:test_003()/318
+cmd: $NMCLI --mode tabular --pretty -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2124 bytes
+>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-319.expected b/clients/tests/test-client.check-on-disk/test_003-319.expected
new file mode 100644
index 0000000000..be9c4821d6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-319.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:878:test_003()/319
+cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 346 bytes
+>>>
+======================================
+ NetworkManager connection profiles
+======================================
+UUID TYPE
+--------------------------------------------------------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-320.expected b/clients/tests/test-client.check-on-disk/test_003-320.expected
new file mode 100644
index 0000000000..b2a134764f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-320.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:878:test_003()/320
+cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 366 bytes
+>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+UUID TYPE
+------------------------------------------------------------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-321.expected b/clients/tests/test-client.check-on-disk/test_003-321.expected
new file mode 100644
index 0000000000..b73696ce61
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-321.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/321
+cmd: $NMCLI --mode tabular --pretty con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-322.expected b/clients/tests/test-client.check-on-disk/test_003-322.expected
new file mode 100644
index 0000000000..42cce251d1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-322.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/322
+cmd: $NMCLI --mode tabular --pretty con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-323.expected b/clients/tests/test-client.check-on-disk/test_003-323.expected
new file mode 100644
index 0000000000..cf0e9c907d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-323.expected
@@ -0,0 +1,22 @@
+location: clients/tests/test-client.py:884:test_003()/323
+cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 1033 bytes
+>>>
+==============================
+ Connection profile details
+==============================
+======================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+======================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-324.expected b/clients/tests/test-client.check-on-disk/test_003-324.expected
new file mode 100644
index 0000000000..605ce53666
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-324.expected
@@ -0,0 +1,22 @@
+location: clients/tests/test-client.py:884:test_003()/324
+cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1068 bytes
+>>>
+================================
+ Szczegóły profilu połączenia
+================================
+===========================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===========================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-325.expected b/clients/tests/test-client.check-on-disk/test_003-325.expected
new file mode 100644
index 0000000000..5863691c76
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-325.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:887:test_003()/325
+cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 4066 bytes
+>>>
+=========================
+ Device details (eth0)
+=========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES no 100 Mb/s no no
+
+NAME CARRIER S390-SUBCHANNELS
+---------------------------------------------
+WIRED-PROPERTIES off --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+---------------
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-326.expected b/clients/tests/test-client.check-on-disk/test_003-326.expected
new file mode 100644
index 0000000000..110b7429d4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-326.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:887:test_003()/326
+cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4124 bytes
+>>>
+==================================
+ Informacje o urządzeniu (eth0)
+==================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie 100 Mb/s nie nie
+
+NAME CARRIER S390-SUBCHANNELS
+-----------------------------------------------
+WIRED-PROPERTIES wyłączone --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+---------------
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-327.expected b/clients/tests/test-client.check-on-disk/test_003-327.expected
new file mode 100644
index 0000000000..b968b81d9e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-327.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:875:test_003()/327
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 2362 bytes
+>>>
+======================================
+ NetworkManager connection profiles
+======================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-328.expected b/clients/tests/test-client.check-on-disk/test_003-328.expected
new file mode 100644
index 0000000000..40b72f9ef6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-328.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:875:test_003()/328
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2394 bytes
+>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet
+ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet
+con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- /etc/NetworkManager/system-connections/con-1
+con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-329.expected b/clients/tests/test-client.check-on-disk/test_003-329.expected
new file mode 100644
index 0000000000..3b861c87e3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-329.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:878:test_003()/329
+cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 346 bytes
+>>>
+======================================
+ NetworkManager connection profiles
+======================================
+UUID TYPE
+--------------------------------------------------------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-330.expected b/clients/tests/test-client.check-on-disk/test_003-330.expected
new file mode 100644
index 0000000000..0967998636
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-330.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:878:test_003()/330
+cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 366 bytes
+>>>
+==========================================
+ Profile połączeń usługi NetworkManager
+==========================================
+UUID TYPE
+------------------------------------------------------------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-331.expected b/clients/tests/test-client.check-on-disk/test_003-331.expected
new file mode 100644
index 0000000000..e4eaa39c08
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-331.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/331
+cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-332.expected b/clients/tests/test-client.check-on-disk/test_003-332.expected
new file mode 100644
index 0000000000..eaaa384d33
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-332.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/332
+cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-333.expected b/clients/tests/test-client.check-on-disk/test_003-333.expected
new file mode 100644
index 0000000000..a600fd729c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-333.expected
@@ -0,0 +1,22 @@
+location: clients/tests/test-client.py:884:test_003()/333
+cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 1033 bytes
+>>>
+==============================
+ Connection profile details
+==============================
+======================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+======================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 deactivating no no -- no /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-334.expected b/clients/tests/test-client.check-on-disk/test_003-334.expected
new file mode 100644
index 0000000000..da8f678122
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-334.expected
@@ -0,0 +1,22 @@
+location: clients/tests/test-client.py:884:test_003()/334
+cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1068 bytes
+>>>
+================================
+ Szczegóły profilu połączenia
+================================
+===========================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===========================================================================
+GROUP NAME UUID DEVICES STATE DEFAULT DEFAULT6 SPEC-OBJECT VPN DBUS-PATH CON-PATH ZONE MASTER-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL ethernet UUID-ethernet-REPLACED-REPLACED-REPL eth0 dezaktywowanie nie nie -- nie /org/freedesktop/NetworkManager/ActiveConnection/1 /org/freedesktop/NetworkManager/Settings/Connection/3 -- --
+
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-335.expected b/clients/tests/test-client.check-on-disk/test_003-335.expected
new file mode 100644
index 0000000000..6abbde8435
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-335.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:887:test_003()/335
+cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 4066 bytes
+>>>
+=========================
+ Device details (eth0)
+=========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/eth0 -- no yes yes no no -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES no 100 Mb/s no no
+
+NAME CARRIER S390-SUBCHANNELS
+---------------------------------------------
+WIRED-PROPERTIES off --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+---------------
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-336.expected b/clients/tests/test-client.check-on-disk/test_003-336.expected
new file mode 100644
index 0000000000..b350f3f1be
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-336.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:887:test_003()/336
+cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4124 bytes
+>>>
+==================================
+ Informacje o urządzeniu (eth0)
+==================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL eth0 ethernet NMDeviceEthernet -- -- virtual -- -- C0:61:AE:26:4D:D7 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/eth0 -- nie tak tak nie nie -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie 100 Mb/s nie nie
+
+NAME CARRIER S390-SUBCHANNELS
+-----------------------------------------------
+WIRED-PROPERTIES wyłączone --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.6.238/29 -- dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64 192.168.213.113 sear4.foo4.bar 192.168.156.115 | 192.168.8.33
+
+GROUP OPTION
+---------------
+DHCP4 --
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103 2001:a::2b50:64d1:9a91:23b4 dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5 sear6.fo.x.y | sear6.foo4.bar
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2,1,3} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-337.expected b/clients/tests/test-client.check-on-disk/test_003-337.expected
new file mode 100644
index 0000000000..cb804c7635
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-337.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:875:test_003()/337
+cmd: $NMCLI --mode tabular --terse -f ALL con
+lang: C
+returncode: 0
+stdout: 847 bytes
+>>>
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-338.expected b/clients/tests/test-client.check-on-disk/test_003-338.expected
new file mode 100644
index 0000000000..cc663815a5
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-338.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:875:test_003()/338
+cmd: $NMCLI --mode tabular --terse -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 847 bytes
+>>>
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-339.expected b/clients/tests/test-client.check-on-disk/test_003-339.expected
new file mode 100644
index 0000000000..175606adad
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-339.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:878:test_003()/339
+cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 104 bytes
+>>>
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-340.expected b/clients/tests/test-client.check-on-disk/test_003-340.expected
new file mode 100644
index 0000000000..5a7c658ed9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-340.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:878:test_003()/340
+cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 104 bytes
+>>>
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-341.expected b/clients/tests/test-client.check-on-disk/test_003-341.expected
new file mode 100644
index 0000000000..c78b913a54
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-341.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/341
+cmd: $NMCLI --mode tabular --terse con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-342.expected b/clients/tests/test-client.check-on-disk/test_003-342.expected
new file mode 100644
index 0000000000..aafc8e8acc
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-342.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/342
+cmd: $NMCLI --mode tabular --terse con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-343.expected b/clients/tests/test-client.check-on-disk/test_003-343.expected
new file mode 100644
index 0000000000..4acd969ef8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-343.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:884:test_003()/343
+cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 189 bytes
+>>>
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-344.expected b/clients/tests/test-client.check-on-disk/test_003-344.expected
new file mode 100644
index 0000000000..536bb69873
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-344.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:884:test_003()/344
+cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 189 bytes
+>>>
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-345.expected b/clients/tests/test-client.check-on-disk/test_003-345.expected
new file mode 100644
index 0000000000..3179e3c798
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-345.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:887:test_003()/345
+cmd: $NMCLI --mode tabular --terse -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 1144 bytes
+>>>
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+CAPABILITIES:no:100 Mb/s:no:no
+WIRED-PROPERTIES:off:
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
+DHCP4:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-346.expected b/clients/tests/test-client.check-on-disk/test_003-346.expected
new file mode 100644
index 0000000000..2917822846
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-346.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:887:test_003()/346
+cmd: $NMCLI --mode tabular --terse -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1167 bytes
+>>>
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
+CAPABILITIES:nie:100 Mb/s:nie:nie
+WIRED-PROPERTIES:wyłączone:
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
+DHCP4:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-347.expected b/clients/tests/test-client.check-on-disk/test_003-347.expected
new file mode 100644
index 0000000000..752a077153
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-347.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:875:test_003()/347
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 1117 bytes
+>>>
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-348.expected b/clients/tests/test-client.check-on-disk/test_003-348.expected
new file mode 100644
index 0000000000..0be108db3d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-348.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:875:test_003()/348
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1117 bytes
+>>>
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth1:activated:/org/freedesktop/NetworkManager/ActiveConnection/2::/etc/NetworkManager/system-connections/ethernet
+ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet::::::/org/freedesktop/NetworkManager/Settings/Connection/3:yes:eth0:deactivating:/org/freedesktop/NetworkManager/ActiveConnection/1::/etc/NetworkManager/system-connections/ethernet
+con-1:5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/1:no:::::/etc/NetworkManager/system-connections/con-1
+con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/org/freedesktop/NetworkManager/Settings/Connection/2:no:::::/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-349.expected b/clients/tests/test-client.check-on-disk/test_003-349.expected
new file mode 100644
index 0000000000..c512ca105d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-349.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:878:test_003()/349
+cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 104 bytes
+>>>
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-350.expected b/clients/tests/test-client.check-on-disk/test_003-350.expected
new file mode 100644
index 0000000000..ea06d37f61
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-350.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:878:test_003()/350
+cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 104 bytes
+>>>
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-351.expected b/clients/tests/test-client.check-on-disk/test_003-351.expected
new file mode 100644
index 0000000000..0bb8650463
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-351.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/351
+cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-352.expected b/clients/tests/test-client.check-on-disk/test_003-352.expected
new file mode 100644
index 0000000000..122a0400f2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-352.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/352
+cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-353.expected b/clients/tests/test-client.check-on-disk/test_003-353.expected
new file mode 100644
index 0000000000..64777d72ff
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-353.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:884:test_003()/353
+cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 189 bytes
+>>>
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-354.expected b/clients/tests/test-client.check-on-disk/test_003-354.expected
new file mode 100644
index 0000000000..e38160d00b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-354.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:884:test_003()/354
+cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 189 bytes
+>>>
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/3::
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-355.expected b/clients/tests/test-client.check-on-disk/test_003-355.expected
new file mode 100644
index 0000000000..7efc5263c8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-355.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:887:test_003()/355
+cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 1144 bytes
+>>>
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+CAPABILITIES:no:100 Mb/s:no:no
+WIRED-PROPERTIES:off:
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
+DHCP4:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-356.expected b/clients/tests/test-client.check-on-disk/test_003-356.expected
new file mode 100644
index 0000000000..261cb8706c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-356.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:887:test_003()/356
+cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1167 bytes
+>>>
+GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/eth0::nie:tak:tak:nie:nie::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:nieznane
+CAPABILITIES:nie:100 Mb/s:nie:nie
+WIRED-PROPERTIES:wyłączone:
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
+DHCP4:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2,1,3}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-357.expected b/clients/tests/test-client.check-on-disk/test_003-357.expected
new file mode 100644
index 0000000000..c78080acac
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-357.expected
@@ -0,0 +1,72 @@
+location: clients/tests/test-client.py:875:test_003()/357
+cmd: $NMCLI --mode multiline -f ALL con
+lang: C
+returncode: 0
+stdout: 3263 bytes
+>>>
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth1
+STATE: activated
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth0
+STATE: deactivating
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-358.expected b/clients/tests/test-client.check-on-disk/test_003-358.expected
new file mode 100644
index 0000000000..f1f8b8739c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-358.expected
@@ -0,0 +1,72 @@
+location: clients/tests/test-client.py:875:test_003()/358
+cmd: $NMCLI --mode multiline -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3270 bytes
+>>>
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth1
+STATE: aktywowano
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth0
+STATE: dezaktywowanie
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-359.expected b/clients/tests/test-client.check-on-disk/test_003-359.expected
new file mode 100644
index 0000000000..0acf144a29
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-359.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:878:test_003()/359
+cmd: $NMCLI --mode multiline -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 252 bytes
+>>>
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-360.expected b/clients/tests/test-client.check-on-disk/test_003-360.expected
new file mode 100644
index 0000000000..39e8a2934e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-360.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:878:test_003()/360
+cmd: $NMCLI --mode multiline -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 252 bytes
+>>>
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-361.expected b/clients/tests/test-client.check-on-disk/test_003-361.expected
new file mode 100644
index 0000000000..1b3f78af1f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-361.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/361
+cmd: $NMCLI --mode multiline con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-362.expected b/clients/tests/test-client.check-on-disk/test_003-362.expected
new file mode 100644
index 0000000000..7b285c3731
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-362.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/362
+cmd: $NMCLI --mode multiline con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-363.expected b/clients/tests/test-client.check-on-disk/test_003-363.expected
new file mode 100644
index 0000000000..cd7413c487
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-363.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/363
+cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 667 bytes
+>>>
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-364.expected b/clients/tests/test-client.check-on-disk/test_003-364.expected
new file mode 100644
index 0000000000..52eb417e92
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-364.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/364
+cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 672 bytes
+>>>
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-365.expected b/clients/tests/test-client.check-on-disk/test_003-365.expected
new file mode 100644
index 0000000000..1da0887e2c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-365.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/365
+cmd: $NMCLI --mode multiline -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 3207 bytes
+>>>
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIRED-PROPERTIES.CARRIER: off
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-366.expected b/clients/tests/test-client.check-on-disk/test_003-366.expected
new file mode 100644
index 0000000000..be1f19bb7c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-366.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/366
+cmd: $NMCLI --mode multiline -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3230 bytes
+>>>
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIRED-PROPERTIES.CARRIER: wyłączone
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-367.expected b/clients/tests/test-client.check-on-disk/test_003-367.expected
new file mode 100644
index 0000000000..06e256aa1b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-367.expected
@@ -0,0 +1,72 @@
+location: clients/tests/test-client.py:875:test_003()/367
+cmd: $NMCLI --mode multiline --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 3533 bytes
+>>>
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth1
+STATE: activated
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth0
+STATE: deactivating
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-368.expected b/clients/tests/test-client.check-on-disk/test_003-368.expected
new file mode 100644
index 0000000000..72597cb7dd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-368.expected
@@ -0,0 +1,72 @@
+location: clients/tests/test-client.py:875:test_003()/368
+cmd: $NMCLI --mode multiline --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3540 bytes
+>>>
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth1
+STATE: aktywowano
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth0
+STATE: dezaktywowanie
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-369.expected b/clients/tests/test-client.check-on-disk/test_003-369.expected
new file mode 100644
index 0000000000..578101ada8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-369.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:878:test_003()/369
+cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 252 bytes
+>>>
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-370.expected b/clients/tests/test-client.check-on-disk/test_003-370.expected
new file mode 100644
index 0000000000..bd7f18ae36
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-370.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:878:test_003()/370
+cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 252 bytes
+>>>
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-371.expected b/clients/tests/test-client.check-on-disk/test_003-371.expected
new file mode 100644
index 0000000000..3c7a482507
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-371.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/371
+cmd: $NMCLI --mode multiline --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-372.expected b/clients/tests/test-client.check-on-disk/test_003-372.expected
new file mode 100644
index 0000000000..aacc502e9f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-372.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/372
+cmd: $NMCLI --mode multiline --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-373.expected b/clients/tests/test-client.check-on-disk/test_003-373.expected
new file mode 100644
index 0000000000..6967e0258a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-373.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/373
+cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 667 bytes
+>>>
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-374.expected b/clients/tests/test-client.check-on-disk/test_003-374.expected
new file mode 100644
index 0000000000..83bf924a92
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-374.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/374
+cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 672 bytes
+>>>
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-375.expected b/clients/tests/test-client.check-on-disk/test_003-375.expected
new file mode 100644
index 0000000000..016cebed4e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-375.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/375
+cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 3207 bytes
+>>>
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIRED-PROPERTIES.CARRIER: off
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-376.expected b/clients/tests/test-client.check-on-disk/test_003-376.expected
new file mode 100644
index 0000000000..83e59a9346
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-376.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/376
+cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3230 bytes
+>>>
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIRED-PROPERTIES.CARRIER: wyłączone
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-377.expected b/clients/tests/test-client.check-on-disk/test_003-377.expected
new file mode 100644
index 0000000000..a264b886fc
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-377.expected
@@ -0,0 +1,79 @@
+location: clients/tests/test-client.py:875:test_003()/377
+cmd: $NMCLI --mode multiline --pretty -f ALL con
+lang: C
+returncode: 0
+stdout: 3800 bytes
+>>>
+===============================================================================
+ NetworkManager connection profiles
+===============================================================================
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth1
+STATE: activated
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth0
+STATE: deactivating
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+-------------------------------------------------------------------------------
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-378.expected b/clients/tests/test-client.check-on-disk/test_003-378.expected
new file mode 100644
index 0000000000..a57ee8bd94
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-378.expected
@@ -0,0 +1,79 @@
+location: clients/tests/test-client.py:875:test_003()/378
+cmd: $NMCLI --mode multiline --pretty -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3813 bytes
+>>>
+===============================================================================
+ Profile połączeń usługi NetworkManager
+===============================================================================
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth1
+STATE: aktywowano
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth0
+STATE: dezaktywowanie
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+-------------------------------------------------------------------------------
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-379.expected b/clients/tests/test-client.check-on-disk/test_003-379.expected
new file mode 100644
index 0000000000..004591aa4e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-379.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:878:test_003()/379
+cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 629 bytes
+>>>
+===============================================================================
+ NetworkManager connection profiles
+===============================================================================
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+-------------------------------------------------------------------------------
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-380.expected b/clients/tests/test-client.check-on-disk/test_003-380.expected
new file mode 100644
index 0000000000..134d48cdef
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-380.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:878:test_003()/380
+cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 635 bytes
+>>>
+===============================================================================
+ Profile połączeń usługi NetworkManager
+===============================================================================
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+-------------------------------------------------------------------------------
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-381.expected b/clients/tests/test-client.check-on-disk/test_003-381.expected
new file mode 100644
index 0000000000..9c9d073e37
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-381.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/381
+cmd: $NMCLI --mode multiline --pretty con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-382.expected b/clients/tests/test-client.check-on-disk/test_003-382.expected
new file mode 100644
index 0000000000..dd3e55416f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-382.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/382
+cmd: $NMCLI --mode multiline --pretty con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-383.expected b/clients/tests/test-client.check-on-disk/test_003-383.expected
new file mode 100644
index 0000000000..9819c2edbf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-383.expected
@@ -0,0 +1,31 @@
+location: clients/tests/test-client.py:884:test_003()/383
+cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 1193 bytes
+>>>
+===============================================================================
+ Connection profile details
+===============================================================================
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-384.expected b/clients/tests/test-client.check-on-disk/test_003-384.expected
new file mode 100644
index 0000000000..9ca2abf2f5
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-384.expected
@@ -0,0 +1,31 @@
+location: clients/tests/test-client.py:884:test_003()/384
+cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1210 bytes
+>>>
+===============================================================================
+ Szczegóły profilu połączenia
+===============================================================================
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-385.expected b/clients/tests/test-client.check-on-disk/test_003-385.expected
new file mode 100644
index 0000000000..0377a0c65f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-385.expected
@@ -0,0 +1,78 @@
+location: clients/tests/test-client.py:887:test_003()/385
+cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 4058 bytes
+>>>
+===============================================================================
+ Device details (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: off
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-386.expected b/clients/tests/test-client.check-on-disk/test_003-386.expected
new file mode 100644
index 0000000000..5b4c432d7a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-386.expected
@@ -0,0 +1,78 @@
+location: clients/tests/test-client.py:887:test_003()/386
+cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4087 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: wyłączone
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-387.expected b/clients/tests/test-client.check-on-disk/test_003-387.expected
new file mode 100644
index 0000000000..ab5c1b575a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-387.expected
@@ -0,0 +1,79 @@
+location: clients/tests/test-client.py:875:test_003()/387
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 4070 bytes
+>>>
+===============================================================================
+ NetworkManager connection profiles
+===============================================================================
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth1
+STATE: activated
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: yes
+DEVICE: eth0
+STATE: deactivating
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+-------------------------------------------------------------------------------
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: never
+AUTOCONNECT: yes
+AUTOCONNECT-PRIORITY: 0
+READONLY: no
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: no
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-388.expected b/clients/tests/test-client.check-on-disk/test_003-388.expected
new file mode 100644
index 0000000000..eb7f691e1e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-388.expected
@@ -0,0 +1,79 @@
+location: clients/tests/test-client.py:875:test_003()/388
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4083 bytes
+>>>
+===============================================================================
+ Profile połączeń usługi NetworkManager
+===============================================================================
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth1
+STATE: aktywowano
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: ethernet
+UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE: ethernet
+TIMESTAMP: --
+TIMESTAMP-REAL: --
+AUTOCONNECT: --
+AUTOCONNECT-PRIORITY: --
+READONLY: --
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE: tak
+DEVICE: eth0
+STATE: dezaktywowanie
+ACTIVE-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/ethernet
+-------------------------------------------------------------------------------
+NAME: con-1
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-1
+-------------------------------------------------------------------------------
+NAME: con-xx1
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+TIMESTAMP: 0
+TIMESTAMP-REAL: nigdy
+AUTOCONNECT: tak
+AUTOCONNECT-PRIORITY: 0
+READONLY: nie
+DBUS-PATH: /org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE: nie
+DEVICE: --
+STATE: --
+ACTIVE-PATH: --
+SLAVE: --
+FILENAME: /etc/NetworkManager/system-connections/con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-389.expected b/clients/tests/test-client.check-on-disk/test_003-389.expected
new file mode 100644
index 0000000000..e81b9df3f9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-389.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:878:test_003()/389
+cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 629 bytes
+>>>
+===============================================================================
+ NetworkManager connection profiles
+===============================================================================
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+-------------------------------------------------------------------------------
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-390.expected b/clients/tests/test-client.check-on-disk/test_003-390.expected
new file mode 100644
index 0000000000..c8881e3fe7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-390.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:878:test_003()/390
+cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 635 bytes
+>>>
+===============================================================================
+ Profile połączeń usługi NetworkManager
+===============================================================================
+UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE: ethernet
+-------------------------------------------------------------------------------
+UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE: ethernet
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-391.expected b/clients/tests/test-client.check-on-disk/test_003-391.expected
new file mode 100644
index 0000000000..670038c4f3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-391.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/391
+cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-392.expected b/clients/tests/test-client.check-on-disk/test_003-392.expected
new file mode 100644
index 0000000000..39ddcb227f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-392.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/392
+cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-393.expected b/clients/tests/test-client.check-on-disk/test_003-393.expected
new file mode 100644
index 0000000000..871662b61f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-393.expected
@@ -0,0 +1,31 @@
+location: clients/tests/test-client.py:884:test_003()/393
+cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 1193 bytes
+>>>
+===============================================================================
+ Connection profile details
+===============================================================================
+===============================================================================
+ Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: deactivating
+GENERAL.DEFAULT: no
+GENERAL.DEFAULT6: no
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: no
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-394.expected b/clients/tests/test-client.check-on-disk/test_003-394.expected
new file mode 100644
index 0000000000..a3e04da28c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-394.expected
@@ -0,0 +1,31 @@
+location: clients/tests/test-client.py:884:test_003()/394
+cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1210 bytes
+>>>
+===============================================================================
+ Szczegóły profilu połączenia
+===============================================================================
+===============================================================================
+ Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
+===============================================================================
+GENERAL.NAME: ethernet
+GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES: eth0
+GENERAL.STATE: dezaktywowanie
+GENERAL.DEFAULT: nie
+GENERAL.DEFAULT6: nie
+GENERAL.SPEC-OBJECT: --
+GENERAL.VPN: nie
+GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE: --
+GENERAL.MASTER-PATH: --
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-395.expected b/clients/tests/test-client.check-on-disk/test_003-395.expected
new file mode 100644
index 0000000000..eb7dcad0c9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-395.expected
@@ -0,0 +1,78 @@
+location: clients/tests/test-client.py:887:test_003()/395
+cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 4058 bytes
+>>>
+===============================================================================
+ Device details (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: off
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-396.expected b/clients/tests/test-client.check-on-disk/test_003-396.expected
new file mode 100644
index 0000000000..db99bda746
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-396.expected
@@ -0,0 +1,78 @@
+location: clients/tests/test-client.py:887:test_003()/396
+cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4087 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (eth0)
+===============================================================================
+GENERAL.DEVICE: eth0
+GENERAL.TYPE: ethernet
+GENERAL.NM-TYPE: NMDeviceEthernet
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: C0:61:AE:26:4D:D7
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/eth0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: ethernet
+GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: 100 Mb/s
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIRED-PROPERTIES.CARRIER: wyłączone
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.6.238/29
+IP4.GATEWAY: --
+IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]: 192.168.213.113
+IP4.DOMAIN[1]: sear4.foo4.bar
+IP4.WINS[1]: 192.168.156.115
+IP4.WINS[2]: 192.168.8.33
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]: sear6.fo.x.y
+IP6.DOMAIN[2]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]: (null) | (null)
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-397.expected b/clients/tests/test-client.check-on-disk/test_003-397.expected
new file mode 100644
index 0000000000..16ab1f4bc6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-397.expected
@@ -0,0 +1,72 @@
+location: clients/tests/test-client.py:875:test_003()/397
+cmd: $NMCLI --mode multiline --terse -f ALL con
+lang: C
+returncode: 0
+stdout: 1403 bytes
+>>>
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:con-1
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-1
+NAME:con-xx1
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-398.expected b/clients/tests/test-client.check-on-disk/test_003-398.expected
new file mode 100644
index 0000000000..f650ec3a62
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-398.expected
@@ -0,0 +1,72 @@
+location: clients/tests/test-client.py:875:test_003()/398
+cmd: $NMCLI --mode multiline --terse -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1403 bytes
+>>>
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:con-1
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-1
+NAME:con-xx1
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-399.expected b/clients/tests/test-client.check-on-disk/test_003-399.expected
new file mode 100644
index 0000000000..f0e34e826f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-399.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:878:test_003()/399
+cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 124 bytes
+>>>
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-400.expected b/clients/tests/test-client.check-on-disk/test_003-400.expected
new file mode 100644
index 0000000000..9d9af6632c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-400.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:878:test_003()/400
+cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 124 bytes
+>>>
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-401.expected b/clients/tests/test-client.check-on-disk/test_003-401.expected
new file mode 100644
index 0000000000..166ae05992
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-401.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/401
+cmd: $NMCLI --mode multiline --terse con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-402.expected b/clients/tests/test-client.check-on-disk/test_003-402.expected
new file mode 100644
index 0000000000..d79b187e31
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-402.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/402
+cmd: $NMCLI --mode multiline --terse con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-403.expected b/clients/tests/test-client.check-on-disk/test_003-403.expected
new file mode 100644
index 0000000000..bfb8d7809f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-403.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/403
+cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 370 bytes
+>>>
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-404.expected b/clients/tests/test-client.check-on-disk/test_003-404.expected
new file mode 100644
index 0000000000..d15587245e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-404.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/404
+cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 370 bytes
+>>>
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-405.expected b/clients/tests/test-client.check-on-disk/test_003-405.expected
new file mode 100644
index 0000000000..db889b0d6b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-405.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/405
+cmd: $NMCLI --mode multiline --terse -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 1979 bytes
+>>>
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIRED-PROPERTIES.CARRIER:off
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-406.expected b/clients/tests/test-client.check-on-disk/test_003-406.expected
new file mode 100644
index 0000000000..22ac9ce7c8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-406.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/406
+cmd: $NMCLI --mode multiline --terse -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2002 bytes
+>>>
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIRED-PROPERTIES.CARRIER:wyłączone
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-407.expected b/clients/tests/test-client.check-on-disk/test_003-407.expected
new file mode 100644
index 0000000000..7fe7e580c7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-407.expected
@@ -0,0 +1,72 @@
+location: clients/tests/test-client.py:875:test_003()/407
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
+lang: C
+returncode: 0
+stdout: 1673 bytes
+>>>
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:con-1
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-1
+NAME:con-xx1
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-408.expected b/clients/tests/test-client.check-on-disk/test_003-408.expected
new file mode 100644
index 0000000000..e650e3c995
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-408.expected
@@ -0,0 +1,72 @@
+location: clients/tests/test-client.py:875:test_003()/408
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1673 bytes
+>>>
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth1
+STATE:activated
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:ethernet
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+TIMESTAMP:
+TIMESTAMP-REAL:
+AUTOCONNECT:
+AUTOCONNECT-PRIORITY:
+READONLY:
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+ACTIVE:yes
+DEVICE:eth0
+STATE:deactivating
+ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/ethernet
+NAME:con-1
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/1
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-1
+NAME:con-xx1
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+TIMESTAMP:0
+TIMESTAMP-REAL:never
+AUTOCONNECT:yes
+AUTOCONNECT-PRIORITY:0
+READONLY:no
+DBUS-PATH:/org/freedesktop/NetworkManager/Settings/Connection/2
+ACTIVE:no
+DEVICE:
+STATE:
+ACTIVE-PATH:
+SLAVE:
+FILENAME:/etc/NetworkManager/system-connections/con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-409.expected b/clients/tests/test-client.check-on-disk/test_003-409.expected
new file mode 100644
index 0000000000..cbf8591218
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-409.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:878:test_003()/409
+cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 124 bytes
+>>>
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-410.expected b/clients/tests/test-client.check-on-disk/test_003-410.expected
new file mode 100644
index 0000000000..c62afd807e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-410.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:878:test_003()/410
+cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 124 bytes
+>>>
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-411.expected b/clients/tests/test-client.check-on-disk/test_003-411.expected
new file mode 100644
index 0000000000..0e320948c6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-411.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/411
+cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 46 bytes
+>>>
+Error: ethernet - no such connection profile.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-412.expected b/clients/tests/test-client.check-on-disk/test_003-412.expected
new file mode 100644
index 0000000000..9e7c3967db
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-412.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:881:test_003()/412
+cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 58 bytes
+>>>
+Błąd: ethernet — nie ma takiego profilu połączenia.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-413.expected b/clients/tests/test-client.check-on-disk/test_003-413.expected
new file mode 100644
index 0000000000..afef1e43ea
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-413.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/413
+cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: C
+returncode: 0
+stdout: 370 bytes
+>>>
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-414.expected b/clients/tests/test-client.check-on-disk/test_003-414.expected
new file mode 100644
index 0000000000..abe85d73b8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-414.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:884:test_003()/414
+cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 370 bytes
+>>>
+GENERAL.NAME:ethernet
+GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:eth0
+GENERAL.STATE:deactivating
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:no
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-415.expected b/clients/tests/test-client.check-on-disk/test_003-415.expected
new file mode 100644
index 0000000000..737a2c0df9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-415.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/415
+cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
+lang: C
+returncode: 0
+stdout: 1979 bytes
+>>>
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIRED-PROPERTIES.CARRIER:off
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-416.expected b/clients/tests/test-client.check-on-disk/test_003-416.expected
new file mode 100644
index 0000000000..f7a0b5cf6d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-416.expected
@@ -0,0 +1,67 @@
+location: clients/tests/test-client.py:887:test_003()/416
+cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2002 bytes
+>>>
+GENERAL.DEVICE:eth0
+GENERAL.TYPE:ethernet
+GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:C0:61:AE:26:4D:D7
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/eth0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:ethernet
+GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:100 Mb/s
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIRED-PROPERTIES.CARRIER:wyłączone
+IP4.ADDRESS[1]:192.168.6.238/29
+IP4.GATEWAY:
+IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792
+IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64
+IP4.DNS[1]:192.168.213.113
+IP4.DOMAIN[1]:sear4.foo4.bar
+IP4.WINS[1]:192.168.156.115
+IP4.WINS[2]:192.168.8.33
+IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
+IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
+IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
+IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4
+IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794
+IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b
+IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
+IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
+IP6.DOMAIN[1]:sear6.fo.x.y
+IP6.DOMAIN[2]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
+DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
+DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:(null) | (null)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-001.expected b/clients/tests/test-client.check-on-disk/test_004-001.expected
index 0fb8a214e6..9c56b52ef3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-001.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-001.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:894:test_004()/1
+location: clients/tests/test-client.py:897:test_004()/1
cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-002.expected b/clients/tests/test-client.check-on-disk/test_004-002.expected
index b52115b06b..e302ad2c11 100644
--- a/clients/tests/test-client.check-on-disk/test_004-002.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-002.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:896:test_004()/2
+location: clients/tests/test-client.py:899:test_004()/2
cmd: $NMCLI connection mod con-xx1 ip.gateway ''
lang: C
returncode: 2
diff --git a/clients/tests/test-client.check-on-disk/test_004-003.expected b/clients/tests/test-client.check-on-disk/test_004-003.expected
index 527f236806..fa74b7bc12 100644
--- a/clients/tests/test-client.check-on-disk/test_004-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-003.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:897:test_004()/3
+location: clients/tests/test-client.py:900:test_004()/3
cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1
lang: pl_PL.UTF-8
returncode: 1
diff --git a/clients/tests/test-client.check-on-disk/test_004-004.expected b/clients/tests/test-client.check-on-disk/test_004-004.expected
index 8692135a65..0ff6deabfb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-004.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-004.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:898:test_004()/4
+location: clients/tests/test-client.py:901:test_004()/4
cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99
lang: C
returncode: 1
diff --git a/clients/tests/test-client.check-on-disk/test_004-005.expected b/clients/tests/test-client.check-on-disk/test_004-005.expected
index 273a4a99bc..e16c063432 100644
--- a/clients/tests/test-client.check-on-disk/test_004-005.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-005.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:899:test_004()/5
+location: clients/tests/test-client.py:902:test_004()/5
cmd: $NMCLI connection mod con-xx1 802.abc ''
lang: C
returncode: 2
diff --git a/clients/tests/test-client.check-on-disk/test_004-006.expected b/clients/tests/test-client.check-on-disk/test_004-006.expected
index 577a964b50..1950fc137d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-006.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-006.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:900:test_004()/6
+location: clients/tests/test-client.py:903:test_004()/6
cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-007.expected b/clients/tests/test-client.check-on-disk/test_004-007.expected
index 7dd6e33829..c2987c7ad1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-007.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-007.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:901:test_004()/7
+location: clients/tests/test-client.py:904:test_004()/7
cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-008.expected b/clients/tests/test-client.check-on-disk/test_004-008.expected
index 265b8c5299..4b7ab20400 100644
--- a/clients/tests/test-client.check-on-disk/test_004-008.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-008.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:903:test_004()/8
+location: clients/tests/test-client.py:906:test_004()/8
cmd: $NMCLI con s con-xx1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-009.expected b/clients/tests/test-client.check-on-disk/test_004-009.expected
index 1117eeb26b..d480d96232 100644
--- a/clients/tests/test-client.check-on-disk/test_004-009.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-009.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:903:test_004()/9
+location: clients/tests/test-client.py:906:test_004()/9
cmd: $NMCLI con s con-xx1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-010.expected b/clients/tests/test-client.check-on-disk/test_004-010.expected
index d0e07c091f..f8f929d903 100644
--- a/clients/tests/test-client.check-on-disk/test_004-010.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-010.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:910:test_004()/10
+location: clients/tests/test-client.py:913:test_004()/10
cmd: $NMCLI connection add type vpn con-name con-vpn-1 ifname '*' vpn-type openvpn vpn.data 'key1 = val1, key2 = val2, key3=val3'
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-011.expected b/clients/tests/test-client.check-on-disk/test_004-011.expected
index e3a9ce8890..d0bb5e3ce6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-011.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-011.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:913:test_004()/11
+location: clients/tests/test-client.py:916:test_004()/11
cmd: $NMCLI con s
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-012.expected b/clients/tests/test-client.check-on-disk/test_004-012.expected
index 8f160dd492..5696ffac90 100644
--- a/clients/tests/test-client.check-on-disk/test_004-012.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-012.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:913:test_004()/12
+location: clients/tests/test-client.py:916:test_004()/12
cmd: $NMCLI con s
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-013.expected b/clients/tests/test-client.check-on-disk/test_004-013.expected
index 2f953a76e0..858d7e8c52 100644
--- a/clients/tests/test-client.check-on-disk/test_004-013.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-013.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:915:test_004()/13
+location: clients/tests/test-client.py:918:test_004()/13
cmd: $NMCLI con s con-vpn-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-014.expected b/clients/tests/test-client.check-on-disk/test_004-014.expected
index 9df648ab66..c8a3477379 100644
--- a/clients/tests/test-client.check-on-disk/test_004-014.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-014.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:915:test_004()/14
+location: clients/tests/test-client.py:918:test_004()/14
cmd: $NMCLI con s con-vpn-1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-015.expected b/clients/tests/test-client.check-on-disk/test_004-015.expected
index dc2af2bc84..f6145b8919 100644
--- a/clients/tests/test-client.check-on-disk/test_004-015.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-015.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:917:test_004()/15
+location: clients/tests/test-client.py:920:test_004()/15
cmd: $NMCLI con up con-xx1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-016.expected b/clients/tests/test-client.check-on-disk/test_004-016.expected
index 4e5bc43d88..1282ea012a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-016.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-016.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:919:test_004()/16
+location: clients/tests/test-client.py:922:test_004()/16
cmd: $NMCLI con s
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-017.expected b/clients/tests/test-client.check-on-disk/test_004-017.expected
index 66de41e4e6..5d3d68eccc 100644
--- a/clients/tests/test-client.check-on-disk/test_004-017.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-017.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:919:test_004()/17
+location: clients/tests/test-client.py:922:test_004()/17
cmd: $NMCLI con s
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-018.expected b/clients/tests/test-client.check-on-disk/test_004-018.expected
index 9bd5d168c2..9dd7c29d28 100644
--- a/clients/tests/test-client.check-on-disk/test_004-018.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-018.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:921:test_004()/18
+location: clients/tests/test-client.py:924:test_004()/18
cmd: $NMCLI con up con-vpn-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-019.expected b/clients/tests/test-client.check-on-disk/test_004-019.expected
index 2e2a067bb7..1c146176c4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-019.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-019.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:923:test_004()/19
+location: clients/tests/test-client.py:926:test_004()/19
cmd: $NMCLI con s
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-020.expected b/clients/tests/test-client.check-on-disk/test_004-020.expected
index ee62bc460a..4fc4918d9e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-020.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-020.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:923:test_004()/20
+location: clients/tests/test-client.py:926:test_004()/20
cmd: $NMCLI con s
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-021.expected b/clients/tests/test-client.check-on-disk/test_004-021.expected
index 537d8bfee0..d16c6815b1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-021.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-021.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:925:test_004()/21
+location: clients/tests/test-client.py:928:test_004()/21
cmd: $NMCLI con s con-vpn-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-022.expected b/clients/tests/test-client.check-on-disk/test_004-022.expected
index 468e3f7397..2cc8464de3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-022.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-022.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:925:test_004()/22
+location: clients/tests/test-client.py:928:test_004()/22
cmd: $NMCLI con s con-vpn-1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-023.expected b/clients/tests/test-client.check-on-disk/test_004-023.expected
index e1629ef6ba..117a8838e3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-023.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-023.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:934:test_004()/23
+location: clients/tests/test-client.py:937:test_004()/23
cmd: $NMCLI con s con-vpn-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-024.expected b/clients/tests/test-client.check-on-disk/test_004-024.expected
index 617bad8127..f7cbbadbaf 100644
--- a/clients/tests/test-client.check-on-disk/test_004-024.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-024.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:934:test_004()/24
+location: clients/tests/test-client.py:937:test_004()/24
cmd: $NMCLI con s con-vpn-1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-025.expected b/clients/tests/test-client.check-on-disk/test_004-025.expected
index c98b79f778..c8f3bf2649 100644
--- a/clients/tests/test-client.check-on-disk/test_004-025.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-025.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:936:test_004()/25
+location: clients/tests/test-client.py:939:test_004()/25
cmd: $NMCLI -t con s con-vpn-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected
index 7179d6a3c5..e80c54cfbc 100644
--- a/clients/tests/test-client.check-on-disk/test_004-026.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-026.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:936:test_004()/26
+location: clients/tests/test-client.py:939:test_004()/26
cmd: $NMCLI -t con s con-vpn-1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-027.expected b/clients/tests/test-client.check-on-disk/test_004-027.expected
index 72e3cd4441..d828b6d613 100644
--- a/clients/tests/test-client.check-on-disk/test_004-027.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-027.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:939:test_004()/27
+location: clients/tests/test-client.py:942:test_004()/27
cmd: $NMCLI -f ALL con s con-vpn-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-028.expected b/clients/tests/test-client.check-on-disk/test_004-028.expected
index f43732333c..7e53d435d8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-028.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-028.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:939:test_004()/28
+location: clients/tests/test-client.py:942:test_004()/28
cmd: $NMCLI -f ALL con s con-vpn-1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-029.expected b/clients/tests/test-client.check-on-disk/test_004-029.expected
index b27e64fa36..3faec240a7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-029.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-029.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:945:test_004()/29
+location: clients/tests/test-client.py:948:test_004()/29
cmd: $NMCLI -f VPN con s con-vpn-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-030.expected b/clients/tests/test-client.check-on-disk/test_004-030.expected
index 41c3a3d9fa..7e23cc9d93 100644
--- a/clients/tests/test-client.check-on-disk/test_004-030.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-030.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:945:test_004()/30
+location: clients/tests/test-client.py:948:test_004()/30
cmd: $NMCLI -f VPN con s con-vpn-1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-031.expected b/clients/tests/test-client.check-on-disk/test_004-031.expected
index 1e0d302f09..f7b1d5ccd4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-031.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-031.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:948:test_004()/31
+location: clients/tests/test-client.py:951:test_004()/31
cmd: $NMCLI -f GENERAL con s con-vpn-1
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-032.expected b/clients/tests/test-client.check-on-disk/test_004-032.expected
index 1e34514059..5471514d21 100644
--- a/clients/tests/test-client.check-on-disk/test_004-032.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-032.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:948:test_004()/32
+location: clients/tests/test-client.py:951:test_004()/32
cmd: $NMCLI -f GENERAL con s con-vpn-1
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected
index 63fa45e1df..ccf0d3c25b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-033.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-033.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:951:test_004()/33
+location: clients/tests/test-client.py:954:test_004()/33
cmd: $NMCLI dev show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected
index 5c30fedc20..aa79cf7308 100644
--- a/clients/tests/test-client.check-on-disk/test_004-034.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-034.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:951:test_004()/34
+location: clients/tests/test-client.py:954:test_004()/34
cmd: $NMCLI dev show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected
index b9516af070..e593159708 100644
--- a/clients/tests/test-client.check-on-disk/test_004-035.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-035.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:954:test_004()/35
+location: clients/tests/test-client.py:957:test_004()/35
cmd: $NMCLI -f all dev show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected
index ec930e8d7b..1209fa2c07 100644
--- a/clients/tests/test-client.check-on-disk/test_004-036.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-036.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:954:test_004()/36
+location: clients/tests/test-client.py:957:test_004()/36
cmd: $NMCLI -f all dev show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-037.expected b/clients/tests/test-client.check-on-disk/test_004-037.expected
index f3c80e0873..b139a24bf2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-037.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-037.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:957:test_004()/37
+location: clients/tests/test-client.py:960:test_004()/37
cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-038.expected b/clients/tests/test-client.check-on-disk/test_004-038.expected
index 3295b7610f..abcf5d9df6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-038.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-038.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:957:test_004()/38
+location: clients/tests/test-client.py:960:test_004()/38
cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-039.expected b/clients/tests/test-client.check-on-disk/test_004-039.expected
index a47398f4f9..6b5fd74c32 100644
--- a/clients/tests/test-client.check-on-disk/test_004-039.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-039.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:960:test_004()/39
+location: clients/tests/test-client.py:963:test_004()/39
cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected
index 23d69cde07..bbaef46ff8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-040.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-040.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:960:test_004()/40
+location: clients/tests/test-client.py:963:test_004()/40
cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-041.expected b/clients/tests/test-client.check-on-disk/test_004-041.expected
index fe54bcf7e5..d04f9583cf 100644
--- a/clients/tests/test-client.check-on-disk/test_004-041.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-041.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:963:test_004()/41
+location: clients/tests/test-client.py:966:test_004()/41
cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-042.expected b/clients/tests/test-client.check-on-disk/test_004-042.expected
index 7d2f05c225..ea56d46728 100644
--- a/clients/tests/test-client.check-on-disk/test_004-042.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-042.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:963:test_004()/42
+location: clients/tests/test-client.py:966:test_004()/42
cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-043.expected b/clients/tests/test-client.check-on-disk/test_004-043.expected
index 8286234ef5..6eb562bfb4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-043.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-043.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:967:test_004()/43
+location: clients/tests/test-client.py:970:test_004()/43
cmd: $NMCLI -f ALL device wifi list
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-044.expected b/clients/tests/test-client.check-on-disk/test_004-044.expected
index 35f5f1771d..5b3d96134c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-044.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-044.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:967:test_004()/44
+location: clients/tests/test-client.py:970:test_004()/44
cmd: $NMCLI -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-045.expected b/clients/tests/test-client.check-on-disk/test_004-045.expected
index 93282b2ff3..148fb51ee9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-045.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-045.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:969:test_004()/45
+location: clients/tests/test-client.py:972:test_004()/45
cmd: $NMCLI -f COMMON device wifi list
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-046.expected b/clients/tests/test-client.check-on-disk/test_004-046.expected
index 94cf4fbb40..8a2a6f5f90 100644
--- a/clients/tests/test-client.check-on-disk/test_004-046.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-046.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:969:test_004()/46
+location: clients/tests/test-client.py:972:test_004()/46
cmd: $NMCLI -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-047.expected b/clients/tests/test-client.check-on-disk/test_004-047.expected
index 43b2ddd258..383f84a50e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-047.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-047.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:972:test_004()/47
+location: clients/tests/test-client.py:975:test_004()/47
cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-048.expected b/clients/tests/test-client.check-on-disk/test_004-048.expected
index 3a9310975e..89fd0fb773 100644
--- a/clients/tests/test-client.check-on-disk/test_004-048.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-048.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:972:test_004()/48
+location: clients/tests/test-client.py:975:test_004()/48
cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-049.expected b/clients/tests/test-client.check-on-disk/test_004-049.expected
index 5e0c12d001..1c9fa87a41 100644
--- a/clients/tests/test-client.check-on-disk/test_004-049.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-049.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:974:test_004()/49
+location: clients/tests/test-client.py:977:test_004()/49
cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-050.expected b/clients/tests/test-client.check-on-disk/test_004-050.expected
index 152a828c79..a95397e1e4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-050.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-050.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:974:test_004()/50
+location: clients/tests/test-client.py:977:test_004()/50
cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-051.expected b/clients/tests/test-client.check-on-disk/test_004-051.expected
index b86d1e3940..0c78a50fc0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-051.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-051.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:976:test_004()/51
+location: clients/tests/test-client.py:979:test_004()/51
cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-052.expected b/clients/tests/test-client.check-on-disk/test_004-052.expected
index 097e57011d..05b4441179 100644
--- a/clients/tests/test-client.check-on-disk/test_004-052.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-052.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:976:test_004()/52
+location: clients/tests/test-client.py:979:test_004()/52
cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-053.expected b/clients/tests/test-client.check-on-disk/test_004-053.expected
index c4722c18a1..a4cc29910d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-053.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-053.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:979:test_004()/53
+location: clients/tests/test-client.py:982:test_004()/53
cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-054.expected b/clients/tests/test-client.check-on-disk/test_004-054.expected
index 9e667e907f..29e429e4aa 100644
--- a/clients/tests/test-client.check-on-disk/test_004-054.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-054.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:979:test_004()/54
+location: clients/tests/test-client.py:982:test_004()/54
cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-055.expected b/clients/tests/test-client.check-on-disk/test_004-055.expected
index 1578ff8665..eddb0fb690 100644
--- a/clients/tests/test-client.check-on-disk/test_004-055.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-055.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:981:test_004()/55
+location: clients/tests/test-client.py:984:test_004()/55
cmd: $NMCLI -f ALL device show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-056.expected b/clients/tests/test-client.check-on-disk/test_004-056.expected
index 42ddb68114..f0ba9e9ea1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-056.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-056.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:981:test_004()/56
+location: clients/tests/test-client.py:984:test_004()/56
cmd: $NMCLI -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-057.expected b/clients/tests/test-client.check-on-disk/test_004-057.expected
index b722ae69ec..c12ca19e5b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-057.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-057.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:983:test_004()/57
+location: clients/tests/test-client.py:986:test_004()/57
cmd: $NMCLI -f COMMON device show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-058.expected b/clients/tests/test-client.check-on-disk/test_004-058.expected
index 8e18081fe5..9334acc50f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-058.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-058.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:983:test_004()/58
+location: clients/tests/test-client.py:986:test_004()/58
cmd: $NMCLI -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-059.expected b/clients/tests/test-client.check-on-disk/test_004-059.expected
index caadb9e04a..f526639b6c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-059.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-059.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:985:test_004()/59
+location: clients/tests/test-client.py:988:test_004()/59
cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-060.expected b/clients/tests/test-client.check-on-disk/test_004-060.expected
index dc1e9666a6..c94837b5ec 100644
--- a/clients/tests/test-client.check-on-disk/test_004-060.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-060.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:985:test_004()/60
+location: clients/tests/test-client.py:988:test_004()/60
cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-061.expected b/clients/tests/test-client.check-on-disk/test_004-061.expected
index a6294cfaf4..50b552ebab 100644
--- a/clients/tests/test-client.check-on-disk/test_004-061.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-061.expected
@@ -1,30 +1,18 @@
-location: clients/tests/test-client.py:967:test_004()/61
-cmd: $NMCLI --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/61
+cmd: $NMCLI --color yes -f ALL device wifi list
lang: C
returncode: 0
-stdout: 2872 bytes
+stdout: 2452 bytes
>>>
-===========================
- Wi-Fi scan list (wlan1)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no   /org/freedesktop/NetworkManager/AccessPoint/4
-===========================
- Wi-Fi scan list (wlan1)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------
-===========================
- Wi-Fi scan list (wlan0)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-062.expected b/clients/tests/test-client.check-on-disk/test_004-062.expected
index f7733f7f26..70da59ed73 100644
--- a/clients/tests/test-client.check-on-disk/test_004-062.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-062.expected
@@ -1,30 +1,18 @@
-location: clients/tests/test-client.py:967:test_004()/62
-cmd: $NMCLI --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/62
+cmd: $NMCLI --color yes -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3100 bytes
+stdout: 2510 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie   /org/freedesktop/NetworkManager/AccessPoint/4
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-063.expected b/clients/tests/test-client.check-on-disk/test_004-063.expected
index 604ddcb37b..b3fd5deb62 100644
--- a/clients/tests/test-client.check-on-disk/test_004-063.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-063.expected
@@ -1,30 +1,18 @@
-location: clients/tests/test-client.py:969:test_004()/63
-cmd: $NMCLI --pretty -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/63
+cmd: $NMCLI --color yes -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 996 bytes
+stdout: 760 bytes
>>>
-===========================
- Wi-Fi scan list (wlan1)
-===========================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-------------------------------------------------------------------------------------------------
- wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+  wlan1-ap-4 Infra 1 54 Mbit/s 48 **  WPA1 WPA2
-===========================
- Wi-Fi scan list (wlan1)
-===========================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
------------------------------------------------------------------------------------
-===========================
- Wi-Fi scan list (wlan0)
-===========================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-------------------------------------------------------------------------------------------------
- wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
- wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
- wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+  wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+  wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+  wlan0-ap-3 Infra 1 54 Mbit/s 55 **  WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-064.expected b/clients/tests/test-client.check-on-disk/test_004-064.expected
index c08967d61c..ac26e85263 100644
--- a/clients/tests/test-client.check-on-disk/test_004-064.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-064.expected
@@ -1,30 +1,18 @@
-location: clients/tests/test-client.py:969:test_004()/64
-cmd: $NMCLI --pretty -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/64
+cmd: $NMCLI --color yes -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1216 bytes
+stdout: 810 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
---------------------------------------------------------------------------------------------------------------------
- wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+  wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 **  WPA1 WPA2
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-------------------------------------------------------------------------------------------------
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
---------------------------------------------------------------------------------------------------------------------
- wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
- wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
- wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+  wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+  wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+  wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 **  WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-065.expected b/clients/tests/test-client.check-on-disk/test_004-065.expected
index 98cdee1514..c984ad076d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-065.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-065.expected
@@ -1,30 +1,18 @@
-location: clients/tests/test-client.py:972:test_004()/65
-cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/65
+cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 2872 bytes
+stdout: 2452 bytes
>>>
-===========================
- Wi-Fi scan list (wlan1)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no   /org/freedesktop/NetworkManager/AccessPoint/4
-===========================
- Wi-Fi scan list (wlan1)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------
-===========================
- Wi-Fi scan list (wlan0)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-066.expected b/clients/tests/test-client.check-on-disk/test_004-066.expected
index ce892d0019..8b6e26882a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-066.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-066.expected
@@ -1,30 +1,18 @@
-location: clients/tests/test-client.py:972:test_004()/66
-cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/66
+cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3100 bytes
+stdout: 2510 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie   /org/freedesktop/NetworkManager/AccessPoint/4
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-067.expected b/clients/tests/test-client.check-on-disk/test_004-067.expected
index 1560630379..1face72907 100644
--- a/clients/tests/test-client.check-on-disk/test_004-067.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-067.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:974:test_004()/67
-cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/67
+cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 962 bytes
+stdout: 721 bytes
>>>
-===========================
- Wi-Fi scan list (wlan0)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-068.expected b/clients/tests/test-client.check-on-disk/test_004-068.expected
index 73c37fe8c4..40a2eaac5b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-068.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-068.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:974:test_004()/68
-cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/68
+cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1039 bytes
+stdout: 739 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-069.expected b/clients/tests/test-client.check-on-disk/test_004-069.expected
index b3606c8492..d1e507d2f4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-069.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-069.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:976:test_004()/69
-cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/69
+cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 317 bytes
+stdout: 210 bytes
>>>
-===========================
- Wi-Fi scan list (wlan0)
-===========================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-------------------------------------------------------------------------------------------------
- wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+  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 15087f3754..a329db45e1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-070.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-070.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:976:test_004()/70
-cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/70
+cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 392 bytes
+stdout: 226 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
---------------------------------------------------------------------------------------------------------------------
- wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+  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 1f59efb287..d84e26ee8b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-071.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-071.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:979:test_004()/71
-cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/71
+cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 962 bytes
+stdout: 721 bytes
>>>
-===========================
- Wi-Fi scan list (wlan0)
-===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-072.expected b/clients/tests/test-client.check-on-disk/test_004-072.expected
index 49c071f683..71445a1812 100644
--- a/clients/tests/test-client.check-on-disk/test_004-072.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-072.expected
@@ -1,15 +1,11 @@
-location: clients/tests/test-client.py:979:test_004()/72
-cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/72
+cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1039 bytes
+stdout: 739 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-073.expected b/clients/tests/test-client.check-on-disk/test_004-073.expected
index 3e2020195f..9d753439b2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-073.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-073.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:981:test_004()/73
-cmd: $NMCLI --pretty -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/73
+cmd: $NMCLI --color yes -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 5691 bytes
+stdout: 4816 bytes
>>>
-===============================================================================
- Device details (wlan0)
-===============================================================================
GENERAL.DEVICE: wlan0
GENERAL.TYPE: wifi
GENERAL.NM-TYPE: NMDeviceWifi
@@ -31,12 +28,10 @@ GENERAL.CONNECTION: con-vpn-1
GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED: unknown
--------------------------------------------------------------------------------
CAPABILITIES.CARRIER-DETECT: no
CAPABILITIES.SPEED: unknown
CAPABILITIES.IS-SOFTWARE: no
CAPABILITIES.SRIOV: no
--------------------------------------------------------------------------------
WIFI-PROPERTIES.WEP: yes
WIFI-PROPERTIES.WPA: yes
WIFI-PROPERTIES.WPA2: yes
@@ -46,34 +41,30 @@ WIFI-PROPERTIES.AP: yes
WIFI-PROPERTIES.ADHOC: yes
WIFI-PROPERTIES.2GHZ: unknown
WIFI-PROPERTIES.5GHZ: unknown
--------------------------------------------------------------------------------
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infra
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mbit/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infra
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mbit/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infra
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mbit/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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
@@ -83,12 +74,10 @@ IP4.DOMAIN[3]: sear4.foo1.bar
IP4.DOMAIN[4]: sear4.foo4.bar
IP4.DOMAIN[5]: sear4.fo.o.bar
IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
IP6.GATEWAY: --
IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
IP6.DOMAIN[1]: sear6.foo2.bar
@@ -97,16 +86,13 @@ IP6.DOMAIN[3]: sear6.fo.x.y
IP6.DOMAIN[4]: sear6.fo.o.bar
IP6.DOMAIN[5]: sear6.foo3.bar
IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-074.expected b/clients/tests/test-client.check-on-disk/test_004-074.expected
index 32b0663960..1a8fc281c1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-074.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-074.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:981:test_004()/74
-cmd: $NMCLI --pretty -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/74
+cmd: $NMCLI --color yes -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 5741 bytes
+stdout: 4859 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (wlan0)
-===============================================================================
GENERAL.DEVICE: wlan0
GENERAL.TYPE: wifi
GENERAL.NM-TYPE: NMDeviceWifi
@@ -31,12 +28,10 @@ GENERAL.CONNECTION: con-vpn-1
GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED: nieznane
--------------------------------------------------------------------------------
CAPABILITIES.CARRIER-DETECT: nie
CAPABILITIES.SPEED: nieznane
CAPABILITIES.IS-SOFTWARE: nie
CAPABILITIES.SRIOV: nie
--------------------------------------------------------------------------------
WIFI-PROPERTIES.WEP: tak
WIFI-PROPERTIES.WPA: tak
WIFI-PROPERTIES.WPA2: tak
@@ -46,34 +41,30 @@ WIFI-PROPERTIES.AP: tak
WIFI-PROPERTIES.ADHOC: tak
WIFI-PROPERTIES.2GHZ: nieznane
WIFI-PROPERTIES.5GHZ: nieznane
--------------------------------------------------------------------------------
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infrastruktura
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mb/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infrastruktura
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mb/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infrastruktura
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mb/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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
@@ -83,12 +74,10 @@ IP4.DOMAIN[3]: sear4.foo1.bar
IP4.DOMAIN[4]: sear4.foo4.bar
IP4.DOMAIN[5]: sear4.fo.o.bar
IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
IP6.GATEWAY: --
IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
IP6.DOMAIN[1]: sear6.foo2.bar
@@ -97,16 +86,13 @@ IP6.DOMAIN[3]: sear6.fo.x.y
IP6.DOMAIN[4]: sear6.fo.o.bar
IP6.DOMAIN[5]: sear6.foo3.bar
IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-075.expected b/clients/tests/test-client.check-on-disk/test_004-075.expected
index a86f93d950..bde9184114 100644
--- a/clients/tests/test-client.check-on-disk/test_004-075.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-075.expected
@@ -1,26 +1,16 @@
-location: clients/tests/test-client.py:983:test_004()/75
-cmd: $NMCLI --pretty -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/75
+cmd: $NMCLI --color yes -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 2294 bytes
+stdout: 1363 bytes
>>>
-===============================================================================
- Device details (wlan0)
-===============================================================================
GENERAL.DEVICE: wlan0
--------------------------------------------------------------------------------
GENERAL.TYPE: wifi
--------------------------------------------------------------------------------
GENERAL.HWADDR: 13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
GENERAL.MTU: 0
--------------------------------------------------------------------------------
GENERAL.STATE: 20 (unavailable)
--------------------------------------------------------------------------------
GENERAL.CONNECTION: con-vpn-1
--------------------------------------------------------------------------------
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
IP4.ADDRESS[1]: 192.168.228.18/32
IP4.ADDRESS[2]: 192.168.209.179/25
IP4.GATEWAY: 192.168.41.120
@@ -30,7 +20,6 @@ IP4.DOMAIN[3]: sear4.foo1.bar
IP4.DOMAIN[4]: sear4.foo4.bar
IP4.DOMAIN[5]: sear4.fo.o.bar
IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
IP6.GATEWAY: --
IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
IP6.DOMAIN[1]: sear6.foo2.bar
@@ -39,7 +28,6 @@ IP6.DOMAIN[3]: sear6.fo.x.y
IP6.DOMAIN[4]: sear6.fo.o.bar
IP6.DOMAIN[5]: sear6.foo3.bar
IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-076.expected b/clients/tests/test-client.check-on-disk/test_004-076.expected
index 01255abedb..3e939e234d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-076.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-076.expected
@@ -1,26 +1,16 @@
-location: clients/tests/test-client.py:983:test_004()/76
-cmd: $NMCLI --pretty -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/76
+cmd: $NMCLI --color yes -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2302 bytes
+stdout: 1364 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (wlan0)
-===============================================================================
GENERAL.DEVICE: wlan0
--------------------------------------------------------------------------------
GENERAL.TYPE: wifi
--------------------------------------------------------------------------------
GENERAL.HWADDR: 13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
GENERAL.MTU: 0
--------------------------------------------------------------------------------
GENERAL.STATE: 20 (niedostępne)
--------------------------------------------------------------------------------
GENERAL.CONNECTION: con-vpn-1
--------------------------------------------------------------------------------
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
IP4.ADDRESS[1]: 192.168.228.18/32
IP4.ADDRESS[2]: 192.168.209.179/25
IP4.GATEWAY: 192.168.41.120
@@ -30,7 +20,6 @@ IP4.DOMAIN[3]: sear4.foo1.bar
IP4.DOMAIN[4]: sear4.foo4.bar
IP4.DOMAIN[5]: sear4.fo.o.bar
IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
IP6.GATEWAY: --
IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
IP6.DOMAIN[1]: sear6.foo2.bar
@@ -39,7 +28,6 @@ IP6.DOMAIN[3]: sear6.fo.x.y
IP6.DOMAIN[4]: sear6.fo.o.bar
IP6.DOMAIN[5]: sear6.foo3.bar
IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-077.expected b/clients/tests/test-client.check-on-disk/test_004-077.expected
index 8db9ff61c7..178e8631d5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-077.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-077.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:985:test_004()/77
-cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/77
+cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 5691 bytes
+stdout: 4816 bytes
>>>
-===============================================================================
- Device details (wlan0)
-===============================================================================
GENERAL.DEVICE: wlan0
GENERAL.TYPE: wifi
GENERAL.NM-TYPE: NMDeviceWifi
@@ -31,12 +28,10 @@ GENERAL.CONNECTION: con-vpn-1
GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED: unknown
--------------------------------------------------------------------------------
CAPABILITIES.CARRIER-DETECT: no
CAPABILITIES.SPEED: unknown
CAPABILITIES.IS-SOFTWARE: no
CAPABILITIES.SRIOV: no
--------------------------------------------------------------------------------
WIFI-PROPERTIES.WEP: yes
WIFI-PROPERTIES.WPA: yes
WIFI-PROPERTIES.WPA2: yes
@@ -46,34 +41,30 @@ WIFI-PROPERTIES.AP: yes
WIFI-PROPERTIES.ADHOC: yes
WIFI-PROPERTIES.2GHZ: unknown
WIFI-PROPERTIES.5GHZ: unknown
--------------------------------------------------------------------------------
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infra
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mbit/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infra
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mbit/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infra
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mbit/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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
@@ -83,12 +74,10 @@ IP4.DOMAIN[3]: sear4.foo1.bar
IP4.DOMAIN[4]: sear4.foo4.bar
IP4.DOMAIN[5]: sear4.fo.o.bar
IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
IP6.GATEWAY: --
IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
IP6.DOMAIN[1]: sear6.foo2.bar
@@ -97,16 +86,13 @@ IP6.DOMAIN[3]: sear6.fo.x.y
IP6.DOMAIN[4]: sear6.fo.o.bar
IP6.DOMAIN[5]: sear6.foo3.bar
IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-078.expected b/clients/tests/test-client.check-on-disk/test_004-078.expected
index 99d001ccf3..7c9ea637f1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-078.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-078.expected
@@ -1,12 +1,9 @@
-location: clients/tests/test-client.py:985:test_004()/78
-cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/78
+cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 5741 bytes
+stdout: 4859 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (wlan0)
-===============================================================================
GENERAL.DEVICE: wlan0
GENERAL.TYPE: wifi
GENERAL.NM-TYPE: NMDeviceWifi
@@ -31,12 +28,10 @@ GENERAL.CONNECTION: con-vpn-1
GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
GENERAL.METERED: nieznane
--------------------------------------------------------------------------------
CAPABILITIES.CARRIER-DETECT: nie
CAPABILITIES.SPEED: nieznane
CAPABILITIES.IS-SOFTWARE: nie
CAPABILITIES.SRIOV: nie
--------------------------------------------------------------------------------
WIFI-PROPERTIES.WEP: tak
WIFI-PROPERTIES.WPA: tak
WIFI-PROPERTIES.WPA2: tak
@@ -46,34 +41,30 @@ WIFI-PROPERTIES.AP: tak
WIFI-PROPERTIES.ADHOC: tak
WIFI-PROPERTIES.2GHZ: nieznane
WIFI-PROPERTIES.5GHZ: nieznane
--------------------------------------------------------------------------------
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infrastruktura
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mb/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infrastruktura
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mb/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infrastruktura
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mb/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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
@@ -83,12 +74,10 @@ IP4.DOMAIN[3]: sear4.foo1.bar
IP4.DOMAIN[4]: sear4.foo4.bar
IP4.DOMAIN[5]: sear4.fo.o.bar
IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
IP6.GATEWAY: --
IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
IP6.DOMAIN[1]: sear6.foo2.bar
@@ -97,16 +86,13 @@ IP6.DOMAIN[3]: sear6.fo.x.y
IP6.DOMAIN[4]: sear6.fo.o.bar
IP6.DOMAIN[5]: sear6.foo3.bar
IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-079.expected b/clients/tests/test-client.check-on-disk/test_004-079.expected
index 7771bfd10d..b42851abbd 100644
--- a/clients/tests/test-client.check-on-disk/test_004-079.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-079.expected
@@ -1,15 +1,30 @@
-location: clients/tests/test-client.py:967:test_004()/79
-cmd: $NMCLI --terse -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/79
+cmd: $NMCLI --pretty -f ALL device wifi list
lang: C
returncode: 0
-stdout: 1022 bytes
+stdout: 2872 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-080.expected b/clients/tests/test-client.check-on-disk/test_004-080.expected
index ebf237be3d..299d571e2c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-080.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-080.expected
@@ -1,15 +1,30 @@
-location: clients/tests/test-client.py:967:test_004()/80
-cmd: $NMCLI --terse -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/80
+cmd: $NMCLI --pretty -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1070 bytes
+stdout: 3100 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-081.expected b/clients/tests/test-client.check-on-disk/test_004-081.expected
index 394de4e1b1..1414932bd4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-081.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-081.expected
@@ -1,15 +1,30 @@
-location: clients/tests/test-client.py:969:test_004()/81
-cmd: $NMCLI --terse -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/81
+cmd: $NMCLI --pretty -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 198 bytes
+stdout: 996 bytes
>>>
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-082.expected b/clients/tests/test-client.check-on-disk/test_004-082.expected
index 934bcc37c7..92a8141d21 100644
--- a/clients/tests/test-client.check-on-disk/test_004-082.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-082.expected
@@ -1,15 +1,30 @@
-location: clients/tests/test-client.py:969:test_004()/82
-cmd: $NMCLI --terse -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/82
+cmd: $NMCLI --pretty -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 234 bytes
+stdout: 1216 bytes
>>>
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-083.expected b/clients/tests/test-client.check-on-disk/test_004-083.expected
index a001ce7975..af4ab12546 100644
--- a/clients/tests/test-client.check-on-disk/test_004-083.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-083.expected
@@ -1,15 +1,30 @@
-location: clients/tests/test-client.py:972:test_004()/83
-cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/83
+cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 1022 bytes
+stdout: 2872 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-084.expected b/clients/tests/test-client.check-on-disk/test_004-084.expected
index 9c0cf842ab..ff634a16d5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-084.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-084.expected
@@ -1,15 +1,30 @@
-location: clients/tests/test-client.py:972:test_004()/84
-cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/84
+cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1070 bytes
+stdout: 3100 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-085.expected b/clients/tests/test-client.check-on-disk/test_004-085.expected
index 281571005b..5a9a74f572 100644
--- a/clients/tests/test-client.check-on-disk/test_004-085.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-085.expected
@@ -1,10 +1,15 @@
-location: clients/tests/test-client.py:974:test_004()/85
-cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/85
+cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 255 bytes
+stdout: 962 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-086.expected b/clients/tests/test-client.check-on-disk/test_004-086.expected
index e93e58a056..fea9522c80 100644
--- a/clients/tests/test-client.check-on-disk/test_004-086.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-086.expected
@@ -1,10 +1,15 @@
-location: clients/tests/test-client.py:974:test_004()/86
-cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/86
+cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 267 bytes
+stdout: 1039 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-087.expected b/clients/tests/test-client.check-on-disk/test_004-087.expected
index 1adb172443..6d47d52e1e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-087.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-087.expected
@@ -1,10 +1,15 @@
-location: clients/tests/test-client.py:976:test_004()/87
-cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/87
+cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 49 bytes
+stdout: 317 bytes
>>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-088.expected b/clients/tests/test-client.check-on-disk/test_004-088.expected
index 1abcb1378e..bb9d1dedfe 100644
--- a/clients/tests/test-client.check-on-disk/test_004-088.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-088.expected
@@ -1,10 +1,15 @@
-location: clients/tests/test-client.py:976:test_004()/88
-cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/88
+cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 58 bytes
+stdout: 392 bytes
>>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-089.expected b/clients/tests/test-client.check-on-disk/test_004-089.expected
index 304bbad551..82f3494039 100644
--- a/clients/tests/test-client.check-on-disk/test_004-089.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-089.expected
@@ -1,10 +1,15 @@
-location: clients/tests/test-client.py:979:test_004()/89
-cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/89
+cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 255 bytes
+stdout: 962 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-090.expected b/clients/tests/test-client.check-on-disk/test_004-090.expected
index 51e68e20f0..233a528e04 100644
--- a/clients/tests/test-client.check-on-disk/test_004-090.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-090.expected
@@ -1,10 +1,15 @@
-location: clients/tests/test-client.py:979:test_004()/90
-cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/90
+cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 267 bytes
+stdout: 1039 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-091.expected b/clients/tests/test-client.check-on-disk/test_004-091.expected
index 1b367d5e0b..06a213fc4f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-091.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-091.expected
@@ -1,98 +1,112 @@
-location: clients/tests/test-client.py:981:test_004()/91
-cmd: $NMCLI --terse -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/91
+cmd: $NMCLI --pretty -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 2467 bytes
+stdout: 5691 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:unknown
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIFI-PROPERTIES.WEP:yes
-WIFI-PROPERTIES.WPA:yes
-WIFI-PROPERTIES.WPA2:yes
-WIFI-PROPERTIES.TKIP:yes
-WIFI-PROPERTIES.CCMP:yes
-WIFI-PROPERTIES.AP:yes
-WIFI-PROPERTIES.ADHOC:yes
-WIFI-PROPERTIES.2GHZ:unknown
-WIFI-PROPERTIES.5GHZ:unknown
-AP[1].IN-USE:
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infra
-AP[1].CHAN:1
-AP[1].RATE:54 Mbit/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infra
-AP[2].CHAN:1
-AP[2].RATE:54 Mbit/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infra
-AP[3].CHAN:1
-AP[3].RATE:54 Mbit/s
-AP[3].SIGNAL:55
-AP[3].BARS:**
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-092.expected b/clients/tests/test-client.check-on-disk/test_004-092.expected
index 1c9840d898..e76c6e0f66 100644
--- a/clients/tests/test-client.check-on-disk/test_004-092.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-092.expected
@@ -1,98 +1,112 @@
-location: clients/tests/test-client.py:981:test_004()/92
-cmd: $NMCLI --terse -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/92
+cmd: $NMCLI --pretty -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2510 bytes
+stdout: 5741 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:nie
-GENERAL.NM-MANAGED:tak
-GENERAL.AUTOCONNECT:tak
-GENERAL.FIRMWARE-MISSING:nie
-GENERAL.NM-PLUGIN-MISSING:nie
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:nieznane
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
-WIFI-PROPERTIES.WEP:tak
-WIFI-PROPERTIES.WPA:tak
-WIFI-PROPERTIES.WPA2:tak
-WIFI-PROPERTIES.TKIP:tak
-WIFI-PROPERTIES.CCMP:tak
-WIFI-PROPERTIES.AP:tak
-WIFI-PROPERTIES.ADHOC:tak
-WIFI-PROPERTIES.2GHZ:nieznane
-WIFI-PROPERTIES.5GHZ:nieznane
-AP[1].IN-USE:
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
-AP[1].RATE:54 Mb/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
-AP[2].RATE:54 Mb/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
-AP[3].RATE:54 Mb/s
-AP[3].SIGNAL:55
-AP[3].BARS:**
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-093.expected b/clients/tests/test-client.check-on-disk/test_004-093.expected
index e760bb7650..10540bee2c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-093.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-093.expected
@@ -1,33 +1,45 @@
-location: clients/tests/test-client.py:983:test_004()/93
-cmd: $NMCLI --terse -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/93
+cmd: $NMCLI --pretty -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 739 bytes
+stdout: 2294 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-094.expected b/clients/tests/test-client.check-on-disk/test_004-094.expected
index ca8546b142..22f4a47370 100644
--- a/clients/tests/test-client.check-on-disk/test_004-094.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-094.expected
@@ -1,33 +1,45 @@
-location: clients/tests/test-client.py:983:test_004()/94
-cmd: $NMCLI --terse -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/94
+cmd: $NMCLI --pretty -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 740 bytes
+stdout: 2302 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (niedostępne)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-095.expected b/clients/tests/test-client.check-on-disk/test_004-095.expected
index b38a1b2765..946d555579 100644
--- a/clients/tests/test-client.check-on-disk/test_004-095.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-095.expected
@@ -1,98 +1,112 @@
-location: clients/tests/test-client.py:985:test_004()/95
-cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/95
+cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 2467 bytes
+stdout: 5691 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:unknown
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIFI-PROPERTIES.WEP:yes
-WIFI-PROPERTIES.WPA:yes
-WIFI-PROPERTIES.WPA2:yes
-WIFI-PROPERTIES.TKIP:yes
-WIFI-PROPERTIES.CCMP:yes
-WIFI-PROPERTIES.AP:yes
-WIFI-PROPERTIES.ADHOC:yes
-WIFI-PROPERTIES.2GHZ:unknown
-WIFI-PROPERTIES.5GHZ:unknown
-AP[1].IN-USE:
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infra
-AP[1].CHAN:1
-AP[1].RATE:54 Mbit/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infra
-AP[2].CHAN:1
-AP[2].RATE:54 Mbit/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infra
-AP[3].CHAN:1
-AP[3].RATE:54 Mbit/s
-AP[3].SIGNAL:55
-AP[3].BARS:**
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-096.expected b/clients/tests/test-client.check-on-disk/test_004-096.expected
index 6cbf0fe3eb..dae7174bd3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-096.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-096.expected
@@ -1,98 +1,112 @@
-location: clients/tests/test-client.py:985:test_004()/96
-cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/96
+cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2510 bytes
+stdout: 5741 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:nie
-GENERAL.NM-MANAGED:tak
-GENERAL.AUTOCONNECT:tak
-GENERAL.FIRMWARE-MISSING:nie
-GENERAL.NM-PLUGIN-MISSING:nie
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:nieznane
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
-WIFI-PROPERTIES.WEP:tak
-WIFI-PROPERTIES.WPA:tak
-WIFI-PROPERTIES.WPA2:tak
-WIFI-PROPERTIES.TKIP:tak
-WIFI-PROPERTIES.CCMP:tak
-WIFI-PROPERTIES.AP:tak
-WIFI-PROPERTIES.ADHOC:tak
-WIFI-PROPERTIES.2GHZ:nieznane
-WIFI-PROPERTIES.5GHZ:nieznane
-AP[1].IN-USE:
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
-AP[1].RATE:54 Mb/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
-AP[2].RATE:54 Mb/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
-AP[3].RATE:54 Mb/s
-AP[3].SIGNAL:55
-AP[3].BARS:**
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-097.expected b/clients/tests/test-client.check-on-disk/test_004-097.expected
index 46a91e50e5..dd1044ac1b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-097.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-097.expected
@@ -1,18 +1,30 @@
-location: clients/tests/test-client.py:967:test_004()/97
-cmd: $NMCLI --mode tabular -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/97
+cmd: $NMCLI --pretty --color yes -f ALL device wifi list
lang: C
returncode: 0
-stdout: 1840 bytes
+stdout: 3484 bytes
>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no   /org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-098.expected b/clients/tests/test-client.check-on-disk/test_004-098.expected
index dacaaac4d9..5b67a97f0a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-098.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-098.expected
@@ -1,18 +1,30 @@
-location: clients/tests/test-client.py:967:test_004()/98
-cmd: $NMCLI --mode tabular -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/98
+cmd: $NMCLI --pretty --color yes -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1898 bytes
+stdout: 3712 bytes
>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie   /org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-099.expected b/clients/tests/test-client.check-on-disk/test_004-099.expected
index dea8b86105..bd39afa3b0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-099.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-099.expected
@@ -1,18 +1,30 @@
-location: clients/tests/test-client.py:969:test_004()/99
-cmd: $NMCLI --mode tabular -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/99
+cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 472 bytes
+stdout: 1284 bytes
>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
- wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+------------------------------------------------------------------------------------------------
+  wlan1-ap-4 Infra 1 54 Mbit/s 48 **  WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
- wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
- wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
- wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+------------------------------------------------------------------------------------------------
+  wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+  wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+  wlan0-ap-3 Infra 1 54 Mbit/s 55 **  WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-100.expected b/clients/tests/test-client.check-on-disk/test_004-100.expected
index 8a4bec3492..942ae56ba1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-100.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-100.expected
@@ -1,18 +1,30 @@
-location: clients/tests/test-client.py:969:test_004()/100
-cmd: $NMCLI --mode tabular -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/100
+cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 522 bytes
+stdout: 1504 bytes
>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
- wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+--------------------------------------------------------------------------------------------------------------------
+  wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 **  WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
- wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
- wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
- wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+--------------------------------------------------------------------------------------------------------------------
+  wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+  wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+  wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 **  WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-101.expected b/clients/tests/test-client.check-on-disk/test_004-101.expected
index 8c8a88d762..7ad4bed52a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-101.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-101.expected
@@ -1,18 +1,30 @@
-location: clients/tests/test-client.py:972:test_004()/101
-cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/101
+cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 1840 bytes
+stdout: 3484 bytes
>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no   /org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-102.expected b/clients/tests/test-client.check-on-disk/test_004-102.expected
index 751b41f918..202688ffc8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-102.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-102.expected
@@ -1,18 +1,30 @@
-location: clients/tests/test-client.py:972:test_004()/102
-cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/102
+cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1898 bytes
+stdout: 3712 bytes
>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie   /org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-103.expected b/clients/tests/test-client.check-on-disk/test_004-103.expected
index 343b6292e1..c15b438f84 100644
--- a/clients/tests/test-client.check-on-disk/test_004-103.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-103.expected
@@ -1,11 +1,15 @@
-location: clients/tests/test-client.py:974:test_004()/103
-cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/103
+cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 568 bytes
+stdout: 1115 bytes
>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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
index 7b962998ff..7e5585eb40 100644
--- a/clients/tests/test-client.check-on-disk/test_004-104.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-104.expected
@@ -1,11 +1,15 @@
-location: clients/tests/test-client.py:974:test_004()/104
-cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/104
+cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 586 bytes
+stdout: 1192 bytes
>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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
index 05f3244268..644f830f59 100644
--- a/clients/tests/test-client.check-on-disk/test_004-105.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-105.expected
@@ -1,11 +1,15 @@
-location: clients/tests/test-client.py:976:test_004()/105
-cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/105
+cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 138 bytes
+stdout: 389 bytes
>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
- wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+------------------------------------------------------------------------------------------------
+  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
index 91a822a213..28714aad47 100644
--- a/clients/tests/test-client.check-on-disk/test_004-106.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-106.expected
@@ -1,11 +1,15 @@
-location: clients/tests/test-client.py:976:test_004()/106
-cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/106
+cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 154 bytes
+stdout: 464 bytes
>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
- wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+--------------------------------------------------------------------------------------------------------------------
+  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
index 7d32f12e15..ce3bddf473 100644
--- a/clients/tests/test-client.check-on-disk/test_004-107.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-107.expected
@@ -1,11 +1,15 @@
-location: clients/tests/test-client.py:979:test_004()/107
-cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/107
+cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 568 bytes
+stdout: 1115 bytes
>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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
index 9a5e5f13a9..49d1211f25 100644
--- a/clients/tests/test-client.check-on-disk/test_004-108.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-108.expected
@@ -1,11 +1,15 @@
-location: clients/tests/test-client.py:979:test_004()/108
-cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/108
+cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 586 bytes
+stdout: 1192 bytes
>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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
index 5e7a3ef80c..0ab277a61d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-109.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-109.expected
@@ -1,37 +1,112 @@
-location: clients/tests/test-client.py:981:test_004()/109
-cmd: $NMCLI --mode tabular -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/109
+cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 2760 bytes
+stdout: 5907 bytes
>>>
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
-GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-CAPABILITIES no unknown no no
-
-NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
-WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
-
-NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
-AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
-AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP OPTION
-DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
-GROUP OPTION
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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-110.expected b/clients/tests/test-client.check-on-disk/test_004-110.expected
index 12646ef4b4..9a4e97e63f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-110.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-110.expected
@@ -1,37 +1,112 @@
-location: clients/tests/test-client.py:981:test_004()/110
-cmd: $NMCLI --mode tabular -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/110
+cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2813 bytes
+stdout: 5957 bytes
>>>
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
-GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-CAPABILITIES nie nieznane nie nie
-
-NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
-WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
-
-NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
-AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
-AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP OPTION
-DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
-GROUP OPTION
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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-111.expected b/clients/tests/test-client.check-on-disk/test_004-111.expected
index 1676eefe72..9118283ce0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-111.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-111.expected
@@ -1,35 +1,45 @@
-location: clients/tests/test-client.py:983:test_004()/111
-cmd: $NMCLI --mode tabular -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/111
+cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 980 bytes
+stdout: 2294 bytes
>>>
-DEVICE
-wlan0
-
-TYPE
-wifi
-
-HWADDR
-13:E0:74:85:7C:D9
-
-MTU
-0
-
-STATE
-20 (unavailable)
-
-CONNECTION
-con-vpn-1
-
-CON-PATH
-/org/freedesktop/NetworkManager/ActiveConnection/2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-112.expected b/clients/tests/test-client.check-on-disk/test_004-112.expected
index fa6eac4a6f..5e9826b93f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-112.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-112.expected
@@ -1,35 +1,45 @@
-location: clients/tests/test-client.py:983:test_004()/112
-cmd: $NMCLI --mode tabular -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/112
+cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 981 bytes
+stdout: 2302 bytes
>>>
-DEVICE
-wlan0
-
-TYPE
-wifi
-
-HWADDR
-13:E0:74:85:7C:D9
-
-MTU
-0
-
-STATE
-20 (niedostępne)
-
-CONNECTION
-con-vpn-1
-
-CON-PATH
-/org/freedesktop/NetworkManager/ActiveConnection/2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (niedostępne)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-113.expected b/clients/tests/test-client.check-on-disk/test_004-113.expected
index 6b2163d5a6..fdef3f97a3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-113.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-113.expected
@@ -1,37 +1,112 @@
-location: clients/tests/test-client.py:985:test_004()/113
-cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/113
+cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 2760 bytes
+stdout: 5907 bytes
>>>
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
-GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-CAPABILITIES no unknown no no
-
-NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
-WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
-
-NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
-AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
-AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP OPTION
-DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
-GROUP OPTION
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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-114.expected b/clients/tests/test-client.check-on-disk/test_004-114.expected
index 0771359ceb..d179fca04c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-114.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-114.expected
@@ -1,37 +1,112 @@
-location: clients/tests/test-client.py:985:test_004()/114
-cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/114
+cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2813 bytes
+stdout: 5957 bytes
>>>
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
-GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-CAPABILITIES nie nieznane nie nie
-
-NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
-WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
-
-NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
-AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
-AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP OPTION
-DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
-GROUP OPTION
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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-115.expected b/clients/tests/test-client.check-on-disk/test_004-115.expected
index cad8697b3f..b1ea5ea5e8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-115.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-115.expected
@@ -1,30 +1,15 @@
-location: clients/tests/test-client.py:967:test_004()/115
-cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/115
+cmd: $NMCLI --terse -f ALL device wifi list
lang: C
returncode: 0
-stdout: 2872 bytes
+stdout: 1022 bytes
>>>
-===========================
- Wi-Fi scan list (wlan1)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
-===========================
- Wi-Fi scan list (wlan1)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------
-===========================
- Wi-Fi scan list (wlan0)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-116.expected b/clients/tests/test-client.check-on-disk/test_004-116.expected
index 45840b3d8e..c0a2211dbd 100644
--- a/clients/tests/test-client.check-on-disk/test_004-116.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-116.expected
@@ -1,30 +1,15 @@
-location: clients/tests/test-client.py:967:test_004()/116
-cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/116
+cmd: $NMCLI --terse -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3100 bytes
+stdout: 1070 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-117.expected b/clients/tests/test-client.check-on-disk/test_004-117.expected
index fa00831040..6b15ce6504 100644
--- a/clients/tests/test-client.check-on-disk/test_004-117.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-117.expected
@@ -1,30 +1,15 @@
-location: clients/tests/test-client.py:969:test_004()/117
-cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/117
+cmd: $NMCLI --terse -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 996 bytes
+stdout: 198 bytes
>>>
-===========================
- Wi-Fi scan list (wlan1)
-===========================
-IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-------------------------------------------------------------------------------------------------
- wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+ :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2
-===========================
- Wi-Fi scan list (wlan1)
-===========================
-IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
------------------------------------------------------------------------------------
-===========================
- Wi-Fi scan list (wlan0)
-===========================
-IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-------------------------------------------------------------------------------------------------
- wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
- wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
- wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-118.expected b/clients/tests/test-client.check-on-disk/test_004-118.expected
index 42f5f048d1..fb90f54ef5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-118.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-118.expected
@@ -1,30 +1,15 @@
-location: clients/tests/test-client.py:969:test_004()/118
-cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/118
+cmd: $NMCLI --terse -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1216 bytes
+stdout: 234 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
---------------------------------------------------------------------------------------------------------------------
- wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+ :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-------------------------------------------------------------------------------------------------
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
---------------------------------------------------------------------------------------------------------------------
- wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
- wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
- wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-119.expected b/clients/tests/test-client.check-on-disk/test_004-119.expected
index 24b8de61b3..caa83ca35b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-119.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-119.expected
@@ -1,30 +1,15 @@
-location: clients/tests/test-client.py:972:test_004()/119
-cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/119
+cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 2872 bytes
+stdout: 1022 bytes
>>>
-===========================
- Wi-Fi scan list (wlan1)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
-===========================
- Wi-Fi scan list (wlan1)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------
-===========================
- Wi-Fi scan list (wlan0)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-120.expected b/clients/tests/test-client.check-on-disk/test_004-120.expected
index 5d3daaa41b..2ee418393b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-120.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-120.expected
@@ -1,30 +1,15 @@
-location: clients/tests/test-client.py:972:test_004()/120
-cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/120
+cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3100 bytes
+stdout: 1070 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
-========================================
- Lista skanowania sieci Wi-Fi (wlan1)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
-AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
-AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-121.expected b/clients/tests/test-client.check-on-disk/test_004-121.expected
index 7b52dbdc5c..5eda89425a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-121.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-121.expected
@@ -1,15 +1,10 @@
-location: clients/tests/test-client.py:974:test_004()/121
-cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/121
+cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 962 bytes
+stdout: 255 bytes
>>>
-===========================
- Wi-Fi scan list (wlan0)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-122.expected b/clients/tests/test-client.check-on-disk/test_004-122.expected
index 8c20660717..5aeba42918 100644
--- a/clients/tests/test-client.check-on-disk/test_004-122.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-122.expected
@@ -1,15 +1,10 @@
-location: clients/tests/test-client.py:974:test_004()/122
-cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/122
+cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1039 bytes
+stdout: 267 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-123.expected b/clients/tests/test-client.check-on-disk/test_004-123.expected
index 7d0d97ec36..4a2433fa63 100644
--- a/clients/tests/test-client.check-on-disk/test_004-123.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-123.expected
@@ -1,15 +1,10 @@
-location: clients/tests/test-client.py:976:test_004()/123
-cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/123
+cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 317 bytes
+stdout: 49 bytes
>>>
-===========================
- Wi-Fi scan list (wlan0)
-===========================
-IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-------------------------------------------------------------------------------------------------
- wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-124.expected b/clients/tests/test-client.check-on-disk/test_004-124.expected
index 0c42ab5fd7..810a20e31a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-124.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-124.expected
@@ -1,15 +1,10 @@
-location: clients/tests/test-client.py:976:test_004()/124
-cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/124
+cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 392 bytes
+stdout: 58 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
---------------------------------------------------------------------------------------------------------------------
- wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-125.expected b/clients/tests/test-client.check-on-disk/test_004-125.expected
index f1fa4f890a..d8997b8de8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-125.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-125.expected
@@ -1,15 +1,10 @@
-location: clients/tests/test-client.py:979:test_004()/125
-cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/125
+cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 962 bytes
+stdout: 255 bytes
>>>
-===========================
- Wi-Fi scan list (wlan0)
-===========================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-126.expected b/clients/tests/test-client.check-on-disk/test_004-126.expected
index 4601536175..21cafa7b4d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-126.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-126.expected
@@ -1,15 +1,10 @@
-location: clients/tests/test-client.py:979:test_004()/126
-cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/126
+cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1039 bytes
+stdout: 267 bytes
>>>
-========================================
- Lista skanowania sieci Wi-Fi (wlan0)
-========================================
-NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-127.expected b/clients/tests/test-client.check-on-disk/test_004-127.expected
index 3081b9e562..968ce10477 100644
--- a/clients/tests/test-client.check-on-disk/test_004-127.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-127.expected
@@ -1,49 +1,98 @@
-location: clients/tests/test-client.py:981:test_004()/127
-cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/127
+cmd: $NMCLI --terse -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 4148 bytes
+stdout: 2467 bytes
>>>
-==========================
- Device details (wlan0)
-==========================
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
------------------------------------------------------------
-CAPABILITIES no unknown no no
-
-NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
----------------------------------------------------------------------------
-WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
-
-NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-----------------------------------------------------------------------------
-AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
-AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
-AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP OPTION
---------------------------------------------------------------------------------------------------
-DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
-GROUP OPTION
--------------------------------------------------------------------------------------------------------------------------
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
------------------------------------------------------------------------------------------------------------
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected
index a73bbc01b7..2317cd91ad 100644
--- a/clients/tests/test-client.check-on-disk/test_004-128.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-128.expected
@@ -1,49 +1,98 @@
-location: clients/tests/test-client.py:981:test_004()/128
-cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/128
+cmd: $NMCLI --terse -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4246 bytes
+stdout: 2510 bytes
>>>
-===================================
- Informacje o urządzeniu (wlan0)
-===================================
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-------------------------------------------------------------
-CAPABILITIES nie nieznane nie nie
-
-NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
------------------------------------------------------------------------------
-WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
-
-NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
-AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
-AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP OPTION
---------------------------------------------------------------------------------------------------
-DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
-GROUP OPTION
--------------------------------------------------------------------------------------------------------------------------
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
------------------------------------------------------------------------------------------------------------
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-129.expected b/clients/tests/test-client.check-on-disk/test_004-129.expected
index 6fd2f960df..04c7366184 100644
--- a/clients/tests/test-client.check-on-disk/test_004-129.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-129.expected
@@ -1,47 +1,33 @@
-location: clients/tests/test-client.py:983:test_004()/129
-cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/129
+cmd: $NMCLI --terse -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 1554 bytes
+stdout: 739 bytes
>>>
-==========================
- Device details (wlan0)
-==========================
-DEVICE
---------
-wlan0
-
-TYPE
-------
-wifi
-
-HWADDR
--------------------
-13:E0:74:85:7C:D9
-
-MTU
------
-0
-
-STATE
-------------------
-20 (unavailable)
-
-CONNECTION
-------------
-con-vpn-1
-
-CON-PATH
-----------------------------------------------------
-/org/freedesktop/NetworkManager/ActiveConnection/2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-130.expected b/clients/tests/test-client.check-on-disk/test_004-130.expected
index ff0a99ec58..a15eeb5fc1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-130.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-130.expected
@@ -1,47 +1,33 @@
-location: clients/tests/test-client.py:983:test_004()/130
-cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/130
+cmd: $NMCLI --terse -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1584 bytes
+stdout: 740 bytes
>>>
-===================================
- Informacje o urządzeniu (wlan0)
-===================================
-DEVICE
---------
-wlan0
-
-TYPE
-------
-wifi
-
-HWADDR
--------------------
-13:E0:74:85:7C:D9
-
-MTU
------
-0
-
-STATE
-------------------
-20 (niedostępne)
-
-CONNECTION
-------------
-con-vpn-1
-
-CON-PATH
-----------------------------------------------------
-/org/freedesktop/NetworkManager/ActiveConnection/2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-131.expected b/clients/tests/test-client.check-on-disk/test_004-131.expected
index b3f452199d..27ceb9d5d6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-131.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-131.expected
@@ -1,49 +1,98 @@
-location: clients/tests/test-client.py:985:test_004()/131
-cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/131
+cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 4148 bytes
+stdout: 2467 bytes
>>>
-==========================
- Device details (wlan0)
-==========================
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
------------------------------------------------------------
-CAPABILITIES no unknown no no
-
-NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
----------------------------------------------------------------------------
-WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
-
-NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-----------------------------------------------------------------------------
-AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
-AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
-AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP OPTION
---------------------------------------------------------------------------------------------------
-DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
-GROUP OPTION
--------------------------------------------------------------------------------------------------------------------------
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
------------------------------------------------------------------------------------------------------------
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected
index cf26aca55f..bae7620978 100644
--- a/clients/tests/test-client.check-on-disk/test_004-132.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-132.expected
@@ -1,49 +1,98 @@
-location: clients/tests/test-client.py:985:test_004()/132
-cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/132
+cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4246 bytes
+stdout: 2510 bytes
>>>
-===================================
- Informacje o urządzeniu (wlan0)
-===================================
-NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
-
-NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
-------------------------------------------------------------
-CAPABILITIES nie nieznane nie nie
-
-NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
------------------------------------------------------------------------------
-WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
-
-NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
------------------------------------------------------------------------------------
-AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
-AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
-AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
-
-GROUP OPTION
---------------------------------------------------------------------------------------------------
-DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-
-GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-
-GROUP OPTION
--------------------------------------------------------------------------------------------------------------------------
-DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-
-NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
------------------------------------------------------------------------------------------------------------
-CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-133.expected b/clients/tests/test-client.check-on-disk/test_004-133.expected
index 8aefeee03d..86360e536b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-133.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-133.expected
@@ -1,15 +1,15 @@
-location: clients/tests/test-client.py:967:test_004()/133
-cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/133
+cmd: $NMCLI --terse --color yes -f ALL device wifi list
lang: C
returncode: 0
-stdout: 1022 bytes
+stdout: 1634 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+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
+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
index abf84f7837..ea348d3d9e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-134.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-134.expected
@@ -1,15 +1,15 @@
-location: clients/tests/test-client.py:967:test_004()/134
-cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/134
+cmd: $NMCLI --terse --color yes -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1070 bytes
+stdout: 1682 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+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
+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
index 9843068494..1f1338fd69 100644
--- a/clients/tests/test-client.check-on-disk/test_004-135.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-135.expected
@@ -1,15 +1,15 @@
-location: clients/tests/test-client.py:969:test_004()/135
-cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/135
+cmd: $NMCLI --terse --color yes -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 198 bytes
+stdout: 486 bytes
>>>
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2
+ :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
+ :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
index 1a47fc3217..c81ff81252 100644
--- a/clients/tests/test-client.check-on-disk/test_004-136.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-136.expected
@@ -1,15 +1,15 @@
-location: clients/tests/test-client.py:969:test_004()/136
-cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/136
+cmd: $NMCLI --terse --color yes -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 234 bytes
+stdout: 522 bytes
>>>
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2
+ :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
+ :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
index 7538b49f2a..0b319bd9e5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-137.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-137.expected
@@ -1,15 +1,15 @@
-location: clients/tests/test-client.py:972:test_004()/137
-cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/137
+cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 1022 bytes
+stdout: 1634 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+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
+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
index 3f4224c653..5cd27af96d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-138.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-138.expected
@@ -1,15 +1,15 @@
-location: clients/tests/test-client.py:972:test_004()/138
-cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/138
+cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1070 bytes
+stdout: 1682 bytes
>>>
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+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
+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
index de0faef112..17300d13a9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-139.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-139.expected
@@ -1,10 +1,10 @@
-location: clients/tests/test-client.py:974:test_004()/139
-cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/139
+cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 255 bytes
+stdout: 408 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+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
index d26255b27c..c7bcf149d5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-140.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-140.expected
@@ -1,10 +1,10 @@
-location: clients/tests/test-client.py:974:test_004()/140
-cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/140
+cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 267 bytes
+stdout: 420 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+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
index d1218cb0c0..2862b632ae 100644
--- a/clients/tests/test-client.check-on-disk/test_004-141.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-141.expected
@@ -1,10 +1,10 @@
-location: clients/tests/test-client.py:976:test_004()/141
-cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/141
+cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 49 bytes
+stdout: 121 bytes
>>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :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
index 95ab33c5b3..6ebeec56de 100644
--- a/clients/tests/test-client.check-on-disk/test_004-142.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-142.expected
@@ -1,10 +1,10 @@
-location: clients/tests/test-client.py:976:test_004()/142
-cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/142
+cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 58 bytes
+stdout: 130 bytes
>>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :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
index 8950bb4626..5908715058 100644
--- a/clients/tests/test-client.check-on-disk/test_004-143.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-143.expected
@@ -1,10 +1,10 @@
-location: clients/tests/test-client.py:979:test_004()/143
-cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/143
+cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 255 bytes
+stdout: 408 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+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
index ffd15bdfe1..27114dfc3d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-144.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-144.expected
@@ -1,10 +1,10 @@
-location: clients/tests/test-client.py:979:test_004()/144
-cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/144
+cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 267 bytes
+stdout: 420 bytes
>>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+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
index c0dab1012e..e6632d5bd4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-145.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-145.expected
@@ -1,20 +1,98 @@
-location: clients/tests/test-client.py:981:test_004()/145
-cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/145
+cmd: $NMCLI --terse --color yes -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 1164 bytes
+stdout: 2683 bytes
>>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
-CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE: 
+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-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected
index d51851ffb5..4ea1fb9b36 100644
--- a/clients/tests/test-client.check-on-disk/test_004-146.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-146.expected
@@ -1,20 +1,98 @@
-location: clients/tests/test-client.py:981:test_004()/146
-cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/146
+cmd: $NMCLI --terse --color yes -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1207 bytes
+stdout: 2726 bytes
>>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
-CAPABILITIES:nie:nieznane:nie:nie
-WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE: 
+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-147.expected b/clients/tests/test-client.check-on-disk/test_004-147.expected
index a5e392fb7f..c27be06a53 100644
--- a/clients/tests/test-client.check-on-disk/test_004-147.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-147.expected
@@ -1,18 +1,33 @@
-location: clients/tests/test-client.py:983:test_004()/147
-cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/147
+cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 446 bytes
+stdout: 739 bytes
>>>
-wlan0
-wifi
-13\:E0\:74\:85\:7C\:D9
-0
-20 (unavailable)
-con-vpn-1
-/org/freedesktop/NetworkManager/ActiveConnection/2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-148.expected b/clients/tests/test-client.check-on-disk/test_004-148.expected
index 61774eb6f6..6ae2ebaed7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-148.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-148.expected
@@ -1,18 +1,33 @@
-location: clients/tests/test-client.py:983:test_004()/148
-cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/148
+cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 447 bytes
+stdout: 740 bytes
>>>
-wlan0
-wifi
-13\:E0\:74\:85\:7C\:D9
-0
-20 (niedostępne)
-con-vpn-1
-/org/freedesktop/NetworkManager/ActiveConnection/2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-149.expected b/clients/tests/test-client.check-on-disk/test_004-149.expected
index ccd9e90fb5..f815ba4955 100644
--- a/clients/tests/test-client.check-on-disk/test_004-149.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-149.expected
@@ -1,20 +1,98 @@
-location: clients/tests/test-client.py:985:test_004()/149
-cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/149
+cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 1164 bytes
+stdout: 2683 bytes
>>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
-CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE: 
+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-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected
index fb8c263eab..aeb3f0588a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-150.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-150.expected
@@ -1,20 +1,98 @@
-location: clients/tests/test-client.py:985:test_004()/150
-cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/150
+cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1207 bytes
+stdout: 2726 bytes
>>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
-CAPABILITIES:nie:nieznane:nie:nie
-WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
-IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
-DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
-IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
-DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
-CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE: 
+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-151.expected b/clients/tests/test-client.check-on-disk/test_004-151.expected
index b2b41921ca..7112ba7593 100644
--- a/clients/tests/test-client.check-on-disk/test_004-151.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-151.expected
@@ -1,79 +1,18 @@
-location: clients/tests/test-client.py:967:test_004()/151
-cmd: $NMCLI --mode multiline -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/151
+cmd: $NMCLI --mode tabular -f ALL device wifi list
lang: C
returncode: 0
-stdout: 3722 bytes
+stdout: 1840 bytes
>>>
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-152.expected b/clients/tests/test-client.check-on-disk/test_004-152.expected
index a8c98f1a38..e985f11d9d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-152.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-152.expected
@@ -1,79 +1,18 @@
-location: clients/tests/test-client.py:967:test_004()/152
-cmd: $NMCLI --mode multiline -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/152
+cmd: $NMCLI --mode tabular -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3770 bytes
+stdout: 1898 bytes
>>>
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-153.expected b/clients/tests/test-client.check-on-disk/test_004-153.expected
index 9ead8cd8d3..db70fcb1c8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-153.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-153.expected
@@ -1,43 +1,18 @@
-location: clients/tests/test-client.py:969:test_004()/153
-cmd: $NMCLI --mode multiline -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/153
+cmd: $NMCLI --mode tabular -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 1478 bytes
+stdout: 472 bytes
>>>
-IN-USE:
-SSID: wlan1-ap-4
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-IN-USE:
-SSID: wlan0-ap-2
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-IN-USE:
-SSID: wlan0-ap-1
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-IN-USE:
-SSID: wlan0-ap-3
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-154.expected b/clients/tests/test-client.check-on-disk/test_004-154.expected
index eb0e258606..8278a5cdea 100644
--- a/clients/tests/test-client.check-on-disk/test_004-154.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-154.expected
@@ -1,43 +1,18 @@
-location: clients/tests/test-client.py:969:test_004()/154
-cmd: $NMCLI --mode multiline -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/154
+cmd: $NMCLI --mode tabular -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1514 bytes
+stdout: 522 bytes
>>>
-IN-USE:
-SSID: wlan1-ap-4
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
-IN-USE:
-SSID: wlan0-ap-2
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-IN-USE:
-SSID: wlan0-ap-1
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-IN-USE:
-SSID: wlan0-ap-3
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-155.expected b/clients/tests/test-client.check-on-disk/test_004-155.expected
index d7e9de1bc1..b018b1746b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-155.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-155.expected
@@ -1,79 +1,18 @@
-location: clients/tests/test-client.py:972:test_004()/155
-cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/155
+cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 3722 bytes
+stdout: 1840 bytes
>>>
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-156.expected b/clients/tests/test-client.check-on-disk/test_004-156.expected
index 7437f4685e..5241e95d52 100644
--- a/clients/tests/test-client.check-on-disk/test_004-156.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-156.expected
@@ -1,79 +1,18 @@
-location: clients/tests/test-client.py:972:test_004()/156
-cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/156
+cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 3770 bytes
+stdout: 1898 bytes
>>>
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-157.expected b/clients/tests/test-client.check-on-disk/test_004-157.expected
index b5060d8d94..b13719fb87 100644
--- a/clients/tests/test-client.check-on-disk/test_004-157.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-157.expected
@@ -1,26 +1,11 @@
-location: clients/tests/test-client.py:974:test_004()/157
-cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/157
+cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 930 bytes
+stdout: 568 bytes
>>>
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-158.expected b/clients/tests/test-client.check-on-disk/test_004-158.expected
index 67a5abe11f..bea10dfe62 100644
--- a/clients/tests/test-client.check-on-disk/test_004-158.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-158.expected
@@ -1,26 +1,11 @@
-location: clients/tests/test-client.py:974:test_004()/158
-cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/158
+cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 942 bytes
+stdout: 586 bytes
>>>
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-159.expected b/clients/tests/test-client.check-on-disk/test_004-159.expected
index 77d3a40584..cec9521a43 100644
--- a/clients/tests/test-client.check-on-disk/test_004-159.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-159.expected
@@ -1,17 +1,11 @@
-location: clients/tests/test-client.py:976:test_004()/159
-cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/159
+cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 369 bytes
+stdout: 138 bytes
>>>
-IN-USE:
-SSID: wlan0-ap-2
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-160.expected b/clients/tests/test-client.check-on-disk/test_004-160.expected
index 2bcb2c120c..e6e0ea171b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-160.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-160.expected
@@ -1,17 +1,11 @@
-location: clients/tests/test-client.py:976:test_004()/160
-cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/160
+cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 378 bytes
+stdout: 154 bytes
>>>
-IN-USE:
-SSID: wlan0-ap-2
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-161.expected b/clients/tests/test-client.check-on-disk/test_004-161.expected
index dfee800a1e..f3cedad304 100644
--- a/clients/tests/test-client.check-on-disk/test_004-161.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-161.expected
@@ -1,26 +1,11 @@
-location: clients/tests/test-client.py:979:test_004()/161
-cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/161
+cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 930 bytes
+stdout: 568 bytes
>>>
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-162.expected b/clients/tests/test-client.check-on-disk/test_004-162.expected
index b3dc1fc0f5..563c54b8d4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-162.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-162.expected
@@ -1,26 +1,11 @@
-location: clients/tests/test-client.py:979:test_004()/162
-cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/162
+cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 942 bytes
+stdout: 586 bytes
>>>
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-163.expected b/clients/tests/test-client.check-on-disk/test_004-163.expected
index ff163a46b4..fad3d76496 100644
--- a/clients/tests/test-client.check-on-disk/test_004-163.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-163.expected
@@ -1,98 +1,37 @@
-location: clients/tests/test-client.py:981:test_004()/163
-cmd: $NMCLI --mode multiline -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/163
+cmd: $NMCLI --mode tabular -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 4600 bytes
+stdout: 2760 bytes
>>>
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.NM-TYPE: NMDeviceWifi
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED: unknown
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: unknown
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
-WIFI-PROPERTIES.WEP: yes
-WIFI-PROPERTIES.WPA: yes
-WIFI-PROPERTIES.WPA2: yes
-WIFI-PROPERTIES.TKIP: yes
-WIFI-PROPERTIES.CCMP: yes
-WIFI-PROPERTIES.AP: yes
-WIFI-PROPERTIES.ADHOC: yes
-WIFI-PROPERTIES.2GHZ: unknown
-WIFI-PROPERTIES.5GHZ: unknown
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infra
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mbit/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infra
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mbit/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infra
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mbit/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
-DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-164.expected b/clients/tests/test-client.check-on-disk/test_004-164.expected
index b09cc4bcdd..975c433ea2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-164.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-164.expected
@@ -1,98 +1,37 @@
-location: clients/tests/test-client.py:981:test_004()/164
-cmd: $NMCLI --mode multiline -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/164
+cmd: $NMCLI --mode tabular -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4643 bytes
+stdout: 2813 bytes
>>>
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.NM-TYPE: NMDeviceWifi
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED: nieznane
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: nieznane
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
-WIFI-PROPERTIES.WEP: tak
-WIFI-PROPERTIES.WPA: tak
-WIFI-PROPERTIES.WPA2: tak
-WIFI-PROPERTIES.TKIP: tak
-WIFI-PROPERTIES.CCMP: tak
-WIFI-PROPERTIES.AP: tak
-WIFI-PROPERTIES.ADHOC: tak
-WIFI-PROPERTIES.2GHZ: nieznane
-WIFI-PROPERTIES.5GHZ: nieznane
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infrastruktura
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mb/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infrastruktura
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mb/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infrastruktura
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mb/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
-DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-165.expected b/clients/tests/test-client.check-on-disk/test_004-165.expected
index f530896d33..e4d8abfeb2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-165.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-165.expected
@@ -1,33 +1,35 @@
-location: clients/tests/test-client.py:983:test_004()/165
-cmd: $NMCLI --mode multiline -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/165
+cmd: $NMCLI --mode tabular -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 1363 bytes
+stdout: 980 bytes
>>>
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
+DEVICE
+wlan0
+
+TYPE
+wifi
+
+HWADDR
+13:E0:74:85:7C:D9
+
+MTU
+0
+
+STATE
+20 (unavailable)
+
+CONNECTION
+con-vpn-1
+
+CON-PATH
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-166.expected b/clients/tests/test-client.check-on-disk/test_004-166.expected
index 594369b5c8..fee61d9842 100644
--- a/clients/tests/test-client.check-on-disk/test_004-166.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-166.expected
@@ -1,33 +1,35 @@
-location: clients/tests/test-client.py:983:test_004()/166
-cmd: $NMCLI --mode multiline -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/166
+cmd: $NMCLI --mode tabular -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1364 bytes
+stdout: 981 bytes
>>>
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
+DEVICE
+wlan0
+
+TYPE
+wifi
+
+HWADDR
+13:E0:74:85:7C:D9
+
+MTU
+0
+
+STATE
+20 (niedostępne)
+
+CONNECTION
+con-vpn-1
+
+CON-PATH
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-167.expected b/clients/tests/test-client.check-on-disk/test_004-167.expected
index 77c74f9571..cccf23a009 100644
--- a/clients/tests/test-client.check-on-disk/test_004-167.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-167.expected
@@ -1,98 +1,37 @@
-location: clients/tests/test-client.py:985:test_004()/167
-cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/167
+cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 4600 bytes
+stdout: 2760 bytes
>>>
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.NM-TYPE: NMDeviceWifi
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED: unknown
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: unknown
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
-WIFI-PROPERTIES.WEP: yes
-WIFI-PROPERTIES.WPA: yes
-WIFI-PROPERTIES.WPA2: yes
-WIFI-PROPERTIES.TKIP: yes
-WIFI-PROPERTIES.CCMP: yes
-WIFI-PROPERTIES.AP: yes
-WIFI-PROPERTIES.ADHOC: yes
-WIFI-PROPERTIES.2GHZ: unknown
-WIFI-PROPERTIES.5GHZ: unknown
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infra
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mbit/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infra
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mbit/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infra
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mbit/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
-DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-168.expected b/clients/tests/test-client.check-on-disk/test_004-168.expected
index 1ed43dcf68..cff1e0f555 100644
--- a/clients/tests/test-client.check-on-disk/test_004-168.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-168.expected
@@ -1,98 +1,37 @@
-location: clients/tests/test-client.py:985:test_004()/168
-cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/168
+cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4643 bytes
+stdout: 2813 bytes
>>>
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.NM-TYPE: NMDeviceWifi
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED: nieznane
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: nieznane
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
-WIFI-PROPERTIES.WEP: tak
-WIFI-PROPERTIES.WPA: tak
-WIFI-PROPERTIES.WPA2: tak
-WIFI-PROPERTIES.TKIP: tak
-WIFI-PROPERTIES.CCMP: tak
-WIFI-PROPERTIES.AP: tak
-WIFI-PROPERTIES.ADHOC: tak
-WIFI-PROPERTIES.2GHZ: nieznane
-WIFI-PROPERTIES.5GHZ: nieznane
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infrastruktura
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mb/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infrastruktura
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mb/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infrastruktura
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mb/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
-DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-169.expected b/clients/tests/test-client.check-on-disk/test_004-169.expected
index a6bde5a463..da98353789 100644
--- a/clients/tests/test-client.check-on-disk/test_004-169.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-169.expected
@@ -1,92 +1,18 @@
-location: clients/tests/test-client.py:967:test_004()/169
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/169
+cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
lang: C
returncode: 0
-stdout: 4678 bytes
+stdout: 2452 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan1)
-===============================================================================
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+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: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
--------------------------------------------------------------------------------
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-170.expected b/clients/tests/test-client.check-on-disk/test_004-170.expected
index 0c34766dc3..36a0b0aff2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-170.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-170.expected
@@ -1,92 +1,18 @@
-location: clients/tests/test-client.py:967:test_004()/170
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/170
+cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4744 bytes
+stdout: 2510 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan1)
-===============================================================================
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+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: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
--------------------------------------------------------------------------------
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-171.expected b/clients/tests/test-client.check-on-disk/test_004-171.expected
index f34ff180b2..d24803d3d6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-171.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-171.expected
@@ -1,56 +1,18 @@
-location: clients/tests/test-client.py:969:test_004()/171
-cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/171
+cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 2434 bytes
+stdout: 760 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan1)
-===============================================================================
-IN-USE:
-SSID: wlan1-ap-4
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+  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: wlan0-ap-2
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-IN-USE:
-SSID: wlan0-ap-1
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-IN-USE:
-SSID: wlan0-ap-3
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+  wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+  wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+  wlan0-ap-3 Infra 1 54 Mbit/s 55 **  WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-172.expected b/clients/tests/test-client.check-on-disk/test_004-172.expected
index bf0518ccb7..1ef80d16c8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-172.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-172.expected
@@ -1,56 +1,18 @@
-location: clients/tests/test-client.py:969:test_004()/172
-cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/172
+cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2488 bytes
+stdout: 810 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan1)
-===============================================================================
-IN-USE:
-SSID: wlan1-ap-4
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+  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: wlan0-ap-2
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-IN-USE:
-SSID: wlan0-ap-1
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-IN-USE:
-SSID: wlan0-ap-3
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+  wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+  wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+  wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 **  WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-173.expected b/clients/tests/test-client.check-on-disk/test_004-173.expected
index 9940861da6..34877b3c2d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-173.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-173.expected
@@ -1,92 +1,18 @@
-location: clients/tests/test-client.py:972:test_004()/173
-cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/173
+cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 4678 bytes
+stdout: 2452 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan1)
-===============================================================================
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+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: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
--------------------------------------------------------------------------------
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-174.expected b/clients/tests/test-client.check-on-disk/test_004-174.expected
index 5df459690e..2fc6960813 100644
--- a/clients/tests/test-client.check-on-disk/test_004-174.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-174.expected
@@ -1,92 +1,18 @@
-location: clients/tests/test-client.py:972:test_004()/174
-cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/174
+cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 4744 bytes
+stdout: 2510 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan1)
-===============================================================================
-NAME: AP[1]
-SSID: wlan1-ap-4
-SSID-HEX: 776C616E312D61702D34
-BSSID: 94:2B:E8:F6:D2:86
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 48
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan1
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+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: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
-NAME: AP[2]
-SSID: wlan0-ap-1
-SSID-HEX: 776C616E302D61702D31
-BSSID: 61:95:77:AC:1E:4C
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 81
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
--------------------------------------------------------------------------------
-NAME: AP[3]
-SSID: wlan0-ap-3
-SSID-HEX: 776C616E302D61702D33
-BSSID: 9B:F6:B7:EC:97:76
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 55
-BARS: **
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 **  WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie   /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-175.expected b/clients/tests/test-client.check-on-disk/test_004-175.expected
index d95cb0a87d..69ef25bd66 100644
--- a/clients/tests/test-client.check-on-disk/test_004-175.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-175.expected
@@ -1,30 +1,11 @@
-location: clients/tests/test-client.py:974:test_004()/175
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/175
+cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 1222 bytes
+stdout: 721 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+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-176.expected b/clients/tests/test-client.check-on-disk/test_004-176.expected
index fafe4fc211..a676324386 100644
--- a/clients/tests/test-client.check-on-disk/test_004-176.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-176.expected
@@ -1,30 +1,11 @@
-location: clients/tests/test-client.py:974:test_004()/176
-cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/176
+cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1240 bytes
+stdout: 739 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+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-177.expected b/clients/tests/test-client.check-on-disk/test_004-177.expected
index 45b63c3feb..a0fd7e315b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-177.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-177.expected
@@ -1,21 +1,11 @@
-location: clients/tests/test-client.py:976:test_004()/177
-cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/177
+cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 661 bytes
+stdout: 210 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan0)
-===============================================================================
-IN-USE:
-SSID: wlan0-ap-2
-MODE: Infra
-CHAN: 1
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+  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-178.expected b/clients/tests/test-client.check-on-disk/test_004-178.expected
index f67b4bdb46..482cafcfa1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-178.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-178.expected
@@ -1,21 +1,11 @@
-location: clients/tests/test-client.py:976:test_004()/178
-cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/178
+cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 676 bytes
+stdout: 226 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan0)
-===============================================================================
-IN-USE:
-SSID: wlan0-ap-2
-MODE: Infrastruktura
-CHAN: 1
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+  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-179.expected b/clients/tests/test-client.check-on-disk/test_004-179.expected
index 960f6cab75..a0cf1d22de 100644
--- a/clients/tests/test-client.check-on-disk/test_004-179.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-179.expected
@@ -1,30 +1,11 @@
-location: clients/tests/test-client.py:979:test_004()/179
-cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/179
+cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 1222 bytes
+stdout: 721 bytes
>>>
-===============================================================================
- Wi-Fi scan list (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infra
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mbit/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: no
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+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-180.expected b/clients/tests/test-client.check-on-disk/test_004-180.expected
index fce85394b2..69af0871d6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-180.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-180.expected
@@ -1,30 +1,11 @@
-location: clients/tests/test-client.py:979:test_004()/180
-cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/180
+cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1240 bytes
+stdout: 739 bytes
>>>
-===============================================================================
- Lista skanowania sieci Wi-Fi (wlan0)
-===============================================================================
-NAME: AP[1]
-SSID: wlan0-ap-2
-SSID-HEX: 776C616E302D61702D32
-BSSID: C0:E2:BE:E8:EF:B6
-MODE: Infrastruktura
-CHAN: 1
-FREQ: 2412 MHz
-RATE: 54 Mb/s
-SIGNAL: 92
-BARS: ****
-SECURITY: WPA1 WPA2
-WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE: wlan0
-ACTIVE: nie
-IN-USE:
-DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
--------------------------------------------------------------------------------
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+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-181.expected b/clients/tests/test-client.check-on-disk/test_004-181.expected
index 058e264319..d23e45ec8e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-181.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-181.expected
@@ -1,112 +1,37 @@
-location: clients/tests/test-client.py:981:test_004()/181
-cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/181
+cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 5691 bytes
+stdout: 3003 bytes
>>>
-===============================================================================
- Device details (wlan0)
-===============================================================================
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.NM-TYPE: NMDeviceWifi
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED: unknown
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: unknown
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP: yes
-WIFI-PROPERTIES.WPA: yes
-WIFI-PROPERTIES.WPA2: yes
-WIFI-PROPERTIES.TKIP: yes
-WIFI-PROPERTIES.CCMP: yes
-WIFI-PROPERTIES.AP: yes
-WIFI-PROPERTIES.ADHOC: yes
-WIFI-PROPERTIES.2GHZ: unknown
-WIFI-PROPERTIES.5GHZ: unknown
--------------------------------------------------------------------------------
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infra
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mbit/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infra
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mbit/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infra
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mbit/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+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-182.expected b/clients/tests/test-client.check-on-disk/test_004-182.expected
index a5b83fe846..f2479a0e11 100644
--- a/clients/tests/test-client.check-on-disk/test_004-182.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-182.expected
@@ -1,112 +1,37 @@
-location: clients/tests/test-client.py:981:test_004()/182
-cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/182
+cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 5741 bytes
+stdout: 3056 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (wlan0)
-===============================================================================
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.NM-TYPE: NMDeviceWifi
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED: nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: nieznane
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP: tak
-WIFI-PROPERTIES.WPA: tak
-WIFI-PROPERTIES.WPA2: tak
-WIFI-PROPERTIES.TKIP: tak
-WIFI-PROPERTIES.CCMP: tak
-WIFI-PROPERTIES.AP: tak
-WIFI-PROPERTIES.ADHOC: tak
-WIFI-PROPERTIES.2GHZ: nieznane
-WIFI-PROPERTIES.5GHZ: nieznane
--------------------------------------------------------------------------------
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infrastruktura
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mb/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infrastruktura
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mb/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infrastruktura
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mb/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+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-183.expected b/clients/tests/test-client.check-on-disk/test_004-183.expected
index f4ee1bb6ee..70dbdce923 100644
--- a/clients/tests/test-client.check-on-disk/test_004-183.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-183.expected
@@ -1,45 +1,35 @@
-location: clients/tests/test-client.py:983:test_004()/183
-cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/183
+cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 2294 bytes
+stdout: 980 bytes
>>>
-===============================================================================
- Device details (wlan0)
-===============================================================================
-GENERAL.DEVICE: wlan0
--------------------------------------------------------------------------------
-GENERAL.TYPE: wifi
--------------------------------------------------------------------------------
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
-GENERAL.MTU: 0
--------------------------------------------------------------------------------
-GENERAL.STATE: 20 (unavailable)
--------------------------------------------------------------------------------
-GENERAL.CONNECTION: con-vpn-1
--------------------------------------------------------------------------------
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
+DEVICE
+wlan0
+
+TYPE
+wifi
+
+HWADDR
+13:E0:74:85:7C:D9
+
+MTU
+0
+
+STATE
+20 (unavailable)
+
+CONNECTION
+con-vpn-1
+
+CON-PATH
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-184.expected b/clients/tests/test-client.check-on-disk/test_004-184.expected
index b8e69d778b..8c94c9eb9a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-184.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-184.expected
@@ -1,45 +1,35 @@
-location: clients/tests/test-client.py:983:test_004()/184
-cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/184
+cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2302 bytes
+stdout: 981 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (wlan0)
-===============================================================================
-GENERAL.DEVICE: wlan0
--------------------------------------------------------------------------------
-GENERAL.TYPE: wifi
--------------------------------------------------------------------------------
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
--------------------------------------------------------------------------------
-GENERAL.MTU: 0
--------------------------------------------------------------------------------
-GENERAL.STATE: 20 (niedostępne)
--------------------------------------------------------------------------------
-GENERAL.CONNECTION: con-vpn-1
--------------------------------------------------------------------------------
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
+DEVICE
+wlan0
+
+TYPE
+wifi
+
+HWADDR
+13:E0:74:85:7C:D9
+
+MTU
+0
+
+STATE
+20 (niedostępne)
+
+CONNECTION
+con-vpn-1
+
+CON-PATH
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-185.expected b/clients/tests/test-client.check-on-disk/test_004-185.expected
index 7e1dd26635..5388190a7d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-185.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-185.expected
@@ -1,112 +1,37 @@
-location: clients/tests/test-client.py:985:test_004()/185
-cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/185
+cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 5691 bytes
+stdout: 3003 bytes
>>>
-===============================================================================
- Device details (wlan0)
-===============================================================================
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.NM-TYPE: NMDeviceWifi
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (unavailable)
-GENERAL.REASON: 0 (No reason given)
-GENERAL.UDI: /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: no
-GENERAL.NM-MANAGED: yes
-GENERAL.AUTOCONNECT: yes
-GENERAL.FIRMWARE-MISSING: no
-GENERAL.NM-PLUGIN-MISSING: no
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED: unknown
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: no
-CAPABILITIES.SPEED: unknown
-CAPABILITIES.IS-SOFTWARE: no
-CAPABILITIES.SRIOV: no
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP: yes
-WIFI-PROPERTIES.WPA: yes
-WIFI-PROPERTIES.WPA2: yes
-WIFI-PROPERTIES.TKIP: yes
-WIFI-PROPERTIES.CCMP: yes
-WIFI-PROPERTIES.AP: yes
-WIFI-PROPERTIES.ADHOC: yes
-WIFI-PROPERTIES.2GHZ: unknown
-WIFI-PROPERTIES.5GHZ: unknown
--------------------------------------------------------------------------------
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infra
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mbit/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infra
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mbit/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infra
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mbit/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+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-186.expected b/clients/tests/test-client.check-on-disk/test_004-186.expected
index 380d479354..eedb660ff7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-186.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-186.expected
@@ -1,112 +1,37 @@
-location: clients/tests/test-client.py:985:test_004()/186
-cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/186
+cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 5741 bytes
+stdout: 3056 bytes
>>>
-===============================================================================
- Informacje o urządzeniu (wlan0)
-===============================================================================
-GENERAL.DEVICE: wlan0
-GENERAL.TYPE: wifi
-GENERAL.NM-TYPE: NMDeviceWifi
-GENERAL.VENDOR: --
-GENERAL.PRODUCT: --
-GENERAL.DRIVER: virtual
-GENERAL.DRIVER-VERSION: --
-GENERAL.FIRMWARE-VERSION: --
-GENERAL.HWADDR: 13:E0:74:85:7C:D9
-GENERAL.MTU: 0
-GENERAL.STATE: 20 (niedostępne)
-GENERAL.REASON: 0 (Nie podano przyczyny)
-GENERAL.UDI: /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE: --
-GENERAL.IS-SOFTWARE: nie
-GENERAL.NM-MANAGED: tak
-GENERAL.AUTOCONNECT: tak
-GENERAL.FIRMWARE-MISSING: nie
-GENERAL.NM-PLUGIN-MISSING: nie
-GENERAL.PHYS-PORT-ID: --
-GENERAL.CONNECTION: con-vpn-1
-GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED: nieznane
--------------------------------------------------------------------------------
-CAPABILITIES.CARRIER-DETECT: nie
-CAPABILITIES.SPEED: nieznane
-CAPABILITIES.IS-SOFTWARE: nie
-CAPABILITIES.SRIOV: nie
--------------------------------------------------------------------------------
-WIFI-PROPERTIES.WEP: tak
-WIFI-PROPERTIES.WPA: tak
-WIFI-PROPERTIES.WPA2: tak
-WIFI-PROPERTIES.TKIP: tak
-WIFI-PROPERTIES.CCMP: tak
-WIFI-PROPERTIES.AP: tak
-WIFI-PROPERTIES.ADHOC: tak
-WIFI-PROPERTIES.2GHZ: nieznane
-WIFI-PROPERTIES.5GHZ: nieznane
--------------------------------------------------------------------------------
-AP[1].IN-USE:
-AP[1].SSID: wlan0-ap-2
-AP[1].MODE: Infrastruktura
-AP[1].CHAN: 1
-AP[1].RATE: 54 Mb/s
-AP[1].SIGNAL: 92
-AP[1].BARS: ****
-AP[1].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[2].IN-USE:
-AP[2].SSID: wlan0-ap-1
-AP[2].MODE: Infrastruktura
-AP[2].CHAN: 1
-AP[2].RATE: 54 Mb/s
-AP[2].SIGNAL: 81
-AP[2].BARS: ****
-AP[2].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-AP[3].IN-USE:
-AP[3].SSID: wlan0-ap-3
-AP[3].MODE: Infrastruktura
-AP[3].CHAN: 1
-AP[3].RATE: 54 Mb/s
-AP[3].SIGNAL: 55
-AP[3].BARS: **
-AP[3].SECURITY: WPA1 WPA2
--------------------------------------------------------------------------------
-IP4.ADDRESS[1]: 192.168.228.18/32
-IP4.ADDRESS[2]: 192.168.209.179/25
-IP4.GATEWAY: 192.168.41.120
-IP4.DOMAIN[1]: sear4.foo2.bar
-IP4.DOMAIN[2]: sear4.fo.x.y
-IP4.DOMAIN[3]: sear4.foo1.bar
-IP4.DOMAIN[4]: sear4.foo4.bar
-IP4.DOMAIN[5]: sear4.fo.o.bar
-IP4.WINS[1]: 192.168.120.79
--------------------------------------------------------------------------------
-DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
--------------------------------------------------------------------------------
-IP6.GATEWAY: --
-IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]: sear6.foo2.bar
-IP6.DOMAIN[2]: sear6.foo1.bar
-IP6.DOMAIN[3]: sear6.fo.x.y
-IP6.DOMAIN[4]: sear6.fo.o.bar
-IP6.DOMAIN[5]: sear6.foo3.bar
-IP6.DOMAIN[6]: sear6.foo4.bar
--------------------------------------------------------------------------------
-DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
--------------------------------------------------------------------------------
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
--------------------------------------------------------------------------------
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+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-187.expected b/clients/tests/test-client.check-on-disk/test_004-187.expected
index 3f24d905db..53e7d54da4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-187.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-187.expected
@@ -1,79 +1,30 @@
-location: clients/tests/test-client.py:967:test_004()/187
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/187
+cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
lang: C
returncode: 0
-stdout: 1470 bytes
+stdout: 2872 bytes
>>>
-NAME:AP[1]
-SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:48
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
-NAME:AP[2]
-SSID:wlan0-ap-1
-SSID-HEX:776C616E302D61702D31
-BSSID:61:95:77:AC:1E:4C
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:81
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
-NAME:AP[3]
-SSID:wlan0-ap-3
-SSID-HEX:776C616E302D61702D33
-BSSID:9B:F6:B7:EC:97:76
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:55
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-188.expected b/clients/tests/test-client.check-on-disk/test_004-188.expected
index 630df0b7cb..f5f3944aba 100644
--- a/clients/tests/test-client.check-on-disk/test_004-188.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-188.expected
@@ -1,79 +1,30 @@
-location: clients/tests/test-client.py:967:test_004()/188
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+location: clients/tests/test-client.py:970:test_004()/188
+cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1518 bytes
+stdout: 3100 bytes
>>>
-NAME:AP[1]
-SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:48
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
-NAME:AP[2]
-SSID:wlan0-ap-1
-SSID-HEX:776C616E302D61702D31
-BSSID:61:95:77:AC:1E:4C
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:81
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
-NAME:AP[3]
-SSID:wlan0-ap-3
-SSID-HEX:776C616E302D61702D33
-BSSID:9B:F6:B7:EC:97:76
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:55
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-189.expected b/clients/tests/test-client.check-on-disk/test_004-189.expected
index 55b6e4733f..ca6a89ddf3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-189.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-189.expected
@@ -1,43 +1,30 @@
-location: clients/tests/test-client.py:969:test_004()/189
-cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/189
+cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
lang: C
returncode: 0
-stdout: 390 bytes
+stdout: 996 bytes
>>>
-IN-USE:
-SSID:wlan1-ap-4
-MODE:Infra
-CHAN:1
-RATE:54 Mbit/s
-SIGNAL:48
-BARS:**
-SECURITY:WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan1-ap-4 Infra 1 54 Mbit/s 48 ** WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
-IN-USE:
-SSID:wlan0-ap-2
-MODE:Infra
-CHAN:1
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-IN-USE:
-SSID:wlan0-ap-1
-MODE:Infra
-CHAN:1
-RATE:54 Mbit/s
-SIGNAL:81
-BARS:****
-SECURITY:WPA1 WPA2
-IN-USE:
-SSID:wlan0-ap-3
-MODE:Infra
-CHAN:1
-RATE:54 Mbit/s
-SIGNAL:55
-BARS:**
-SECURITY:WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-190.expected b/clients/tests/test-client.check-on-disk/test_004-190.expected
index 122ffe6e79..2512b4d600 100644
--- a/clients/tests/test-client.check-on-disk/test_004-190.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-190.expected
@@ -1,43 +1,30 @@
-location: clients/tests/test-client.py:969:test_004()/190
-cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
+location: clients/tests/test-client.py:972:test_004()/190
+cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 426 bytes
+stdout: 1216 bytes
>>>
-IN-USE:
-SSID:wlan1-ap-4
-MODE:Infrastruktura
-CHAN:1
-RATE:54 Mb/s
-SIGNAL:48
-BARS:**
-SECURITY:WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan1-ap-4 Infrastruktura 1 54 Mb/s 48 ** WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
-IN-USE:
-SSID:wlan0-ap-2
-MODE:Infrastruktura
-CHAN:1
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-IN-USE:
-SSID:wlan0-ap-1
-MODE:Infrastruktura
-CHAN:1
-RATE:54 Mb/s
-SIGNAL:81
-BARS:****
-SECURITY:WPA1 WPA2
-IN-USE:
-SSID:wlan0-ap-3
-MODE:Infrastruktura
-CHAN:1
-RATE:54 Mb/s
-SIGNAL:55
-BARS:**
-SECURITY:WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+ wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+ wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-191.expected b/clients/tests/test-client.check-on-disk/test_004-191.expected
index 884d1aa5bf..8d9a884bad 100644
--- a/clients/tests/test-client.check-on-disk/test_004-191.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-191.expected
@@ -1,79 +1,30 @@
-location: clients/tests/test-client.py:972:test_004()/191
-cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/191
+cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: C
returncode: 0
-stdout: 1470 bytes
+stdout: 2872 bytes
>>>
-NAME:AP[1]
-SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:48
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infra 1 2412 MHz 54 Mbit/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
-NAME:AP[2]
-SSID:wlan0-ap-1
-SSID-HEX:776C616E302D61702D31
-BSSID:61:95:77:AC:1E:4C
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:81
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
-NAME:AP[3]
-SSID:wlan0-ap-3
-SSID-HEX:776C616E302D61702D33
-BSSID:9B:F6:B7:EC:97:76
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:55
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infra 1 2412 MHz 54 Mbit/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-192.expected b/clients/tests/test-client.check-on-disk/test_004-192.expected
index 206b798829..77e9b48870 100644
--- a/clients/tests/test-client.check-on-disk/test_004-192.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-192.expected
@@ -1,79 +1,30 @@
-location: clients/tests/test-client.py:972:test_004()/192
-cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+location: clients/tests/test-client.py:975:test_004()/192
+cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
lang: pl_PL.UTF-8
returncode: 0
-stdout: 1518 bytes
+stdout: 3100 bytes
>>>
-NAME:AP[1]
-SSID:wlan1-ap-4
-SSID-HEX:776C616E312D61702D34
-BSSID:94:2B:E8:F6:D2:86
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:48
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan1
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 2412 MHz 54 Mb/s 48 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
-NAME:AP[2]
-SSID:wlan0-ap-1
-SSID-HEX:776C616E302D61702D31
-BSSID:61:95:77:AC:1E:4C
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:81
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
-NAME:AP[3]
-SSID:wlan0-ap-3
-SSID-HEX:776C616E302D61702D33
-BSSID:9B:F6:B7:EC:97:76
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:55
-BARS:**
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
+AP[2] wlan0-ap-1 776C616E302D61702D31 61:95:77:AC:1E:4C Infrastruktura 1 2412 MHz 54 Mb/s 81 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
+AP[3] wlan0-ap-3 776C616E302D61702D33 9B:F6:B7:EC:97:76 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-193.expected b/clients/tests/test-client.check-on-disk/test_004-193.expected
index 4e05948aa0..c5f9dac251 100644
--- a/clients/tests/test-client.check-on-disk/test_004-193.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-193.expected
@@ -1,26 +1,15 @@
-location: clients/tests/test-client.py:974:test_004()/193
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/193
+cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 367 bytes
+stdout: 962 bytes
>>>
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-194.expected b/clients/tests/test-client.check-on-disk/test_004-194.expected
index 8a825fae87..1437017d58 100644
--- a/clients/tests/test-client.check-on-disk/test_004-194.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-194.expected
@@ -1,26 +1,15 @@
-location: clients/tests/test-client.py:974:test_004()/194
-cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:977:test_004()/194
+cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 379 bytes
+stdout: 1039 bytes
>>>
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-195.expected b/clients/tests/test-client.check-on-disk/test_004-195.expected
index de6fe36c7f..6fce301e7e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-195.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-195.expected
@@ -1,17 +1,15 @@
-location: clients/tests/test-client.py:976:test_004()/195
-cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/195
+cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 97 bytes
+stdout: 317 bytes
>>>
-IN-USE:
-SSID:wlan0-ap-2
-MODE:Infra
-CHAN:1
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-196.expected b/clients/tests/test-client.check-on-disk/test_004-196.expected
index bf4a491c7f..fdcf4cbb3e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-196.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-196.expected
@@ -1,17 +1,15 @@
-location: clients/tests/test-client.py:976:test_004()/196
-cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:979:test_004()/196
+cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 106 bytes
+stdout: 392 bytes
>>>
-IN-USE:
-SSID:wlan0-ap-2
-MODE:Infrastruktura
-CHAN:1
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+ wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-197.expected b/clients/tests/test-client.check-on-disk/test_004-197.expected
index 5e8542a87c..62b7df8fa8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-197.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-197.expected
@@ -1,26 +1,15 @@
-location: clients/tests/test-client.py:979:test_004()/197
-cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/197
+cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: C
returncode: 0
-stdout: 367 bytes
+stdout: 962 bytes
>>>
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infra
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mbit/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:no
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infra 1 2412 MHz 54 Mbit/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-198.expected b/clients/tests/test-client.check-on-disk/test_004-198.expected
index c69497ab94..af6bedc518 100644
--- a/clients/tests/test-client.check-on-disk/test_004-198.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-198.expected
@@ -1,26 +1,15 @@
-location: clients/tests/test-client.py:979:test_004()/198
-cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+location: clients/tests/test-client.py:982:test_004()/198
+cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
lang: pl_PL.UTF-8
returncode: 0
-stdout: 379 bytes
+stdout: 1039 bytes
>>>
-NAME:AP[1]
-SSID:wlan0-ap-2
-SSID-HEX:776C616E302D61702D32
-BSSID:C0:E2:BE:E8:EF:B6
-MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
-RATE:54 Mb/s
-SIGNAL:92
-BARS:****
-SECURITY:WPA1 WPA2
-WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
-DEVICE:wlan0
-ACTIVE:nie
-IN-USE:
-DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 2412 MHz 54 Mb/s 92 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-199.expected b/clients/tests/test-client.check-on-disk/test_004-199.expected
index 2dae9e6254..ed7a8e5ac1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-199.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-199.expected
@@ -1,98 +1,49 @@
-location: clients/tests/test-client.py:981:test_004()/199
-cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/199
+cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
lang: C
returncode: 0
-stdout: 2467 bytes
+stdout: 4148 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:unknown
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIFI-PROPERTIES.WEP:yes
-WIFI-PROPERTIES.WPA:yes
-WIFI-PROPERTIES.WPA2:yes
-WIFI-PROPERTIES.TKIP:yes
-WIFI-PROPERTIES.CCMP:yes
-WIFI-PROPERTIES.AP:yes
-WIFI-PROPERTIES.ADHOC:yes
-WIFI-PROPERTIES.2GHZ:unknown
-WIFI-PROPERTIES.5GHZ:unknown
-AP[1].IN-USE:
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infra
-AP[1].CHAN:1
-AP[1].RATE:54 Mbit/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infra
-AP[2].CHAN:1
-AP[2].RATE:54 Mbit/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infra
-AP[3].CHAN:1
-AP[3].RATE:54 Mbit/s
-AP[3].SIGNAL:55
-AP[3].BARS:**
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+==========================
+ Device details (wlan0)
+==========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+-----------------------------------------------------------
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+---------------------------------------------------------------------------
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+----------------------------------------------------------------------------
+AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+-----------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-200.expected b/clients/tests/test-client.check-on-disk/test_004-200.expected
index 2ccac7c2d7..ef7399f40e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-200.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-200.expected
@@ -1,98 +1,49 @@
-location: clients/tests/test-client.py:981:test_004()/200
-cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
+location: clients/tests/test-client.py:984:test_004()/200
+cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2510 bytes
+stdout: 4246 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:nie
-GENERAL.NM-MANAGED:tak
-GENERAL.AUTOCONNECT:tak
-GENERAL.FIRMWARE-MISSING:nie
-GENERAL.NM-PLUGIN-MISSING:nie
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:nieznane
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
-WIFI-PROPERTIES.WEP:tak
-WIFI-PROPERTIES.WPA:tak
-WIFI-PROPERTIES.WPA2:tak
-WIFI-PROPERTIES.TKIP:tak
-WIFI-PROPERTIES.CCMP:tak
-WIFI-PROPERTIES.AP:tak
-WIFI-PROPERTIES.ADHOC:tak
-WIFI-PROPERTIES.2GHZ:nieznane
-WIFI-PROPERTIES.5GHZ:nieznane
-AP[1].IN-USE:
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
-AP[1].RATE:54 Mb/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
-AP[2].RATE:54 Mb/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
-AP[3].RATE:54 Mb/s
-AP[3].SIGNAL:55
-AP[3].BARS:**
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+-----------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-201.expected b/clients/tests/test-client.check-on-disk/test_004-201.expected
index e32762751a..f6a75b5a32 100644
--- a/clients/tests/test-client.check-on-disk/test_004-201.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-201.expected
@@ -1,33 +1,47 @@
-location: clients/tests/test-client.py:983:test_004()/201
-cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/201
+cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
lang: C
returncode: 0
-stdout: 739 bytes
+stdout: 1554 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
+==========================
+ Device details (wlan0)
+==========================
+DEVICE
+--------
+wlan0
+
+TYPE
+------
+wifi
+
+HWADDR
+-------------------
+13:E0:74:85:7C:D9
+
+MTU
+-----
+0
+
+STATE
+------------------
+20 (unavailable)
+
+CONNECTION
+------------
+con-vpn-1
+
+CON-PATH
+----------------------------------------------------
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-202.expected b/clients/tests/test-client.check-on-disk/test_004-202.expected
index 963796586e..f41a8c1f7b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-202.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-202.expected
@@ -1,33 +1,47 @@
-location: clients/tests/test-client.py:983:test_004()/202
-cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
+location: clients/tests/test-client.py:986:test_004()/202
+cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 740 bytes
+stdout: 1584 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+DEVICE
+--------
+wlan0
+
+TYPE
+------
+wifi
+
+HWADDR
+-------------------
+13:E0:74:85:7C:D9
+
+MTU
+-----
+0
+
+STATE
+------------------
+20 (niedostępne)
+
+CONNECTION
+------------
+con-vpn-1
+
+CON-PATH
+----------------------------------------------------
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-203.expected b/clients/tests/test-client.check-on-disk/test_004-203.expected
index 2afc05f342..3eff1ecd85 100644
--- a/clients/tests/test-client.check-on-disk/test_004-203.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-203.expected
@@ -1,98 +1,49 @@
-location: clients/tests/test-client.py:985:test_004()/203
-cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/203
+cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: C
returncode: 0
-stdout: 2467 bytes
+stdout: 4148 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
-GENERAL.REASON:0 (No reason given)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:no
-GENERAL.NM-MANAGED:yes
-GENERAL.AUTOCONNECT:yes
-GENERAL.FIRMWARE-MISSING:no
-GENERAL.NM-PLUGIN-MISSING:no
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:unknown
-CAPABILITIES.CARRIER-DETECT:no
-CAPABILITIES.SPEED:unknown
-CAPABILITIES.IS-SOFTWARE:no
-CAPABILITIES.SRIOV:no
-WIFI-PROPERTIES.WEP:yes
-WIFI-PROPERTIES.WPA:yes
-WIFI-PROPERTIES.WPA2:yes
-WIFI-PROPERTIES.TKIP:yes
-WIFI-PROPERTIES.CCMP:yes
-WIFI-PROPERTIES.AP:yes
-WIFI-PROPERTIES.ADHOC:yes
-WIFI-PROPERTIES.2GHZ:unknown
-WIFI-PROPERTIES.5GHZ:unknown
-AP[1].IN-USE:
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infra
-AP[1].CHAN:1
-AP[1].RATE:54 Mbit/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infra
-AP[2].CHAN:1
-AP[2].RATE:54 Mbit/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infra
-AP[3].CHAN:1
-AP[3].RATE:54 Mbit/s
-AP[3].SIGNAL:55
-AP[3].BARS:**
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+==========================
+ Device details (wlan0)
+==========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+-----------------------------------------------------------
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+---------------------------------------------------------------------------
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+----------------------------------------------------------------------------
+AP[1] wlan0-ap-2 Infra 1 54 Mbit/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+-----------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-204.expected b/clients/tests/test-client.check-on-disk/test_004-204.expected
index 792567e07e..780d2e1257 100644
--- a/clients/tests/test-client.check-on-disk/test_004-204.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-204.expected
@@ -1,98 +1,49 @@
-location: clients/tests/test-client.py:985:test_004()/204
-cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+location: clients/tests/test-client.py:988:test_004()/204
+cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
lang: pl_PL.UTF-8
returncode: 0
-stdout: 2510 bytes
+stdout: 4246 bytes
>>>
-GENERAL.DEVICE:wlan0
-GENERAL.TYPE:wifi
-GENERAL.NM-TYPE:NMDeviceWifi
-GENERAL.VENDOR:
-GENERAL.PRODUCT:
-GENERAL.DRIVER:virtual
-GENERAL.DRIVER-VERSION:
-GENERAL.FIRMWARE-VERSION:
-GENERAL.HWADDR:13:E0:74:85:7C:D9
-GENERAL.MTU:0
-GENERAL.STATE:20 (niedostępne)
-GENERAL.REASON:0 (Nie podano przyczyny)
-GENERAL.UDI:/sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:
-GENERAL.IS-SOFTWARE:nie
-GENERAL.NM-MANAGED:tak
-GENERAL.AUTOCONNECT:tak
-GENERAL.FIRMWARE-MISSING:nie
-GENERAL.NM-PLUGIN-MISSING:nie
-GENERAL.PHYS-PORT-ID:
-GENERAL.CONNECTION:con-vpn-1
-GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:nieznane
-CAPABILITIES.CARRIER-DETECT:nie
-CAPABILITIES.SPEED:nieznane
-CAPABILITIES.IS-SOFTWARE:nie
-CAPABILITIES.SRIOV:nie
-WIFI-PROPERTIES.WEP:tak
-WIFI-PROPERTIES.WPA:tak
-WIFI-PROPERTIES.WPA2:tak
-WIFI-PROPERTIES.TKIP:tak
-WIFI-PROPERTIES.CCMP:tak
-WIFI-PROPERTIES.AP:tak
-WIFI-PROPERTIES.ADHOC:tak
-WIFI-PROPERTIES.2GHZ:nieznane
-WIFI-PROPERTIES.5GHZ:nieznane
-AP[1].IN-USE:
-AP[1].SSID:wlan0-ap-2
-AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
-AP[1].RATE:54 Mb/s
-AP[1].SIGNAL:92
-AP[1].BARS:****
-AP[1].SECURITY:WPA1 WPA2
-AP[2].IN-USE:
-AP[2].SSID:wlan0-ap-1
-AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
-AP[2].RATE:54 Mb/s
-AP[2].SIGNAL:81
-AP[2].BARS:****
-AP[2].SECURITY:WPA1 WPA2
-AP[3].IN-USE:
-AP[3].SSID:wlan0-ap-3
-AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
-AP[3].RATE:54 Mb/s
-AP[3].SIGNAL:55
-AP[3].BARS:**
-AP[3].SECURITY:WPA1 WPA2
-IP4.ADDRESS[1]:192.168.228.18/32
-IP4.ADDRESS[2]:192.168.209.179/25
-IP4.GATEWAY:192.168.41.120
-IP4.DOMAIN[1]:sear4.foo2.bar
-IP4.DOMAIN[2]:sear4.fo.x.y
-IP4.DOMAIN[3]:sear4.foo1.bar
-IP4.DOMAIN[4]:sear4.foo4.bar
-IP4.DOMAIN[5]:sear4.fo.o.bar
-IP4.WINS[1]:192.168.120.79
-DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
-DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
-DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
-DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
-IP6.GATEWAY:
-IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
-IP6.DOMAIN[1]:sear6.foo2.bar
-IP6.DOMAIN[2]:sear6.foo1.bar
-IP6.DOMAIN[3]:sear6.fo.x.y
-IP6.DOMAIN[4]:sear6.fo.o.bar
-IP6.DOMAIN[5]:sear6.foo3.bar
-IP6.DOMAIN[6]:sear6.foo4.bar
-DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
-DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
-DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
-DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
-DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+AP[1] wlan0-ap-2 Infrastruktura 1 54 Mb/s 92 **** WPA1 WPA2
+AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 81 **** WPA1 WPA2
+AP[3] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP OPTION
+--------------------------------------------------------------------------------------------------
+DHCP4 dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+GROUP OPTION
+-------------------------------------------------------------------------------------------------------------------------
+DHCP6 dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+
+NAME AVAILABLE-CONNECTION-PATHS AVAILABLE-CONNECTIONS
+-----------------------------------------------------------------------------------------------------------
+CONNECTIONS /org/freedesktop/NetworkManager/Settings/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
<<<
stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-205.expected b/clients/tests/test-client.check-on-disk/test_004-205.expected
new file mode 100644
index 0000000000..1a3eca4498
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-205.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:970:test_004()/205
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 3484 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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-206.expected b/clients/tests/test-client.check-on-disk/test_004-206.expected
new file mode 100644
index 0000000000..b8bdb3683b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-206.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:970:test_004()/206
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3712 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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-207.expected b/clients/tests/test-client.check-on-disk/test_004-207.expected
new file mode 100644
index 0000000000..25b8b4507f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-207.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:972:test_004()/207
+cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 1284 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+  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-208.expected b/clients/tests/test-client.check-on-disk/test_004-208.expected
new file mode 100644
index 0000000000..d575849223
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-208.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:972:test_004()/208
+cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1504 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+  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-209.expected b/clients/tests/test-client.check-on-disk/test_004-209.expected
new file mode 100644
index 0000000000..f3fdfba5d7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-209.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:975:test_004()/209
+cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 3484 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan1)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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-210.expected b/clients/tests/test-client.check-on-disk/test_004-210.expected
new file mode 100644
index 0000000000..efe96b2a62
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-210.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:975:test_004()/210
+cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3712 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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-211.expected b/clients/tests/test-client.check-on-disk/test_004-211.expected
new file mode 100644
index 0000000000..11593832c6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-211.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:977:test_004()/211
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1115 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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-212.expected b/clients/tests/test-client.check-on-disk/test_004-212.expected
new file mode 100644
index 0000000000..8c3e2081ae
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-212.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:977:test_004()/212
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1192 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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-213.expected b/clients/tests/test-client.check-on-disk/test_004-213.expected
new file mode 100644
index 0000000000..cc808f42d4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-213.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:979:test_004()/213
+cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 389 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+------------------------------------------------------------------------------------------------
+  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-214.expected b/clients/tests/test-client.check-on-disk/test_004-214.expected
new file mode 100644
index 0000000000..f1f4e60ec6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-214.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:979:test_004()/214
+cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 464 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+--------------------------------------------------------------------------------------------------------------------
+  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-215.expected b/clients/tests/test-client.check-on-disk/test_004-215.expected
new file mode 100644
index 0000000000..a47d1506d1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-215.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:982:test_004()/215
+cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1115 bytes
+>>>
+===========================
+ Wi-Fi scan list (wlan0)
+===========================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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-216.expected b/clients/tests/test-client.check-on-disk/test_004-216.expected
new file mode 100644
index 0000000000..0d4b4804ef
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-216.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:982:test_004()/216
+cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1192 bytes
+>>>
+========================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+========================================
+NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+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-217.expected b/clients/tests/test-client.check-on-disk/test_004-217.expected
new file mode 100644
index 0000000000..59734df68e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-217.expected
@@ -0,0 +1,52 @@
+location: clients/tests/test-client.py:984:test_004()/217
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 4391 bytes
+>>>
+==========================
+ Device details (wlan0)
+==========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+-----------------------------------------------------------
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+---------------------------------------------------------------------------
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+----------------------------------------------------------------------------
+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-218.expected b/clients/tests/test-client.check-on-disk/test_004-218.expected
new file mode 100644
index 0000000000..16f08c99d4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-218.expected
@@ -0,0 +1,52 @@
+location: clients/tests/test-client.py:984:test_004()/218
+cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4489 bytes
+>>>
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+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-219.expected b/clients/tests/test-client.check-on-disk/test_004-219.expected
new file mode 100644
index 0000000000..e1559e1e6f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-219.expected
@@ -0,0 +1,50 @@
+location: clients/tests/test-client.py:986:test_004()/219
+cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 1554 bytes
+>>>
+==========================
+ Device details (wlan0)
+==========================
+DEVICE
+--------
+wlan0
+
+TYPE
+------
+wifi
+
+HWADDR
+-------------------
+13:E0:74:85:7C:D9
+
+MTU
+-----
+0
+
+STATE
+------------------
+20 (unavailable)
+
+CONNECTION
+------------
+con-vpn-1
+
+CON-PATH
+----------------------------------------------------
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-220.expected b/clients/tests/test-client.check-on-disk/test_004-220.expected
new file mode 100644
index 0000000000..d014f53302
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-220.expected
@@ -0,0 +1,50 @@
+location: clients/tests/test-client.py:986:test_004()/220
+cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1584 bytes
+>>>
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+DEVICE
+--------
+wlan0
+
+TYPE
+------
+wifi
+
+HWADDR
+-------------------
+13:E0:74:85:7C:D9
+
+MTU
+-----
+0
+
+STATE
+------------------
+20 (niedostępne)
+
+CONNECTION
+------------
+con-vpn-1
+
+CON-PATH
+----------------------------------------------------
+/org/freedesktop/NetworkManager/ActiveConnection/2
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN WINS
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4 192.168.228.18/32 | 192.168.209.179/25 192.168.41.120 -- -- sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar 192.168.120.79
+
+GROUP ADDRESS GATEWAY ROUTE DNS DOMAIN
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-221.expected b/clients/tests/test-client.check-on-disk/test_004-221.expected
new file mode 100644
index 0000000000..8f50cabe4e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-221.expected
@@ -0,0 +1,52 @@
+location: clients/tests/test-client.py:988:test_004()/221
+cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 4391 bytes
+>>>
+==========================
+ Device details (wlan0)
+==========================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (unavailable) 0 (No reason given) /sys/devices/virtual/wlan0 -- no yes yes no no -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 unknown
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+-----------------------------------------------------------
+CAPABILITIES no unknown no no
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+---------------------------------------------------------------------------
+WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+----------------------------------------------------------------------------
+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-222.expected b/clients/tests/test-client.check-on-disk/test_004-222.expected
new file mode 100644
index 0000000000..a577b116ad
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-222.expected
@@ -0,0 +1,52 @@
+location: clients/tests/test-client.py:988:test_004()/222
+cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4489 bytes
+>>>
+===================================
+ Informacje o urządzeniu (wlan0)
+===================================
+NAME DEVICE TYPE NM-TYPE VENDOR PRODUCT DRIVER DRIVER-VERSION FIRMWARE-VERSION HWADDR MTU STATE REASON UDI IP-IFACE IS-SOFTWARE NM-MANAGED AUTOCONNECT FIRMWARE-MISSING NM-PLUGIN-MISSING PHYS-PORT-ID CONNECTION CON-UUID CON-PATH METERED
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL wlan0 wifi NMDeviceWifi -- -- virtual -- -- 13:E0:74:85:7C:D9 0 20 (niedostępne) 0 (Nie podano przyczyny) /sys/devices/virtual/wlan0 -- nie tak tak nie nie -- con-vpn-1 UUID-con-vpn-1-REPLACED-REPLACED-REP /org/freedesktop/NetworkManager/ActiveConnection/2 nieznane
+
+NAME CARRIER-DETECT SPEED IS-SOFTWARE SRIOV
+------------------------------------------------------------
+CAPABILITIES nie nieznane nie nie
+
+NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ
+-----------------------------------------------------------------------------
+WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane
+
+NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
+-----------------------------------------------------------------------------------
+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-223.expected b/clients/tests/test-client.check-on-disk/test_004-223.expected
new file mode 100644
index 0000000000..6e5be968b7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-223.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:970:test_004()/223
+cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 1022 bytes
+>>>
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-224.expected b/clients/tests/test-client.check-on-disk/test_004-224.expected
new file mode 100644
index 0000000000..165a664f99
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-224.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:970:test_004()/224
+cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1070 bytes
+>>>
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-225.expected b/clients/tests/test-client.check-on-disk/test_004-225.expected
new file mode 100644
index 0000000000..cc0e738b1b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-225.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:972:test_004()/225
+cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 198 bytes
+>>>
+ :wlan1-ap-4:Infra:1:54 Mbit/s:48:** :WPA1 WPA2
+
+
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
+ :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-226.expected b/clients/tests/test-client.check-on-disk/test_004-226.expected
new file mode 100644
index 0000000000..843a7b75a1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-226.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:972:test_004()/226
+cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 234 bytes
+>>>
+ :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:** :WPA1 WPA2
+
+
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
+ :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-227.expected b/clients/tests/test-client.check-on-disk/test_004-227.expected
new file mode 100644
index 0000000000..306e5d92d2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-227.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:975:test_004()/227
+cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 1022 bytes
+>>>
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-228.expected b/clients/tests/test-client.check-on-disk/test_004-228.expected
new file mode 100644
index 0000000000..4391a7eb03
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-228.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:975:test_004()/228
+cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1070 bytes
+>>>
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:** :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-229.expected b/clients/tests/test-client.check-on-disk/test_004-229.expected
new file mode 100644
index 0000000000..655110eac4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-229.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:977:test_004()/229
+cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 255 bytes
+>>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-230.expected b/clients/tests/test-client.check-on-disk/test_004-230.expected
new file mode 100644
index 0000000000..2be9ecb875
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-230.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:977:test_004()/230
+cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 267 bytes
+>>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-231.expected b/clients/tests/test-client.check-on-disk/test_004-231.expected
new file mode 100644
index 0000000000..8dd9c61e53
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-231.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:979:test_004()/231
+cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 49 bytes
+>>>
+ :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-232.expected b/clients/tests/test-client.check-on-disk/test_004-232.expected
new file mode 100644
index 0000000000..440043b530
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-232.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:979:test_004()/232
+cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 58 bytes
+>>>
+ :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-233.expected b/clients/tests/test-client.check-on-disk/test_004-233.expected
new file mode 100644
index 0000000000..dcece1275c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-233.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:982:test_004()/233
+cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 255 bytes
+>>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-234.expected b/clients/tests/test-client.check-on-disk/test_004-234.expected
new file mode 100644
index 0000000000..ca24233dcb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-234.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:982:test_004()/234
+cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 267 bytes
+>>>
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-235.expected b/clients/tests/test-client.check-on-disk/test_004-235.expected
new file mode 100644
index 0000000000..e13b008d0d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-235.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:984:test_004()/235
+cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 1164 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+CAPABILITIES:no:unknown:no:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-236.expected b/clients/tests/test-client.check-on-disk/test_004-236.expected
new file mode 100644
index 0000000000..b35e6f1e42
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-236.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:984:test_004()/236
+cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1207 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+CAPABILITIES:nie:nieznane:nie:nie
+WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
+AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-237.expected b/clients/tests/test-client.check-on-disk/test_004-237.expected
new file mode 100644
index 0000000000..b7f4bcf277
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-237.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:986:test_004()/237
+cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 446 bytes
+>>>
+wlan0
+wifi
+13\:E0\:74\:85\:7C\:D9
+0
+20 (unavailable)
+con-vpn-1
+/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-238.expected b/clients/tests/test-client.check-on-disk/test_004-238.expected
new file mode 100644
index 0000000000..dd78d13094
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-238.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:986:test_004()/238
+cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 447 bytes
+>>>
+wlan0
+wifi
+13\:E0\:74\:85\:7C\:D9
+0
+20 (niedostępne)
+con-vpn-1
+/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-239.expected b/clients/tests/test-client.check-on-disk/test_004-239.expected
new file mode 100644
index 0000000000..714add3ef7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-239.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:988:test_004()/239
+cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 1164 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+CAPABILITIES:no:unknown:no:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1 WPA2
+AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-240.expected b/clients/tests/test-client.check-on-disk/test_004-240.expected
new file mode 100644
index 0000000000..b246d9a043
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-240.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:988:test_004()/240
+cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1207 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+CAPABILITIES:nie:nieznane:nie:nie
+WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
+AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1 WPA2
+AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
+CONNECTIONS:/org/freedesktop/NetworkManager/Settings/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-241.expected b/clients/tests/test-client.check-on-disk/test_004-241.expected
new file mode 100644
index 0000000000..6ab04ae756
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-241.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:970:test_004()/241
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 1634 bytes
+>>>
+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-242.expected b/clients/tests/test-client.check-on-disk/test_004-242.expected
new file mode 100644
index 0000000000..bb7760a4ff
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-242.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:970:test_004()/242
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1682 bytes
+>>>
+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-243.expected b/clients/tests/test-client.check-on-disk/test_004-243.expected
new file mode 100644
index 0000000000..f1c52313a3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-243.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:972:test_004()/243
+cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 486 bytes
+>>>
+ :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-244.expected b/clients/tests/test-client.check-on-disk/test_004-244.expected
new file mode 100644
index 0000000000..c3e0fcddef
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-244.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:972:test_004()/244
+cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 522 bytes
+>>>
+ :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-245.expected b/clients/tests/test-client.check-on-disk/test_004-245.expected
new file mode 100644
index 0000000000..9901f2bd95
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-245.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:975:test_004()/245
+cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 1634 bytes
+>>>
+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-246.expected b/clients/tests/test-client.check-on-disk/test_004-246.expected
new file mode 100644
index 0000000000..7b4ca1c3ce
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-246.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:975:test_004()/246
+cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1682 bytes
+>>>
+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-247.expected b/clients/tests/test-client.check-on-disk/test_004-247.expected
new file mode 100644
index 0000000000..1263cd213d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-247.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:977:test_004()/247
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 408 bytes
+>>>
+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-248.expected b/clients/tests/test-client.check-on-disk/test_004-248.expected
new file mode 100644
index 0000000000..e0ec0c297d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-248.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:977:test_004()/248
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 420 bytes
+>>>
+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-249.expected b/clients/tests/test-client.check-on-disk/test_004-249.expected
new file mode 100644
index 0000000000..de069ea52e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-249.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:979:test_004()/249
+cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 121 bytes
+>>>
+ :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-250.expected b/clients/tests/test-client.check-on-disk/test_004-250.expected
new file mode 100644
index 0000000000..19b3582c5c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-250.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:979:test_004()/250
+cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 130 bytes
+>>>
+ :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-251.expected b/clients/tests/test-client.check-on-disk/test_004-251.expected
new file mode 100644
index 0000000000..2ed951fb9e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-251.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:982:test_004()/251
+cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 408 bytes
+>>>
+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-252.expected b/clients/tests/test-client.check-on-disk/test_004-252.expected
new file mode 100644
index 0000000000..d35cdd3a8f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-252.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:982:test_004()/252
+cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 420 bytes
+>>>
+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-253.expected b/clients/tests/test-client.check-on-disk/test_004-253.expected
new file mode 100644
index 0000000000..1615f87ada
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-253.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:984:test_004()/253
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 1407 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+CAPABILITIES:no:unknown:no:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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-254.expected b/clients/tests/test-client.check-on-disk/test_004-254.expected
new file mode 100644
index 0000000000..01a7767ece
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-254.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:984:test_004()/254
+cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1450 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+CAPABILITIES:nie:nieznane:nie:nie
+WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
+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-255.expected b/clients/tests/test-client.check-on-disk/test_004-255.expected
new file mode 100644
index 0000000000..f409fff9cb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-255.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:986:test_004()/255
+cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 446 bytes
+>>>
+wlan0
+wifi
+13\:E0\:74\:85\:7C\:D9
+0
+20 (unavailable)
+con-vpn-1
+/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-256.expected b/clients/tests/test-client.check-on-disk/test_004-256.expected
new file mode 100644
index 0000000000..c29a93b849
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-256.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:986:test_004()/256
+cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 447 bytes
+>>>
+wlan0
+wifi
+13\:E0\:74\:85\:7C\:D9
+0
+20 (niedostępne)
+con-vpn-1
+/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
+IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-257.expected b/clients/tests/test-client.check-on-disk/test_004-257.expected
new file mode 100644
index 0000000000..8858c7ed49
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-257.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:988:test_004()/257
+cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 1407 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+CAPABILITIES:no:unknown:no:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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-258.expected b/clients/tests/test-client.check-on-disk/test_004-258.expected
new file mode 100644
index 0000000000..f56c1906be
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-258.expected
@@ -0,0 +1,23 @@
+location: clients/tests/test-client.py:988:test_004()/258
+cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1450 bytes
+>>>
+GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (niedostępne):0 (Nie podano przyczyny):/sys/devices/virtual/wlan0::nie:tak:tak:nie:nie::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:nieznane
+CAPABILITIES:nie:nieznane:nie:nie
+WIFI-PROPERTIES:tak:tak:tak:tak:tak:tak:tak:nieznane:nieznane
+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-259.expected b/clients/tests/test-client.check-on-disk/test_004-259.expected
new file mode 100644
index 0000000000..b37abdfd4c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-259.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:970:test_004()/259
+cmd: $NMCLI --mode multiline -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 3722 bytes
+>>>
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-260.expected b/clients/tests/test-client.check-on-disk/test_004-260.expected
new file mode 100644
index 0000000000..32e566a937
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-260.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:970:test_004()/260
+cmd: $NMCLI --mode multiline -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3770 bytes
+>>>
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-261.expected b/clients/tests/test-client.check-on-disk/test_004-261.expected
new file mode 100644
index 0000000000..0caaf74e35
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-261.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:972:test_004()/261
+cmd: $NMCLI --mode multiline -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 1478 bytes
+>>>
+IN-USE:
+SSID: wlan1-ap-4
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+
+
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+IN-USE:
+SSID: wlan0-ap-1
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+IN-USE:
+SSID: wlan0-ap-3
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-262.expected b/clients/tests/test-client.check-on-disk/test_004-262.expected
new file mode 100644
index 0000000000..0abca79ec9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-262.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:972:test_004()/262
+cmd: $NMCLI --mode multiline -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1514 bytes
+>>>
+IN-USE:
+SSID: wlan1-ap-4
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+
+
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+IN-USE:
+SSID: wlan0-ap-1
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+IN-USE:
+SSID: wlan0-ap-3
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-263.expected b/clients/tests/test-client.check-on-disk/test_004-263.expected
new file mode 100644
index 0000000000..3966a9d57a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-263.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:975:test_004()/263
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 3722 bytes
+>>>
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-264.expected b/clients/tests/test-client.check-on-disk/test_004-264.expected
new file mode 100644
index 0000000000..bdd21d8993
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-264.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:975:test_004()/264
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3770 bytes
+>>>
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-265.expected b/clients/tests/test-client.check-on-disk/test_004-265.expected
new file mode 100644
index 0000000000..d3cb3901fd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-265.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:977:test_004()/265
+cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 930 bytes
+>>>
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-266.expected b/clients/tests/test-client.check-on-disk/test_004-266.expected
new file mode 100644
index 0000000000..6e3fc8a1f6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-266.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:977:test_004()/266
+cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 942 bytes
+>>>
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-267.expected b/clients/tests/test-client.check-on-disk/test_004-267.expected
new file mode 100644
index 0000000000..9fc3b18965
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-267.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:979:test_004()/267
+cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 369 bytes
+>>>
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-268.expected b/clients/tests/test-client.check-on-disk/test_004-268.expected
new file mode 100644
index 0000000000..a2eea56094
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-268.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:979:test_004()/268
+cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 378 bytes
+>>>
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-269.expected b/clients/tests/test-client.check-on-disk/test_004-269.expected
new file mode 100644
index 0000000000..8f830e7e4e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-269.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:982:test_004()/269
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 930 bytes
+>>>
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-270.expected b/clients/tests/test-client.check-on-disk/test_004-270.expected
new file mode 100644
index 0000000000..579b623457
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-270.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:982:test_004()/270
+cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 942 bytes
+>>>
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-271.expected b/clients/tests/test-client.check-on-disk/test_004-271.expected
new file mode 100644
index 0000000000..1b29d1dcd6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-271.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:984:test_004()/271
+cmd: $NMCLI --mode multiline -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 4600 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-272.expected b/clients/tests/test-client.check-on-disk/test_004-272.expected
new file mode 100644
index 0000000000..80a931a9d0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-272.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:984:test_004()/272
+cmd: $NMCLI --mode multiline -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4643 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-273.expected b/clients/tests/test-client.check-on-disk/test_004-273.expected
new file mode 100644
index 0000000000..5546afa6f7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-273.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:986:test_004()/273
+cmd: $NMCLI --mode multiline -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 1363 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-274.expected b/clients/tests/test-client.check-on-disk/test_004-274.expected
new file mode 100644
index 0000000000..7a0f9b55b7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-274.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:986:test_004()/274
+cmd: $NMCLI --mode multiline -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1364 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-275.expected b/clients/tests/test-client.check-on-disk/test_004-275.expected
new file mode 100644
index 0000000000..8b52dd9334
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-275.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:988:test_004()/275
+cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 4600 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-276.expected b/clients/tests/test-client.check-on-disk/test_004-276.expected
new file mode 100644
index 0000000000..0a0cf672a7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-276.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:988:test_004()/276
+cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4643 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-277.expected b/clients/tests/test-client.check-on-disk/test_004-277.expected
new file mode 100644
index 0000000000..fd04cf3f38
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-277.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:970:test_004()/277
+cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 4334 bytes
+>>>
+NAME: 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-278.expected b/clients/tests/test-client.check-on-disk/test_004-278.expected
new file mode 100644
index 0000000000..5e6f601c9f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-278.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:970:test_004()/278
+cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4382 bytes
+>>>
+NAME: 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-279.expected b/clients/tests/test-client.check-on-disk/test_004-279.expected
new file mode 100644
index 0000000000..c5e0cce390
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-279.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:972:test_004()/279
+cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 1766 bytes
+>>>
+IN-USE:  
+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-280.expected b/clients/tests/test-client.check-on-disk/test_004-280.expected
new file mode 100644
index 0000000000..86049af445
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-280.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:972:test_004()/280
+cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1802 bytes
+>>>
+IN-USE:  
+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-281.expected b/clients/tests/test-client.check-on-disk/test_004-281.expected
new file mode 100644
index 0000000000..76e7b6addb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-281.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:975:test_004()/281
+cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 4334 bytes
+>>>
+NAME: 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-282.expected b/clients/tests/test-client.check-on-disk/test_004-282.expected
new file mode 100644
index 0000000000..88e0dab9f1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-282.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:975:test_004()/282
+cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4382 bytes
+>>>
+NAME: 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-283.expected b/clients/tests/test-client.check-on-disk/test_004-283.expected
new file mode 100644
index 0000000000..7c38833e88
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-283.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:977:test_004()/283
+cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1083 bytes
+>>>
+NAME: 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-284.expected b/clients/tests/test-client.check-on-disk/test_004-284.expected
new file mode 100644
index 0000000000..daf4a1c6e3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-284.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:977:test_004()/284
+cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1095 bytes
+>>>
+NAME: 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-285.expected b/clients/tests/test-client.check-on-disk/test_004-285.expected
new file mode 100644
index 0000000000..af3304db99
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-285.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:979:test_004()/285
+cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 441 bytes
+>>>
+IN-USE:  
+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-286.expected b/clients/tests/test-client.check-on-disk/test_004-286.expected
new file mode 100644
index 0000000000..e8389e49df
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-286.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:979:test_004()/286
+cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 450 bytes
+>>>
+IN-USE:  
+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-287.expected b/clients/tests/test-client.check-on-disk/test_004-287.expected
new file mode 100644
index 0000000000..8e46f268f0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-287.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:982:test_004()/287
+cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1083 bytes
+>>>
+NAME: 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-288.expected b/clients/tests/test-client.check-on-disk/test_004-288.expected
new file mode 100644
index 0000000000..5852a2f7a2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-288.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:982:test_004()/288
+cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1095 bytes
+>>>
+NAME: 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-289.expected b/clients/tests/test-client.check-on-disk/test_004-289.expected
new file mode 100644
index 0000000000..f3ce7b56c9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-289.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:984:test_004()/289
+cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 4816 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+AP[1].IN-USE:  
+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-290.expected b/clients/tests/test-client.check-on-disk/test_004-290.expected
new file mode 100644
index 0000000000..4fe20920f2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-290.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:984:test_004()/290
+cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4859 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+AP[1].IN-USE:  
+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-291.expected b/clients/tests/test-client.check-on-disk/test_004-291.expected
new file mode 100644
index 0000000000..af475cc63a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-291.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:986:test_004()/291
+cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 1363 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-292.expected b/clients/tests/test-client.check-on-disk/test_004-292.expected
new file mode 100644
index 0000000000..a4d6a20d25
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-292.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:986:test_004()/292
+cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1364 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-293.expected b/clients/tests/test-client.check-on-disk/test_004-293.expected
new file mode 100644
index 0000000000..d447e3ca00
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-293.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:988:test_004()/293
+cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 4816 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+AP[1].IN-USE:  
+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-294.expected b/clients/tests/test-client.check-on-disk/test_004-294.expected
new file mode 100644
index 0000000000..dd30287a5d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-294.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:988:test_004()/294
+cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4859 bytes
+>>>
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+AP[1].IN-USE:  
+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-295.expected b/clients/tests/test-client.check-on-disk/test_004-295.expected
new file mode 100644
index 0000000000..16942ca50a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-295.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:970:test_004()/295
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 4678 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-296.expected b/clients/tests/test-client.check-on-disk/test_004-296.expected
new file mode 100644
index 0000000000..ba71072ebf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-296.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:970:test_004()/296
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4744 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-297.expected b/clients/tests/test-client.check-on-disk/test_004-297.expected
new file mode 100644
index 0000000000..ed1c82a43b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-297.expected
@@ -0,0 +1,59 @@
+location: clients/tests/test-client.py:972:test_004()/297
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 2434 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+IN-USE:
+SSID: wlan1-ap-4
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IN-USE:
+SSID: wlan0-ap-1
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IN-USE:
+SSID: wlan0-ap-3
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-298.expected b/clients/tests/test-client.check-on-disk/test_004-298.expected
new file mode 100644
index 0000000000..1671d9611d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-298.expected
@@ -0,0 +1,59 @@
+location: clients/tests/test-client.py:972:test_004()/298
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2488 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+IN-USE:
+SSID: wlan1-ap-4
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IN-USE:
+SSID: wlan0-ap-1
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IN-USE:
+SSID: wlan0-ap-3
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-299.expected b/clients/tests/test-client.check-on-disk/test_004-299.expected
new file mode 100644
index 0000000000..dd3649e511
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-299.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:975:test_004()/299
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 4678 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-300.expected b/clients/tests/test-client.check-on-disk/test_004-300.expected
new file mode 100644
index 0000000000..aba27deb65
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-300.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:975:test_004()/300
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4744 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+NAME: AP[1]
+SSID: wlan1-ap-4
+SSID-HEX: 776C616E312D61702D34
+BSSID: 94:2B:E8:F6:D2:86
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 48
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan1
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/4
+-------------------------------------------------------------------------------
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+NAME: AP[2]
+SSID: wlan0-ap-1
+SSID-HEX: 776C616E302D61702D31
+BSSID: 61:95:77:AC:1E:4C
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 81
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/1
+-------------------------------------------------------------------------------
+NAME: AP[3]
+SSID: wlan0-ap-3
+SSID-HEX: 776C616E302D61702D33
+BSSID: 9B:F6:B7:EC:97:76
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 55
+BARS: **
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/3
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-301.expected b/clients/tests/test-client.check-on-disk/test_004-301.expected
new file mode 100644
index 0000000000..bb19f4c0a5
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-301.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:977:test_004()/301
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1222 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-302.expected b/clients/tests/test-client.check-on-disk/test_004-302.expected
new file mode 100644
index 0000000000..8e28c37900
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-302.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:977:test_004()/302
+cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1240 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-303.expected b/clients/tests/test-client.check-on-disk/test_004-303.expected
new file mode 100644
index 0000000000..8a64ec9409
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-303.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:979:test_004()/303
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 661 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infra
+CHAN: 1
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-304.expected b/clients/tests/test-client.check-on-disk/test_004-304.expected
new file mode 100644
index 0000000000..25268c8ec0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-304.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:979:test_004()/304
+cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 676 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+IN-USE:
+SSID: wlan0-ap-2
+MODE: Infrastruktura
+CHAN: 1
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-305.expected b/clients/tests/test-client.check-on-disk/test_004-305.expected
new file mode 100644
index 0000000000..a64949ef8f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-305.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:982:test_004()/305
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1222 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infra
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mbit/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: no
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-306.expected b/clients/tests/test-client.check-on-disk/test_004-306.expected
new file mode 100644
index 0000000000..de328b98b0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-306.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:982:test_004()/306
+cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1240 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: AP[1]
+SSID: wlan0-ap-2
+SSID-HEX: 776C616E302D61702D32
+BSSID: C0:E2:BE:E8:EF:B6
+MODE: Infrastruktura
+CHAN: 1
+FREQ: 2412 MHz
+RATE: 54 Mb/s
+SIGNAL: 92
+BARS: ****
+SECURITY: WPA1 WPA2
+WPA-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS: pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE: wlan0
+ACTIVE: nie
+IN-USE:
+DBUS-PATH: /org/freedesktop/NetworkManager/AccessPoint/2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-307.expected b/clients/tests/test-client.check-on-disk/test_004-307.expected
new file mode 100644
index 0000000000..e0d952ae71
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-307.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:984:test_004()/307
+cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 5691 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-308.expected b/clients/tests/test-client.check-on-disk/test_004-308.expected
new file mode 100644
index 0000000000..a9c0e91fdd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-308.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:984:test_004()/308
+cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5741 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-309.expected b/clients/tests/test-client.check-on-disk/test_004-309.expected
new file mode 100644
index 0000000000..010b3a534c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-309.expected
@@ -0,0 +1,48 @@
+location: clients/tests/test-client.py:986:test_004()/309
+cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 2294 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-310.expected b/clients/tests/test-client.check-on-disk/test_004-310.expected
new file mode 100644
index 0000000000..0c83622101
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-310.expected
@@ -0,0 +1,48 @@
+location: clients/tests/test-client.py:986:test_004()/310
+cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2302 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (niedostępne)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-311.expected b/clients/tests/test-client.check-on-disk/test_004-311.expected
new file mode 100644
index 0000000000..9dcf1837ef
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-311.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:988:test_004()/311
+cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 5691 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infra
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mbit/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infra
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mbit/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infra
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mbit/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-312.expected b/clients/tests/test-client.check-on-disk/test_004-312.expected
new file mode 100644
index 0000000000..3d65693d6b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-312.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:988:test_004()/312
+cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5741 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:
+AP[1].SSID: wlan0-ap-2
+AP[1].MODE: Infrastruktura
+AP[1].CHAN: 1
+AP[1].RATE: 54 Mb/s
+AP[1].SIGNAL: 92
+AP[1].BARS: ****
+AP[1].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:
+AP[2].SSID: wlan0-ap-1
+AP[2].MODE: Infrastruktura
+AP[2].CHAN: 1
+AP[2].RATE: 54 Mb/s
+AP[2].SIGNAL: 81
+AP[2].BARS: ****
+AP[2].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:
+AP[3].SSID: wlan0-ap-3
+AP[3].MODE: Infrastruktura
+AP[3].CHAN: 1
+AP[3].RATE: 54 Mb/s
+AP[3].SIGNAL: 55
+AP[3].BARS: **
+AP[3].SECURITY: WPA1 WPA2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5
+-------------------------------------------------------------------------------
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-313.expected b/clients/tests/test-client.check-on-disk/test_004-313.expected
new file mode 100644
index 0000000000..624e23531f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-313.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:970:test_004()/313
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 5290 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+NAME: 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-314.expected b/clients/tests/test-client.check-on-disk/test_004-314.expected
new file mode 100644
index 0000000000..c0f9de9e67
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-314.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:970:test_004()/314
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5356 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+NAME: 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-315.expected b/clients/tests/test-client.check-on-disk/test_004-315.expected
new file mode 100644
index 0000000000..63042e95ed
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-315.expected
@@ -0,0 +1,59 @@
+location: clients/tests/test-client.py:972:test_004()/315
+cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 2722 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+IN-USE:  
+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-316.expected b/clients/tests/test-client.check-on-disk/test_004-316.expected
new file mode 100644
index 0000000000..aade67b6f6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-316.expected
@@ -0,0 +1,59 @@
+location: clients/tests/test-client.py:972:test_004()/316
+cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2776 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+IN-USE:  
+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-317.expected b/clients/tests/test-client.check-on-disk/test_004-317.expected
new file mode 100644
index 0000000000..b1e063f190
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-317.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:975:test_004()/317
+cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 5290 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan1)
+===============================================================================
+NAME: 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-318.expected b/clients/tests/test-client.check-on-disk/test_004-318.expected
new file mode 100644
index 0000000000..3a18cbbaff
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-318.expected
@@ -0,0 +1,95 @@
+location: clients/tests/test-client.py:975:test_004()/318
+cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5356 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan1)
+===============================================================================
+NAME: 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-319.expected b/clients/tests/test-client.check-on-disk/test_004-319.expected
new file mode 100644
index 0000000000..91cb18f2cb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-319.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:977:test_004()/319
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1375 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: 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-320.expected b/clients/tests/test-client.check-on-disk/test_004-320.expected
new file mode 100644
index 0000000000..c991d03d82
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-320.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:977:test_004()/320
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1393 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: 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-321.expected b/clients/tests/test-client.check-on-disk/test_004-321.expected
new file mode 100644
index 0000000000..46366a0053
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-321.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:979:test_004()/321
+cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 733 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+IN-USE:  
+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-322.expected b/clients/tests/test-client.check-on-disk/test_004-322.expected
new file mode 100644
index 0000000000..bdcba65b75
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-322.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:979:test_004()/322
+cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 748 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+IN-USE:  
+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-323.expected b/clients/tests/test-client.check-on-disk/test_004-323.expected
new file mode 100644
index 0000000000..6b5ebaa59f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-323.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:982:test_004()/323
+cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 1375 bytes
+>>>
+===============================================================================
+ Wi-Fi scan list (wlan0)
+===============================================================================
+NAME: 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-324.expected b/clients/tests/test-client.check-on-disk/test_004-324.expected
new file mode 100644
index 0000000000..d0109d9ad1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-324.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:982:test_004()/324
+cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1393 bytes
+>>>
+===============================================================================
+ Lista skanowania sieci Wi-Fi (wlan0)
+===============================================================================
+NAME: 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-325.expected b/clients/tests/test-client.check-on-disk/test_004-325.expected
new file mode 100644
index 0000000000..ce69bfbef4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-325.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:984:test_004()/325
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 5907 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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-326.expected b/clients/tests/test-client.check-on-disk/test_004-326.expected
new file mode 100644
index 0000000000..146e5f157d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-326.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:984:test_004()/326
+cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5957 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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-327.expected b/clients/tests/test-client.check-on-disk/test_004-327.expected
new file mode 100644
index 0000000000..7cc536f099
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-327.expected
@@ -0,0 +1,48 @@
+location: clients/tests/test-client.py:986:test_004()/327
+cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 2294 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (unavailable)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-328.expected b/clients/tests/test-client.check-on-disk/test_004-328.expected
new file mode 100644
index 0000000000..7265a792bb
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-328.expected
@@ -0,0 +1,48 @@
+location: clients/tests/test-client.py:986:test_004()/328
+cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2302 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+-------------------------------------------------------------------------------
+GENERAL.TYPE: wifi
+-------------------------------------------------------------------------------
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+-------------------------------------------------------------------------------
+GENERAL.MTU: 0
+-------------------------------------------------------------------------------
+GENERAL.STATE: 20 (niedostępne)
+-------------------------------------------------------------------------------
+GENERAL.CONNECTION: con-vpn-1
+-------------------------------------------------------------------------------
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+-------------------------------------------------------------------------------
+IP4.ADDRESS[1]: 192.168.228.18/32
+IP4.ADDRESS[2]: 192.168.209.179/25
+IP4.GATEWAY: 192.168.41.120
+IP4.DOMAIN[1]: sear4.foo2.bar
+IP4.DOMAIN[2]: sear4.fo.x.y
+IP4.DOMAIN[3]: sear4.foo1.bar
+IP4.DOMAIN[4]: sear4.foo4.bar
+IP4.DOMAIN[5]: sear4.fo.o.bar
+IP4.WINS[1]: 192.168.120.79
+-------------------------------------------------------------------------------
+IP6.GATEWAY: --
+IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]: sear6.foo2.bar
+IP6.DOMAIN[2]: sear6.foo1.bar
+IP6.DOMAIN[3]: sear6.fo.x.y
+IP6.DOMAIN[4]: sear6.fo.o.bar
+IP6.DOMAIN[5]: sear6.foo3.bar
+IP6.DOMAIN[6]: sear6.foo4.bar
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-329.expected b/clients/tests/test-client.check-on-disk/test_004-329.expected
new file mode 100644
index 0000000000..faed570e81
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-329.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:988:test_004()/329
+cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 5907 bytes
+>>>
+===============================================================================
+ Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (unavailable)
+GENERAL.REASON: 0 (No reason given)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: no
+GENERAL.NM-MANAGED: yes
+GENERAL.AUTOCONNECT: yes
+GENERAL.FIRMWARE-MISSING: no
+GENERAL.NM-PLUGIN-MISSING: no
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: unknown
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: no
+CAPABILITIES.SPEED: unknown
+CAPABILITIES.IS-SOFTWARE: no
+CAPABILITIES.SRIOV: no
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: yes
+WIFI-PROPERTIES.WPA: yes
+WIFI-PROPERTIES.WPA2: yes
+WIFI-PROPERTIES.TKIP: yes
+WIFI-PROPERTIES.CCMP: yes
+WIFI-PROPERTIES.AP: yes
+WIFI-PROPERTIES.ADHOC: yes
+WIFI-PROPERTIES.2GHZ: unknown
+WIFI-PROPERTIES.5GHZ: unknown
+-------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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-330.expected b/clients/tests/test-client.check-on-disk/test_004-330.expected
new file mode 100644
index 0000000000..2e887975f2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-330.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:988:test_004()/330
+cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 5957 bytes
+>>>
+===============================================================================
+ Informacje o urządzeniu (wlan0)
+===============================================================================
+GENERAL.DEVICE: wlan0
+GENERAL.TYPE: wifi
+GENERAL.NM-TYPE: NMDeviceWifi
+GENERAL.VENDOR: --
+GENERAL.PRODUCT: --
+GENERAL.DRIVER: virtual
+GENERAL.DRIVER-VERSION: --
+GENERAL.FIRMWARE-VERSION: --
+GENERAL.HWADDR: 13:E0:74:85:7C:D9
+GENERAL.MTU: 0
+GENERAL.STATE: 20 (niedostępne)
+GENERAL.REASON: 0 (Nie podano przyczyny)
+GENERAL.UDI: /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE: --
+GENERAL.IS-SOFTWARE: nie
+GENERAL.NM-MANAGED: tak
+GENERAL.AUTOCONNECT: tak
+GENERAL.FIRMWARE-MISSING: nie
+GENERAL.NM-PLUGIN-MISSING: nie
+GENERAL.PHYS-PORT-ID: --
+GENERAL.CONNECTION: con-vpn-1
+GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED: nieznane
+-------------------------------------------------------------------------------
+CAPABILITIES.CARRIER-DETECT: nie
+CAPABILITIES.SPEED: nieznane
+CAPABILITIES.IS-SOFTWARE: nie
+CAPABILITIES.SRIOV: nie
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP: tak
+WIFI-PROPERTIES.WPA: tak
+WIFI-PROPERTIES.WPA2: tak
+WIFI-PROPERTIES.TKIP: tak
+WIFI-PROPERTIES.CCMP: tak
+WIFI-PROPERTIES.AP: tak
+WIFI-PROPERTIES.ADHOC: tak
+WIFI-PROPERTIES.2GHZ: nieznane
+WIFI-PROPERTIES.5GHZ: nieznane
+-------------------------------------------------------------------------------
+AP[1].IN-USE:  
+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-331.expected b/clients/tests/test-client.check-on-disk/test_004-331.expected
new file mode 100644
index 0000000000..a9fe39d737
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-331.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:970:test_004()/331
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 1470 bytes
+>>>
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+NAME:AP[2]
+SSID:wlan0-ap-1
+SSID-HEX:776C616E302D61702D31
+BSSID:61:95:77:AC:1E:4C
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
+NAME:AP[3]
+SSID:wlan0-ap-3
+SSID-HEX:776C616E302D61702D33
+BSSID:9B:F6:B7:EC:97:76
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-332.expected b/clients/tests/test-client.check-on-disk/test_004-332.expected
new file mode 100644
index 0000000000..baec97cd69
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-332.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:970:test_004()/332
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1518 bytes
+>>>
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+NAME:AP[2]
+SSID:wlan0-ap-1
+SSID-HEX:776C616E302D61702D31
+BSSID:61:95:77:AC:1E:4C
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
+NAME:AP[3]
+SSID:wlan0-ap-3
+SSID-HEX:776C616E302D61702D33
+BSSID:9B:F6:B7:EC:97:76
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-333.expected b/clients/tests/test-client.check-on-disk/test_004-333.expected
new file mode 100644
index 0000000000..321b00247c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-333.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:972:test_004()/333
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 390 bytes
+>>>
+IN-USE:
+SSID:wlan1-ap-4
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+
+
+IN-USE:
+SSID:wlan0-ap-2
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+IN-USE:
+SSID:wlan0-ap-1
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+IN-USE:
+SSID:wlan0-ap-3
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-334.expected b/clients/tests/test-client.check-on-disk/test_004-334.expected
new file mode 100644
index 0000000000..acde12a35b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-334.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:972:test_004()/334
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 426 bytes
+>>>
+IN-USE:
+SSID:wlan1-ap-4
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+
+
+IN-USE:
+SSID:wlan0-ap-2
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+IN-USE:
+SSID:wlan0-ap-1
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+IN-USE:
+SSID:wlan0-ap-3
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-335.expected b/clients/tests/test-client.check-on-disk/test_004-335.expected
new file mode 100644
index 0000000000..cb2d79d36b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-335.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:975:test_004()/335
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 1470 bytes
+>>>
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+NAME:AP[2]
+SSID:wlan0-ap-1
+SSID-HEX:776C616E302D61702D31
+BSSID:61:95:77:AC:1E:4C
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
+NAME:AP[3]
+SSID:wlan0-ap-3
+SSID-HEX:776C616E302D61702D33
+BSSID:9B:F6:B7:EC:97:76
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-336.expected b/clients/tests/test-client.check-on-disk/test_004-336.expected
new file mode 100644
index 0000000000..27f21d96ab
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-336.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:975:test_004()/336
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1518 bytes
+>>>
+NAME:AP[1]
+SSID:wlan1-ap-4
+SSID-HEX:776C616E312D61702D34
+BSSID:94:2B:E8:F6:D2:86
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:48
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan1
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
+
+
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+NAME:AP[2]
+SSID:wlan0-ap-1
+SSID-HEX:776C616E302D61702D31
+BSSID:61:95:77:AC:1E:4C
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:81
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/1
+NAME:AP[3]
+SSID:wlan0-ap-3
+SSID-HEX:776C616E302D61702D33
+BSSID:9B:F6:B7:EC:97:76
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:55
+BARS:**
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/3
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-337.expected b/clients/tests/test-client.check-on-disk/test_004-337.expected
new file mode 100644
index 0000000000..0ada8160d7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-337.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:977:test_004()/337
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 367 bytes
+>>>
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-338.expected b/clients/tests/test-client.check-on-disk/test_004-338.expected
new file mode 100644
index 0000000000..5548fecace
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-338.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:977:test_004()/338
+cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 379 bytes
+>>>
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-339.expected b/clients/tests/test-client.check-on-disk/test_004-339.expected
new file mode 100644
index 0000000000..009425d49a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-339.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:979:test_004()/339
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 97 bytes
+>>>
+IN-USE:
+SSID:wlan0-ap-2
+MODE:Infra
+CHAN:1
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-340.expected b/clients/tests/test-client.check-on-disk/test_004-340.expected
new file mode 100644
index 0000000000..e372797eed
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-340.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:979:test_004()/340
+cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 106 bytes
+>>>
+IN-USE:
+SSID:wlan0-ap-2
+MODE:Infrastruktura
+CHAN:1
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-341.expected b/clients/tests/test-client.check-on-disk/test_004-341.expected
new file mode 100644
index 0000000000..450e274aff
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-341.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:982:test_004()/341
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 367 bytes
+>>>
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infra
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mbit/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:no
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-342.expected b/clients/tests/test-client.check-on-disk/test_004-342.expected
new file mode 100644
index 0000000000..fc980eed52
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-342.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:982:test_004()/342
+cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 379 bytes
+>>>
+NAME:AP[1]
+SSID:wlan0-ap-2
+SSID-HEX:776C616E302D61702D32
+BSSID:C0:E2:BE:E8:EF:B6
+MODE:Infrastruktura
+CHAN:1
+FREQ:2412 MHz
+RATE:54 Mb/s
+SIGNAL:92
+BARS:****
+SECURITY:WPA1 WPA2
+WPA-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+RSN-FLAGS:pair_tkip pair_ccmp group_tkip group_ccmp psk
+DEVICE:wlan0
+ACTIVE:nie
+IN-USE:
+DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-343.expected b/clients/tests/test-client.check-on-disk/test_004-343.expected
new file mode 100644
index 0000000000..7d054d88f0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-343.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:984:test_004()/343
+cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 2467 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-344.expected b/clients/tests/test-client.check-on-disk/test_004-344.expected
new file mode 100644
index 0000000000..cc4ac7be7c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-344.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:984:test_004()/344
+cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2510 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-345.expected b/clients/tests/test-client.check-on-disk/test_004-345.expected
new file mode 100644
index 0000000000..bb74f48027
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-345.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:986:test_004()/345
+cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 739 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-346.expected b/clients/tests/test-client.check-on-disk/test_004-346.expected
new file mode 100644
index 0000000000..b728a32e71
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-346.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:986:test_004()/346
+cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 740 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-347.expected b/clients/tests/test-client.check-on-disk/test_004-347.expected
new file mode 100644
index 0000000000..07b0c58671
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-347.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:988:test_004()/347
+cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 2467 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-348.expected b/clients/tests/test-client.check-on-disk/test_004-348.expected
new file mode 100644
index 0000000000..370e51b90a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-348.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:988:test_004()/348
+cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2510 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE:
+AP[1].SSID:wlan0-ap-2
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:92
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE:
+AP[2].SSID:wlan0-ap-1
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:81
+AP[2].BARS:****
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE:
+AP[3].SSID:wlan0-ap-3
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:55
+AP[3].BARS:**
+AP[3].SECURITY:WPA1 WPA2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+DHCP4.OPTION[1]:dhcp-4-opt-0 = val-0
+DHCP4.OPTION[2]:dhcp-4-opt-2 = val-2
+DHCP4.OPTION[3]:dhcp-4-opt-4 = val-4
+DHCP4.OPTION[4]:dhcp-4-opt-7 = val-7
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
+DHCP6.OPTION[2]:dhcp-6-opt-2 = val-2
+DHCP6.OPTION[3]:dhcp-6-opt-3 = val-3
+DHCP6.OPTION[4]:dhcp-6-opt-4 = val-4
+DHCP6.OPTION[5]:dhcp-6-opt-5 = val-5
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-349.expected b/clients/tests/test-client.check-on-disk/test_004-349.expected
new file mode 100644
index 0000000000..d7cbbb939c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-349.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:970:test_004()/349
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
+lang: C
+returncode: 0
+stdout: 2082 bytes
+>>>
+NAME: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-350.expected b/clients/tests/test-client.check-on-disk/test_004-350.expected
new file mode 100644
index 0000000000..ea73f413a0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-350.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:970:test_004()/350
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2130 bytes
+>>>
+NAME: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-351.expected b/clients/tests/test-client.check-on-disk/test_004-351.expected
new file mode 100644
index 0000000000..c12141fd9f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-351.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:972:test_004()/351
+cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
+lang: C
+returncode: 0
+stdout: 678 bytes
+>>>
+IN-USE: 
+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-352.expected b/clients/tests/test-client.check-on-disk/test_004-352.expected
new file mode 100644
index 0000000000..8bae27726a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-352.expected
@@ -0,0 +1,46 @@
+location: clients/tests/test-client.py:972:test_004()/352
+cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 714 bytes
+>>>
+IN-USE: 
+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-353.expected b/clients/tests/test-client.check-on-disk/test_004-353.expected
new file mode 100644
index 0000000000..71df9d3726
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-353.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:975:test_004()/353
+cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: C
+returncode: 0
+stdout: 2082 bytes
+>>>
+NAME: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-354.expected b/clients/tests/test-client.check-on-disk/test_004-354.expected
new file mode 100644
index 0000000000..e173a145b8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-354.expected
@@ -0,0 +1,82 @@
+location: clients/tests/test-client.py:975:test_004()/354
+cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2130 bytes
+>>>
+NAME: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-355.expected b/clients/tests/test-client.check-on-disk/test_004-355.expected
new file mode 100644
index 0000000000..37dbddd68f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-355.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:977:test_004()/355
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 520 bytes
+>>>
+NAME: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-356.expected b/clients/tests/test-client.check-on-disk/test_004-356.expected
new file mode 100644
index 0000000000..91d824dd6f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-356.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:977:test_004()/356
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 532 bytes
+>>>
+NAME: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-357.expected b/clients/tests/test-client.check-on-disk/test_004-357.expected
new file mode 100644
index 0000000000..cbf1792f1b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-357.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:979:test_004()/357
+cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 169 bytes
+>>>
+IN-USE: 
+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-358.expected b/clients/tests/test-client.check-on-disk/test_004-358.expected
new file mode 100644
index 0000000000..d91e0209ea
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-358.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:979:test_004()/358
+cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 178 bytes
+>>>
+IN-USE: 
+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-359.expected b/clients/tests/test-client.check-on-disk/test_004-359.expected
new file mode 100644
index 0000000000..04208d5464
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-359.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:982:test_004()/359
+cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: C
+returncode: 0
+stdout: 520 bytes
+>>>
+NAME: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-360.expected b/clients/tests/test-client.check-on-disk/test_004-360.expected
new file mode 100644
index 0000000000..6ef9b446f9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-360.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:982:test_004()/360
+cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 532 bytes
+>>>
+NAME: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-361.expected b/clients/tests/test-client.check-on-disk/test_004-361.expected
new file mode 100644
index 0000000000..2e8fdb364a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-361.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:984:test_004()/361
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
+lang: C
+returncode: 0
+stdout: 2683 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE: 
+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-362.expected b/clients/tests/test-client.check-on-disk/test_004-362.expected
new file mode 100644
index 0000000000..a8096a9b23
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-362.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:984:test_004()/362
+cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2726 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE: 
+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-363.expected b/clients/tests/test-client.check-on-disk/test_004-363.expected
new file mode 100644
index 0000000000..33c98fd478
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-363.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:986:test_004()/363
+cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
+lang: C
+returncode: 0
+stdout: 739 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-364.expected b/clients/tests/test-client.check-on-disk/test_004-364.expected
new file mode 100644
index 0000000000..9e406882a3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-364.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:986:test_004()/364
+cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 740 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+IP4.ADDRESS[1]:192.168.228.18/32
+IP4.ADDRESS[2]:192.168.209.179/25
+IP4.GATEWAY:192.168.41.120
+IP4.DOMAIN[1]:sear4.foo2.bar
+IP4.DOMAIN[2]:sear4.fo.x.y
+IP4.DOMAIN[3]:sear4.foo1.bar
+IP4.DOMAIN[4]:sear4.foo4.bar
+IP4.DOMAIN[5]:sear4.fo.o.bar
+IP4.WINS[1]:192.168.120.79
+IP6.GATEWAY:
+IP6.ROUTE[1]:dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086
+IP6.DOMAIN[1]:sear6.foo2.bar
+IP6.DOMAIN[2]:sear6.foo1.bar
+IP6.DOMAIN[3]:sear6.fo.x.y
+IP6.DOMAIN[4]:sear6.fo.o.bar
+IP6.DOMAIN[5]:sear6.foo3.bar
+IP6.DOMAIN[6]:sear6.foo4.bar
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-365.expected b/clients/tests/test-client.check-on-disk/test_004-365.expected
new file mode 100644
index 0000000000..a554b0bff4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-365.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:988:test_004()/365
+cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: C
+returncode: 0
+stdout: 2683 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (unavailable)
+GENERAL.REASON:0 (No reason given)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:no
+GENERAL.NM-MANAGED:yes
+GENERAL.AUTOCONNECT:yes
+GENERAL.FIRMWARE-MISSING:no
+GENERAL.NM-PLUGIN-MISSING:no
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:unknown
+CAPABILITIES.CARRIER-DETECT:no
+CAPABILITIES.SPEED:unknown
+CAPABILITIES.IS-SOFTWARE:no
+CAPABILITIES.SRIOV:no
+WIFI-PROPERTIES.WEP:yes
+WIFI-PROPERTIES.WPA:yes
+WIFI-PROPERTIES.WPA2:yes
+WIFI-PROPERTIES.TKIP:yes
+WIFI-PROPERTIES.CCMP:yes
+WIFI-PROPERTIES.AP:yes
+WIFI-PROPERTIES.ADHOC:yes
+WIFI-PROPERTIES.2GHZ:unknown
+WIFI-PROPERTIES.5GHZ:unknown
+AP[1].IN-USE: 
+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-366.expected b/clients/tests/test-client.check-on-disk/test_004-366.expected
new file mode 100644
index 0000000000..311fd8e42c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-366.expected
@@ -0,0 +1,101 @@
+location: clients/tests/test-client.py:988:test_004()/366
+cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2726 bytes
+>>>
+GENERAL.DEVICE:wlan0
+GENERAL.TYPE:wifi
+GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.VENDOR:
+GENERAL.PRODUCT:
+GENERAL.DRIVER:virtual
+GENERAL.DRIVER-VERSION:
+GENERAL.FIRMWARE-VERSION:
+GENERAL.HWADDR:13:E0:74:85:7C:D9
+GENERAL.MTU:0
+GENERAL.STATE:20 (niedostępne)
+GENERAL.REASON:0 (Nie podano przyczyny)
+GENERAL.UDI:/sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:
+GENERAL.IS-SOFTWARE:nie
+GENERAL.NM-MANAGED:tak
+GENERAL.AUTOCONNECT:tak
+GENERAL.FIRMWARE-MISSING:nie
+GENERAL.NM-PLUGIN-MISSING:nie
+GENERAL.PHYS-PORT-ID:
+GENERAL.CONNECTION:con-vpn-1
+GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:nieznane
+CAPABILITIES.CARRIER-DETECT:nie
+CAPABILITIES.SPEED:nieznane
+CAPABILITIES.IS-SOFTWARE:nie
+CAPABILITIES.SRIOV:nie
+WIFI-PROPERTIES.WEP:tak
+WIFI-PROPERTIES.WPA:tak
+WIFI-PROPERTIES.WPA2:tak
+WIFI-PROPERTIES.TKIP:tak
+WIFI-PROPERTIES.CCMP:tak
+WIFI-PROPERTIES.AP:tak
+WIFI-PROPERTIES.ADHOC:tak
+WIFI-PROPERTIES.2GHZ:nieznane
+WIFI-PROPERTIES.5GHZ:nieznane
+AP[1].IN-USE: 
+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 8bca269c9b..b8010bc247 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -235,7 +235,9 @@ class Util:
for fmt in [[],
['--pretty'],
['--terse']]:
- yield mode + fmt
+ for color in [[],
+ ['--color', 'yes']]:
+ yield mode + fmt + color
###############################################################################
@@ -552,6 +554,7 @@ class TestNmcli(NmTestBase):
env['LIBNM_USE_SESSION_BUS'] = '1'
env['LIBNM_USE_NO_UDEV'] = '1'
env['TERM'] = 'linux'
+ env['XDG_CONFIG_HOME'] = PathConfiguration.srcdir()
if fatal_warnings is _DEFAULT_ARG or fatal_warnings:
env['G_DEBUG'] = 'fatal-warnings'