clients/tests: add test for terse output of `nmcli -t connection show $VPN`

14 files changed, 530 insertions, 320 deletions

diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am
index 7c9cabe8a4..e36654bc8d 100644
--- a/clients/tests/test-client.check-on-disk/Makefile.am
+++ b/clients/tests/test-client.check-on-disk/Makefile.am
@@ -177,4 +177,6 @@ clients_tests_expected_files = \
 	clients/tests/test-client.check-on-disk/test_004-032.expected \
 	clients/tests/test-client.check-on-disk/test_004-033.expected \
 	clients/tests/test-client.check-on-disk/test_004-034.expected \
+	clients/tests/test-client.check-on-disk/test_004-035.expected \
+	clients/tests/test-client.check-on-disk/test_004-036.expected \
 	$(NULL)
diff --git a/clients/tests/test-client.check-on-disk/test_004-025.expected b/clients/tests/test-client.check-on-disk/test_004-025.expected
index bf7758b000..ef42d6ce51 100644
--- a/clients/tests/test-client.check-on-disk/test_004-025.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-025.expected
@@ -1,80 +1,100 @@
-location: clients/tests/test-client.py:857:test_004()/25
-cmd: $NMCLI -f ALL con s con-vpn-1
+location: clients/tests/test-client.py:856:test_004()/25
+cmd: $NMCLI -t con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3274 bytes
+stdout: 2131 bytes
 >>>
-connection.id:                          con-vpn-1
-connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
-connection.stable-id:                   --
-connection.type:                        vpn
-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)
-ipv4.method:                            auto
-ipv4.dns:                               --
-ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
-ipv4.dns-priority:                      0
-ipv4.addresses:                         --
-ipv4.gateway:                           --
-ipv4.routes:                            --
-ipv4.route-metric:                      -1
-ipv4.route-table:                       0 (unspec)
-ipv4.ignore-auto-routes:                no
-ipv4.ignore-auto-dns:                   no
-ipv4.dhcp-client-id:                    --
-ipv4.dhcp-timeout:                      0 (default)
-ipv4.dhcp-send-hostname:                yes
-ipv4.dhcp-hostname:                     --
-ipv4.dhcp-fqdn:                         --
-ipv4.never-default:                     no
-ipv4.may-fail:                          yes
-ipv4.dad-timeout:                       -1 (default)
-ipv6.method:                            auto
-ipv6.dns:                               --
-ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
-ipv6.dns-priority:                      0
-ipv6.addresses:                         --
-ipv6.gateway:                           --
-ipv6.routes:                            --
-ipv6.route-metric:                      -1
-ipv6.route-table:                       0 (unspec)
-ipv6.ignore-auto-routes:                no
-ipv6.ignore-auto-dns:                   no
-ipv6.never-default:                     no
-ipv6.may-fail:                          yes
-ipv6.ip6-privacy:                       -1 (unknown)
-ipv6.addr-gen-mode:                     stable-privacy
-ipv6.dhcp-duid:                         --
-ipv6.dhcp-send-hostname:                yes
-ipv6.dhcp-hostname:                     --
-ipv6.token:                             --
-vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
-vpn.user-name:                          --
-vpn.data:                               key1 = val1, key2 = val2, key3 = val3
-vpn.secrets:                            <hidden>
-vpn.persistent:                         no
-vpn.timeout:                            0
-proxy.method:                           none
-proxy.browser-only:                     no
-proxy.pac-url:                          --
-proxy.pac-script:                       --
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.stable-id:
+connection.type:vpn
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options: 
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options: 
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+vpn.service-type:org.freedesktop.NetworkManager.openvpn
+vpn.user-name:
+vpn.data:key1 = val1, key2 = val2, key3 = val3
+vpn.secrets:<hidden>
+vpn.persistent:no
+vpn.timeout:0
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:con-vpn-1
+GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.DEVICES:wlan0
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:yes
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+VPN.TYPE:openvpn
+VPN.USERNAME:
+VPN.GATEWAY:
+VPN.BANNER:*** VPN connection con-vpn-1 ***
+VPN.VPN-STATE:5 - VPN connected
+VPN.CFG[1]:key1 = val1
+VPN.CFG[2]:key2 = val2
+VPN.CFG[3]:key3 = val3
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected
index 26e2788827..c37f72b6ce 100644
--- a/clients/tests/test-client.check-on-disk/test_004-026.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-026.expected
@@ -1,80 +1,100 @@
-location: clients/tests/test-client.py:857:test_004()/26
-cmd: $NMCLI -f ALL con s con-vpn-1
+location: clients/tests/test-client.py:856:test_004()/26
+cmd: $NMCLI -t con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3284 bytes
+stdout: 2136 bytes
 >>>
