diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-05-24 16:35:54 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-05-24 16:40:27 +0200 |
| commit | bb87c67f10160d10e02f30cbafb4ee47b87073f7 (patch) | |
| tree | b993abffb35507b337b253a79107a707e03c5698 | |
| parent | 869009ab1134784e3af0fb7188f3eecfd0cdca3e (diff) | |
| parent | 41dbf2b9d36d5eae53a594180d5334c134cbe18c (diff) | |
| download | NetworkManager-bb87c67f10160d10e02f30cbafb4ee47b87073f7.tar.gz | |
tests: merge branch 'th/cli-tests'
105 files changed, 2200 insertions, 1336 deletions
diff --git a/Makefile.am b/Makefile.am index b4bd5437e0..cffb524f5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3815,10 +3815,6 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_001-006.expected \ clients/tests/test-client.check-on-disk/test_001-007.expected \ clients/tests/test-client.check-on-disk/test_001-008.expected \ - clients/tests/test-client.check-on-disk/test_001-009.expected \ - clients/tests/test-client.check-on-disk/test_001-010.expected \ - clients/tests/test-client.check-on-disk/test_001-011.expected \ - clients/tests/test-client.check-on-disk/test_001-012.expected \ clients/tests/test-client.check-on-disk/test_002-001.expected \ clients/tests/test-client.check-on-disk/test_002-002.expected \ clients/tests/test-client.check-on-disk/test_002-003.expected \ @@ -3843,18 +3839,6 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_002-022.expected \ clients/tests/test-client.check-on-disk/test_002-023.expected \ clients/tests/test-client.check-on-disk/test_002-024.expected \ - clients/tests/test-client.check-on-disk/test_002-025.expected \ - clients/tests/test-client.check-on-disk/test_002-026.expected \ - clients/tests/test-client.check-on-disk/test_002-027.expected \ - clients/tests/test-client.check-on-disk/test_002-028.expected \ - clients/tests/test-client.check-on-disk/test_002-029.expected \ - clients/tests/test-client.check-on-disk/test_002-030.expected \ - clients/tests/test-client.check-on-disk/test_002-031.expected \ - clients/tests/test-client.check-on-disk/test_002-032.expected \ - clients/tests/test-client.check-on-disk/test_002-033.expected \ - clients/tests/test-client.check-on-disk/test_002-034.expected \ - clients/tests/test-client.check-on-disk/test_002-035.expected \ - clients/tests/test-client.check-on-disk/test_002-036.expected \ clients/tests/test-client.check-on-disk/test_003-001.expected \ clients/tests/test-client.check-on-disk/test_003-002.expected \ clients/tests/test-client.check-on-disk/test_003-003.expected \ @@ -3885,6 +3869,30 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_003-028.expected \ clients/tests/test-client.check-on-disk/test_003-029.expected \ clients/tests/test-client.check-on-disk/test_003-030.expected \ + clients/tests/test-client.check-on-disk/test_003-031.expected \ + clients/tests/test-client.check-on-disk/test_003-032.expected \ + clients/tests/test-client.check-on-disk/test_003-033.expected \ + clients/tests/test-client.check-on-disk/test_003-034.expected \ + clients/tests/test-client.check-on-disk/test_003-035.expected \ + clients/tests/test-client.check-on-disk/test_003-036.expected \ + clients/tests/test-client.check-on-disk/test_003-037.expected \ + clients/tests/test-client.check-on-disk/test_003-038.expected \ + clients/tests/test-client.check-on-disk/test_003-039.expected \ + clients/tests/test-client.check-on-disk/test_003-040.expected \ + clients/tests/test-client.check-on-disk/test_003-041.expected \ + clients/tests/test-client.check-on-disk/test_003-042.expected \ + clients/tests/test-client.check-on-disk/test_003-043.expected \ + clients/tests/test-client.check-on-disk/test_003-044.expected \ + clients/tests/test-client.check-on-disk/test_003-045.expected \ + clients/tests/test-client.check-on-disk/test_003-046.expected \ + clients/tests/test-client.check-on-disk/test_003-047.expected \ + clients/tests/test-client.check-on-disk/test_003-048.expected \ + clients/tests/test-client.check-on-disk/test_003-049.expected \ + clients/tests/test-client.check-on-disk/test_003-050.expected \ + clients/tests/test-client.check-on-disk/test_003-051.expected \ + clients/tests/test-client.check-on-disk/test_003-052.expected \ + clients/tests/test-client.check-on-disk/test_003-053.expected \ + clients/tests/test-client.check-on-disk/test_003-054.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 a6490d2e6a..6132deea3f 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:543:test_001()/1 +location: clients/tests/test-client.py:577: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 03107ea54e..75b8827e3d 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:543:test_001()/2 +location: clients/tests/test-client.py:577: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 5bbd500b4e..b98da49fe7 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,20 +1,13 @@ -location: clients/tests/test-client.py:543:test_001()/3 -cmd: $NMCLI -lang: de_DE.utf8 -returncode: 0 -stdout: 322 bytes +location: clients/tests/test-client.py:579:test_001()/3 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: C +returncode: 10 +stdout: 0 bytes >>> -DNS configuration: - servers: 1.2.3.4 5.6.7.8 - -Rufen Sie »nmcli device show« auf, um vollständige Informationen über bekannte Geräte abzurufen -und »nmcli connection show« für eine Übersicht über aktive Verbindungsprofile. - - -Die Hilfeseiten nmcli(1) und nmcli-examples(5) geben vollständige Aufrufbeschreibungen. <<< -stderr: 0 bytes +stderr: 33 bytes >>> +Error: Device 'wlan0' not found. <<< 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 83f32d5a8f..4b38d92160 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,13 +1,13 @@ -location: clients/tests/test-client.py:545:test_001()/4 +location: clients/tests/test-client.py:579:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: C +lang: pl_PL.UTF-8 returncode: 10 stdout: 0 bytes >>> <<< -stderr: 33 bytes +stderr: 49 bytes >>> -Error: Device 'wlan0' not found. +Błąd: Nie odnaleziono urządzenia „wlan0”. <<< 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 b27c224d16..854fffa450 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,13 +1,13 @@ -location: clients/tests/test-client.py:545:test_001()/5 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: pl_PL.UTF-8 -returncode: 10 -stdout: 0 bytes +location: clients/tests/test-client.py:581:test_001()/5 +cmd: $NMCLI c s +lang: C +returncode: 0 +stdout: 26 bytes >>> +NAME UUID TYPE DEVICE <<< -stderr: 49 bytes +stderr: 0 bytes >>> -Błąd: Nie odnaleziono urządzenia „wlan0”. <<< 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 724e80e1f5..6e65b2b00d 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,13 +1,13 @@ -location: clients/tests/test-client.py:545:test_001()/6 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: de_DE.utf8 -returncode: 10 -stdout: 0 bytes +location: clients/tests/test-client.py:581:test_001()/6 +cmd: $NMCLI c s +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 26 bytes >>> +NAME UUID TYPE DEVICE <<< -stderr: 47 bytes +stderr: 0 bytes >>> -Fehler: Gerät »wlan0« wurde nicht gefunden. <<< 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 56dc92a366..2854fb8a74 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,13 +1,13 @@ -location: clients/tests/test-client.py:547:test_001()/7 -cmd: $NMCLI c s +location: clients/tests/test-client.py:583:test_001()/7 +cmd: $NMCLI bogus s lang: C -returncode: 0 -stdout: 26 bytes +returncode: 2 +stdout: 0 bytes >>> -NAME UUID TYPE DEVICE <<< -stderr: 0 bytes +stderr: 68 bytes >>> +Error: argument 'bogus' not understood. Try passing --help instead. <<< 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 e2da59bd10..40a76d5f79 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,13 +1,13 @@ -location: clients/tests/test-client.py:547:test_001()/8 -cmd: $NMCLI c s +location: clients/tests/test-client.py:583:test_001()/8 +cmd: $NMCLI bogus s lang: pl_PL.UTF-8 -returncode: 0 -stdout: 26 bytes +returncode: 2 +stdout: 0 bytes >>> -NAME UUID TYPE DEVICE <<< -stderr: 0 bytes +stderr: 87 bytes >>> +Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast tego. <<< 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 deleted file mode 100644 index 967df95b2a..0000000000 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ /dev/null @@ -1,13 +0,0 @@ -location: clients/tests/test-client.py:547:test_001()/9 -cmd: $NMCLI c s -lang: de_DE.utf8 -returncode: 0 -stdout: 26 bytes ->>> -NAME UUID TYPE DEVICE - -<<< -stderr: 0 bytes ->>> - -<<< 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 deleted file mode 100644 index 876f8c52c3..0000000000 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ /dev/null @@ -1,13 +0,0 @@ -location: clients/tests/test-client.py:549:test_001()/10 -cmd: $NMCLI bogus s -lang: C -returncode: 2 -stdout: 0 bytes ->>> - -<<< -stderr: 68 bytes ->>> -Error: argument 'bogus' not understood. Try passing --help instead. - -<<< 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 deleted file mode 100644 index 95101af11d..0000000000 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ /dev/null @@ -1,13 +0,0 @@ -location: clients/tests/test-client.py:549:test_001()/11 -cmd: $NMCLI bogus s -lang: pl_PL.UTF-8 -returncode: 2 -stdout: 0 bytes ->>> - -<<< -stderr: 87 bytes ->>> -Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast tego. - -<<< 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 deleted file mode 100644 index f2acfca91d..0000000000 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ /dev/null @@ -1,13 +0,0 @@ -location: clients/tests/test-client.py:549:test_001()/12 -cmd: $NMCLI bogus s -lang: de_DE.utf8 -returncode: 2 -stdout: 0 bytes ->>> - -<<< -stderr: 88 bytes ->>> -Fehler: Argument »bogus« wird nicht verstanden. Versuchen Sie stattdessen »--help«. - -<<< 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 c1f8737afa..b9f7ead5ed 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,11 +1,12 @@ -location: clients/tests/test-client.py:554:test_002()/1 +location: clients/tests/test-client.py:588:test_002()/1 cmd: $NMCLI d lang: C returncode: 0 -stdout: 215 bytes +stdout: 258 bytes >>> DEVICE TYPE STATE CONNECTION eth0 ethernet unavailable -- +eth1 ethernet unavailable -- wlan0 wifi unavailable -- wlan1 wifi unavailable -- wlan1 wifi unavailable -- 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 a05f585c72..7c690db925 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,11 +1,12 @@ -location: clients/tests/test-client.py:554:test_002()/2 +location: clients/tests/test-client.py:588:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 -stdout: 219 bytes +stdout: 263 bytes >>> DEVICE TYPE STATE CONNECTION eth0 ethernet niedostępne -- +eth1 ethernet niedostępne -- wlan0 wifi niedostępne -- wlan1 wifi niedostępne -- wlan1 wifi niedostępne -- 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 bea81cdb74..81392202d6 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,14 +1,15 @@ -location: clients/tests/test-client.py:554:test_002()/3 -cmd: $NMCLI d -lang: de_DE.utf8 +location: clients/tests/test-client.py:590:test_002()/3 +cmd: $NMCLI -f all d +lang: C returncode: 0 -stdout: 239 bytes +stdout: 636 bytes >>> -DEVICE TYPE STATE CONNECTION -eth0 ethernet nicht verfügbar -- -wlan0 wifi nicht verfügbar -- -wlan1 wifi nicht verfügbar -- -wlan1 wifi nicht verfügbar -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 -- -- -- +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< stderr: 0 bytes 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 381bff9996..d5c93d91db 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,14 +1,15 @@ -location: clients/tests/test-client.py:556:test_002()/4 +location: clients/tests/test-client.py:590:test_002()/4 cmd: $NMCLI -f all d -lang: C +lang: pl_PL.UTF-8 returncode: 0 -stdout: 530 bytes +stdout: 641 bytes >>> DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 -- -- -- -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 -- -- -- +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< stderr: 0 bytes 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 9bc51b99b4..3f4cc29238 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,14 +1,36 @@ -location: clients/tests/test-client.py:556:test_002()/5 -cmd: $NMCLI -f all d -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:592:test_002()/5 +cmd: $NMCLI +lang: C returncode: 0 -stdout: 534 bytes +stdout: 621 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 -- -- -- -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +eth0: unavailable + "eth0" + ethernet (virtual), 72:41:AB:90:41:5D, hw + +eth1: unavailable + "eth1" + ethernet (virtual), 1F:E6:D1:E6:1D:53, hw + +wlan0: unavailable + "wlan0" + wifi (virtual), 5A:88:5E:B6:90:40, hw + +wlan1: unavailable + "wlan1" + wifi (virtual), 7C:D4:69:31:67:0B, hw + +wlan1: unavailable + "wlan1" + wifi (virtual), 41:21:6B:F3:C9:4A, hw + +DNS configuration: + servers: 1.2.3.4 5.6.7.8 + +Use "nmcli device show" to get complete information about known devices and +"nmcli connection show" to get an overview on active connection profiles. + +Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details. <<< stderr: 0 bytes 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 f97b23a2a3..0f745fdc3c 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,14 +1,38 @@ -location: clients/tests/test-client.py:556:test_002()/6 -cmd: $NMCLI -f all d -lang: de_DE.utf8 +location: clients/tests/test-client.py:592:test_002()/6 +cmd: $NMCLI +lang: pl_PL.UTF-8 returncode: 0 -stdout: 554 bytes +stdout: 684 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 -- -- -- -wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- +eth0: niedostępne + "eth0" + ethernet (virtual), 72:41:AB:90:41:5D, sprzęt + +eth1: niedostępne + "eth1" + ethernet (virtual), 1F:E6:D1:E6:1D:53, sprzęt + +wlan0: niedostępne + "wlan0" + wifi (virtual), 5A:88:5E:B6:90:40, sprzęt + +wlan1: niedostępne + "wlan1" + wifi (virtual), 7C:D4:69:31:67:0B, sprzęt + +wlan1: niedostępne + "wlan1" + wifi (virtual), 41:21:6B:F3:C9:4A, sprzęt + +DNS configuration: + servers: 1.2.3.4 5.6.7.8 + +Polecenie „nmcli device show” wyświetli pełne informacje o znanych +urządzeniach, a „nmcli connection show” wyświetli przegląd aktywnych +profili połączeń. + +Strony podręcznika nmcli(1) i nmcli-examples(5) zawierają pełne informacje +o użyciu. <<< stderr: 0 bytes 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 5b0e5d81e2..b1a743c125 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,32 +1,33 @@ -location: clients/tests/test-client.py:558:test_002()/7 -cmd: $NMCLI +location: clients/tests/test-client.py:594:test_002()/7 +cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 -stdout: 551 bytes +stdout: 1107 bytes >>> -eth0: unavailable - "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, hw - -wlan0: unavailable - "wlan0" - wifi (virtual), 5A:88:5E:B6:90:40, hw - -wlan1: unavailable - "wlan1" - wifi (virtual), 7C:D4:69:31:67:0B, hw - -wlan1: unavailable - "wlan1" - wifi (virtual), 41:21:6B:F3:C9:4A, hw - -DNS configuration: - servers: 1.2.3.4 5.6.7.8 - -Use "nmcli device show" to get complete information about known devices and -"nmcli connection show" to get an overview on active connection profiles. - -Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details. +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 <<< stderr: 0 bytes 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 8c8e0d8266..93c5565312 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,34 +1,33 @@ -location: clients/tests/test-client.py:558:test_002()/8 -cmd: $NMCLI +location: clients/tests/test-client.py:594:test_002()/8 +cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 608 bytes +stdout: 1134 bytes >>> -eth0: niedostępne - "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, sprzęt - -wlan0: niedostępne - "wlan0" - wifi (virtual), 5A:88:5E:B6:90:40, sprzęt - -wlan1: niedostępne - "wlan1" - wifi (virtual), 7C:D4:69:31:67:0B, sprzęt - -wlan1: niedostępne - "wlan1" - wifi (virtual), 41:21:6B:F3:C9:4A, sprzęt - -DNS configuration: - servers: 1.2.3.4 5.6.7.8 - -Polecenie „nmcli device show” wyświetli pełne informacje o znanych -urządzeniach, a „nmcli connection show” wyświetli przegląd aktywnych -profili połączeń. - -Strony podręcznika nmcli(1) i nmcli-examples(5) zawierają pełne informacje -o użyciu. +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 <<< stderr: 0 bytes 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 c505b76b59..5c583622b7 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,33 +1,39 @@ -location: clients/tests/test-client.py:558:test_002()/9 -cmd: $NMCLI -lang: de_DE.utf8 +location: clients/tests/test-client.py:595:test_002()/9 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: C returncode: 0 -stdout: 616 bytes +stdout: 1558 bytes >>> -eth0: nicht verfügbar - "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, hw - -wlan0: nicht verfügbar - "wlan0" - wifi (virtual), 5A:88:5E:B6:90:40, hw - -wlan1: nicht verfügbar - "wlan1" - wifi (virtual), 7C:D4:69:31:67:0B, hw - -wlan1: nicht verfügbar - "wlan1" - wifi (virtual), 41:21:6B:F3:C9:4A, hw - -DNS configuration: - servers: 1.2.3.4 5.6.7.8 - -Rufen Sie »nmcli device show« auf, um vollständige Informationen über bekannte Geräte abzurufen -und »nmcli connection show« für eine Übersicht über aktive Verbindungsprofile. - - -Die Hilfeseiten nmcli(1) und nmcli-examples(5) geben vollständige Aufrufbeschreibungen. +=============================================================================== + Device details (wlan0) +=============================================================================== +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- <<< stderr: 0 bytes 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 8167d6bc1f..7b6f604f3f 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,33 +1,39 @@ -location: clients/tests/test-client.py:560:test_002()/10 -cmd: $NMCLI -f AP -mode multiline d show wlan0 -lang: C +location: clients/tests/test-client.py:595:test_002()/10 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1107 bytes +stdout: 1592 bytes >>> +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== AP[1].IN-USE: AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infra +AP[1].MODE: Infrastruktura AP[1].CHAN: 1 -AP[1].RATE: 54 Mbit/s +AP[1].RATE: 54 Mb/s AP[1].SIGNAL: 88 AP[1].BARS: **** AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- AP[2].IN-USE: AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infra +AP[2].MODE: Infrastruktura AP[2].CHAN: 1 -AP[2].RATE: 54 Mbit/s +AP[2].RATE: 54 Mb/s AP[2].SIGNAL: 61 AP[2].BARS: *** AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- AP[3].IN-USE: AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infra +AP[3].MODE: Infrastruktura AP[3].CHAN: 1 -AP[3].RATE: 54 Mbit/s +AP[3].RATE: 54 Mb/s AP[3].SIGNAL: 29 AP[3].BARS: * AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- <<< stderr: 0 bytes 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 6e705a9097..4d82482108 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,33 +1,33 @@ -location: clients/tests/test-client.py:560:test_002()/11 -cmd: $NMCLI -f AP -mode multiline d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:596:test_002()/11 +cmd: $NMCLI -f AP -mode multiline -t d show wlan0 +lang: C returncode: 0 -stdout: 1134 bytes +stdout: 435 bytes >>> -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infrastruktura -AP[1].CHAN: 1 -AP[1].RATE: 54 Mb/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infrastruktura -AP[2].CHAN: 1 -AP[2].RATE: 54 Mb/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infrastruktura -AP[3].CHAN: 1 -AP[3].RATE: 54 Mb/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-3 +AP[1].MODE:Infra +AP[1].CHAN:1 +AP[1].RATE:54 Mbit/s +AP[1].SIGNAL:88 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-2 +AP[2].MODE:Infra +AP[2].CHAN:1 +AP[2].RATE:54 Mbit/s +AP[2].SIGNAL:61 +AP[2].BARS:*** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-1 +AP[3].MODE:Infra +AP[3].CHAN:1 +AP[3].RATE:54 Mbit/s +AP[3].SIGNAL:29 +AP[3].BARS:* +AP[3].SECURITY:WPA1 WPA2 <<< stderr: 0 bytes 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 836310387d..3517a53e64 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,33 +1,33 @@ -location: clients/tests/test-client.py:560:test_002()/12 -cmd: $NMCLI -f AP -mode multiline d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:596:test_002()/12 +cmd: $NMCLI -f AP -mode multiline -t d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1107 bytes +stdout: 462 bytes >>> -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infra -AP[1].CHAN: 1 -AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infra -AP[2].CHAN: 1 -AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infra -AP[3].CHAN: 1 -AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-3 +AP[1].MODE:Infrastruktura +AP[1].CHAN:1 +AP[1].RATE:54 Mb/s +AP[1].SIGNAL:88 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-2 +AP[2].MODE:Infrastruktura +AP[2].CHAN:1 +AP[2].RATE:54 Mb/s +AP[2].SIGNAL:61 +AP[2].BARS:*** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-1 +AP[3].MODE:Infrastruktura +AP[3].CHAN:1 +AP[3].RATE:54 Mb/s +AP[3].SIGNAL:29 +AP[3].BARS:* +AP[3].SECURITY:WPA1 WPA2 <<< stderr: 0 bytes 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 dc134b9929..d7a66f1b18 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,39 +1,13 @@ -location: clients/tests/test-client.py:561:test_002()/13 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +location: clients/tests/test-client.py:597:test_002()/13 +cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 -stdout: 1558 bytes +stdout: 304 bytes >>> -=============================================================================== - Device details (wlan0) -=============================================================================== -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infra -AP[1].CHAN: 1 -AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infra -AP[2].CHAN: 1 -AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infra -AP[3].CHAN: 1 -AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 <<< stderr: 0 bytes 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 2ce1dd5b5e..c062eac5e0 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,39 +1,13 @@ -location: clients/tests/test-client.py:561:test_002()/14 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +location: clients/tests/test-client.py:597:test_002()/14 +cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1592 bytes +stdout: 338 bytes >>> -=============================================================================== - Informacje o urządzeniu (wlan0) -=============================================================================== -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infrastruktura -AP[1].CHAN: 1 -AP[1].RATE: 54 Mb/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infrastruktura -AP[2].CHAN: 1 -AP[2].RATE: 54 Mb/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infrastruktura -AP[3].CHAN: 1 -AP[3].RATE: 54 Mb/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 <<< stderr: 0 bytes 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 31774e7711..6293c2b4cb 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,39 +1,17 @@ -location: clients/tests/test-client.py:561:test_002()/15 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:598:test_002()/15 +cmd: $NMCLI -f AP -mode tabular -p d show wlan0 +lang: C returncode: 0 -stdout: 1562 bytes +stdout: 460 bytes >>> -=============================================================================== - Geräteinformationen (wlan0) -=============================================================================== -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infra -AP[1].CHAN: 1 -AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infra -AP[2].CHAN: 1 -AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infra -AP[3].CHAN: 1 -AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- +========================== + Device details (wlan0) +========================== +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +---------------------------------------------------------------------------- +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 <<< stderr: 0 bytes 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 74e46abfaf..617ed9ae3a 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,33 +1,17 @@ -location: clients/tests/test-client.py:562:test_002()/16 -cmd: $NMCLI -f AP -mode multiline -t d show wlan0 -lang: C +location: clients/tests/test-client.py:598:test_002()/16 +cmd: $NMCLI -f AP -mode tabular -p d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 435 bytes +stdout: 530 bytes >>> -AP[1].IN-USE: -AP[1].SSID:wlan0-ap-3 -AP[1].MODE:Infra -AP[1].CHAN:1 -AP[1].RATE:54 Mbit/s -AP[1].SIGNAL:88 -AP[1].BARS:**** -AP[1].SECURITY:WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 -AP[2].MODE:Infra -AP[2].CHAN:1 -AP[2].RATE:54 Mbit/s -AP[2].SIGNAL:61 -AP[2].BARS:*** -AP[2].SECURITY:WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 -AP[3].MODE:Infra -AP[3].CHAN:1 -AP[3].RATE:54 Mbit/s -AP[3].SIGNAL:29 -AP[3].BARS:* -AP[3].SECURITY:WPA1 WPA2 +=================================== + Informacje o urządzeniu (wlan0) +=================================== +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +----------------------------------------------------------------------------------- +AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 <<< stderr: 0 bytes 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 abe9fab09f..90e5053213 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,33 +1,12 @@ -location: clients/tests/test-client.py:562:test_002()/17 -cmd: $NMCLI -f AP -mode multiline -t d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:599:test_002()/17 +cmd: $NMCLI -f AP -mode tabular -t d show wlan0 +lang: C returncode: 0 -stdout: 462 bytes +stdout: 165 bytes >>> -AP[1].IN-USE: -AP[1].SSID:wlan0-ap-3 -AP[1].MODE:Infrastruktura -AP[1].CHAN:1 -AP[1].RATE:54 Mb/s -AP[1].SIGNAL:88 -AP[1].BARS:**** -AP[1].SECURITY:WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 -AP[2].MODE:Infrastruktura -AP[2].CHAN:1 -AP[2].RATE:54 Mb/s -AP[2].SIGNAL:61 -AP[2].BARS:*** -AP[2].SECURITY:WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 -AP[3].MODE:Infrastruktura -AP[3].CHAN:1 -AP[3].RATE:54 Mb/s -AP[3].SIGNAL:29 -AP[3].BARS:* -AP[3].SECURITY:WPA1 WPA2 +AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2 +AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2 +AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2 <<< stderr: 0 bytes 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 15972d961d..f17d1ecd8f 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,33 +1,12 @@ -location: clients/tests/test-client.py:562:test_002()/18 -cmd: $NMCLI -f AP -mode multiline -t d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:599:test_002()/18 +cmd: $NMCLI -f AP -mode tabular -t d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 435 bytes +stdout: 192 bytes >>> -AP[1].IN-USE: -AP[1].SSID:wlan0-ap-3 -AP[1].MODE:Infra -AP[1].CHAN:1 -AP[1].RATE:54 Mbit/s -AP[1].SIGNAL:88 -AP[1].BARS:**** -AP[1].SECURITY:WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 -AP[2].MODE:Infra -AP[2].CHAN:1 -AP[2].RATE:54 Mbit/s -AP[2].SIGNAL:61 -AP[2].BARS:*** -AP[2].SECURITY:WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 -AP[3].MODE:Infra -AP[3].CHAN:1 -AP[3].RATE:54 Mbit/s -AP[3].SIGNAL:29 -AP[3].BARS:* -AP[3].SECURITY:WPA1 WPA2 +AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:88:****:WPA1 WPA2 +AP[2]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2 +AP[3]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:29:* :WPA1 WPA2 <<< stderr: 0 bytes 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 4a495e21fe..263056988a 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,13 +1,18 @@ -location: clients/tests/test-client.py:563:test_002()/19 -cmd: $NMCLI -f AP -mode tabular d show wlan0 +location: clients/tests/test-client.py:601:test_002()/19 +cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 -stdout: 304 bytes +stdout: 1840 bytes >>> -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH <<< stderr: 0 bytes 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 4a9a528dc7..ff534ad05f 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,13 +1,18 @@ -location: clients/tests/test-client.py:563:test_002()/20 -cmd: $NMCLI -f AP -mode tabular d show wlan0 +location: clients/tests/test-client.py:601:test_002()/20 +cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 -stdout: 338 bytes +stdout: 1898 bytes >>> -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infrastruktura 1 2412 MHz 54 Mb/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infrastruktura 1 2412 MHz 54 Mb/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infrastruktura 1 2412 MHz 54 Mb/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH <<< stderr: 0 bytes 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 6a9ce747e4..ab1173d45e 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,13 +1,11 @@ -location: clients/tests/test-client.py:563:test_002()/21 -cmd: $NMCLI -f AP -mode tabular d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:603:test_002()/21 +cmd: $NMCLI c +lang: C returncode: 0 -stdout: 304 bytes +stdout: 126 bytes >>> -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- <<< stderr: 0 bytes 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 244225addb..b48c35cdae 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,17 +1,11 @@ -location: clients/tests/test-client.py:564:test_002()/22 -cmd: $NMCLI -f AP -mode tabular -p d show wlan0 -lang: C +location: clients/tests/test-client.py:603:test_002()/22 +cmd: $NMCLI c +lang: pl_PL.UTF-8 returncode: 0 -stdout: 460 bytes +stdout: 126 bytes >>> -========================== - Device details (wlan0) -========================== -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------- -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- <<< stderr: 0 bytes 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 8d04359192..e70ccfd669 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,17 +1,30 @@ -location: clients/tests/test-client.py:564:test_002()/23 -cmd: $NMCLI -f AP -mode tabular -p d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:605:test_002()/23 +cmd: $NMCLI c s con-1 +lang: C returncode: 0 -stdout: 530 bytes +stdout: 990 bytes >>> -=================================== - Informacje o urządzeniu (wlan0) -=================================== -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ------------------------------------------------------------------------------------ -AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) <<< stderr: 0 bytes 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 63648ea829..22801ef42b 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,17 +1,30 @@ -location: clients/tests/test-client.py:564:test_002()/24 -cmd: $NMCLI -f AP -mode tabular -p d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:605:test_002()/24 +cmd: $NMCLI c s con-1 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 476 bytes +stdout: 992 bytes >>> -=============================== - Geräteinformationen (wlan0) -=============================== -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------- -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-025.expected b/clients/tests/test-client.check-on-disk/test_002-025.expected deleted file mode 100644 index 34bc44eed2..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-025.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:565:test_002()/25 -cmd: $NMCLI -f AP -mode tabular -t d show wlan0 -lang: C -returncode: 0 -stdout: 165 bytes ->>> -AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2 - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-026.expected b/clients/tests/test-client.check-on-disk/test_002-026.expected deleted file mode 100644 index 21b3ae9993..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-026.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:565:test_002()/26 -cmd: $NMCLI -f AP -mode tabular -t d show wlan0 -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 192 bytes ->>> -AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:29:* :WPA1 WPA2 - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-027.expected b/clients/tests/test-client.check-on-disk/test_002-027.expected deleted file mode 100644 index 19f7899f29..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-027.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:565:test_002()/27 -cmd: $NMCLI -f AP -mode tabular -t d show wlan0 -lang: de_DE.utf8 -returncode: 0 -stdout: 165 bytes ->>> -AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2 - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-028.expected b/clients/tests/test-client.check-on-disk/test_002-028.expected deleted file mode 100644 index 9ec2112173..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-028.expected +++ /dev/null @@ -1,21 +0,0 @@ -location: clients/tests/test-client.py:567:test_002()/28 -cmd: $NMCLI -f ALL d wifi -lang: C -returncode: 0 -stdout: 1840 bytes ->>> -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 -AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 -AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 - -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 - -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-029.expected b/clients/tests/test-client.check-on-disk/test_002-029.expected deleted file mode 100644 index a3f09fce81..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-029.expected +++ /dev/null @@ -1,21 +0,0 @@ -location: clients/tests/test-client.py:567:test_002()/29 -cmd: $NMCLI -f ALL d wifi -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 1898 bytes ->>> -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infrastruktura 1 2412 MHz 54 Mb/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 -AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infrastruktura 1 2412 MHz 54 Mb/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 -AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infrastruktura 1 2412 MHz 54 Mb/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 - -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 - -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-030.expected b/clients/tests/test-client.check-on-disk/test_002-030.expected deleted file mode 100644 index 41e1435c84..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-030.expected +++ /dev/null @@ -1,21 +0,0 @@ -location: clients/tests/test-client.py:567:test_002()/30 -cmd: $NMCLI -f ALL d wifi -lang: de_DE.utf8 -returncode: 0 -stdout: 1840 bytes ->>> -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/3 -AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/2 -AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/1 - -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nein /org/freedesktop/NetworkManager/AccessPoint/4 - -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-031.expected b/clients/tests/test-client.check-on-disk/test_002-031.expected deleted file mode 100644 index 2dd4201c8e..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-031.expected +++ /dev/null @@ -1,14 +0,0 @@ -location: clients/tests/test-client.py:569:test_002()/31 -cmd: $NMCLI c -lang: C -returncode: 0 -stdout: 126 bytes ->>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-032.expected b/clients/tests/test-client.check-on-disk/test_002-032.expected deleted file mode 100644 index d6dfedab7e..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-032.expected +++ /dev/null @@ -1,14 +0,0 @@ -location: clients/tests/test-client.py:569:test_002()/32 -cmd: $NMCLI c -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 126 bytes ->>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-033.expected b/clients/tests/test-client.check-on-disk/test_002-033.expected deleted file mode 100644 index 9a9c109cda..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-033.expected +++ /dev/null @@ -1,14 +0,0 @@ -location: clients/tests/test-client.py:569:test_002()/33 -cmd: $NMCLI c -lang: de_DE.utf8 -returncode: 0 -stdout: 126 bytes ->>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-034.expected b/clients/tests/test-client.check-on-disk/test_002-034.expected deleted file mode 100644 index 59fc086675..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-034.expected +++ /dev/null @@ -1,33 +0,0 @@ -location: clients/tests/test-client.py:571:test_002()/34 -cmd: $NMCLI c s con-1 -lang: C -returncode: 0 -stdout: 990 bytes ->>> -connection.id: con-1 -connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-035.expected b/clients/tests/test-client.check-on-disk/test_002-035.expected deleted file mode 100644 index ec3bad7634..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-035.expected +++ /dev/null @@ -1,33 +0,0 @@ -location: clients/tests/test-client.py:571:test_002()/35 -cmd: $NMCLI c s con-1 -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 992 bytes ->>> -connection.id: con-1 -connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-036.expected b/clients/tests/test-client.check-on-disk/test_002-036.expected deleted file mode 100644 index 244facd05b..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-036.expected +++ /dev/null @@ -1,33 +0,0 @@ -location: clients/tests/test-client.py:571:test_002()/36 -cmd: $NMCLI c s con-1 -lang: de_DE.utf8 -returncode: 0 -stdout: 993 bytes ->>> -connection.id: con-1 -connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: ja -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nein -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unbekannt -connection.lldp: default -connection.mdns: -1 (default) - -<<< -stderr: 0 bytes ->>> - -<<< 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 a4e739c764..6bcce4e234 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:581:test_003()/1 +location: clients/tests/test-client.py:615: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 21c1a23205..22eac1c1c6 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:584:test_003()/2 +location: clients/tests/test-client.py:618: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 86acb7c455..98520d9e2c 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:584:test_003()/3 +location: clients/tests/test-client.py:618: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 576708df2e..29ef6fbadf 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,12 +1,10 @@ -location: clients/tests/test-client.py:584:test_003()/4 -cmd: $NMCLI c s -lang: de_DE.utf8 +location: clients/tests/test-client.py:623:test_003()/4 +cmd: $NMCLI c add type ethernet ifname '*' +lang: C returncode: 0 -stdout: 195 bytes +stdout: 81 bytes >>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added. <<< stderr: 0 bytes 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 ca71469c7f..b32b1978e0 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,10 +1,13 @@ -location: clients/tests/test-client.py:589:test_003()/5 -cmd: $NMCLI c add type ethernet ifname '*' +location: clients/tests/test-client.py:626:test_003()/5 +cmd: $NMCLI c s lang: C returncode: 0 -stdout: 81 bytes +stdout: 264 bytes >>> -Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added. +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- <<< stderr: 0 bytes 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 80df78cb6e..c7f77f1e39 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,6 +1,6 @@ -location: clients/tests/test-client.py:592:test_003()/6 +location: clients/tests/test-client.py:626:test_003()/6 cmd: $NMCLI c s -lang: C +lang: pl_PL.UTF-8 returncode: 0 stdout: 264 bytes >>> 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 e27a081f0a..67ef4f54a7 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,13 +1,13 @@ -location: clients/tests/test-client.py:592:test_003()/7 -cmd: $NMCLI c s -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:629:test_003()/7 +cmd: $NMCLI -f ALL c s +lang: C returncode: 0 -stdout: 264 bytes +stdout: 912 bytes >>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- -- <<< stderr: 0 bytes 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 5892986b52..148b07f453 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,13 +1,13 @@ -location: clients/tests/test-client.py:592:test_003()/8 -cmd: $NMCLI c s -lang: de_DE.utf8 +location: clients/tests/test-client.py:629:test_003()/8 +cmd: $NMCLI -f ALL c s +lang: pl_PL.UTF-8 returncode: 0 -stdout: 264 bytes +stdout: 912 bytes >>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 nie -- -- -- -- <<< stderr: 0 bytes 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 85a102a392..27a8dd7e20 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,14 +1,20 @@ -location: clients/tests/test-client.py:595:test_003()/9 -cmd: $NMCLI -f ALL c s +location: clients/tests/test-client.py:633:test_003()/9 +cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 -stdout: 912 bytes +stdout: 64 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- -- +--active +--order +apath +con-1 +con-xx1 +ethernet +help +id +path +uuid <<< stderr: 0 bytes >>> 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 4d1b93e718..310ee36bb7 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,14 +1,20 @@ -location: clients/tests/test-client.py:595:test_003()/10 -cmd: $NMCLI -f ALL c s +location: clients/tests/test-client.py:633:test_003()/10 +cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 -stdout: 912 bytes +stdout: 64 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 nie -- -- -- -- +--active +--order +apath +con-1 +con-xx1 +ethernet +help +id +path +uuid <<< stderr: 0 bytes >>> 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 9611a18263..54624dcafe 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,13 +1,10 @@ -location: clients/tests/test-client.py:595:test_003()/11 -cmd: $NMCLI -f ALL c s -lang: de_DE.utf8 +location: clients/tests/test-client.py:646:test_003()/11 +cmd: $NMCLI con up ethernet ifname eth0 +lang: C returncode: 0 -stdout: 912 bytes +stdout: 106 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/1 nein -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/2 nein -- -- -- -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 nein -- -- -- -- +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/1) <<< stderr: 0 bytes 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 1a56267735..1ab12034c1 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,20 +1,14 @@ -location: clients/tests/test-client.py:599:test_003()/12 -cmd: $NMCLI --complete-args -f ALL c s '' +location: clients/tests/test-client.py:649:test_003()/12 +cmd: $NMCLI con lang: C returncode: 0 -stdout: 64 bytes +stdout: 264 bytes >>> +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- ---active ---order -apath -con-1 -con-xx1 -ethernet -help -id -path -uuid <<< stderr: 0 bytes >>> 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 3fa8126ea1..a0f816a0cf 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,20 +1,14 @@ -location: clients/tests/test-client.py:599:test_003()/13 -cmd: $NMCLI --complete-args -f ALL c s '' +location: clients/tests/test-client.py:649:test_003()/13 +cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 -stdout: 64 bytes +stdout: 264 bytes >>> +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- ---active ---order -apath -con-1 -con-xx1 -ethernet -help -id -path -uuid <<< stderr: 0 bytes >>> 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 247e785f53..a5c2039f2d 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,20 +1,14 @@ -location: clients/tests/test-client.py:599:test_003()/14 -cmd: $NMCLI --complete-args -f ALL c s '' -lang: de_DE.utf8 +location: clients/tests/test-client.py:652:test_003()/14 +cmd: $NMCLI -f ALL con +lang: C returncode: 0 -stdout: 64 bytes +stdout: 1084 bytes >>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- ---active ---order -apath -con-1 -con-xx1 -ethernet -help -id -path -uuid <<< stderr: 0 bytes >>> 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 5937f5241d..75d4970fa5 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,10 +1,13 @@ -location: clients/tests/test-client.py:601:test_003()/15 -cmd: $NMCLI con up ethernet ifname eth0 -lang: C +location: clients/tests/test-client.py:652:test_003()/15 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 106 bytes +stdout: 1088 bytes >>> -Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/1) +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- <<< stderr: 0 bytes 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 57bbcd7247..868195bc4a 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,13 +1,87 @@ -location: clients/tests/test-client.py:604:test_003()/16 -cmd: $NMCLI con +location: clients/tests/test-client.py:655:test_003()/16 +cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 264 bytes +stdout: 3516 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes 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 11aad7c5b9..b1c5f7f973 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,13 +1,87 @@ -location: clients/tests/test-client.py:604:test_003()/17 -cmd: $NMCLI con +location: clients/tests/test-client.py:655:test_003()/17 +cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 264 bytes +stdout: 3534 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes 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 7c5070b5b4..d5da947aeb 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,13 +1,99 @@ -location: clients/tests/test-client.py:604:test_003()/18 -cmd: $NMCLI con -lang: de_DE.utf8 +location: clients/tests/test-client.py:658:test_003()/18 +cmd: $NMCLI con s ethernet +lang: C returncode: 0 -stdout: 264 bytes +stdout: 4180 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +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-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index d95f3ea073..19f9ea393d 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,13 +1,99 @@ -location: clients/tests/test-client.py:607:test_003()/19 -cmd: $NMCLI -f ALL con -lang: C +location: clients/tests/test-client.py:658:test_003()/19 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1084 bytes +stdout: 4201 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +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-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index be0e3109d1..832b2bb017 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,16 +1,19 @@ -location: clients/tests/test-client.py:607:test_003()/20 -cmd: $NMCLI -f ALL con -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:661:test_003()/20 +cmd: $NMCLI -f ALL dev s eth0 +lang: C returncode: 0 -stdout: 1088 bytes +stdout: 1056 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Unknown parameter: eth0 <<< 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 a5fe70a1e6..eee653084c 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,16 +1,19 @@ -location: clients/tests/test-client.py:607:test_003()/21 -cmd: $NMCLI -f ALL con -lang: de_DE.utf8 +location: clients/tests/test-client.py:661:test_003()/21 +cmd: $NMCLI -f ALL dev s eth0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1084 bytes +stdout: 1061 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 ja eth0 aktiviert /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/1 nein -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/2 nein -- -- -- -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Nieznany parametr: eth0 <<< 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 b74865ed3f..d14a5f4557 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,87 +1,39 @@ -location: clients/tests/test-client.py:610:test_003()/22 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:664:test_003()/22 +cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 3516 bytes +stdout: 1487 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- <<< stderr: 0 bytes 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 a2e91df1c1..42254129c5 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,87 +1,39 @@ -location: clients/tests/test-client.py:610:test_003()/23 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:664:test_003()/23 +cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3534 bytes +stdout: 1510 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- <<< stderr: 0 bytes 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 0ae321ebad..01dfb22ac9 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,87 +1,10 @@ -location: clients/tests/test-client.py:610:test_003()/24 -cmd: $NMCLI -f ALL con s ethernet -lang: de_DE.utf8 +location: clients/tests/test-client.py:646:test_003()/24 +cmd: $NMCLI con up ethernet ifname eth1 +lang: C returncode: 0 -stdout: 3531 bytes +stdout: 106 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: ja -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nein -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unbekannt -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nein -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nein -ipv4.ignore-auto-dns: nein -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: ja -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nein -ipv4.may-fail: ja -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nein -ipv6.ignore-auto-dns: nein -ipv6.never-default: nein -ipv6.may-fail: ja -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: ja -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nein -proxy.pac-url: -- -proxy.pac-script: -- +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) <<< stderr: 0 bytes 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 1cc8f5a609..f332a1aed4 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,18 +1,16 @@ -location: clients/tests/test-client.py:613:test_003()/25 -cmd: $NMCLI -f ALL dev s eth0 +location: clients/tests/test-client.py:649:test_003()/25 +cmd: $NMCLI con lang: C returncode: 0 -stdout: 880 bytes +stdout: 264 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Unknown parameter: eth0 <<< 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 92161b21af..dae13b9c4a 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,18 +1,16 @@ -location: clients/tests/test-client.py:613:test_003()/26 -cmd: $NMCLI -f ALL dev s eth0 +location: clients/tests/test-client.py:649:test_003()/26 +cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 -stdout: 884 bytes +stdout: 264 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Nieznany parametr: eth0 <<< 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 45ecba75cf..ac579da794 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,18 +1,16 @@ -location: clients/tests/test-client.py:613:test_003()/27 -cmd: $NMCLI -f ALL dev s eth0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:652:test_003()/27 +cmd: $NMCLI -f ALL con +lang: C returncode: 0 -stdout: 904 bytes +stdout: 1084 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- -eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- <<< -stderr: 28 bytes +stderr: 0 bytes >>> -Unbekannter Parameter: eth0 <<< 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 b3563bbe4b..13f8bcc305 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,39 +1,13 @@ -location: clients/tests/test-client.py:616:test_003()/28 -cmd: $NMCLI -f ALL dev show eth0 -lang: C +location: clients/tests/test-client.py:652:test_003()/28 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1487 bytes +stdout: 1088 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: no -GENERAL.NM-MANAGED: yes -GENERAL.AUTOCONNECT: yes -GENERAL.FIRMWARE-MISSING: no -GENERAL.NM-PLUGIN-MISSING: no -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unknown -CAPABILITIES.CARRIER-DETECT: no -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: no -CAPABILITIES.SRIOV: no -WIRED-PROPERTIES.CARRIER: off -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- <<< stderr: 0 bytes 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 ae4af0107e..f5d1460809 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,39 +1,87 @@ -location: clients/tests/test-client.py:616:test_003()/29 -cmd: $NMCLI -f ALL dev show eth0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:655:test_003()/29 +cmd: $NMCLI -f ALL con s ethernet +lang: C returncode: 0 -stdout: 1510 bytes +stdout: 3516 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (niedostępne) -GENERAL.REASON: 0 (Nie podano przyczyny) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nie -GENERAL.NM-MANAGED: tak -GENERAL.AUTOCONNECT: tak -GENERAL.FIRMWARE-MISSING: nie -GENERAL.NM-PLUGIN-MISSING: nie -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: nieznane -CAPABILITIES.CARRIER-DETECT: nie -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nie -CAPABILITIES.SRIOV: nie -WIRED-PROPERTIES.CARRIER: wyłączone -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes 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 9a4106a3a3..cca85878ad 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,39 +1,87 @@ -location: clients/tests/test-client.py:616:test_003()/30 -cmd: $NMCLI -f ALL dev show eth0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:655:test_003()/30 +cmd: $NMCLI -f ALL con s ethernet +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1509 bytes +stdout: 3534 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (nicht verfügbar) -GENERAL.REASON: 0 (Kein Grund angegeben) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nein -GENERAL.NM-MANAGED: ja -GENERAL.AUTOCONNECT: ja -GENERAL.FIRMWARE-MISSING: nein -GENERAL.NM-PLUGIN-MISSING: nein -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unbekannt -CAPABILITIES.CARRIER-DETECT: nein -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nein -CAPABILITIES.SRIOV: nein -WIRED-PROPERTIES.CARRIER: aus -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes 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 new file mode 100644 index 0000000000..c61cf39df6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:658:test_003()/31 +cmd: $NMCLI con s ethernet +lang: C +returncode: 0 +stdout: 4845 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.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: -- + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 0000000000..c96f65001d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:658:test_003()/32 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4869 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +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: -- + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 0000000000..f27a0a3492 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:661:test_003()/33 +cmd: $NMCLI -f ALL dev s eth0 +lang: C +returncode: 0 +stdout: 1056 bytes +>>> +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 + +<<< +stderr: 24 bytes +>>> +Unknown parameter: eth0 + +<<< 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 new file mode 100644 index 0000000000..18ef705f3e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:661:test_003()/34 +cmd: $NMCLI -f ALL dev s eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1061 bytes +>>> +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 + +<<< +stderr: 24 bytes +>>> +Nieznany parametr: eth0 + +<<< 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 new file mode 100644 index 0000000000..93059163e5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:664:test_003()/35 +cmd: $NMCLI -f ALL dev show eth0 +lang: C +returncode: 0 +stdout: 1487 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 0000000000..94f76f4b15 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:664:test_003()/36 +cmd: $NMCLI -f ALL dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1510 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 0000000000..6506712d67 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:671:test_003()/37 +cmd: $NMCLI -f ALL con +lang: C +returncode: 0 +stdout: 1096 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 0000000000..9f9dd494bd --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:671:test_003()/38 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1104 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 0000000000..93f6715843 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:674:test_003()/39 +cmd: $NMCLI -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected new file mode 100644 index 0000000000..978abd1a5e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:674:test_003()/40 +cmd: $NMCLI -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected new file mode 100644 index 0000000000..4a499e8a40 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:677:test_003()/41 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: C +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected new file mode 100644 index 0000000000..d34996d0f9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:677:test_003()/42 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected new file mode 100644 index 0000000000..98b6955242 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:680:test_003()/43 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: C +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected new file mode 100644 index 0000000000..59b391b531 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:680:test_003()/44 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected new file mode 100644 index 0000000000..fcb2d89335 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:683:test_003()/45 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: C +returncode: 0 +stdout: 835 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected new file mode 100644 index 0000000000..09d7bce20c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:683:test_003()/46 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 841 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected new file mode 100644 index 0000000000..bae911d8eb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:686:test_003()/47 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: C +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected new file mode 100644 index 0000000000..69f5bc7c8b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:686:test_003()/48 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected new file mode 100644 index 0000000000..7e76d41946 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:689:test_003()/49 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: C +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected new file mode 100644 index 0000000000..930375ad58 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:689:test_003()/50 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected new file mode 100644 index 0000000000..980d0820f2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:692:test_003()/51 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: C +returncode: 0 +stdout: 394 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected new file mode 100644 index 0000000000..c68c6b7ad3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:692:test_003()/52 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 414 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected new file mode 100644 index 0000000000..de0cb2398e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:695:test_003()/53 +cmd: $NMCLI con s ethernet +lang: C +returncode: 0 +stdout: 4848 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.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: -- + +<<< +stderr: 0 bytes +>>> + +<<< 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 new file mode 100644 index 0000000000..8f64284d0b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:695:test_003()/54 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4872 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +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: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 84863d7526..f2e096644b 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -3,6 +3,17 @@ from __future__ import print_function import sys + +try: + import gi + from gi.repository import GLib + + gi.require_version('NM', '1.0') + from gi.repository import NM +except Exception as e: + GLib = None + NM = None + import os import errno import unittest @@ -243,6 +254,17 @@ class NMStubServer: raise AssertionError("Unexpectedly not found connection %s: %s" % (con_id, str(e))) return u + def setProperty(self, path, propname, value, iface_name = None): + if iface_name is None: + iface_name = '' + self.op_SetProperties([ + (path, [ + (iface_name, [ + (propname, value), + ]), + ]), + ]) + ############################################################################### class NmTestBase(unittest.TestCase): @@ -287,9 +309,10 @@ class TestNmcli(NmTestBase): expected_stderr = _DEFAULT_ARG, replace_stdout = None, replace_stderr = None, - sort_lines_stdout = False): + sort_lines_stdout = False, + extra_env = None): frame = sys._getframe(1) - for lang in [ 'C', 'pl', 'de' ]: + for lang in [ 'C', 'pl' ]: self._call_nmcli(args, lang, check_on_disk, @@ -299,6 +322,7 @@ class TestNmcli(NmTestBase): replace_stdout, replace_stderr, sort_lines_stdout, + extra_env, frame) @@ -312,7 +336,8 @@ class TestNmcli(NmTestBase): expected_stderr = _DEFAULT_ARG, replace_stdout = None, replace_stderr = None, - sort_lines_stdout = False): + sort_lines_stdout = False, + extra_env = None): frame = sys._getframe(1) @@ -333,6 +358,7 @@ class TestNmcli(NmTestBase): replace_stdout, replace_stderr, sort_lines_stdout, + extra_env, frame) def _call_nmcli(self, @@ -345,6 +371,7 @@ class TestNmcli(NmTestBase): replace_stdout, replace_stderr, sort_lines_stdout, + extra_env, frame): calling_fcn = frame.f_code.co_name @@ -364,6 +391,9 @@ class TestNmcli(NmTestBase): self.fail('invalid language %s' % (lang)) env = {} + if extra_env is not None: + for k, v in extra_env.items(): + env[k] = v for k in ['LD_LIBRARY_PATH', 'DBUS_SESSION_BUS_ADDRESS']: val = os.environ.get(k, None) @@ -488,6 +518,8 @@ class TestNmcli(NmTestBase): def setUp(self): if not dbus_session_inited: self.skipTest("Own D-Bus session for testing is not initialized. Do you have dbus-run-session available?") + if NM is None: + self.skipTest("gi.NM is not available. Did you build with introspection?") self.srv = NMStubServer() self._calling_num = {} self._skip_test_for_l10n_diff = [] @@ -510,6 +542,8 @@ class TestNmcli(NmTestBase): def init_001(self): self.srv.op_AddObj('WiredDevice', iface = 'eth0') + self.srv.op_AddObj('WiredDevice', + iface = 'eth1') self.srv.op_AddObj('WifiDevice', iface = 'wlan0') self.srv.op_AddObj('WifiDevice', @@ -598,23 +632,69 @@ class TestNmcli(NmTestBase): replace_stdout = replace_stdout, sort_lines_stdout = True) - self.call_nmcli(['con', 'up', 'ethernet', 'ifname', 'eth0']) + # activate the same profile on multiple devices. Our stub-implmentation + # is fine with that... although NetworkManager service would reject + # such a configuration by deactivating the profile first. But note that + # that is only an internal behavior of NetworkManager service. The D-Bus + # API perfectly allows for one profile to be active multiple times. Also + # note, that there is always a short time where one profile goes down, + # while another is activating. Hence, while real NetworkManager commonly + # does not allow that multiple profiles *stay* connected at the same + # time, there is always the possibility that a profile is activating/active + # on a device, while also activating/deactivating in parallel. + for dev in ['eth0', 'eth1']: + self.call_nmcli(['con', 'up', 'ethernet', 'ifname', dev]) - self.call_nmcli_l(['con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'ALL', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['con', 's', 'ethernet'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], + replace_stdout = replace_stdout) + + self.srv.setProperty('/org/freedesktop/NetworkManager/ActiveConnection/1', + 'State', + dbus.UInt32(NM.ActiveConnectionState.DEACTIVATING)) self.call_nmcli_l(['-f', 'ALL', 'con'], replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'], + self.call_nmcli_l(['-f', 'UUID,TYPE', 'con'], replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'], + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', 'con'], replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--terse', 'con'], replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--pretty', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--terse', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--pretty', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['con', 's', 'ethernet'], + replace_stdout = replace_stdout) + + ############################################################################### def main(): diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index fd3c44a0ff..9b4d3c8c29 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -160,11 +160,40 @@ class ExportedObj(dbus.service.Object): return self._dbus_interface_get_property(self._dbus_interface_get(dbus_iface), propname) - def _dbus_property_set(self, dbus_iface, propname, value): - dbus_interface = self._dbus_interface_get(dbus_iface) - prop = self._dbus_interface_get_property(dbus_interface) - assert propname in prop - prop[propname] = value + def _dbus_property_set(self, dbus_iface, propname, value, allow_detect_dbus_iface = False, dry_run = False): + if allow_detect_dbus_iface and not dbus_iface: + props = None + for p, dbus_interface in self._dbus_ifaces.items(): + if propname in dbus_interface.props: + if props is not None: + raise TestError("Cannot uniquely find the property '%s' on object '%s'" % (propname, self.path)) + props = dbus_interface.props + dbus_iface = p + if props is None: + raise TestError("Cannot find the property '%s' on object '%s'" % (propname, self.path)) + else: + try: + dbus_interface = self._dbus_interface_get(dbus_iface) + props = self._dbus_interface_get_property(dbus_interface) + except: + if dry_run: + raise TestError("No interface '%s' on '%s'" % (dbus_iface, self.path)) + raise + + if dry_run: + if propname not in props: + raise TestError("No property '%s' on '%s' on '%s'" % (propname, dbus_iface, self.path)) + + if isinstance(self, ActiveConnection) \ + and dbus_iface == 'org.freedesktop.NetworkManager.Connection.Active' \ + and propname == 'State': + return + else: + raise TestError("Cannot set property '%s' on '%s' on '%s' via D-Bus" % (propname, dbus_iface, self.path)) + + assert propname in props + + props[propname] = value self._dbus_property_notify(dbus_iface, propname) def _dbus_property_notify(self, dbus_iface, propname): @@ -199,7 +228,7 @@ class ExportedObj(dbus.service.Object): my_ifaces = {} for iface in self._dbus_ifaces: my_ifaces[iface] = self._dbus_ifaces[iface].props - return self.path, my_ifaces + return my_ifaces ############################################################################### @@ -942,6 +971,20 @@ class NetworkManager(ExportedObj): def FindConnections(self, args): return [(c.path, c.get_uuid(), c.get_id()) for c in gl.settings.find_connections(**args)] + @dbus.service.method(IFACE_TEST, in_signature='a(oa(sa(sv)))', out_signature='') + def SetProperties(self, all_args): + for i in [0, 1]: + for path, iface_args in all_args: + o = gl.object_manager.find_object(path) + if o is None: + raise TestError("Object %s does not exist" % (path)) + for iface_name, args in iface_args: + for propname, value in args: + o._dbus_property_set(iface_name, propname, value, + allow_detect_dbus_iface = True, + dry_run = (i == 0)) + + @dbus.service.method(IFACE_TEST, in_signature='sa{sv}', out_signature='o') def AddObj(self, class_name, args): if class_name in ['WiredDevice', 'WifiDevice']: @@ -1341,15 +1384,19 @@ class ObjectManager(dbus.service.Object): dbus.service.Object.__init__(self, gl.bus, object_path) self.objs = [] + def find_object(self, path): + for o in self.objs: + if path == o.path: + return o + return None + def add_object(self, obj): - name, ifaces = obj.get_managed_ifaces() self.objs.append(obj) - self.InterfacesAdded(name, ifaces) + self.InterfacesAdded(obj.path, obj.get_managed_ifaces()) def remove_object(self, obj): - name, ifaces = obj.get_managed_ifaces() self.objs.remove(obj) - self.InterfacesRemoved(name, ifaces.keys()) + self.InterfacesRemoved(obj.path, obj.get_managed_ifaces().keys()) @dbus.service.signal(IFACE_OBJECT_MANAGER, signature='oa{sa{sv}}') def InterfacesAdded(self, name, ifaces): @@ -1365,8 +1412,7 @@ class ObjectManager(dbus.service.Object): def GetManagedObjects(self, sender=None): managed_objects = {} for obj in self.objs: - name, ifaces = obj.get_managed_ifaces() - managed_objects[name] = ifaces + managed_objects[obj.path] = obj.get_managed_ifaces() return managed_objects ############################################################################### |