diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-11-09 16:46:13 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-11-09 17:52:26 +0100 |
| commit | 4466edcffaa7a5d8ff5c54a81bdf29e0e5d71f20 (patch) | |
| tree | dcb47f8cbca5829162cb39941f7ba79cf4b07c15 | |
| parent | 53d9c3d661b47b69f854ab1238a9c60c9a964d42 (diff) | |
| download | NetworkManager-lr/ac-sort.tar.gz | |
cli/connections: improve sort by active connectionslr/ac-sort
When sorting the active connections, use the same policy as "nmcli" and
"nmcli d", not just the connection state. It looks better that way.
| -rw-r--r-- | clients/cli/connections.c | 6 | ||||
| -rw-r--r-- | clients/tests/test-client.check-on-disk/test_003.expected | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index c08acad5d2..b645a774fa 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1693,12 +1693,10 @@ con_show_get_items_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data) switch (item) { case NMC_SORT_ACTIVE: - NM_CMP_DIRECT (active_connection_get_state_ord (ac_b), - active_connection_get_state_ord (ac_a)); + NM_CMP_RETURN (nmc_active_connection_cmp (ac_b, ac_a)); break; case NMC_SORT_ACTIVE_INV: - NM_CMP_DIRECT (active_connection_get_state_ord (ac_a), - active_connection_get_state_ord (ac_b)); + NM_CMP_RETURN (nmc_active_connection_cmp (ac_a, ac_b)); break; case NMC_SORT_TYPE: diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected index ddd2fb0b9f..0485e76f36 100644 --- a/clients/tests/test-client.check-on-disk/test_003.expected +++ b/clients/tests/test-client.check-on-disk/test_003.expected @@ -1196,8 +1196,8 @@ returncode: 0 stdout: 396 bytes >>> NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- con-gsm1 UUID-con-gsm1-REPLACED-REPLACED-REPL gsm -- con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- @@ -1211,8 +1211,8 @@ returncode: 0 stdout: 396 bytes >>> NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- con-gsm1 UUID-con-gsm1-REPLACED-REPLACED-REPL gsm -- con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- @@ -1226,8 +1226,8 @@ returncode: 0 stdout: 1920 bytes >>> NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/4 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/4 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/4 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- /etc/NetworkManager/system-connections/con-1 con-gsm1 UUID-con-gsm1-REPLACED-REPLACED-REPL gsm 0 never no 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- -- /etc/NetworkManager/system-connections/con-gsm1 con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- /etc/NetworkManager/system-connections/con-xx1 @@ -1256,8 +1256,8 @@ returncode: 0 stdout: 960 bytes >>> NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/4 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/4 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/4 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet <<< size: 1107 @@ -1268,8 +1268,8 @@ returncode: 0 stdout: 963 bytes >>> NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE FILENAME -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/4 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/4 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- /etc/NetworkManager/system-connections/ethernet +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/4 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- /etc/NetworkManager/system-connections/ethernet <<< size: 450 @@ -1292,8 +1292,8 @@ returncode: 0 stdout: 294 bytes >>> ACTIVE-PATH DEVICE UUID -/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 eth1 UUID-ethernet-REPLACED-REPLACED-REPL +/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL <<< size: 241 |