-connection.id:                          con-vpn-1
-connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
-connection.stable-id:                   --
-connection.type:                        vpn
-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)
-ipv4.method:                            auto
-ipv4.dns:                               --
-ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
-ipv4.dns-priority:                      0
-ipv4.addresses:                         --
-ipv4.gateway:                           --
-ipv4.routes:                            --
-ipv4.route-metric:                      -1
-ipv4.route-table:                       0 (unspec)
-ipv4.ignore-auto-routes:                nie
-ipv4.ignore-auto-dns:                   nie
-ipv4.dhcp-client-id:                    --
-ipv4.dhcp-timeout:                      0 (default)
-ipv4.dhcp-send-hostname:                tak
-ipv4.dhcp-hostname:                     --
-ipv4.dhcp-fqdn:                         --
-ipv4.never-default:                     nie
-ipv4.may-fail:                          tak
-ipv4.dad-timeout:                       -1 (default)
-ipv6.method:                            auto
-ipv6.dns:                               --
-ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
-ipv6.dns-priority:                      0
-ipv6.addresses:                         --
-ipv6.gateway:                           --
-ipv6.routes:                            --
-ipv6.route-metric:                      -1
-ipv6.route-table:                       0 (unspec)
-ipv6.ignore-auto-routes:                nie
-ipv6.ignore-auto-dns:                   nie
-ipv6.never-default:                     nie
-ipv6.may-fail:                          tak
-ipv6.ip6-privacy:                       -1 (unknown)
-ipv6.addr-gen-mode:                     stable-privacy
-ipv6.dhcp-duid:                         --
-ipv6.dhcp-send-hostname:                tak
-ipv6.dhcp-hostname:                     --
-ipv6.token:                             --
-vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
-vpn.user-name:                          --
-vpn.data:                               key1 = val1, key2 = val2, key3 = val3
-vpn.secrets:                            <hidden>
-vpn.persistent:                         nie
-vpn.timeout:                            0
-proxy.method:                           none
-proxy.browser-only:                     nie
-proxy.pac-url:                          --
-proxy.pac-script:                       --
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.stable-id:
+connection.type:vpn
+connection.interface-name:
+connection.autoconnect:yes
+connection.autoconnect-priority:0
+connection.autoconnect-retries:-1
+connection.auth-retries:-1
+connection.timestamp:0
+connection.read-only:no
+connection.permissions:
+connection.zone:
+connection.master:
+connection.slave-type:
+connection.autoconnect-slaves:-1
+connection.secondaries:
+connection.gateway-ping-timeout:0
+connection.metered:unknown
+connection.lldp:default
+connection.mdns:-1
+ipv4.method:auto
+ipv4.dns:
+ipv4.dns-search:
+ipv4.dns-options: 
+ipv4.dns-priority:0
+ipv4.addresses:
+ipv4.gateway:
+ipv4.routes:
+ipv4.route-metric:-1
+ipv4.route-table:0
+ipv4.ignore-auto-routes:no
+ipv4.ignore-auto-dns:no
+ipv4.dhcp-client-id:
+ipv4.dhcp-timeout:0
+ipv4.dhcp-send-hostname:yes
+ipv4.dhcp-hostname:
+ipv4.dhcp-fqdn:
+ipv4.never-default:no
+ipv4.may-fail:yes
+ipv4.dad-timeout:-1
+ipv6.method:auto
+ipv6.dns:
+ipv6.dns-search:
+ipv6.dns-options: 
+ipv6.dns-priority:0
+ipv6.addresses:
+ipv6.gateway:
+ipv6.routes:
+ipv6.route-metric:-1
+ipv6.route-table:0
+ipv6.ignore-auto-routes:no
+ipv6.ignore-auto-dns:no
+ipv6.never-default:no
+ipv6.may-fail:yes
+ipv6.ip6-privacy:-1
+ipv6.addr-gen-mode:stable-privacy
+ipv6.dhcp-duid:
+ipv6.dhcp-send-hostname:yes
+ipv6.dhcp-hostname:
+ipv6.token:
+vpn.service-type:org.freedesktop.NetworkManager.openvpn
+vpn.user-name:
+vpn.data:key1 = val1, key2 = val2, key3 = val3
+vpn.secrets:<hidden>
+vpn.persistent:no
+vpn.timeout:0
+proxy.method:none
+proxy.browser-only:no
+proxy.pac-url:
+proxy.pac-script:
+GENERAL.NAME:con-vpn-1
+GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.DEVICES:wlan0
+GENERAL.STATE:activated
+GENERAL.DEFAULT:no
+GENERAL.DEFAULT6:no
+GENERAL.SPEC-OBJECT:
+GENERAL.VPN:yes
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:
+GENERAL.MASTER-PATH:
+VPN.TYPE:openvpn
+VPN.USERNAME:
+VPN.GATEWAY:
+VPN.BANNER:*** VPN connection con-vpn-1 ***
+VPN.VPN-STATE:5 - Połączono z VPN
+VPN.CFG[1]:key1 = val1
+VPN.CFG[2]:key2 = val2
+VPN.CFG[3]:key3 = val3
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-027.expected b/clients/tests/test-client.check-on-disk/test_004-027.expected
index 8f16f02420..2e5852f17a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-027.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-027.expected
@@ -1,15 +1,80 @@
-location: clients/tests/test-client.py:863:test_004()/27
-cmd: $NMCLI -f VPN con s con-vpn-1
+location: clients/tests/test-client.py:859:test_004()/27
+cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 334 bytes
+stdout: 3274 bytes
 >>>
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.stable-id:                   --
+connection.type:                        vpn
+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)
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-duid:                         --
+ipv6.dhcp-send-hostname:                yes
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
 vpn.data:                               key1 = val1, key2 = val2, key3 = val3
 vpn.secrets:                            <hidden>
 vpn.persistent:                         no
 vpn.timeout:                            0
+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_004-028.expected b/clients/tests/test-client.check-on-disk/test_004-028.expected
index 4e8f78eedb..afd7e27e67 100644
--- a/clients/tests/test-client.check-on-disk/test_004-028.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-028.expected
@@ -1,15 +1,80 @@
-location: clients/tests/test-client.py:863:test_004()/28
-cmd: $NMCLI -f VPN con s con-vpn-1
+location: clients/tests/test-client.py:859:test_004()/28
+cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 335 bytes
+stdout: 3284 bytes
 >>>
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.stable-id:                   --
+connection.type:                        vpn
+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)
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                nie
+ipv4.ignore-auto-dns:                   nie
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                tak
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     nie
+ipv4.may-fail:                          tak
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                nie
+ipv6.ignore-auto-dns:                   nie
+ipv6.never-default:                     nie
+ipv6.may-fail:                          tak
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-duid:                         --
+ipv6.dhcp-send-hostname:                tak
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
 vpn.data:                               key1 = val1, key2 = val2, key3 = val3
 vpn.secrets:                            <hidden>
 vpn.persistent:                         nie
 vpn.timeout:                            0
+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_004-029.expected b/clients/tests/test-client.check-on-disk/test_004-029.expected
index 2c81c0e9d2..b1945db297 100644
--- a/clients/tests/test-client.check-on-disk/test_004-029.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-029.expected
@@ -1,21 +1,15 @@
-location: clients/tests/test-client.py:866:test_004()/29
-cmd: $NMCLI -f GENERAL con s con-vpn-1
+location: clients/tests/test-client.py:865:test_004()/29
+cmd: $NMCLI -f VPN con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 334 bytes
 >>>
-GENERAL.NAME:                           con-vpn-1
-GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.DEVICES:                        wlan0
-GENERAL.STATE:                          activated
-GENERAL.DEFAULT:                        no
-GENERAL.DEFAULT6:                       no
-GENERAL.SPEC-OBJECT:                    --
-GENERAL.VPN:                            yes
-GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:                           --
-GENERAL.MASTER-PATH:                    --
+vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
+vpn.user-name:                          --
+vpn.data:                               key1 = val1, key2 = val2, key3 = val3
+vpn.secrets:                            <hidden>
+vpn.persistent:                         no
+vpn.timeout:                            0
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-030.expected b/clients/tests/test-client.check-on-disk/test_004-030.expected
index 9e31d58b17..06ce34164c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-030.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-030.expected
@@ -1,21 +1,15 @@
-location: clients/tests/test-client.py:866:test_004()/30
-cmd: $NMCLI -f GENERAL con s con-vpn-1
+location: clients/tests/test-client.py:865:test_004()/30
+cmd: $NMCLI -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 670 bytes
+stdout: 335 bytes
 >>>
-GENERAL.NAME:                           con-vpn-1
-GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
-GENERAL.DEVICES:                        wlan0
-GENERAL.STATE:                          aktywowano
-GENERAL.DEFAULT:                        nie
-GENERAL.DEFAULT6:                       nie
-GENERAL.SPEC-OBJECT:                    --
-GENERAL.VPN:                            tak
-GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
-GENERAL.ZONE:                           --
-GENERAL.MASTER-PATH:                    --
+vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
+vpn.user-name:                          --
+vpn.data:                               key1 = val1, key2 = val2, key3 = val3
+vpn.secrets:                            <hidden>
+vpn.persistent:                         nie
+vpn.timeout:                            0
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-031.expected b/clients/tests/test-client.check-on-disk/test_004-031.expected
index 04e137af64..561a9d1c10 100644
--- a/clients/tests/test-client.check-on-disk/test_004-031.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-031.expected
@@ -1,16 +1,21 @@
-location: clients/tests/test-client.py:869:test_004()/31
-cmd: $NMCLI dev show wlan0
+location: clients/tests/test-client.py:868:test_004()/31
+cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 389 bytes
+stdout: 667 bytes
 >>>
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.HWADDR:                         5A:88:5E:B6:90:40
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.NAME:                           con-vpn-1
+GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.DEVICES:                        wlan0
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        no
+GENERAL.DEFAULT6:                       no
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            yes
+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_004-032.expected b/clients/tests/test-client.check-on-disk/test_004-032.expected
index 6521a34569..fc68846326 100644
--- a/clients/tests/test-client.check-on-disk/test_004-032.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-032.expected
@@ -1,16 +1,21 @@
-location: clients/tests/test-client.py:869:test_004()/32
-cmd: $NMCLI dev show wlan0
+location: clients/tests/test-client.py:868:test_004()/32
+cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 390 bytes
+stdout: 670 bytes
 >>>
-GENERAL.DEVICE:                         wlan0
-GENERAL.TYPE:                           wifi
-GENERAL.HWADDR:                         5A:88:5E:B6:90:40
-GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
-GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.NAME:                           con-vpn-1
+GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.DEVICES:                        wlan0
+GENERAL.STATE:                          aktywowano
+GENERAL.DEFAULT:                        nie
+GENERAL.DEFAULT6:                       nie
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            tak
+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_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected
index 95a96d7603..31ed829921 100644
--- a/clients/tests/test-client.check-on-disk/test_004-033.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-033.expected
@@ -1,71 +1,16 @@
-location: clients/tests/test-client.py:872:test_004()/33
-cmd: $NMCLI -f all dev show wlan0
+location: clients/tests/test-client.py:871:test_004()/33
+cmd: $NMCLI dev show wlan0
 lang: C
 returncode: 0
-stdout: 2948 bytes
+stdout: 389 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         5A:88:5E:B6:90:40
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (unavailable)
-GENERAL.REASON:                         0 (No reason given)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    no
-GENERAL.NM-MANAGED:                     yes
-GENERAL.AUTOCONNECT:                    yes
-GENERAL.FIRMWARE-MISSING:               no
-GENERAL.NM-PLUGIN-MISSING:              no
-GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        unknown
-CAPABILITIES.CARRIER-DETECT:            no
-CAPABILITIES.SPEED:                     unknown
-CAPABILITIES.IS-SOFTWARE:               no
-CAPABILITIES.SRIOV:                     no
-WIFI-PROPERTIES.WEP:                    yes
-WIFI-PROPERTIES.WPA:                    yes
-WIFI-PROPERTIES.WPA2:                   yes
-WIFI-PROPERTIES.TKIP:                   yes
-WIFI-PROPERTIES.CCMP:                   yes
-WIFI-PROPERTIES.AP:                     yes
-WIFI-PROPERTIES.ADHOC:                  yes
-WIFI-PROPERTIES.2GHZ:                   unknown
-WIFI-PROPERTIES.5GHZ:                   unknown
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-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
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected
index e33738241a..fbb3bfa1ce 100644
--- a/clients/tests/test-client.check-on-disk/test_004-034.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-034.expected
@@ -1,71 +1,16 @@
-location: clients/tests/test-client.py:872:test_004()/34
-cmd: $NMCLI -f all dev show wlan0
+location: clients/tests/test-client.py:871:test_004()/34
+cmd: $NMCLI dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2991 bytes
+stdout: 390 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
-GENERAL.NM-TYPE:                        NMDeviceWifi
-GENERAL.VENDOR:                         --
-GENERAL.PRODUCT:                        --
-GENERAL.DRIVER:                         virtual
-GENERAL.DRIVER-VERSION:                 --
-GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         5A:88:5E:B6:90:40
 GENERAL.MTU:                            0
 GENERAL.STATE:                          20 (niedostępne)
-GENERAL.REASON:                         0 (Nie podano przyczyny)
-GENERAL.UDI:                            /sys/devices/virtual/wlan0
-GENERAL.IP-IFACE:                       --
-GENERAL.IS-SOFTWARE:                    nie
-GENERAL.NM-MANAGED:                     tak
-GENERAL.AUTOCONNECT:                    tak
-GENERAL.FIRMWARE-MISSING:               nie
-GENERAL.NM-PLUGIN-MISSING:              nie
-GENERAL.PHYS-PORT-ID:                   --
 GENERAL.CONNECTION:                     con-vpn-1
-GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
-GENERAL.METERED:                        nieznane
-CAPABILITIES.CARRIER-DETECT:            nie
-CAPABILITIES.SPEED:                     nieznane
-CAPABILITIES.IS-SOFTWARE:               nie
-CAPABILITIES.SRIOV:                     nie
-WIFI-PROPERTIES.WEP:                    tak
-WIFI-PROPERTIES.WPA:                    tak
-WIFI-PROPERTIES.WPA2:                   tak
-WIFI-PROPERTIES.TKIP:                   tak
-WIFI-PROPERTIES.CCMP:                   tak
-WIFI-PROPERTIES.AP:                     tak
-WIFI-PROPERTIES.ADHOC:                  tak
-WIFI-PROPERTIES.2GHZ:                   nieznane
-WIFI-PROPERTIES.5GHZ:                   nieznane
-AP[1].IN-USE:                            
-AP[1].SSID:                             wlan0-ap-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
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected
new file mode 100644
index 0000000000..8193673733
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-035.expected
@@ -0,0 +1,74 @@
+location: clients/tests/test-client.py:874:test_004()/35
+cmd: $NMCLI -f all dev show wlan0
+lang: C
+returncode: 0
+stdout: 2948 bytes
+>>>
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           wifi
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
+GENERAL.HWADDR:                         5A:88:5E:B6:90:40
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        unknown
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     unknown
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+WIFI-PROPERTIES.2GHZ:                   unknown
+WIFI-PROPERTIES.5GHZ:                   unknown
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-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
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected
new file mode 100644
index 0000000000..e3be08716f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-036.expected
@@ -0,0 +1,74 @@
+location: clients/tests/test-client.py:874:test_004()/36
+cmd: $NMCLI -f all dev show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2991 bytes
+>>>
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           wifi
+GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
+GENERAL.HWADDR:                         5A:88:5E:B6:90:40
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.UDI:                            /sys/devices/virtual/wlan0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     con-vpn-1
+GENERAL.CON-UUID:                       UUID-con-vpn-1-REPLACED-REPLACED-REP
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.METERED:                        nieznane
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     nieznane
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
+WIFI-PROPERTIES.WEP:                    tak
+WIFI-PROPERTIES.WPA:                    tak
+WIFI-PROPERTIES.WPA2:                   tak
+WIFI-PROPERTIES.TKIP:                   tak
+WIFI-PROPERTIES.CCMP:                   tak
+WIFI-PROPERTIES.AP:                     tak
+WIFI-PROPERTIES.ADHOC:                  tak
+WIFI-PROPERTIES.2GHZ:                   nieznane
+WIFI-PROPERTIES.5GHZ:                   nieznane
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-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
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
index 51fd5d7cc5..1d5cc54f60 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -852,6 +852,8 @@ class TestNmcli(NmTestBase):
 
         self.call_nmcli_l(['con', 's', 'con-vpn-1'],
                           replace_stdout = replace_stdout)
+        self.call_nmcli_l(['-t', 'con', 's', 'con-vpn-1'],
+                          replace_stdout = replace_stdout)
 
         self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'con-vpn-1'],
                           replace_stdout = replace_stdout)