[Pkg-utopia-maintainers] Bug#1109465: unblock: network-manager/1.52.1-1

Michael Biebl biebl at debian.org
Fri Jul 18 11:49:47 BST 2025


Package: release.debian.org
Severity: normal
X-Debbugs-Cc: network-manager at packages.debian.org
Control: affects -1 + src:network-manager
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package network-manager

NetworkManager upstream has made a point release (1.52.0 → 1.52.1) which
I think our trixie users would benefit from.
Upstream is very conservative when applying changes to a stable
branch.

The summary of the changes is

* Fail early if we cannot get current FEC
  (Forward Error Correction) value.
* Allow reapplying ovs-bridge and ovs-port properties.
* When activating a WireGuard connection to an IPv6 endpoint, now
  NetworkManager creates firewall rules to ensure that the incoming
  packets are not dropped by kernel reverse path filtering.

Aside from that, there a various smaller fixes, like fixing memory
leaks, NULL pointer accesses, GObject introspection annotations.


[ Reason ]
I'd like to see the fixes from the stable point release 1.15.1 be
available to our trixie users. Especially the improved IPv6 handling of
firewall rules with Wireguard.

[ Impact ]
Various smaller fixes and improvements are not available to trixie
users.


[ Tests ]
The network-manager package has build-tests, a non-trivial autopackage
test the autopkgtests of reverse dependencies look fine as well.
Aside from that I did some basic, manual testing which all looked fine.
Since the upload I haven't received a new bug report either.

[ Risks ]
network-manager is a key package, but I consider the risks rather small
as the fixes are targetted and upstream has a good track record
regarding what fixes are applied to stable branches.

[ Checklist ]
  [] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x ] attach debdiff against the package in testing

[ Other info ]
The diffstat reads

 50 files changed, 2780 insertions(+), 2113 deletions(-)

The majority is coming from the test suite though:

 src/nm-initrd-generator/tests/test-cmdline-reader.c          |  126 ++++
 src/tests/client/test-client.check-on-disk/test_002.expected |   96 +--
 src/tests/client/test-client.check-on-disk/test_003.expected |  112 ++--
 src/tests/client/test-client.check-on-disk/test_004.expected | 2968 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 src/tests/client/test-client.py                              |  188 +++++--
 tools/test-networkmanager-service.py                         |    2

and nm-cloud can be ignored since that feature is not built on Debian:

 src/nm-cloud-setup/main.c                                    |  122 +++-
 src/nm-cloud-setup/nm-cloud-setup-utils.c                    |    3
 src/nm-cloud-setup/nm-cloud-setup-utils.h                    |    2


The attached debdiff includes the full diff but I can provide a filtered
diff if requested.

Regards,
Michael

unblock network-manager/1.52.1-1
-------------- next part --------------
diff --git a/NEWS b/NEWS
index 1e50ee0cf2..b47b76b865 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+=============================================
+NetworkManager-1.52.1
+Overview of changes since NetworkManager-1.52
+=============================================
+* Fail early if we cannot get current FEC
+  (Forward Error Correction) value.
+* Allow reapplying ovs-bridge and ovs-port properties.
+* When activating a WireGuard connection to an IPv6 endpoint, now
+  NetworkManager creates firewall rules to ensure that the incoming
+  packets are not dropped by kernel reverse path filtering.
+
 =============================================
 NetworkManager-1.52
 Overview of changes since NetworkManager-1.50
diff --git a/config.h.meson b/config.h.meson
index e59160dec5..9ae88b26bf 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -67,6 +67,9 @@
 /* Define to path of iptables binary */
 #mesondefine IPTABLES_PATH
 
+/* Define to path of ip6tables binary */
+#mesondefine IP6TABLES_PATH
+
 /* Define to path of nft binary */
 #mesondefine NFT_PATH
 
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 2af0f44602..22a1a49cf8 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -597,6 +597,7 @@ Preferably use nmcli instead.
 %endif
 	-Dnft=%{_sbindir}/nft \
 	-Diptables=%{_sbindir}/iptables \
+	-Dip6tables=%{_sbindir}/ip6tables \
 %if %{with dhclient}
 	-Ddhclient=%{_sbindir}/dhclient \
 %else
diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh
index b1944d7780..2dbca0e7d2 100755
--- a/contrib/fedora/rpm/build_clean.sh
+++ b/contrib/fedora/rpm/build_clean.sh
@@ -222,6 +222,7 @@ if [[ $NO_DIST != 1 ]]; then
         -Dconfig_dhcp_default=internal \
         -Dconfig_dns_rc_manager_default=auto \
         -Diptables=/usr/sbin/iptables \
+        -Dip6tables=/usr/sbin/ip6tables \
         -Dnft=/usr/bin/nft \
         || die "Error meson setup"
 
diff --git a/contrib/fedora/rpm/configure-for-system.sh b/contrib/fedora/rpm/configure-for-system.sh
index fff426bcad..f0638591bd 100755
--- a/contrib/fedora/rpm/configure-for-system.sh
+++ b/contrib/fedora/rpm/configure-for-system.sh
@@ -368,6 +368,7 @@ meson setup\
     $(args_enable "$P_TEST" --werror) \
     -Dnft="${D_SBINDIR}/nft" \
     -Diptables="${D_SBINDIR}/iptables" \
+    -Dip6tables="${D_SBINDIR}/ip6tables" \
     -Ddhclient="${D_SBINDIR}/dhclient" \
     -Ddhcpcd=no \
     -Dconfig_dhcp_default="$P_DHCP_DEFAULT" \
diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh
index 5a7e0c16de..ff18cc5b00 100755
--- a/contrib/fedora/rpm/release.sh
+++ b/contrib/fedora/rpm/release.sh
@@ -559,9 +559,11 @@ if [[ $GITLAB_TOKEN == "" ]]; then
 fi
 
 # This step is not necessary for authentication, we use it only to provide a meaningful error message.
-curl --request GET --header "PRIVATE-TOKEN: $GITLAB_TOKEN" \
-    "https://gitlab.freedesktop.org/api/v4/personal_access_tokens/self" &>/dev/null \
-    || die "failed to authenticate at gitlab.freedesktop.org with the private token"
+GITLAB_USER_ID=$(curl --request GET --header "PRIVATE-TOKEN: $GITLAB_TOKEN" \
+                      "https://gitlab.freedesktop.org/api/v4/personal_access_tokens/self" 2>/dev/null | jq ".user_id" || true)
+if [ -z "$GITLAB_USER_ID" ] || [ "$GITLAB_USER_ID" = "null" ]; then
+    die "failed to authenticate to gitlab.freedesktop.org with the private token"
+fi
 
 do_command git push "$ORIGIN" "${BRANCHES[@]}" || die "failed to to push branches ${BRANCHES[@]} to $ORIGIN"
 
@@ -640,4 +642,4 @@ fi
 
 if [[ $CREATE_RELEASE_FAIL == 1 ]]; then
     die "failed creating the release at gitlab.freedesktop.org. This was the last step, create it manually from the web UI"
-fi
\ No newline at end of file
+fi
diff --git a/debian/changelog b/debian/changelog
index 78613a2474..cbd4bc3e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+network-manager (1.52.1-1) unstable; urgency=medium
+
+  * New upstream version 1.52.1
+  * Explicitly specify the path for ip6tables
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 15 Jul 2025 12:21:02 +0200
+
 network-manager (1.52.0-6) unstable; urgency=medium
 
   [ Lukas Märdian ]
diff --git a/debian/rules b/debian/rules
index f222c09b28..1279622896 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ override_dh_auto_configure:
 		-Dmodprobe=/usr/sbin/modprobe \
 		-Ddhcpcd=false \
 		-Diptables=/usr/sbin/iptables \
+		-Dip6tables=/usr/sbin/ip6tables \
 		-Dnft=/usr/sbin/nft \
 		-Ddnsmasq=/usr/sbin/dnsmasq \
 		-Dpolkit_agent_helper_1=/usr/lib/policykit-1/polkit-agent-helper-1 \
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 4652887905..eb8f18e76a 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -1933,7 +1933,7 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
           <literal>"uuid:83037490-1d17-4986-a397-01f1db3a7fc2"</literal></para></listitem>
         </varlistentry>
         <varlistentry>
-          <term>id=ID</term>
+          <term>id:ID</term>
           <listitem><para>Match the connection by name.</para></listitem>
         </varlistentry>
         <varlistentry>
diff --git a/meson.build b/meson.build
index 52bd072b0c..847f72b556 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project(
 # NOTE: When incrementing version also add corresponding
 #       NM_VERSION_x_y_z macros in
 #       "src/libnm-core-public/nm-version-macros.h.in"
-  version: '1.52.0',
+  version: '1.52.1',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
@@ -723,6 +723,7 @@ default_paths = ['/sbin', '/usr/sbin']
 
 # 0: cmdline option, 1: paths, 2: fallback
 progs = [['iptables', default_paths, '/usr/sbin/iptables'],
+         ['ip6tables', default_paths, '/usr/sbin/ip6tables'],
          ['nft',      default_paths, '/usr/sbin/nft'],
          ['dnsmasq',  default_paths, ''],
          ['modprobe', default_paths, '/sbin/modprobe']
@@ -1125,6 +1126,7 @@ endif
 output += '\n'
 output += '  jansson: ' + jansson_msg + '\n'
 output += '  iptables: ' + config_h.get('IPTABLES_PATH') + '\n'
+output += '  ip6tables: ' + config_h.get('IP6TABLES_PATH') + '\n'
 output += '  nft: ' + config_h.get('NFT_PATH') + '\n'
 output += '  modprobe: ' + config_h.get('MODPROBE_PATH') + '\n'
 output += '  modemmanager-1: ' + enable_modem_manager.to_string() + '\n'
diff --git a/meson_options.txt b/meson_options.txt
index 4bc11aa08b..fe696aaf16 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,6 +6,7 @@ option('dbus_conf_dir', type: 'string', value: '', description: 'where D-Bus sys
 option('kernel_firmware_dir', type: 'string', value: '/lib/firmware', description: 'where kernel firmware directory is (default is /lib/firmware)')
 option('runtime_dir', type: 'string', value: '', description: 'Directory for transient runtime state [default: LOCALSTATEDIR/run or /run]')
 option('iptables', type: 'string', value: '', description: 'path to iptables')
+option('ip6tables', type: 'string', value: '', description: 'path to ip6tables')
 option('nft', type: 'string', value: '', description: 'path to nft')
 option('dnsmasq', type: 'string', value: '', description: 'path to dnsmasq')
 option('modprobe', type: 'string', value: '', description: 'path to modprobe')
diff --git a/src/core/devices/nm-device-6lowpan.c b/src/core/devices/nm-device-6lowpan.c
index 3dabcb9bdc..61b1e4eee8 100644
--- a/src/core/devices/nm-device-6lowpan.c
+++ b/src/core/devices/nm-device-6lowpan.c
@@ -137,14 +137,6 @@ link_changed(NMDevice *device, const NMPlatformLink *pllink)
     nm_device_parent_set_ifindex(device, parent);
 }
 
-static gboolean
-is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
-{
-    if (!nm_device_parent_get_device(device))
-        return FALSE;
-    return NM_DEVICE_CLASS(nm_device_6lowpan_parent_class)->is_available(device, flags);
-}
-
 static gboolean
 complete_connection(NMDevice            *device,
                     NMConnection        *connection,
@@ -237,7 +229,6 @@ nm_device_6lowpan_class_init(NMDevice6LowpanClass *klass)
     device_class->get_generic_capabilities               = get_generic_capabilities;
     device_class->get_configured_mtu                     = nm_device_get_configured_mtu_for_wired;
     device_class->link_changed                           = link_changed;
-    device_class->is_available                           = is_available;
     device_class->parent_changed_notify                  = parent_changed_notify;
     device_class->update_connection                      = update_connection;
 }
diff --git a/src/core/devices/nm-device-ipvlan.c b/src/core/devices/nm-device-ipvlan.c
index 00a1b57937..abeb82f794 100644
--- a/src/core/devices/nm-device-ipvlan.c
+++ b/src/core/devices/nm-device-ipvlan.c
@@ -221,16 +221,6 @@ get_generic_capabilities(NMDevice *device)
 
 /*****************************************************************************/
 
-static gboolean
-is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
-{
-    if (!nm_device_parent_get_device(device))
-        return FALSE;
-    return NM_DEVICE_CLASS(nm_device_ipvlan_parent_class)->is_available(device, flags);
-}
-
-/*****************************************************************************/
-
 static gboolean
 check_connection_compatible(NMDevice     *device,
                             NMConnection *connection,
@@ -376,7 +366,6 @@ nm_device_ipvlan_class_init(NMDeviceIpvlanClass *klass)
     device_class->check_connection_compatible = check_connection_compatible;
     device_class->create_and_realize          = create_and_realize;
     device_class->get_generic_capabilities    = get_generic_capabilities;
-    device_class->is_available                = is_available;
     device_class->link_changed                = link_changed;
     device_class->update_connection           = update_connection;
 
diff --git a/src/core/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c
index 89a0672097..2ff1eeb30a 100644
--- a/src/core/devices/nm-device-macsec.c
+++ b/src/core/devices/nm-device-macsec.c
@@ -683,14 +683,6 @@ get_generic_capabilities(NMDevice *dev)
 
 /******************************************************************/
 
-static gboolean
-is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
-{
-    if (!nm_device_parent_get_device(device))
-        return FALSE;
-    return NM_DEVICE_CLASS(nm_device_macsec_parent_class)->is_available(device, flags);
-}
-
 static gboolean
 create_and_realize(NMDevice              *device,
                    NMConnection          *connection,
@@ -903,7 +895,6 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
     device_class->deactivate               = deactivate;
     device_class->get_generic_capabilities = get_generic_capabilities;
     device_class->link_changed             = link_changed;
-    device_class->is_available             = is_available;
     device_class->parent_changed_notify    = parent_changed_notify;
     device_class->state_changed            = device_state_changed;
     device_class->get_configured_mtu       = nm_device_get_configured_mtu_wired_parent;
diff --git a/src/core/devices/nm-device-macvlan.c b/src/core/devices/nm-device-macvlan.c
index 9501e8f15c..c5bcc91ad1 100644
--- a/src/core/devices/nm-device-macvlan.c
+++ b/src/core/devices/nm-device-macvlan.c
@@ -270,16 +270,6 @@ get_generic_capabilities(NMDevice *device)
 
 /*****************************************************************************/
 
-static gboolean
-is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
-{
-    if (!nm_device_parent_get_device(device))
-        return FALSE;
-    return NM_DEVICE_CLASS(nm_device_macvlan_parent_class)->is_available(device, flags);
-}
-
-/*****************************************************************************/
-
 static gboolean
 check_connection_compatible(NMDevice     *device,
                             NMConnection *connection,
@@ -508,7 +498,6 @@ nm_device_macvlan_class_init(NMDeviceMacvlanClass *klass)
     device_class->create_and_realize                     = create_and_realize;
     device_class->get_generic_capabilities               = get_generic_capabilities;
     device_class->get_configured_mtu    = nm_device_get_configured_mtu_wired_parent;
-    device_class->is_available          = is_available;
     device_class->link_changed          = link_changed;
     device_class->parent_changed_notify = parent_changed_notify;
     device_class->update_connection     = update_connection;
diff --git a/src/core/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c
index 59a429ca7f..9d03e33704 100644
--- a/src/core/devices/nm-device-vlan.c
+++ b/src/core/devices/nm-device-vlan.c
@@ -292,16 +292,6 @@ get_generic_capabilities(NMDevice *device)
 
 /*****************************************************************************/
 
-static gboolean
-is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
-{
-    if (!nm_device_parent_get_device(device))
-        return FALSE;
-    return NM_DEVICE_CLASS(nm_device_vlan_parent_class)->is_available(device, flags);
-}
-
-/*****************************************************************************/
-
 static gboolean
 check_connection_compatible(NMDevice     *device,
                             NMConnection *connection,
@@ -561,7 +551,6 @@ nm_device_vlan_class_init(NMDeviceVlanClass *klass)
     device_class->act_stage1_prepare_set_hwaddr_ethernet = TRUE;
     device_class->act_stage1_prepare                     = act_stage1_prepare;
     device_class->get_configured_mtu    = nm_device_get_configured_mtu_wired_parent;
-    device_class->is_available          = is_available;
     device_class->parent_changed_notify = parent_changed_notify;
 
     device_class->check_connection_compatible = check_connection_compatible;
diff --git a/src/core/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c
index 4a08192e03..299e3b30e8 100644
--- a/src/core/devices/nm-device-wireguard.c
+++ b/src/core/devices/nm-device-wireguard.c
@@ -23,6 +23,7 @@
 #include "nm-active-connection.h"
 #include "nm-act-request.h"
 #include "dns/nm-dns-manager.h"
+#include "nm-firewall-utils.h"
 
 #define _NMLOG_DEVICE_TYPE NMDeviceWireGuard
 #include "nm-device-logging.h"
@@ -1207,6 +1208,40 @@ skip:
     *out_allowed_ips_data = g_steal_pointer(&allowed_ips);
 }
 
+static void
+_configure_firewall(NMDeviceWireGuard *self, NMConnection *connection, int addr_family, gboolean up)
+{
+    NMDeviceWireGuardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE(self);
+    const char               *ip_iface;
+    NMSettingIPConfig        *ip_config;
+
+    ip_iface = nm_device_get_ip_iface(NM_DEVICE(self));
+
+    nm_assert(ip_iface);
+
+    switch (addr_family) {
+    case AF_INET:
+        if (!priv->auto_default_route_enabled_4)
+            return;
+
+        ip_config = nm_connection_get_setting_ip4_config(connection);
+        break;
+    case AF_INET6:
+        if (!priv->auto_default_route_enabled_6)
+            return;
+
+        ip_config = nm_connection_get_setting_ip6_config(connection);
+        break;
+    default:
+        nm_assert_not_reached();
+    }
+
+    nm_assert(ip_config);
+    nm_assert(priv->auto_default_route_fwmark);
+
+    nm_firewall_config_set_wg_rule(ip_iface, ip_config, priv->auto_default_route_fwmark, up);
+}
+
 /*****************************************************************************/
 
 static void
@@ -1300,6 +1335,18 @@ create_and_realize(NMDevice              *device,
     return TRUE;
 }
 
+static void
+deactivate(NMDevice *device)
+{
+    NMDeviceWireGuard *self       = NM_DEVICE_WIREGUARD(device);
+    NMConnection      *connection = nm_device_get_applied_connection(NM_DEVICE(self));
+
+    if (connection) {
+        _configure_firewall(self, connection, AF_INET, FALSE);
+        _configure_firewall(self, connection, AF_INET6, FALSE);
+    }
+}
+
 /*****************************************************************************/
 
 static void
@@ -1768,6 +1815,10 @@ act_stage3_ip_config(NMDevice *device, int addr_family)
     nm_auto_unref_l3cd const NML3ConfigData *l3cd = NULL;
 
     l3cd = _get_dev2_ip_config(NM_DEVICE_WIREGUARD(device), addr_family);
+    _configure_firewall(NM_DEVICE_WIREGUARD(device),
+                        nm_device_get_applied_connection(device),
+                        addr_family,
+                        TRUE);
     nm_device_devip_set_state(device, addr_family, NM_DEVICE_IP_STATE_READY, l3cd);
 }
 
@@ -1866,6 +1917,10 @@ reapply_connection(NMDevice *device, NMConnection *con_old, NMConnection *con_ne
 
     if (state >= NM_DEVICE_STATE_CONFIG) {
         priv->auto_default_route_refresh = TRUE;
+
+        _configure_firewall(self, con_old, AF_INET, FALSE);
+        _configure_firewall(self, con_old, AF_INET6, FALSE);
+
         link_config(NM_DEVICE_WIREGUARD(device), "reapply", LINK_CONFIG_MODE_REAPPLY, NULL);
     }
 
@@ -2018,6 +2073,7 @@ nm_device_wireguard_class_init(NMDeviceWireGuardClass *klass)
 
     device_class->state_changed                                 = device_state_changed;
     device_class->create_and_realize                            = create_and_realize;
+    device_class->deactivate                                    = deactivate;
     device_class->act_stage2_config                             = act_stage2_config;
     device_class->act_stage2_config_also_for_external_or_assume = TRUE;
     device_class->act_stage3_ip_config                          = act_stage3_ip_config;
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index e310a9c680..2f2f25a5b8 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -603,6 +603,7 @@ typedef struct _NMDevicePrivate {
 
     bool is_attached : 1;
 
+    bool device_link_carrier_changed_down : 1;
     bool device_link_changed_down : 1;
 
     bool concheck_rp_filter_checked : 1;
@@ -2759,22 +2760,23 @@ _ethtool_fec_set(NMDevice         *self,
 
     g_hash_table_iter_init(&iter, hash);
     while (g_hash_table_iter_next(&iter, (gpointer *) &name, (gpointer *) &variant)) {
-        NMEthtoolID ethtool_id = nm_ethtool_id_get_by_name(name);
-
-        if (!nm_ethtool_id_is_fec(ethtool_id))
-            continue;
-
-        nm_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_UINT32));
-        fec_mode = g_variant_get_uint32(variant);
+        if (nm_ethtool_id_is_fec(nm_ethtool_id_get_by_name(name))) {
+            nm_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_UINT32));
+            fec_mode = g_variant_get_uint32(variant);
+            break;
+        }
     }
 
-    nm_platform_ethtool_get_fec_mode(platform, ethtool_state->ifindex, &old_fec_mode);
-
     /* The NM_SETTING_ETHTOOL_FEC_MODE_NONE is query only value, hence do nothing. */
     if (!fec_mode || fec_mode == NM_SETTING_ETHTOOL_FEC_MODE_NONE) {
         return;
     }
 
+    if (!nm_platform_ethtool_get_fec_mode(platform, ethtool_state->ifindex, &old_fec_mode)) {
+        _LOGW(LOGD_DEVICE, "ethtool: failure setting FEC %d: cannot get current value", fec_mode);
+        return;
+    }
+
     if (!nm_platform_ethtool_set_fec_mode(platform, ethtool_state->ifindex, fec_mode))
         _LOGW(LOGD_DEVICE, "ethtool: failure setting FEC %d", fec_mode);
     else {
@@ -7123,6 +7125,9 @@ nm_device_controller_release_port(NMDevice           *self,
                                      NM_UNMANAGED_IS_PORT,
                                      NM_UNMAN_FLAG_OP_FORGET,
                                      NM_DEVICE_STATE_REASON_REMOVED);
+
+    /* Once the port is detached, unmanaged-external-down might change */
+    _dev_unmanaged_check_external_down(self, FALSE, FALSE);
 }
 
 /*****************************************************************************/
@@ -7558,10 +7563,12 @@ device_link_changed(gpointer user_data)
     gboolean                        carrier_was_up;
     gboolean                        update_unmanaged_specs = FALSE;
     gboolean                        got_hw_addr            = FALSE, had_hw_addr;
+    gboolean                        carrier_seen_down      = priv->device_link_carrier_changed_down;
     gboolean                        seen_down              = priv->device_link_changed_down;
 
-    priv->device_link_changed_id   = 0;
-    priv->device_link_changed_down = FALSE;
+    priv->device_link_changed_id           = 0;
+    priv->device_link_changed_down         = FALSE;
+    priv->device_link_carrier_changed_down = FALSE;
 
     ifindex = nm_device_get_ifindex(self);
     if (ifindex <= 0)
@@ -7712,7 +7719,8 @@ device_link_changed(gpointer user_data)
         if (priv->state >= NM_DEVICE_STATE_IP_CONFIG && priv->state <= NM_DEVICE_STATE_ACTIVATED
             && !nm_device_managed_type_is_external(self))
             nm_device_l3cfg_commit(self, NM_L3_CFG_COMMIT_TYPE_REAPPLY, FALSE);
-
+    }
+    if (priv->carrier && (!carrier_was_up || carrier_seen_down)) {
         /* If the device is active without a carrier (probably because it is
          * tagged for carrier ignore) ensure that when the carrier appears we
          * renew DHCP leases and such.
@@ -7803,6 +7811,8 @@ link_changed_cb(NMPlatform     *platform,
     priv = NM_DEVICE_GET_PRIVATE(self);
 
     if (ifindex == nm_device_get_ifindex(self)) {
+        if (!(pllink->n_ifi_flags & IFF_LOWER_UP))
+            priv->device_link_carrier_changed_down = TRUE;
         if (!(pllink->n_ifi_flags & IFF_UP))
             priv->device_link_changed_down = TRUE;
         if (!priv->device_link_changed_id) {
@@ -8814,6 +8824,9 @@ nm_device_controller_add_port(NMDevice *self, NMDevice *port, gboolean configure
     } else
         g_return_val_if_fail(port_priv->controller == self, FALSE);
 
+    /* Once the port is attached, unmanaged-external-down might change */
+    _dev_unmanaged_check_external_down(self, TRUE, FALSE);
+
     nm_device_queue_recheck_assume(self);
     nm_device_queue_recheck_assume(port);
 
@@ -13417,6 +13430,8 @@ _dev_ipsharedx_cleanup(NMDevice *self, int addr_family)
         nm_clear_l3cd(&priv->ipshared_data_4.v4.l3cd);
 
         _dev_l3_register_l3cds_set_one(self, L3_CONFIG_DATA_TYPE_SHARED_4, NULL, FALSE);
+    } else {
+        _dev_l3_register_l3cds_set_one(self, L3_CONFIG_DATA_TYPE_PD_6, NULL, FALSE);
     }
 
     _dev_ipsharedx_set_state(self, addr_family, NM_DEVICE_IP_STATE_NONE);
@@ -15085,8 +15100,8 @@ respawn_ping_cb(gpointer user_data)
     nm_clear_g_source_inst(&ping_op->watch);
 
     if (!spawn_ping_for_operation(self, ping_op)) {
-        cleanup_ping_operation(ping_op);
         priv->ping_operations = g_list_remove(priv->ping_operations, ping_op);
+        cleanup_ping_operation(ping_op);
 
         if (g_list_length(priv->ping_operations) == 0) {
             ip_check_pre_up(self);
@@ -15129,7 +15144,6 @@ ip_check_ping_watch_cb(GPid pid, int status, gpointer user_data)
 
     if (success) {
         if (ping_op->ping_addresses_require_all) {
-            cleanup_ping_operation(ping_op);
             priv->ping_operations = g_list_remove(priv->ping_operations, ping_op);
             if (g_list_length(priv->ping_operations) == 0) {
                 _LOGD(ping_op->log_domain,
@@ -15139,6 +15153,7 @@ ip_check_ping_watch_cb(GPid pid, int status, gpointer user_data)
                     nm_clear_g_source_inst(&priv->ping_timeout);
                 ip_check_pre_up(self);
             }
+            cleanup_ping_operation(ping_op);
         } else {
             nm_assert(priv->ping_operations);
 
diff --git a/src/core/devices/ovs/nm-device-ovs-bridge.c b/src/core/devices/ovs/nm-device-ovs-bridge.c
index 0977766939..c9b1f4c6af 100644
--- a/src/core/devices/ovs/nm-device-ovs-bridge.c
+++ b/src/core/devices/ovs/nm-device-ovs-bridge.c
@@ -135,13 +135,36 @@ nm_device_ovs_reapply_connection(NMDevice *self, NMConnection *con_old, NMConnec
     nm_ovsdb_set_reapply(nm_ovsdb_get(),
                          device_type,
                          nm_device_get_ip_iface(self),
-                         nm_connection_get_uuid(con_new),
+                         nm_simple_connection_new_clone(con_new),
                          _nm_connection_get_setting(con_old, NM_TYPE_SETTING_OVS_EXTERNAL_IDS),
                          _nm_connection_get_setting(con_new, NM_TYPE_SETTING_OVS_EXTERNAL_IDS),
                          _nm_connection_get_setting(con_old, NM_TYPE_SETTING_OVS_OTHER_CONFIG),
                          _nm_connection_get_setting(con_new, NM_TYPE_SETTING_OVS_OTHER_CONFIG));
 }
 
+static gboolean
+can_reapply_change(NMDevice   *device,
+                   const char *setting_name,
+                   NMSetting  *s_old,
+                   NMSetting  *s_new,
+                   GHashTable *diffs,
+                   GError    **error)
+{
+    NMDeviceClass *device_class = NM_DEVICE_CLASS(nm_device_ovs_bridge_parent_class);
+
+    if (nm_streq(setting_name, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) {
+        return nm_device_hash_check_invalid_keys(diffs,
+                                                 NM_SETTING_OVS_BRIDGE_SETTING_NAME,
+                                                 error,
+                                                 NM_SETTING_OVS_BRIDGE_FAIL_MODE,
+                                                 NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE,
+                                                 NM_SETTING_OVS_BRIDGE_RSTP_ENABLE,
+                                                 NM_SETTING_OVS_BRIDGE_STP_ENABLE);
+    }
+
+    return device_class->can_reapply_change(device, setting_name, s_old, s_new, diffs, error);
+}
+
 /*****************************************************************************/
 
 static void
@@ -180,6 +203,7 @@ nm_device_ovs_bridge_class_init(NMDeviceOvsBridgeClass *klass)
     device_class->ready_for_ip_config                 = ready_for_ip_config;
     device_class->attach_port                         = attach_port;
     device_class->detach_port                         = detach_port;
+    device_class->can_reapply_change                  = can_reapply_change;
     device_class->can_reapply_change_ovs_external_ids = TRUE;
     device_class->reapply_connection                  = nm_device_ovs_reapply_connection;
 }
diff --git a/src/core/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c
index 06a1da15e0..512aa5c327 100644
--- a/src/core/devices/ovs/nm-device-ovs-interface.c
+++ b/src/core/devices/ovs/nm-device-ovs-interface.c
@@ -26,16 +26,18 @@ typedef struct {
     NMOvsdb *ovsdb;
 
     struct {
-        /* The source for the idle handler to set the TUN ifindex */
-        GSource *tun_set_ifindex_idle_source;
-        /* The cloned MAC to set */
-        char *cloned_mac;
-        /* The id for the signal watching the TUN link to appear/change */
+        /* The signal id for the TUN link-changed event */
         gulong tun_link_signal_id;
-        /* The TUN ifindex to set in the idle handler */
+        /* The idle handler source for the TUN link-changed event */
+        GSource *tun_link_idle_source;
+        /* The ifindex for the TUN link-changed event */
         int tun_ifindex;
+
+        /* The cloned MAC to set */
+        char *cloned_mac;
         /* Whether we have determined the cloned MAC */
         bool cloned_mac_evaluated : 1;
+
         /* Whether we are waiting for the kernel link */
         bool waiting : 1;
     } wait_link;
@@ -261,39 +263,33 @@ ready_for_ip_config(NMDevice *device, gboolean is_manual)
 }
 
 static gboolean
-_set_ip_ifindex_tun(gpointer user_data)
+_netdev_tun_link_cb_in_idle(gpointer user_data)
 {
     NMDevice                    *device = user_data;
     NMDeviceOvsInterface        *self   = NM_DEVICE_OVS_INTERFACE(device);
     NMDeviceOvsInterfacePrivate *priv   = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE(self);
 
-    _LOGT(LOGD_CORE,
-          "ovs-wait-link: setting ip-ifindex %d from tun interface",
-          priv->wait_link.tun_ifindex);
-
-    nm_clear_g_source_inst(&priv->wait_link.tun_set_ifindex_idle_source);
-
-    nm_device_set_ip_ifindex(device, priv->wait_link.tun_ifindex);
-
-    if (check_waiting_for_link(device, "set-ip-ifindex-tun")) {
-        /* If the link is not ready, it means the MAC is not set yet. We don't have
-         * a convenient way to monitor for ip-ifindex changes other than listening
-         * for platform events again.*/
-        nm_assert(!priv->wait_link.tun_link_signal_id);
-        priv->wait_link.tun_link_signal_id = g_signal_connect(nm_device_get_platform(device),
-                                                              NM_PLATFORM_SIGNAL_LINK_CHANGED,
-                                                              G_CALLBACK(_netdev_tun_link_cb),
-                                                              self);
-        return G_SOURCE_CONTINUE;
+    if (nm_device_get_ip_ifindex(device) <= 0) {
+        _LOGT(LOGD_CORE,
+              "ovs-wait-link: setting ip-ifindex %d from tun link",
+              priv->wait_link.tun_ifindex);
+        nm_device_set_ip_ifindex(device, priv->wait_link.tun_ifindex);
     }
 
-    _LOGT(LOGD_CORE, "tun link is ready");
+    if (check_waiting_for_link(device, "tun-link-changed")) {
+        nm_clear_g_source_inst(&priv->wait_link.tun_link_idle_source);
+        return G_SOURCE_CONTINUE;
+    }
 
+    _LOGT(LOGD_CORE, "ovs-wait-link: tun link is ready");
     nm_device_link_properties_set(device, FALSE);
+    nm_device_bring_up(device);
 
     nm_device_devip_set_state(device, AF_INET, NM_DEVICE_IP_STATE_PENDING, NULL);
     nm_device_devip_set_state(device, AF_INET6, NM_DEVICE_IP_STATE_PENDING, NULL);
     nm_device_activate_schedule_stage3_ip_config(device, FALSE);
+    nm_clear_g_signal_handler(nm_device_get_platform(device), &priv->wait_link.tun_link_signal_id);
+    nm_clear_g_source_inst(&priv->wait_link.tun_link_idle_source);
 
     return G_SOURCE_CONTINUE;
 }
@@ -309,40 +305,28 @@ _netdev_tun_link_cb(NMPlatform     *platform,
     const NMPlatformSignalChangeType change_type = change_type_i;
     NMDeviceOvsInterface            *self        = NM_DEVICE_OVS_INTERFACE(device);
     NMDeviceOvsInterfacePrivate     *priv        = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE(self);
-    int                              ip_ifindex;
 
-    if (pllink->type != NM_LINK_TYPE_TUN || !nm_streq0(pllink->name, nm_device_get_iface(device)))
+    /* This is the handler for the link-changed platform events. It is triggered for all
+     * link changes. Keep only the ones matching our device. */
+    if (!NM_IN_SET(change_type, NM_PLATFORM_SIGNAL_ADDED, NM_PLATFORM_SIGNAL_CHANGED))
         return;
-
-    ip_ifindex = nm_device_get_ip_ifindex(device);
-    if (ip_ifindex > 0) {
-        /* When we have an ifindex, we are only waiting for the MAC to settle */
-        if (change_type != NM_PLATFORM_SIGNAL_CHANGED)
-            return;
-
-        if (!check_waiting_for_link(device, "tun-link-changed")) {
-            _LOGT(LOGD_CORE, "ovs-wait-link: tun link is ready, cloned MAC is set");
-
-            nm_clear_g_signal_handler(platform, &priv->wait_link.tun_link_signal_id);
-            nm_device_link_properties_set(device, FALSE);
-
-            nm_device_devip_set_state(device, AF_INET, NM_DEVICE_IP_STATE_PENDING, NULL);
-            nm_device_devip_set_state(device, AF_INET6, NM_DEVICE_IP_STATE_PENDING, NULL);
-            nm_device_activate_schedule_stage3_ip_config(device, FALSE);
-        }
-        return;
-    }
-
-    /* No ip-ifindex on the device, set it when the link appears */
-    if (change_type != NM_PLATFORM_SIGNAL_ADDED)
+    if (pllink->type != NM_LINK_TYPE_TUN || !nm_streq0(pllink->name, nm_device_get_iface(device)))
         return;
 
     _LOGT(LOGD_CORE,
-          "ovs-wait-link: found matching tun interface, schedule set-ip-ifindex(%d)",
+          "ovs-wait-link: got platform event \'%s\' for ifindex %d, scheduling idle handler",
+          change_type == NM_PLATFORM_SIGNAL_ADDED ? "added" : "changed",
           ifindex);
-    nm_clear_g_signal_handler(platform, &priv->wait_link.tun_link_signal_id);
-    priv->wait_link.tun_ifindex                 = ifindex;
-    priv->wait_link.tun_set_ifindex_idle_source = nm_g_idle_add_source(_set_ip_ifindex_tun, device);
+
+    /* The handler is invoked by the platform synchronously in the netlink receive loop.
+     * We can't perform other platform operations (like bringing the interface up) since
+     * the code there is not re-entrant. Schedule an idle handler. */
+    nm_clear_g_source_inst(&priv->wait_link.tun_link_idle_source);
+    priv->wait_link.tun_link_idle_source =
+        nm_g_idle_add_source(_netdev_tun_link_cb_in_idle, device);
+    priv->wait_link.tun_ifindex = ifindex;
+
+    return;
 }
 
 static gboolean
@@ -464,7 +448,7 @@ act_stage3_ip_config(NMDevice *device, int addr_family)
         nm_device_activate_schedule_stage3_ip_config(device, TRUE);
         return;
     }
-    nm_clear_g_source_inst(&priv->wait_link.tun_set_ifindex_idle_source);
+    nm_clear_g_source_inst(&priv->wait_link.tun_link_idle_source);
     nm_clear_g_signal_handler(nm_device_get_platform(device), &priv->wait_link.tun_link_signal_id);
 
     nm_device_link_properties_set(device, FALSE);
@@ -488,7 +472,7 @@ deactivate(NMDevice *device)
     priv->wait_link.cloned_mac_evaluated = FALSE;
     nm_clear_g_free(&priv->wait_link.cloned_mac);
     nm_clear_g_signal_handler(nm_device_get_platform(device), &priv->wait_link.tun_link_signal_id);
-    nm_clear_g_source_inst(&priv->wait_link.tun_set_ifindex_idle_source);
+    nm_clear_g_source_inst(&priv->wait_link.tun_link_idle_source);
 }
 
 typedef struct {
@@ -581,7 +565,7 @@ deactivate_async(NMDevice                  *device,
     _LOGT(LOGD_CORE, "deactivate: start async");
 
     nm_clear_g_signal_handler(nm_device_get_platform(device), &priv->wait_link.tun_link_signal_id);
-    nm_clear_g_source_inst(&priv->wait_link.tun_set_ifindex_idle_source);
+    nm_clear_g_source_inst(&priv->wait_link.tun_link_idle_source);
     priv->wait_link.tun_ifindex          = -1;
     priv->wait_link.cloned_mac_evaluated = FALSE;
     nm_clear_g_free(&priv->wait_link.cloned_mac);
@@ -682,7 +666,7 @@ dispose(GObject *object)
 
     nm_assert(!priv->wait_link.waiting);
     nm_assert(priv->wait_link.tun_link_signal_id == 0);
-    nm_assert(!priv->wait_link.tun_set_ifindex_idle_source);
+    nm_assert(!priv->wait_link.tun_link_idle_source);
 
     if (priv->ovsdb) {
         g_signal_handlers_disconnect_by_func(priv->ovsdb, G_CALLBACK(ovsdb_ready), self);
diff --git a/src/core/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c
index 7eacedb847..e9928548ff 100644
--- a/src/core/devices/ovs/nm-device-ovs-port.c
+++ b/src/core/devices/ovs/nm-device-ovs-port.c
@@ -256,6 +256,32 @@ detach_port(NMDevice                  *device,
     return ret;
 }
 
+static gboolean
+can_reapply_change(NMDevice   *device,
+                   const char *setting_name,
+                   NMSetting  *s_old,
+                   NMSetting  *s_new,
+                   GHashTable *diffs,
+                   GError    **error)
+{
+    NMDeviceClass *device_class = NM_DEVICE_CLASS(nm_device_ovs_port_parent_class);
+
+    if (nm_streq(setting_name, NM_SETTING_OVS_PORT_SETTING_NAME)) {
+        return nm_device_hash_check_invalid_keys(diffs,
+                                                 NM_SETTING_OVS_PORT_SETTING_NAME,
+                                                 error,
+                                                 NM_SETTING_OVS_PORT_TAG,
+                                                 NM_SETTING_OVS_PORT_VLAN_MODE,
+                                                 NM_SETTING_OVS_PORT_BOND_UPDELAY,
+                                                 NM_SETTING_OVS_PORT_BOND_DOWNDELAY,
+                                                 NM_SETTING_OVS_PORT_LACP,
+                                                 NM_SETTING_OVS_PORT_BOND_MODE,
+                                                 NM_SETTING_OVS_PORT_TRUNKS);
+    }
+
+    return device_class->can_reapply_change(device, setting_name, s_old, s_new, diffs, error);
+}
+
 /*****************************************************************************/
 
 static void
@@ -293,6 +319,7 @@ nm_device_ovs_port_class_init(NMDeviceOvsPortClass *klass)
     device_class->ready_for_ip_config                 = ready_for_ip_config;
     device_class->attach_port                         = attach_port;
     device_class->detach_port                         = detach_port;
+    device_class->can_reapply_change                  = can_reapply_change;
     device_class->can_reapply_change_ovs_external_ids = TRUE;
     device_class->reapply_connection                  = nm_device_ovs_reapply_connection;
 }
diff --git a/src/core/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c
index 528d44d8f1..2dbc842a73 100644
--- a/src/core/devices/ovs/nm-ovsdb.c
+++ b/src/core/devices/ovs/nm-ovsdb.c
@@ -101,13 +101,13 @@ typedef union {
         guint32 mtu;
     } set_interface_mtu;
     struct {
-        NMDeviceType device_type;
-        char        *ifname;
-        char        *connection_uuid;
-        GHashTable  *external_ids_old;
-        GHashTable  *external_ids_new;
-        GHashTable  *other_config_old;
-        GHashTable  *other_config_new;
+        NMDeviceType  device_type;
+        char         *ifname;
+        NMConnection *connection;
+        GHashTable   *external_ids_old;
+        GHashTable   *external_ids_new;
+        GHashTable   *other_config_old;
+        GHashTable   *other_config_new;
     } set_reapply;
 } OvsdbMethodPayload;
 
@@ -242,24 +242,21 @@ static void     cleanup_check_ready(NMOvsdb *self);
             },                                                    \
     }))
 
-#define OVSDB_METHOD_PAYLOAD_SET_REAPPLY(xdevice_type,                               \
-                                         xifname,                                    \
-                                         xconnection_uuid,                           \
-                                         xexternal_ids_old,                          \
-                                         xexternal_ids_new,                          \
-                                         xother_config_old,                          \
-                                         xother_config_new)                          \
-    (&((const OvsdbMethodPayload) {                                                  \
-        .set_reapply =                                                               \
-            {                                                                        \
-                .device_type      = xdevice_type,                                    \
-                .ifname           = (char *) NM_CONSTCAST(char, (xifname)),          \
-                .connection_uuid  = (char *) NM_CONSTCAST(char, (xconnection_uuid)), \
-                .external_ids_old = (xexternal_ids_old),                             \
-                .external_ids_new = (xexternal_ids_new),                             \
-                .other_config_old = (xother_config_old),                             \
-                .other_config_new = (xother_config_new),                             \
-            },                                                                       \
+#define OVSDB_METHOD_PAYLOAD_SET_REAPPLY(xdevice_type,                              \
+                                         xifname,                                   \
+                                         xconnection,                               \
+                                         xexternal_ids_old,                         \
+                                         xexternal_ids_new,                         \
+                                         xother_config_old,                         \
+                                         xother_config_new)                         \
+    (&((const OvsdbMethodPayload) {                                                 \
+        .set_reapply = {.device_type      = xdevice_type,                           \
+                        .ifname           = (char *) NM_CONSTCAST(char, (xifname)), \
+                        .connection       = (xconnection),                          \
+                        .external_ids_old = (xexternal_ids_old),                    \
+                        .external_ids_new = (xexternal_ids_new),                    \
+                        .other_config_old = (xother_config_old),                    \
+                        .other_config_new = (xother_config_new)},                   \
     }))
 
 /*****************************************************************************/
@@ -316,7 +313,7 @@ _call_complete(OvsdbMethodCall *call, json_t *response, GError *error)
         break;
     case OVSDB_SET_REAPPLY:
         nm_clear_g_free(&call->payload.set_reapply.ifname);
-        nm_clear_g_free(&call->payload.set_reapply.connection_uuid);
+        nm_clear_g_object(&call->payload.set_reapply.connection);
         nm_clear_pointer(&call->payload.set_reapply.external_ids_old, g_hash_table_destroy);
         nm_clear_pointer(&call->payload.set_reapply.external_ids_new, g_hash_table_destroy);
         nm_clear_pointer(&call->payload.set_reapply.other_config_old, g_hash_table_destroy);
@@ -476,9 +473,9 @@ ovsdb_call_method(NMOvsdb                  *self,
                    call->payload.set_interface_mtu.mtu);
         break;
     case OVSDB_SET_REAPPLY:
-        call->payload.set_reapply.device_type     = payload->set_reapply.device_type;
-        call->payload.set_reapply.ifname          = g_strdup(payload->set_reapply.ifname);
-        call->payload.set_reapply.connection_uuid = g_strdup(payload->set_reapply.connection_uuid);
+        call->payload.set_reapply.device_type = payload->set_reapply.device_type;
+        call->payload.set_reapply.ifname      = g_strdup(payload->set_reapply.ifname);
+        call->payload.set_reapply.connection  = payload->set_reapply.connection;
         call->payload.set_reapply.external_ids_old =
             nm_g_hash_table_ref(payload->set_reapply.external_ids_old);
         call->payload.set_reapply.external_ids_new =
@@ -488,8 +485,8 @@ ovsdb_call_method(NMOvsdb                  *self,
         call->payload.set_reapply.other_config_new =
             nm_g_hash_table_ref(payload->set_reapply.other_config_new);
         _LOGT_call(call,
-                   "new: set external-ids/other-config con-uuid=%s, interface=%s",
-                   call->payload.set_reapply.connection_uuid,
+                   "new: reapply con-uuid=%s, interface=%s",
+                   nm_connection_get_uuid(payload->set_reapply.connection),
                    call->payload.set_reapply.ifname);
         break;
     }
@@ -976,65 +973,79 @@ _insert_interface(json_t       *params,
                                     "rowInterface"));
 }
 
-/**
- * _insert_port:
- *
- * Returns an commands that adds new port from a given connection.
- */
 static void
-_insert_port(json_t *params, NMConnection *port, json_t *new_interfaces)
+ovsdb_row_set_string_or_null(json_t *row, const char *key, const char *str)
+{
+    /* ovsdb represents a NULL string (no value) as an empty set */
+    if (str) {
+        json_object_set_new(row, key, json_string(str));
+    } else {
+        json_object_set_new(row, key, json_pack("[s, []]", "set"));
+    }
+}
+
+static json_t *
+create_port_row_object(NMConnection *connection)
 {
     NMSettingOvsPort *s_ovs_port;
-    const char       *vlan_mode      = NULL;
-    json_t           *trunks         = NULL;
-    guint             tag            = 0;
-    const char       *lacp           = NULL;
-    const char       *bond_mode      = NULL;
-    guint             bond_updelay   = 0;
-    guint             bond_downdelay = 0;
     json_t           *row;
+    const char       *s;
+    guint             u;
 
-    s_ovs_port = nm_connection_get_setting_ovs_port(port);
+    s_ovs_port = nm_connection_get_setting_ovs_port(connection);
+    nm_assert(s_ovs_port);
 
     row = json_object();
 
-    if (s_ovs_port) {
+    s = nm_setting_ovs_port_get_vlan_mode(s_ovs_port);
+    ovsdb_row_set_string_or_null(row, "vlan_mode", s);
+
+    u = nm_setting_ovs_port_get_tag(s_ovs_port);
+    json_object_set_new(row, "tag", u != 0 ? json_integer(u) : json_pack("[s, []]", "set"));
+
+    u = nm_setting_ovs_port_get_bond_updelay(s_ovs_port);
+    json_object_set_new(row, "bond_updelay", json_integer(u));
+
+    u = nm_setting_ovs_port_get_bond_downdelay(s_ovs_port);
+    json_object_set_new(row, "bond_downdelay", json_integer(u));
+
+    s = nm_setting_ovs_port_get_lacp(s_ovs_port);
+    ovsdb_row_set_string_or_null(row, "lacp", s);
+
+    s = nm_setting_ovs_port_get_bond_mode(s_ovs_port);
+    ovsdb_row_set_string_or_null(row, "bond_mode", s);
+
+    {
         const GPtrArray *ranges;
-        guint            i;
+        json_t          *trunks = json_array();
         guint64          start;
         guint64          end;
-
-        vlan_mode      = nm_setting_ovs_port_get_vlan_mode(s_ovs_port);
-        tag            = nm_setting_ovs_port_get_tag(s_ovs_port);
-        lacp           = nm_setting_ovs_port_get_lacp(s_ovs_port);
-        bond_mode      = nm_setting_ovs_port_get_bond_mode(s_ovs_port);
-        bond_updelay   = nm_setting_ovs_port_get_bond_updelay(s_ovs_port);
-        bond_downdelay = nm_setting_ovs_port_get_bond_downdelay(s_ovs_port);
+        guint            i;
 
         ranges = _nm_setting_ovs_port_get_trunks_arr(s_ovs_port);
         for (i = 0; i < ranges->len; i++) {
-            if (!trunks)
-                trunks = json_array();
             nm_range_get_range(ranges->pdata[i], &start, &end);
             for (; start <= end; start++)
                 json_array_append_new(trunks, json_integer(start));
         }
-    }
 
-    if (vlan_mode)
-        json_object_set_new(row, "vlan_mode", json_string(vlan_mode));
-    if (tag)
-        json_object_set_new(row, "tag", json_integer(tag));
-    if (trunks)
         json_object_set_new(row, "trunks", json_pack("[s, o]", "set", trunks));
-    if (lacp)
-        json_object_set_new(row, "lacp", json_string(lacp));
-    if (bond_mode)
-        json_object_set_new(row, "bond_mode", json_string(bond_mode));
-    if (bond_updelay)
-        json_object_set_new(row, "bond_updelay", json_integer(bond_updelay));
-    if (bond_downdelay)
-        json_object_set_new(row, "bond_downdelay", json_integer(bond_downdelay));
+    }
+
+    return row;
+}
+
+/**
+ * _insert_port:
+ *
+ * Returns a command that adds new port from a given connection.
+ */
+static void
+_insert_port(json_t *params, NMConnection *port, json_t *new_interfaces)
+{
+    json_t *row;
+
+    row = create_port_row_object(port);
 
     json_object_set_new(row, "name", json_string(nm_connection_get_interface_name(port)));
     json_object_set_new(row, "interfaces", json_pack("[s, O]", "set", new_interfaces));
@@ -1058,10 +1069,50 @@ _insert_port(json_t *params, NMConnection *port, json_t *new_interfaces)
                                     "rowPort"));
 }
 
+static json_t *
+create_bridge_row_object(NMConnection *connection, gboolean is_reapply)
+{
+    NMSettingOvsBridge *s_ovs_bridge;
+    json_t             *row;
+    gboolean            b;
+    const char         *s;
+
+    s_ovs_bridge = nm_connection_get_setting_ovs_bridge(connection);
+    nm_assert(s_ovs_bridge);
+
+    row = json_object();
+
+    b = nm_setting_ovs_bridge_get_mcast_snooping_enable(s_ovs_bridge);
+    json_object_set_new(row, "mcast_snooping_enable", json_boolean(b));
+
+    b = nm_setting_ovs_bridge_get_rstp_enable(s_ovs_bridge);
+    json_object_set_new(row, "rstp_enable", json_boolean(b));
+
+    b = nm_setting_ovs_bridge_get_stp_enable(s_ovs_bridge);
+    json_object_set_new(row, "stp_enable", json_boolean(b));
+
+    s = nm_setting_ovs_bridge_get_fail_mode(s_ovs_bridge);
+    ovsdb_row_set_string_or_null(row, "fail_mode", s);
+
+    if (!is_reapply) {
+        /* The datapath type can't be reapplied because after changing it,
+         * ovs removes the existing ovs-interface and creates a tun one (or
+         * vice-versa). */
+        s = nm_setting_ovs_bridge_get_datapath_type(s_ovs_bridge);
+        if (s) {
+            /* Cannot use ovsdb_row_set_string_or_null() here as the column
+             * is a set and must not be empty. */
+            json_object_set_new(row, "datapath_type", json_string(s));
+        }
+    }
+
+    return row;
+}
+
 /**
  * _insert_bridge:
  *
- * Returns an commands that adds new bridge from a given connection.
+ * Returns a command that adds new bridge from a given connection.
  */
 static void
 _insert_bridge(json_t       *params,
@@ -1070,36 +1121,9 @@ _insert_bridge(json_t       *params,
                json_t       *new_ports,
                const char   *cloned_mac)
 {
-    NMSettingOvsBridge *s_ovs_bridge;
-    const char         *fail_mode             = NULL;
-    gboolean            mcast_snooping_enable = FALSE;
-    gboolean            rstp_enable           = FALSE;
-    gboolean            stp_enable            = FALSE;
-    const char         *datapath_type         = NULL;
-    json_t             *row;
-
-    s_ovs_bridge = nm_connection_get_setting_ovs_bridge(bridge);
-
-    row = json_object();
-
-    if (s_ovs_bridge) {
-        fail_mode             = nm_setting_ovs_bridge_get_fail_mode(s_ovs_bridge);
-        mcast_snooping_enable = nm_setting_ovs_bridge_get_mcast_snooping_enable(s_ovs_bridge);
-        rstp_enable           = nm_setting_ovs_bridge_get_rstp_enable(s_ovs_bridge);
-        stp_enable            = nm_setting_ovs_bridge_get_stp_enable(s_ovs_bridge);
-        datapath_type         = nm_setting_ovs_bridge_get_datapath_type(s_ovs_bridge);
-    }
+    json_t *row;
 
-    if (fail_mode)
-        json_object_set_new(row, "fail_mode", json_string(fail_mode));
-    if (mcast_snooping_enable)
-        json_object_set_new(row, "mcast_snooping_enable", json_boolean(mcast_snooping_enable));
-    if (rstp_enable)
-        json_object_set_new(row, "rstp_enable", json_boolean(rstp_enable));
-    if (stp_enable)
-        json_object_set_new(row, "stp_enable", json_boolean(stp_enable));
-    if (datapath_type)
-        json_object_set_new(row, "datapath_type", json_string(datapath_type));
+    row = create_bridge_row_object(bridge, FALSE);
 
     json_object_set_new(row, "name", json_string(nm_connection_get_interface_name(bridge)));
     json_object_set_new(row, "ports", json_pack("[s, O]", "set", new_ports));
@@ -1541,13 +1565,47 @@ ovsdb_next_command(NMOvsdb *self)
             break;
         case OVSDB_SET_REAPPLY:
         {
-            json_t *mutations;
+            NMConnection *connection;
+            json_t       *mutations;
+            json_t       *row;
+            const char   *table;
+
+            connection = call->payload.set_reapply.connection;
+            table      = _device_type_to_table(call->payload.set_reapply.device_type);
+
+            /* Reapply device properties */
+            switch (call->payload.set_reapply.device_type) {
+            case NM_DEVICE_TYPE_OVS_BRIDGE:
+                row = create_bridge_row_object(connection, TRUE);
+                break;
+            case NM_DEVICE_TYPE_OVS_PORT:
+                row = create_port_row_object(connection);
+                break;
+            default:
+                row = NULL;
+                break;
+            }
 
-            mutations = json_array();
+            if (row) {
+                json_array_append_new(params,
+                                      json_pack("{s:s, s:s, s:o, s:[[s, s, s]]}",
+                                                "op",
+                                                "update",
+                                                "table",
+                                                table,
+                                                "row",
+                                                row,
+                                                "where",
+                                                "name",
+                                                "==",
+                                                call->payload.set_reapply.ifname));
+            }
 
+            /* Reapply external-ids and other-config */
+            mutations = json_array();
             _j_create_strv_array_update(mutations,
                                         STRDICT_TYPE_EXTERNAL_IDS,
-                                        call->payload.set_reapply.connection_uuid,
+                                        nm_connection_get_uuid(connection),
                                         call->payload.set_reapply.external_ids_old,
                                         call->payload.set_reapply.external_ids_new);
             _j_create_strv_array_update(mutations,
@@ -1556,19 +1614,18 @@ ovsdb_next_command(NMOvsdb *self)
                                         call->payload.set_reapply.other_config_old,
                                         call->payload.set_reapply.other_config_new);
 
-            json_array_append_new(
-                params,
-                json_pack("{s:s, s:s, s:o, s:[[s, s, s]]}",
-                          "op",
-                          "mutate",
-                          "table",
-                          _device_type_to_table(call->payload.set_reapply.device_type),
-                          "mutations",
-                          mutations,
-                          "where",
-                          "name",
-                          "==",
-                          call->payload.set_reapply.ifname));
+            json_array_append_new(params,
+                                  json_pack("{s:s, s:s, s:o, s:[[s, s, s]]}",
+                                            "op",
+                                            "mutate",
+                                            "table",
+                                            table,
+                                            "mutations",
+                                            mutations,
+                                            "where",
+                                            "name",
+                                            "==",
+                                            call->payload.set_reapply.ifname));
             break;
         }
 
@@ -2411,7 +2468,7 @@ again:
                  * content is broken (_json_read_msg() cannot extract any data) and
                  * we disconnect. */
                 priv->input_timeout_source =
-                    nm_g_timeout_add_seconds_source(5, _ovsdb_read_input_timeout_cb, NULL);
+                    nm_g_timeout_add_seconds_source(5, _ovsdb_read_input_timeout_cb, self);
             }
             return;
         }
@@ -2975,7 +3032,7 @@ void
 nm_ovsdb_set_reapply(NMOvsdb                 *self,
                      NMDeviceType             device_type,
                      const char              *ifname,
-                     const char              *connection_uuid,
+                     NMConnection            *connection_take,
                      NMSettingOvsExternalIDs *s_external_ids_old,
                      NMSettingOvsExternalIDs *s_external_ids_new,
                      NMSettingOvsOtherConfig *s_other_config_old,
@@ -2986,6 +3043,11 @@ nm_ovsdb_set_reapply(NMOvsdb                 *self,
     gs_unref_hashtable GHashTable *other_config_old = NULL;
     gs_unref_hashtable GHashTable *other_config_new = NULL;
 
+    nm_assert(NM_IN_SET(device_type,
+                        NM_DEVICE_TYPE_OVS_BRIDGE,
+                        NM_DEVICE_TYPE_OVS_PORT,
+                        NM_DEVICE_TYPE_OVS_INTERFACE));
+
     external_ids_old =
         s_external_ids_old
             ? nm_strdict_clone(_nm_setting_ovs_external_ids_get_data(s_external_ids_old))
@@ -3011,7 +3073,7 @@ nm_ovsdb_set_reapply(NMOvsdb                 *self,
                       OVSDB_SET_REAPPLY,
                       OVSDB_METHOD_PAYLOAD_SET_REAPPLY(device_type,
                                                        ifname,
-                                                       connection_uuid,
+                                                       connection_take,
                                                        external_ids_old,
                                                        external_ids_new,
                                                        other_config_old,
diff --git a/src/core/devices/ovs/nm-ovsdb.h b/src/core/devices/ovs/nm-ovsdb.h
index a022ff00ad..9b3fb8f941 100644
--- a/src/core/devices/ovs/nm-ovsdb.h
+++ b/src/core/devices/ovs/nm-ovsdb.h
@@ -50,7 +50,7 @@ void nm_ovsdb_set_interface_mtu(NMOvsdb        *self,
 void nm_ovsdb_set_reapply(NMOvsdb                 *self,
                           NMDeviceType             device_type,
                           const char              *ifname,
-                          const char              *connection_uuid,
+                          NMConnection            *connection_take,
                           NMSettingOvsExternalIDs *s_external_ids_old,
                           NMSettingOvsExternalIDs *s_external_ids_new,
                           NMSettingOvsOtherConfig *s_other_config_old,
diff --git a/src/core/dns/nm-dns-dnsconfd.c b/src/core/dns/nm-dns-dnsconfd.c
index 63b3060f3d..c17fb9cf44 100644
--- a/src/core/dns/nm-dns-dnsconfd.c
+++ b/src/core/dns/nm-dns-dnsconfd.c
@@ -71,6 +71,15 @@ typedef enum {
 
 /*****************************************************************************/
 
+static void
+dnsconfd_change_plugin_state(NMDnsDnsconfd *self, DnsconfdPluginState new_state)
+{
+    NMDnsDnsconfdPrivate *priv = NM_DNS_DNSCONFD_GET_PRIVATE(self);
+
+    priv->plugin_state = new_state;
+    _nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
+}
+
 static void
 dnsconfd_serial_changed(NMDnsDnsconfd *self, guint new_serial)
 {
@@ -78,12 +87,10 @@ dnsconfd_serial_changed(NMDnsDnsconfd *self, guint new_serial)
     priv->present_configuration_serial = new_serial;
     if (priv->plugin_state == DNSCONFD_PLUGIN_WAIT_SERIAL
         && priv->awaited_configuration_serial == new_serial) {
-        priv->plugin_state = DNSCONFD_PLUGIN_IDLE;
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
         /* Update finished, serials match */
         _LOGT("serials match, update finished");
     }
-
-    _nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
 }
 
 static void
@@ -132,6 +139,12 @@ dnsconfd_serial_retrieval_done(GObject *source_object, GAsyncResult *res, gpoint
     self = user_data;
     priv = NM_DNS_DNSCONFD_GET_PRIVATE(self);
 
+    if (!response) {
+        _LOGW("dnsconfd serial retrieval failed: %s", error->message);
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
+        return;
+    }
+
     nm_clear_g_cancellable(&priv->serial_cancellable);
 
     g_variant_get(response, "(v)", &new_serial_variant);
@@ -201,8 +214,11 @@ dnsconfd_update_done(GObject *source_object, GAsyncResult *res, gpointer user_da
 
     nm_clear_g_cancellable(&priv->update_cancellable);
 
-    if (!response)
+    if (!response) {
         _LOGW("dnsconfd update failed: %s", error->message);
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
+        return;
+    }
 
     /* By using &s we will get pointer to char data contained
      * in variant and thus no freing of dnsconfd_message is required */
@@ -210,8 +226,7 @@ dnsconfd_update_done(GObject *source_object, GAsyncResult *res, gpointer user_da
 
     if (!awaited_serial) {
         _LOGW("dnsconfd refused update: %s", dnsconfd_message);
-        priv->plugin_state = DNSCONFD_PLUGIN_IDLE;
-        _nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
         return;
     }
 
@@ -220,14 +235,12 @@ dnsconfd_update_done(GObject *source_object, GAsyncResult *res, gpointer user_da
 
     if (priv->awaited_configuration_serial == priv->present_configuration_serial) {
         /* Serials match, update finished */
-        priv->plugin_state = DNSCONFD_PLUGIN_IDLE;
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
         _LOGT("after update serials match");
     } else {
-        priv->plugin_state = DNSCONFD_PLUGIN_WAIT_SERIAL;
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_SERIAL);
         _LOGT("after update serials don't match, waiting");
     }
-
-    _nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
 }
 
 static gboolean
@@ -478,8 +491,7 @@ name_owner_changed(NMDnsDnsconfd *self, const char *name_owner)
             || priv->plugin_state == DNSCONFD_PLUGIN_WAIT_SERIAL) {
             /* We were waiting for either serial or confirmation of update and name
              * disappeared, thus we need to retransmit */
-            priv->plugin_state = DNSCONFD_PLUGIN_WAIT_CONNECT;
-            _nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
+            dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_CONNECT);
         }
         return;
     }
@@ -490,15 +502,13 @@ name_owner_changed(NMDnsDnsconfd *self, const char *name_owner)
     if (!subscribe_serial(self)) {
         /* This means that in time between new name and subscribe serial call
          * we lost the name again thus wait again */
-        priv->plugin_state = DNSCONFD_PLUGIN_WAIT_CONNECT;
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_CONNECT);
         _LOGT("subscription failed, waiting to connect");
     } else {
-        priv->plugin_state = DNSCONFD_PLUGIN_WAIT_UPDATE_DONE;
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_UPDATE_DONE);
         _LOGT("sending update and waiting for its finish");
         send_dnsconfd_update(self);
     }
-
-    _nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
 }
 
 static void
@@ -695,18 +705,16 @@ update(NMDnsPlugin             *plugin,
     /* We need to consider only whether we are connected, because newer update call
      * overrides the old one */
     if (all_connected == CONNECTION_FAIL) {
-        priv->plugin_state = DNSCONFD_PLUGIN_IDLE;
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
         _LOGT("failed to connect");
     } else if (all_connected == CONNECTION_WAIT) {
-        priv->plugin_state = DNSCONFD_PLUGIN_WAIT_CONNECT;
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_CONNECT);
         _LOGT("not connected, waiting to connect");
     } else {
-        priv->plugin_state = DNSCONFD_PLUGIN_WAIT_UPDATE_DONE;
+        dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_UPDATE_DONE);
         _LOGT("connected, waiting for update to finish");
     }
 
-    _nm_dns_plugin_update_pending_maybe_changed(plugin);
-
     if (all_connected == CONNECTION_FAIL) {
         nm_utils_error_set(error,
                            NM_UTILS_ERROR_UNKNOWN,
diff --git a/src/core/nm-bond-manager.c b/src/core/nm-bond-manager.c
index 2f7fe36c16..116cb73744 100644
--- a/src/core/nm-bond-manager.c
+++ b/src/core/nm-bond-manager.c
@@ -882,7 +882,7 @@ nm_bond_manager_send_arp(int                 bond_ifindex,
         .sll_protocol = htons(ETH_P_ARP),
         .sll_ifindex  = bond_ifindex,
     };
-    ARPPacket         data;
+    ARPPacket         data = {0};
     const guint8     *hwaddr;
     gsize             hwaddrlen    = 0;
     nm_auto_close int sockfd       = -1;
@@ -940,6 +940,7 @@ nm_bond_manager_send_arp(int                 bond_ifindex,
         data.op = htons(ARP_OP_GARP);
         memcpy(data.s_addr, hwaddr, hwaddrlen);
         memcpy(data.s_hw_addr, hwaddr, hwaddrlen);
+        memset(data.d_hw_addr, 0xff, ETH_ALEN);
         for (int i = 0; i < addrs_len; i++) {
             const in_addr_t tmp_addr = addrs_array[i];
 
diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
index 22e6c0d5eb..2aa22331ea 100644
--- a/src/core/nm-connectivity.c
+++ b/src/core/nm-connectivity.c
@@ -25,6 +25,8 @@
 
 #define HEADER_STATUS_ONLINE "X-NetworkManager-Status: online\r\n"
 
+#define SD_RESOLVED_DNS ((guint64) (1LL << 0))
+
 /*****************************************************************************/
 
 static NM_UTILS_LOOKUP_STR_DEFINE(_state_to_string,
@@ -950,9 +952,6 @@ systemd_resolved_resolve_cb(GObject *object, GAsyncResult *res, gpointer user_da
 
     do_curl_request(cb_data, nm_str_buf_get_str(&strbuf_hosts));
 }
-#endif
-
-#define SD_RESOLVED_DNS ((guint64) (1LL << 0))
 
 static NMConnectivityState
 check_platform_config(NMConnectivity *self,
@@ -1013,6 +1012,7 @@ check_platform_config(NMConnectivity *self,
     NM_SET_OUT(reason, NULL);
     return NM_CONNECTIVITY_UNKNOWN;
 }
+#endif
 
 NMConnectivityCheckHandle *
 nm_connectivity_check_start(NMConnectivity             *self,
diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c
index b496061247..60f40228db 100644
--- a/src/core/nm-firewall-utils.c
+++ b/src/core/nm-firewall-utils.c
@@ -8,6 +8,7 @@
 
 #include "nm-firewall-utils.h"
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "libnm-glib-aux/nm-str-buf.h"
 #include "libnm-glib-aux/nm-io-utils.h"
 #include "libnm-platform/nm-platform.h"
@@ -127,7 +128,7 @@ _share_iptables_subnet_to_str(char      buf[static _SHARE_IPTABLES_SUBNET_TO_STR
 }
 
 static char *
-_share_iptables_get_name(gboolean is_iptables_chain, const char *prefix, const char *ip_iface)
+_iptables_get_name(gboolean is_iptables_chain, const char *prefix, const char *ip_iface)
 {
     NMStrBuf strbuf = NM_STR_BUF_INIT(NM_UTILS_GET_NEXT_REALLOC_SIZE_40, FALSE);
     gsize    ip_iface_len;
@@ -179,13 +180,13 @@ _share_iptables_get_name(gboolean is_iptables_chain, const char *prefix, const c
 /*****************************************************************************/
 
 static gboolean
-_share_iptables_call_v(const char *const *argv)
+_iptables_call_v(const char *const *argv)
 {
     gs_free_error GError *error    = NULL;
     gs_free char         *argv_str = NULL;
     int                   status;
 
-    nm_log_dbg(LOGD_SHARING, "iptables: %s", (argv_str = g_strjoinv(" ", (char **) argv)));
+    nm_log_dbg(LOGD_FIREWALL, "iptables: %s", (argv_str = g_strjoinv(" ", (char **) argv)));
 
     if (!g_spawn_sync("/",
                       (char **) argv,
@@ -197,7 +198,7 @@ _share_iptables_call_v(const char *const *argv)
                       NULL,
                       &status,
                       &error)) {
-        nm_log_warn(LOGD_SHARING,
+        nm_log_warn(LOGD_FIREWALL,
                     "iptables: error executing command %s: %s",
                     argv[0],
                     error->message);
@@ -205,20 +206,24 @@ _share_iptables_call_v(const char *const *argv)
     }
 
     if (!g_spawn_check_exit_status(status, &error)) {
-        nm_log_warn(LOGD_SHARING, "iptables: command %s failed: %s", argv[0], error->message);
+        nm_log_warn(LOGD_FIREWALL, "iptables: command %s failed: %s", argv[0], error->message);
         return FALSE;
     }
 
     return TRUE;
 }
 
-#define _share_iptables_call(...) \
-    _share_iptables_call_v(NM_MAKE_STRV("" IPTABLES_PATH "", "--wait", "2", __VA_ARGS__))
+#define _ipxtables_call(family, ...)                                                   \
+    _iptables_call_v(                                                                  \
+        NM_MAKE_STRV((family == AF_INET ? "" IPTABLES_PATH "" : "" IP6TABLES_PATH ""), \
+                     "--wait",                                                         \
+                     "2",                                                              \
+                     __VA_ARGS__))
 
 static gboolean
 _share_iptables_chain_op(const char *table, const char *chain, const char *op)
 {
-    return _share_iptables_call("--table", table, op, chain);
+    return _ipxtables_call(AF_INET, "--table", table, op, chain);
 }
 
 static gboolean
@@ -244,24 +249,25 @@ _share_iptables_set_masquerade_sync(gboolean up, const char *ip_iface, in_addr_t
     char          str_subnet[_SHARE_IPTABLES_SUBNET_TO_STR_LEN];
     gs_free char *comment_name = NULL;
 
-    comment_name = _share_iptables_get_name(FALSE, "nm-shared", ip_iface);
+    comment_name = _iptables_get_name(FALSE, "nm-shared", ip_iface);
 
     _share_iptables_subnet_to_str(str_subnet, addr, plen);
-    _share_iptables_call("--table",
-                         "nat",
-                         up ? "--insert" : "--delete",
-                         "POSTROUTING",
-                         "--source",
-                         str_subnet,
-                         "!",
-                         "--destination",
-                         str_subnet,
-                         "--jump",
-                         "MASQUERADE",
-                         "-m",
-                         "comment",
-                         "--comment",
-                         comment_name);
+    _ipxtables_call(AF_INET,
+                    "--table",
+                    "nat",
+                    up ? "--insert" : "--delete",
+                    "POSTROUTING",
+                    "--source",
+                    str_subnet,
+                    "!",
+                    "--destination",
+                    str_subnet,
+                    "--jump",
+                    "MASQUERADE",
+                    "-m",
+                    "comment",
+                    "--comment",
+                    comment_name);
 }
 
 static void
@@ -297,70 +303,76 @@ _share_iptables_set_shared_chains_add(const char *chain_input,
     _share_iptables_chain_add("filter", chain_input);
 
     for (i = 0; i < (int) G_N_ELEMENTS(input_params); i++) {
-        _share_iptables_call("--table",
-                             "filter",
-                             "--append",
-                             chain_input,
-                             "--protocol",
-                             input_params[i][0],
-                             "--destination-port",
-                             input_params[i][1],
-                             "--jump",
-                             "ACCEPT");
+        _ipxtables_call(AF_INET,
+                        "--table",
+                        "filter",
+                        "--append",
+                        chain_input,
+                        "--protocol",
+                        input_params[i][0],
+                        "--destination-port",
+                        input_params[i][1],
+                        "--jump",
+                        "ACCEPT");
     }
 
     _share_iptables_chain_add("filter", chain_forward);
 
-    _share_iptables_call("--table",
-                         "filter",
-                         "--append",
-                         chain_forward,
-                         "--destination",
-                         str_subnet,
-                         "--out-interface",
-                         ip_iface,
-                         "--match",
-                         "state",
-                         "--state",
-                         "ESTABLISHED,RELATED",
-                         "--jump",
-                         "ACCEPT");
-    _share_iptables_call("--table",
-                         "filter",
-                         "--append",
-                         chain_forward,
-                         "--source",
-                         str_subnet,
-                         "--in-interface",
-                         ip_iface,
-                         "--jump",
-                         "ACCEPT");
-    _share_iptables_call("--table",
-                         "filter",
-                         "--append",
-                         chain_forward,
-                         "--in-interface",
-                         ip_iface,
-                         "--out-interface",
-                         ip_iface,
-                         "--jump",
-                         "ACCEPT");
-    _share_iptables_call("--table",
-                         "filter",
-                         "--append",
-                         chain_forward,
-                         "--out-interface",
-                         ip_iface,
-                         "--jump",
-                         "REJECT");
-    _share_iptables_call("--table",
-                         "filter",
-                         "--append",
-                         chain_forward,
-                         "--in-interface",
-                         ip_iface,
-                         "--jump",
-                         "REJECT");
+    _ipxtables_call(AF_INET,
+                    "--table",
+                    "filter",
+                    "--append",
+                    chain_forward,
+                    "--destination",
+                    str_subnet,
+                    "--out-interface",
+                    ip_iface,
+                    "--match",
+                    "state",
+                    "--state",
+                    "ESTABLISHED,RELATED",
+                    "--jump",
+                    "ACCEPT");
+    _ipxtables_call(AF_INET,
+                    "--table",
+                    "filter",
+                    "--append",
+                    chain_forward,
+                    "--source",
+                    str_subnet,
+                    "--in-interface",
+                    ip_iface,
+                    "--jump",
+                    "ACCEPT");
+    _ipxtables_call(AF_INET,
+                    "--table",
+                    "filter",
+                    "--append",
+                    chain_forward,
+                    "--in-interface",
+                    ip_iface,
+                    "--out-interface",
+                    ip_iface,
+                    "--jump",
+                    "ACCEPT");
+    _ipxtables_call(AF_INET,
+                    "--table",
+                    "filter",
+                    "--append",
+                    chain_forward,
+                    "--out-interface",
+                    ip_iface,
+                    "--jump",
+                    "REJECT");
+    _ipxtables_call(AF_INET,
+                    "--table",
+                    "filter",
+                    "--append",
+                    chain_forward,
+                    "--in-interface",
+                    ip_iface,
+                    "--jump",
+                    "REJECT");
 }
 
 static void
@@ -377,36 +389,38 @@ _share_iptables_set_shared_sync(gboolean up, const char *ip_iface, in_addr_t add
     gs_free char *chain_input   = NULL;
     gs_free char *chain_forward = NULL;
 
-    comment_name  = _share_iptables_get_name(FALSE, "nm-shared", ip_iface);
-    chain_input   = _share_iptables_get_name(TRUE, "nm-sh-in", ip_iface);
-    chain_forward = _share_iptables_get_name(TRUE, "nm-sh-fw", ip_iface);
+    comment_name  = _iptables_get_name(FALSE, "nm-shared", ip_iface);
+    chain_input   = _iptables_get_name(TRUE, "nm-sh-in", ip_iface);
+    chain_forward = _iptables_get_name(TRUE, "nm-sh-fw", ip_iface);
 
     if (up)
         _share_iptables_set_shared_chains_add(chain_input, chain_forward, ip_iface, addr, plen);
 
-    _share_iptables_call("--table",
-                         "filter",
-                         up ? "--insert" : "--delete",
-                         "INPUT",
-                         "--in-interface",
-                         ip_iface,
-                         "--jump",
-                         chain_input,
-                         "-m",
-                         "comment",
-                         "--comment",
-                         comment_name);
-
-    _share_iptables_call("--table",
-                         "filter",
-                         up ? "--insert" : "--delete",
-                         "FORWARD",
-                         "--jump",
-                         chain_forward,
-                         "-m",
-                         "comment",
-                         "--comment",
-                         comment_name);
+    _ipxtables_call(AF_INET,
+                    "--table",
+                    "filter",
+                    up ? "--insert" : "--delete",
+                    "INPUT",
+                    "--in-interface",
+                    ip_iface,
+                    "--jump",
+                    chain_input,
+                    "-m",
+                    "comment",
+                    "--comment",
+                    comment_name);
+
+    _ipxtables_call(AF_INET,
+                    "--table",
+                    "filter",
+                    up ? "--insert" : "--delete",
+                    "FORWARD",
+                    "--jump",
+                    chain_forward,
+                    "-m",
+                    "comment",
+                    "--comment",
+                    comment_name);
 
     if (!up)
         _share_iptables_set_shared_chains_delete(chain_input, chain_forward);
@@ -460,19 +474,19 @@ _fw_nft_call_communicate_cb(GObject *source, GAsyncResult *result, gpointer user
         /* on any error, the process might still be running. We need to abort it in
          * the background... */
         if (!nm_utils_error_is_cancelled(error)) {
-            nm_log_dbg(LOGD_SHARING,
+            nm_log_dbg(LOGD_FIREWALL,
                        "firewall: nft[%s]: communication failed: %s. Kill process",
                        call_data->identifier,
                        error->message);
         } else if (!call_data->timeout_source) {
-            nm_log_dbg(LOGD_SHARING,
-                       "firewall: ntf[%s]: communication timed out. Kill process",
+            nm_log_dbg(LOGD_FIREWALL,
+                       "firewall: nft[%s]: communication timed out. Kill process",
                        call_data->identifier);
             nm_clear_error(&error);
             nm_utils_error_set(&error, NM_UTILS_ERROR_UNKNOWN, "timeout communicating with nft");
         } else {
-            nm_log_dbg(LOGD_SHARING,
-                       "firewall: ntf[%s]: communication cancelled. Kill process",
+            nm_log_dbg(LOGD_FIREWALL,
+                       "firewall: nft[%s]: communication cancelled. Kill process",
                        call_data->identifier);
         }
 
@@ -485,7 +499,7 @@ _fw_nft_call_communicate_cb(GObject *source, GAsyncResult *result, gpointer user
             nm_g_subprocess_terminate_in_background(call_data->subprocess, 200);
         }
     } else if (g_subprocess_get_successful(call_data->subprocess)) {
-        nm_log_dbg(LOGD_SHARING, "firewall: nft[%s]: command successful", call_data->identifier);
+        nm_log_dbg(LOGD_FIREWALL, "firewall: nft[%s]: command successful", call_data->identifier);
     } else {
         char          buf[NM_UTILS_GET_PROCESS_EXIT_STATUS_BUF_LEN];
         gs_free char *ss_stdout    = NULL;
@@ -498,7 +512,7 @@ _fw_nft_call_communicate_cb(GObject *source, GAsyncResult *result, gpointer user
 
         nm_utils_get_process_exit_status_desc_buf(status, buf, sizeof(buf));
 
-        nm_log_warn(LOGD_SHARING,
+        nm_log_warn(LOGD_FIREWALL,
                     "firewall: nft[%s]: command %s:%s%s%s%s%s%s%s",
                     call_data->identifier,
                     buf,
@@ -534,7 +548,7 @@ _fw_nft_call_cancelled_cb(GCancellable *cancellable, gpointer user_data)
     if (call_data->cancellable_id == 0)
         return;
 
-    nm_log_dbg(LOGD_SHARING, "firewall: nft[%s]: operation cancelled", call_data->identifier);
+    nm_log_dbg(LOGD_FIREWALL, "firewall: nft[%s]: operation cancelled", call_data->identifier);
 
     nm_clear_g_signal_handler(g_task_get_cancellable(call_data->task), &call_data->cancellable_id);
     nm_clear_g_cancellable(&call_data->intern_cancellable);
@@ -546,7 +560,7 @@ _fw_nft_call_timeout_cb(gpointer user_data)
     FwNftCallData *call_data = user_data;
 
     nm_clear_g_source_inst(&call_data->timeout_source);
-    nm_log_dbg(LOGD_SHARING,
+    nm_log_dbg(LOGD_FIREWALL,
                "firewall: nft[%s]: cancel operation after timeout",
                call_data->identifier);
 
@@ -573,7 +587,7 @@ nm_firewall_nft_call(GBytes             *stdin_buf,
         .timeout_source = NULL,
     };
 
-    nm_log_trace(LOGD_SHARING,
+    nm_log_trace(LOGD_FIREWALL,
                  "firewall: nft: call command: [ '%s' ]",
                  nm_utils_buf_utf8safe_escape_bytes(stdin_buf,
                                                     NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL,
@@ -585,7 +599,7 @@ nm_firewall_nft_call(GBytes             *stdin_buf,
                                                           call_data,
                                                           NULL);
         if (call_data->cancellable_id == 0) {
-            nm_log_dbg(LOGD_SHARING, "firewall: nft: already cancelled");
+            nm_log_dbg(LOGD_FIREWALL, "firewall: nft: already cancelled");
             nm_utils_error_set_cancelled(&error, FALSE, NULL);
             _fw_nft_call_data_free(call_data, g_steal_pointer(&error));
             return;
@@ -602,14 +616,14 @@ nm_firewall_nft_call(GBytes             *stdin_buf,
                                                          &error);
 
     if (!call_data->subprocess) {
-        nm_log_dbg(LOGD_SHARING, "firewall: nft: spawning nft failed: %s", error->message);
+        nm_log_dbg(LOGD_FIREWALL, "firewall: nft: spawning nft failed: %s", error->message);
         _fw_nft_call_data_free(call_data, g_steal_pointer(&error));
         return;
     }
 
     call_data->identifier = g_strdup(g_subprocess_get_identifier(call_data->subprocess));
 
-    nm_log_dbg(LOGD_SHARING, "firewall: nft[%s]: communicate with nft", call_data->identifier);
+    nm_log_dbg(LOGD_FIREWALL, "firewall: nft[%s]: communicate with nft", call_data->identifier);
 
     nm_shutdown_wait_obj_register_object(call_data->task, "nft-call");
 
@@ -691,7 +705,7 @@ _fw_nft_set_shared_construct(gboolean up, const char *ip_iface, in_addr_t addr,
     gs_free char            *table_name = NULL;
     char                     str_subnet[_SHARE_IPTABLES_SUBNET_TO_STR_LEN];
 
-    table_name = _share_iptables_get_name(FALSE, "nm-shared", ip_iface);
+    table_name = _iptables_get_name(FALSE, "nm-shared", ip_iface);
 
     _share_iptables_subnet_to_str(str_subnet, addr, plen);
 
@@ -756,6 +770,141 @@ _fw_nft_set_shared_construct(gboolean up, const char *ip_iface, in_addr_t addr,
     return nm_str_buf_finalize_to_gbytes(&strbuf);
 }
 
+static GBytes *
+_fw_nft_wg_default_construct(const char        *ip_iface,
+                             NMSettingIPConfig *ip_config,
+                             int                fwmark,
+                             gboolean           up)
+{
+    nm_auto_str_buf NMStrBuf strbuf = NM_STR_BUF_INIT(NM_UTILS_GET_NEXT_REALLOC_SIZE_1000, FALSE);
+    gs_free char            *table_name = NULL;
+    const char              *family_str;
+
+    table_name = _iptables_get_name(FALSE, "nm-wg", ip_iface);
+    family_str = nm_setting_ip_config_get_addr_family(ip_config) == AF_INET ? "ip" : "ip6";
+
+    _fw_nft_append_cmd_table(&strbuf, family_str, table_name, up);
+
+    if (up) {
+        guint n_addresses = nm_setting_ip_config_get_num_addresses(ip_config);
+
+        if (n_addresses) {
+            _append(&strbuf, "add chain %s %s preraw {", family_str, table_name);
+
+            for (guint i = 0; i < n_addresses; i++) {
+                NMIPAddress *addr = nm_setting_ip_config_get_address(ip_config, i);
+
+                _append(&strbuf,
+                        " iifname != \"%s\" "
+                        " %s daddr %s "
+                        " fib saddr type != local "
+                        "drop;",
+                        ip_iface,
+                        family_str,
+                        nm_ip_address_get_address(addr));
+            }
+
+            _append(&strbuf, "};");
+        }
+
+        _append(&strbuf,
+                "add chain %s %s premangle {"
+                " type filter hook prerouting priority mangle; policy accept; "
+                " meta l4proto udp meta mark set ct mark; "
+                "};",
+                family_str,
+                table_name);
+
+        _append(&strbuf,
+                "add chain %s %s postmangle {"
+                " type filter hook postrouting priority mangle; policy accept; "
+                " meta l4proto udp mark 0x%08x ct mark set meta mark; "
+                "};",
+                family_str,
+                table_name,
+                fwmark);
+    }
+
+    return nm_str_buf_finalize_to_gbytes(&strbuf);
+}
+
+static void
+_fw_iptables_wg_configure(const char        *ip_iface,
+                          NMSettingIPConfig *ip_config,
+                          int                fwmark,
+                          gboolean           up)
+{
+    gs_free char *comment_name = NULL;
+    char          fwmark_str[11];
+    int           family      = nm_setting_ip_config_get_addr_family(ip_config);
+    guint         n_addresses = nm_setting_ip_config_get_num_addresses(ip_config);
+
+    comment_name = _iptables_get_name(FALSE, "nm-wg", ip_iface);
+    g_snprintf(fwmark_str, sizeof(fwmark_str), "%" G_GUINT32_FORMAT, fwmark);
+
+    nm_assert(strlen(fwmark_str) > 0);
+
+    for (guint i = 0; i < n_addresses; i++) {
+        NMIPAddress *addr = nm_setting_ip_config_get_address(ip_config, i);
+
+        _ipxtables_call(family,
+                        "--table",
+                        "raw",
+                        up ? "--insert" : "--delete",
+                        "PREROUTING",
+                        "!",
+                        "--in-interface",
+                        ip_iface,
+                        "--destination",
+                        nm_ip_address_get_address(addr),
+                        "--match",
+                        "addrtype",
+                        "!",
+                        "--src-type",
+                        "LOCAL",
+                        "-j",
+                        "DROP",
+                        "-m",
+                        "comment",
+                        "--comment",
+                        comment_name);
+    }
+
+    _ipxtables_call(family,
+                    "--table",
+                    "mangle",
+                    up ? "--insert" : "--delete",
+                    "POSTROUTING",
+                    "--match",
+                    "mark",
+                    "--mark",
+                    fwmark_str,
+                    "--protocol",
+                    "udp",
+                    "--jump",
+                    "CONNMARK",
+                    "--save-mark",
+                    "-m",
+                    "comment",
+                    "--comment",
+                    comment_name);
+
+    _ipxtables_call(family,
+                    "--table",
+                    "mangle",
+                    up ? "--insert" : "--delete",
+                    "PREROUTING",
+                    "--protocol",
+                    "udp",
+                    "--jump",
+                    "CONNMARK",
+                    "--restore-mark",
+                    "-m",
+                    "comment",
+                    "--comment",
+                    comment_name);
+}
+
 /*****************************************************************************/
 
 GBytes *
@@ -1046,6 +1195,31 @@ nm_firewall_config_free(NMFirewallConfig *self)
 }
 
 /*****************************************************************************/
+void
+nm_firewall_config_set_wg_rule(const char        *ifname,
+                               NMSettingIPConfig *ip_config,
+                               int                fwmark,
+                               gboolean           up)
+{
+    switch (nm_firewall_utils_get_backend()) {
+    case NM_FIREWALL_BACKEND_NFTABLES:
+    {
+        gs_unref_bytes GBytes *stdin_buf = NULL;
+
+        stdin_buf = _fw_nft_wg_default_construct(ifname, ip_config, fwmark, up);
+        _fw_nft_call_sync(stdin_buf, NULL);
+        break;
+    }
+    case NM_FIREWALL_BACKEND_IPTABLES:
+        _fw_iptables_wg_configure(ifname, ip_config, fwmark, up);
+        break;
+    case NM_FIREWALL_BACKEND_NONE:
+        break;
+    default:
+        nm_assert_not_reached();
+        break;
+    }
+}
 
 void
 nm_firewall_config_apply_sync(NMFirewallConfig *self, gboolean up)
@@ -1124,7 +1298,7 @@ again:
         if (!g_atomic_int_compare_and_exchange(&backend, NM_FIREWALL_BACKEND_UNKNOWN, b))
             goto again;
 
-        nm_log_dbg(LOGD_SHARING,
+        nm_log_dbg(LOGD_FIREWALL,
                    "firewall: use %s backend%s%s%s%s%s%s%s",
                    FirewallBackends[b - 1].name,
                    NM_PRINT_FMT_QUOTED(FirewallBackends[b - 1].path,
diff --git a/src/core/nm-firewall-utils.h b/src/core/nm-firewall-utils.h
index 9f13a5127e..4df33d11db 100644
--- a/src/core/nm-firewall-utils.h
+++ b/src/core/nm-firewall-utils.h
@@ -24,6 +24,11 @@ NMFirewallConfig *nm_firewall_config_new_shared(const char *ip_iface, in_addr_t
 
 void nm_firewall_config_free(NMFirewallConfig *self);
 
+void nm_firewall_config_set_wg_rule(const char        *ifname,
+                                    NMSettingIPConfig *ip_config,
+                                    int                fwmark,
+                                    gboolean           up);
+
 void nm_firewall_config_apply_sync(NMFirewallConfig *self, gboolean up);
 
 /*****************************************************************************/
diff --git a/src/core/nm-ip-config.c b/src/core/nm-ip-config.c
index eb0ec9aa03..975ae20d45 100644
--- a/src/core/nm-ip-config.c
+++ b/src/core/nm-ip-config.c
@@ -826,7 +826,7 @@ _handle_l3cd_changed(NMIPConfig *self, const NML3ConfigData *l3cd)
     if (v_i != v_i_old)
         changed_params[n_changed_params++] = obj_properties_ip[PROP_IP_DNS_PRIORITY];
 
-    strarr_old = nm_l3_config_data_get_dns_options(l3cd_old, addr_family, &len);
+    strarr_old = nm_l3_config_data_get_dns_options(l3cd_old, addr_family, &len_old);
     strarr     = nm_l3_config_data_get_dns_options(priv->l3cd, addr_family, &len);
     if (!nm_strv_equal_n(strarr, len, strarr_old, len_old))
         changed_params[n_changed_params++] = obj_properties_ip[PROP_IP_DNS_OPTIONS];
diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c
index 2ff41f0067..e08296c20f 100644
--- a/src/core/tests/test-core.c
+++ b/src/core/tests/test-core.c
@@ -36,6 +36,7 @@ test_config_h(void)
     G_STMT_END
 
     ABSOLUTE_PATH(IPTABLES_PATH);
+    ABSOLUTE_PATH(IP6TABLES_PATH);
     ABSOLUTE_PATH(NFT_PATH);
 }
 
diff --git a/src/core/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c
index d0607160cd..22364ef9dc 100644
--- a/src/core/vpn/nm-vpn-connection.c
+++ b/src/core/vpn/nm-vpn-connection.c
@@ -1899,7 +1899,7 @@ _dbus_signal_config_cb(NMVpnConnection *self, GVariant *dict)
     _LOGD("config: reply received (IPv4:%s(%s), IPv6:%s(%s))",
           priv->ip_data_4.enabled ? "on" : "off",
           priv->ip_data_4.method_auto ? "auto" : "disabled",
-          priv->ip_data_4.enabled ? "on" : "off",
+          priv->ip_data_6.enabled ? "on" : "off",
           priv->ip_data_6.method_auto ? "auto" : "disabled");
 
     if (!priv->ip_data_4.method_auto)
diff --git a/src/libnm-client-impl/nm-ip-config.c b/src/libnm-client-impl/nm-ip-config.c
index ad5f08f814..ef3dcca1a5 100644
--- a/src/libnm-client-impl/nm-ip-config.c
+++ b/src/libnm-client-impl/nm-ip-config.c
@@ -180,6 +180,7 @@ _notify_update_prop_nameservers(NMClient               *client,
                             goto next;
                         nameserver = g_steal_pointer(&val_str);
                     } else if (nm_streq(key, "uri")) {
+                        g_free(nameserver);
                         nameserver = g_variant_dup_string(val, NULL);
                     }
 next:
diff --git a/src/libnm-client-public/nm-secret-agent-old.h b/src/libnm-client-public/nm-secret-agent-old.h
index ca7bfa4cc9..6cf94a6d51 100644
--- a/src/libnm-client-public/nm-secret-agent-old.h
+++ b/src/libnm-client-public/nm-secret-agent-old.h
@@ -39,13 +39,13 @@ typedef struct {
  * note that this object will be unrefed after the callback has returned, use
  * g_object_ref()/g_object_unref() if you want to use this object after the callback
  * has returned
- * @secrets: the #GVariant of type %NM_VARIANT_TYPE_CONNECTION containing the requested
+ * @secrets: (nullable): the #GVariant of type %NM_VARIANT_TYPE_CONNECTION containing the requested
  * secrets (as created by nm_connection_to_dbus() for example).  Each key in @secrets
  * should be the name of a #NMSetting object (like "802-11-wireless-security")
  * and each value should be an %NM_VARIANT_TYPE_SETTING variant.  The sub-dicts
  * map string:value, where the string is the setting property name (like "psk")
  * and the value is the secret
- * @error: if the secrets request failed, give a descriptive error here
+ * @error: (nullable): if the secrets request failed, give a descriptive error here
  * @user_data: caller-specific data to be passed to the function
  *
  * Called as a result of a request by NM to retrieve secrets.  When the
@@ -90,7 +90,7 @@ typedef void (*NMSecretAgentOldGetSecretsFunc)(NMSecretAgentOld *agent,
  * note that this object will be unrefed after the callback has returned, use
  * g_object_ref()/g_object_unref() if you want to use this object after the callback
  * has returned
- * @error: if the saving secrets failed, give a descriptive error here
+ * @error: (nullable): if the saving secrets failed, give a descriptive error here
  * @user_data: caller-specific data to be passed to the function
  *
  * Called as a result of a request by NM to save secrets.  When the
@@ -109,7 +109,7 @@ typedef void (*NMSecretAgentOldSaveSecretsFunc)(NMSecretAgentOld *agent,
  * note that this object will be unrefed after the callback has returned, use
  * g_object_ref()/g_object_unref() if you want to use this object after the callback
  * has returned
- * @error: if the deleting secrets failed, give a descriptive error here
+ * @error: (nullable): if the deleting secrets failed, give a descriptive error here
  * @user_data: caller-specific data to be passed to the function
  *
  * Called as a result of a request by NM to delete secrets.  When the
diff --git a/src/libnm-core-impl/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c
index 37cb61f176..b9dcf34f61 100644
--- a/src/libnm-core-impl/nm-meta-setting-base-impl.c
+++ b/src/libnm-core-impl/nm-meta-setting-base-impl.c
@@ -431,7 +431,7 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = {
     [NM_META_SETTING_TYPE_OVS_DPDK] =
         {
             .meta_type         = NM_META_SETTING_TYPE_OVS_DPDK,
-            .setting_priority  = NM_SETTING_PRIORITY_HW_BASE,
+            .setting_priority  = NM_SETTING_PRIORITY_AUX,
             .setting_name      = NM_SETTING_OVS_DPDK_SETTING_NAME,
             .get_setting_gtype = nm_setting_ovs_dpdk_get_type,
         },
@@ -459,7 +459,7 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = {
     [NM_META_SETTING_TYPE_OVS_PATCH] =
         {
             .meta_type         = NM_META_SETTING_TYPE_OVS_PATCH,
-            .setting_priority  = NM_SETTING_PRIORITY_HW_BASE,
+            .setting_priority  = NM_SETTING_PRIORITY_AUX,
             .setting_name      = NM_SETTING_OVS_PATCH_SETTING_NAME,
             .get_setting_gtype = nm_setting_ovs_patch_get_type,
         },
@@ -656,9 +656,7 @@ const NMMetaSettingType nm_meta_setting_types_by_priority[] = {
     NM_META_SETTING_TYPE_MACSEC,
     NM_META_SETTING_TYPE_MACVLAN,
     NM_META_SETTING_TYPE_OVS_BRIDGE,
-    NM_META_SETTING_TYPE_OVS_DPDK,
     NM_META_SETTING_TYPE_OVS_INTERFACE,
-    NM_META_SETTING_TYPE_OVS_PATCH,
     NM_META_SETTING_TYPE_OVS_PORT,
     NM_META_SETTING_TYPE_TEAM,
     NM_META_SETTING_TYPE_TUN,
@@ -688,8 +686,10 @@ const NMMetaSettingType nm_meta_setting_types_by_priority[] = {
     NM_META_SETTING_TYPE_ETHTOOL,
     NM_META_SETTING_TYPE_LINK,
     NM_META_SETTING_TYPE_MATCH,
+    NM_META_SETTING_TYPE_OVS_DPDK,
     NM_META_SETTING_TYPE_OVS_EXTERNAL_IDS,
     NM_META_SETTING_TYPE_OVS_OTHER_CONFIG,
+    NM_META_SETTING_TYPE_OVS_PATCH,
     NM_META_SETTING_TYPE_PPP,
     NM_META_SETTING_TYPE_PPPOE,
     NM_META_SETTING_TYPE_TEAM_PORT,
diff --git a/src/libnm-core-impl/nm-setting-macvlan.c b/src/libnm-core-impl/nm-setting-macvlan.c
index 2adecdfe6c..41d41a539a 100644
--- a/src/libnm-core-impl/nm-setting-macvlan.c
+++ b/src/libnm-core-impl/nm-setting-macvlan.c
@@ -251,7 +251,7 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass)
     /**
      * NMSettingMacvlan:promiscuous:
      *
-     * Whether the interface should be put in promiscuous mode.
+     * Whether the parent interface should be put in promiscuous mode (true by default).
      *
      * Since: 1.2
      **/
diff --git a/src/libnmc-setting/nm-meta-setting-base-impl.c b/src/libnmc-setting/nm-meta-setting-base-impl.c
index 37cb61f176..b9dcf34f61 100644
--- a/src/libnmc-setting/nm-meta-setting-base-impl.c
+++ b/src/libnmc-setting/nm-meta-setting-base-impl.c
@@ -431,7 +431,7 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = {
     [NM_META_SETTING_TYPE_OVS_DPDK] =
         {
             .meta_type         = NM_META_SETTING_TYPE_OVS_DPDK,
-            .setting_priority  = NM_SETTING_PRIORITY_HW_BASE,
+            .setting_priority  = NM_SETTING_PRIORITY_AUX,
             .setting_name      = NM_SETTING_OVS_DPDK_SETTING_NAME,
             .get_setting_gtype = nm_setting_ovs_dpdk_get_type,
         },
@@ -459,7 +459,7 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = {
     [NM_META_SETTING_TYPE_OVS_PATCH] =
         {
             .meta_type         = NM_META_SETTING_TYPE_OVS_PATCH,
-            .setting_priority  = NM_SETTING_PRIORITY_HW_BASE,
+            .setting_priority  = NM_SETTING_PRIORITY_AUX,
             .setting_name      = NM_SETTING_OVS_PATCH_SETTING_NAME,
             .get_setting_gtype = nm_setting_ovs_patch_get_type,
         },
@@ -656,9 +656,7 @@ const NMMetaSettingType nm_meta_setting_types_by_priority[] = {
     NM_META_SETTING_TYPE_MACSEC,
     NM_META_SETTING_TYPE_MACVLAN,
     NM_META_SETTING_TYPE_OVS_BRIDGE,
-    NM_META_SETTING_TYPE_OVS_DPDK,
     NM_META_SETTING_TYPE_OVS_INTERFACE,
-    NM_META_SETTING_TYPE_OVS_PATCH,
     NM_META_SETTING_TYPE_OVS_PORT,
     NM_META_SETTING_TYPE_TEAM,
     NM_META_SETTING_TYPE_TUN,
@@ -688,8 +686,10 @@ const NMMetaSettingType nm_meta_setting_types_by_priority[] = {
     NM_META_SETTING_TYPE_ETHTOOL,
     NM_META_SETTING_TYPE_LINK,
     NM_META_SETTING_TYPE_MATCH,
+    NM_META_SETTING_TYPE_OVS_DPDK,
     NM_META_SETTING_TYPE_OVS_EXTERNAL_IDS,
     NM_META_SETTING_TYPE_OVS_OTHER_CONFIG,
+    NM_META_SETTING_TYPE_OVS_PATCH,
     NM_META_SETTING_TYPE_PPP,
     NM_META_SETTING_TYPE_PPPOE,
     NM_META_SETTING_TYPE_TEAM_PORT,
diff --git a/src/libnmc-setting/nm-meta-setting-desc.c b/src/libnmc-setting/nm-meta-setting-desc.c
index e35db06eca..fcb2d041d2 100644
--- a/src/libnmc-setting/nm-meta-setting-desc.c
+++ b/src/libnmc-setting/nm-meta-setting-desc.c
@@ -9133,12 +9133,7 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
             NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
         ),
     ),
-    SETTING_INFO (OVS_DPDK,
-        .valid_parts = NM_META_SETTING_VALID_PARTS (
-            NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-            NM_META_SETTING_VALID_PART_ITEM (OVS_DPDK,              TRUE),
-        ),
-    ),
+    SETTING_INFO (OVS_DPDK),
     SETTING_INFO_EMPTY (OVS_OTHER_CONFIG),
     SETTING_INFO_EMPTY (OVS_EXTERNAL_IDS),
     SETTING_INFO (OVS_INTERFACE,
@@ -9153,12 +9148,7 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
             NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
         ),
     ),
-    SETTING_INFO (OVS_PATCH,
-        .valid_parts = NM_META_SETTING_VALID_PARTS (
-            NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-            NM_META_SETTING_VALID_PART_ITEM (OVS_PATCH,             TRUE),
-        ),
-    ),
+    SETTING_INFO (OVS_PATCH),
     SETTING_INFO (OVS_PORT,
         .valid_parts = NM_META_SETTING_VALID_PARTS (
             NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in
index dd719afad6..3bae49b8b5 100644
--- a/src/libnmc-setting/settings-docs.h.in
+++ b/src/libnmc-setting/settings-docs.h.in
@@ -286,7 +286,7 @@
 #define DESCRIBE_DOC_NM_SETTING_MACSEC_VALIDATION N_("Specifies the validation mode for incoming frames.")
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_MODE N_("The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.")
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created.  If this property is not specified, the connection must contain an \"802-3-ethernet\" setting with a \"mac-address\" property.")
-#define DESCRIBE_DOC_NM_SETTING_MACVLAN_PROMISCUOUS N_("Whether the interface should be put in promiscuous mode.")
+#define DESCRIBE_DOC_NM_SETTING_MACVLAN_PROMISCUOUS N_("Whether the parent interface should be put in promiscuous mode (true by default).")
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_TAP N_("Whether the interface should be a MACVTAP.")
 #define DESCRIBE_DOC_NM_SETTING_MATCH_DRIVER N_("A list of driver names to match. Each element is a shell wildcard pattern. See NMSettingMatch:interface-name for how special characters '|', '&', '!' and '\\' are used for optional and mandatory matches and inverting the pattern.")
 #define DESCRIBE_DOC_NM_SETTING_MATCH_INTERFACE_NAME N_("A list of interface names to match. Each element is a shell wildcard pattern. An element can be prefixed with a pipe symbol (|) or an ampersand (&). The former means that the element is optional and the latter means that it is mandatory. If there are any optional elements, than the match evaluates to true if at least one of the optional element matches (logical OR). If there are any mandatory elements, then they all must match (logical AND). By default, an element is optional. This means that an element \"foo\" behaves the same as \"|foo\". An element can also be inverted with exclamation mark (!) between the pipe symbol (or the ampersand) and before the pattern. Note that \"!foo\" is a shortcut for the mandatory match \"&!foo\". Finally, a backslash can be used at the beginning of the element (after the optional special characters) to escape the start of the pattern. For example, \"&\\!a\" is an mandatory match for literally \"!a\".")
diff --git a/src/n-dhcp4/src/n-dhcp4-c-probe.c b/src/n-dhcp4/src/n-dhcp4-c-probe.c
index 7a6def340c..58d61e72ba 100644
--- a/src/n-dhcp4/src/n-dhcp4-c-probe.c
+++ b/src/n-dhcp4/src/n-dhcp4-c-probe.c
@@ -1140,8 +1140,6 @@ int n_dhcp4_client_probe_transition_decline(NDhcp4ClientProbe *probe, NDhcp4Inco
                 r = n_dhcp4_c_connection_send_request(&probe->connection, request, ns_now);
                 if (r)
                         return r;
-                else
-                        request = NULL; /* consumed */
 
                 n_dhcp4_client_lease_unlink(probe->current_lease);
                 probe->current_lease = n_dhcp4_client_lease_unref(probe->current_lease);
@@ -1346,7 +1344,6 @@ int n_dhcp4_client_probe_release(NDhcp4ClientProbe *probe) {
 
         probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT;
         n_dhcp4_client_lease_unlink(probe->current_lease);
-        request_out = NULL;
 
         return 0;
 }
diff --git a/src/nm-cloud-setup/main.c b/src/nm-cloud-setup/main.c
index 9de9341875..d2a5a1cf5e 100644
--- a/src/nm-cloud-setup/main.c
+++ b/src/nm-cloud-setup/main.c
@@ -387,17 +387,6 @@ _nmc_skip_connection_by_user_data(NMConnection *connection)
     return FALSE;
 }
 
-static gboolean
-_nmc_skip_connection_by_type(NMConnection *connection, const char *connection_type)
-{
-    if (!nm_streq0(nm_connection_get_connection_type(connection), connection_type))
-        return TRUE;
-    if (!nm_connection_get_setting_ip4_config(connection))
-        return TRUE;
-
-    return FALSE;
-}
-
 static void
 _nmc_mangle_connection(NMDevice                             *device,
                        NMConnection                         *connection,
@@ -618,8 +607,14 @@ try_again:
         return any_changes;
     }
 
-    if (_nmc_skip_connection_by_type(applied_connection, connection_type)) {
-        _LOGD("config device %s: device has no suitable applied connection. Skip", hwaddr);
+    if (!nm_streq0(nm_connection_get_connection_type(applied_connection), connection_type)) {
+        _LOGD("config device %s: skip applied connection due to type mismatch", hwaddr);
+        return any_changes;
+    }
+
+    if (!nm_connection_get_setting_ip4_config(applied_connection)) {
+        _LOGD("config device %s: skip applied connection due to missing IPv4 configuration",
+              hwaddr);
         return any_changes;
     }
 
@@ -696,13 +691,34 @@ try_again:
     return TRUE;
 }
 
+static NMConnection *
+_new_connection(void)
+{
+    NMConnection *connection;
+    NMSetting    *s_user;
+
+    connection = nm_simple_connection_new();
+    s_user     = nm_setting_user_new();
+    nm_connection_add_setting(connection, s_user);
+    nm_setting_user_set_data(NM_SETTING_USER(s_user),
+                             "org.freedesktop.NetworkManager.origin",
+                             "nm-cloud-setup",
+                             NULL);
+
+    return connection;
+}
+
 static gboolean
 _config_ethernet(SigTermData                          *sigterm_data,
                  const NMCSProviderGetConfigIfaceData *config_data,
                  NMClient                             *nmc,
-                 const NMCSProviderGetConfigResult    *result)
+                 const NMCSProviderGetConfigResult    *result,
+                 gboolean                              allow_new_connections)
 {
-    gs_unref_object NMDevice *device = NULL;
+    gs_unref_object NMDevice           *device            = NULL;
+    gs_unref_object NMConnection       *connection        = NULL;
+    gs_unref_object NMActiveConnection *active_connection = NULL;
+    gs_free_error GError               *error             = NULL;
 
     device = nm_g_object_ref(
         _nmc_get_device_by_hwaddr(nmc, NM_TYPE_DEVICE_ETHERNET, config_data->hwaddr));
@@ -711,12 +727,52 @@ _config_ethernet(SigTermData                          *sigterm_data,
         return FALSE;
     }
 
-    return _config_existing(sigterm_data,
-                            config_data,
-                            nmc,
-                            result,
-                            NM_SETTING_WIRED_SETTING_NAME,
-                            device);
+    if (allow_new_connections && nm_device_get_state(device) == NM_DEVICE_STATE_DISCONNECTED) {
+        connection = _new_connection();
+        nm_connection_add_setting(connection,
+                                  g_object_new(NM_TYPE_SETTING_CONNECTION,
+                                               NM_SETTING_CONNECTION_TYPE,
+                                               NM_SETTING_WIRED_SETTING_NAME,
+                                               NULL));
+        nm_connection_add_setting(connection,
+                                  g_object_new(NM_TYPE_SETTING_IP4_CONFIG,
+                                               NM_SETTING_IP_CONFIG_METHOD,
+                                               NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+                                               NULL));
+
+        nm_connection_add_setting(connection,
+                                  g_object_new(NM_TYPE_SETTING_WIRED,
+                                               NM_SETTING_WIRED_MAC_ADDRESS,
+                                               config_data->hwaddr,
+                                               NULL));
+
+        _nmc_mangle_connection(device, connection, result, config_data, NULL, NULL);
+
+        active_connection = nmcs_add_and_activate(nmc, NULL, device, connection, &error);
+        if (!active_connection) {
+            if (!nm_utils_error_is_cancelled(error)) {
+                _LOGD("config device %s: failure to activate connection: %s",
+                      nm_device_get_iface(NM_DEVICE(device)),
+                      error->message);
+            }
+            return FALSE;
+        }
+
+        _LOGD("config device %s: connection \"%s\" (%s) created",
+              nm_device_get_iface(NM_DEVICE(device)),
+              nm_active_connection_get_id(active_connection),
+              nm_active_connection_get_uuid(active_connection));
+
+        return TRUE;
+
+    } else {
+        return _config_existing(sigterm_data,
+                                config_data,
+                                nmc,
+                                result,
+                                NM_SETTING_WIRED_SETTING_NAME,
+                                device);
+    }
 }
 
 static gboolean
@@ -738,9 +794,8 @@ _oci_new_vlan_dev(SigTermData                          *sigterm_data,
     const char                         *wired_mac_addr    = NULL;
     const NMUtilsNamedValue            *map               = NULL;
     const char                         *ip4_config_method;
-    NMSetting                          *s_user;
 
-    connection = nm_simple_connection_new();
+    connection = _new_connection();
 
     macvlan_name  = g_strdup_printf("macvlan%ld", config_data->iface_idx);
     connection_id = g_strdup_printf("%s%ld", connection_type, config_data->iface_idx);
@@ -811,13 +866,6 @@ _oci_new_vlan_dev(SigTermData                          *sigterm_data,
                                            hwaddr,
                                            NULL));
 
-    s_user = nm_setting_user_new();
-    nm_connection_add_setting(connection, s_user);
-    nm_setting_user_set_data(NM_SETTING_USER(s_user),
-                             "org.freedesktop.NetworkManager.origin",
-                             "nm-cloud-setup",
-                             NULL);
-
     _nmc_mangle_connection(NULL, connection, result, config_data, NULL, NULL);
 
     _LOGD("config device %s: creating %s connection for VLAN %d on %s...",
@@ -826,7 +874,7 @@ _oci_new_vlan_dev(SigTermData                          *sigterm_data,
           config_data->priv.oci.vlan_tag,
           parent_hwaddr);
 
-    active_connection = nmcs_add_and_activate(nmc, NULL, connection, &error);
+    active_connection = nmcs_add_and_activate(nmc, NULL, NULL, connection, &error);
     if (active_connection == NULL) {
         if (!nm_utils_error_is_cancelled(error)) {
             _LOGD("config device %s: failure to activate connection: %s", hwaddr, error->message);
@@ -877,6 +925,7 @@ _config_one(SigTermData                       *sigterm_data,
             guint                              idx)
 {
     const NMCSProviderGetConfigIfaceData *config_data = result->iface_datas_arr[idx];
+    gboolean                              allow_new_connections;
     gboolean                              any_changes;
 
     g_main_context_iteration(NULL, FALSE);
@@ -899,7 +948,13 @@ _config_one(SigTermData                       *sigterm_data,
         return FALSE;
     }
 
-    if (NMCS_IS_PROVIDER_OCI(provider) && config_data->priv.oci.vlan_tag != 0) {
+    /* Default on on OCI, with an environment variable serving as a chicken bit. */
+    allow_new_connections =
+        _nm_utils_ascii_str_to_bool(g_getenv(NMCS_ENV_NM_CLOUD_SETUP_ALLOW_NEW_CONN),
+                                    NMCS_IS_PROVIDER_OCI(provider));
+
+    if (allow_new_connections && NMCS_IS_PROVIDER_OCI(provider)
+        && config_data->priv.oci.vlan_tag != 0) {
         if (config_data->priv.oci.parent_hwaddr == NULL) {
             _LOGW("config device %s: has vlan id %d but no parent device",
                   config_data->hwaddr,
@@ -924,7 +979,8 @@ _config_one(SigTermData                       *sigterm_data,
                                             config_data->hwaddr);
 
     } else {
-        any_changes = _config_ethernet(sigterm_data, config_data, nmc, result);
+        any_changes =
+            _config_ethernet(sigterm_data, config_data, nmc, result, allow_new_connections);
     }
 
     return any_changes;
diff --git a/src/nm-cloud-setup/nm-cloud-setup-utils.c b/src/nm-cloud-setup/nm-cloud-setup-utils.c
index 314e401108..3889cff29a 100644
--- a/src/nm-cloud-setup/nm-cloud-setup-utils.c
+++ b/src/nm-cloud-setup/nm-cloud-setup-utils.c
@@ -637,6 +637,7 @@ _nmcs_add_and_activate_cb(GObject *source, GAsyncResult *result, gpointer user_d
 NMActiveConnection *
 nmcs_add_and_activate(NMClient     *client,
                       GCancellable *sigterm_cancellable,
+                      NMDevice     *device,
                       NMConnection *connection,
                       GError      **error)
 {
@@ -648,7 +649,7 @@ nmcs_add_and_activate(NMClient     *client,
 
     nm_client_add_and_activate_connection_async(client,
                                                 connection,
-                                                NULL,
+                                                device,
                                                 NULL,
                                                 sigterm_cancellable,
                                                 _nmcs_add_and_activate_cb,
diff --git a/src/nm-cloud-setup/nm-cloud-setup-utils.h b/src/nm-cloud-setup/nm-cloud-setup-utils.h
index 962053690e..6b3be11f1c 100644
--- a/src/nm-cloud-setup/nm-cloud-setup-utils.h
+++ b/src/nm-cloud-setup/nm-cloud-setup-utils.h
@@ -23,6 +23,7 @@
 #define NMCS_ENV_NM_CLOUD_SETUP_GCP_HOST       "NM_CLOUD_SETUP_GCP_HOST"
 #define NMCS_ENV_NM_CLOUD_SETUP_OCI_HOST       "NM_CLOUD_SETUP_OCI_HOST"
 #define NMCS_ENV_NM_CLOUD_SETUP_MAP_INTERFACES "NM_CLOUD_SETUP_MAP_INTERFACES"
+#define NMCS_ENV_NM_CLOUD_SETUP_ALLOW_NEW_CONN "NM_CLOUD_SETUP_ALLOW_NEW_CONN"
 
 /*****************************************************************************/
 
@@ -155,6 +156,7 @@ NMConnection *nmcs_device_get_applied_connection(NMDevice     *device,
 
 NMActiveConnection *nmcs_add_and_activate(NMClient     *client,
                                           GCancellable *sigterm_cancellable,
+                                          NMDevice     *device,
                                           NMConnection *connection,
                                           GError      **error);
 
diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c
index d6dc1fcb7c..5389748d82 100644
--- a/src/nm-initrd-generator/nmi-cmdline-reader.c
+++ b/src/nm-initrd-generator/nmi-cmdline-reader.c
@@ -299,33 +299,44 @@ get_word(char **argument, const char separator)
 {
     char *word;
     int   nest = 0;
+    char *last_ch;
+    char *first_close = NULL;
 
     if (*argument == NULL)
         return NULL;
 
-    if (**argument == '[') {
-        nest++;
-        (*argument)++;
-    }
-
-    word = *argument;
+    word = last_ch = *argument;
 
     while (**argument != '\0') {
-        if (nest && **argument == ']') {
-            **argument = '\0';
-            (*argument)++;
-            nest--;
-            continue;
-        }
-
         if (nest == 0 && **argument == separator) {
             **argument = '\0';
             (*argument)++;
             break;
         }
+        if (**argument == '[') {
+            nest++;
+        } else if (nest && **argument == ']') {
+            nest--;
+            if (!first_close && nest == 0)
+                first_close = *argument;
+        }
+
+        last_ch = *argument;
         (*argument)++;
     }
 
+    /* If the word is surrounded with the nesting symbols [], strip them so we return
+     * the inner content only.
+     * If there were nesting symbols but embracing only part of the inner content, don't
+     * remove them. Example:
+     *    Remove [] in get_word("[fc08::1]:other_token", ":")
+     *    Don't remove [] in get_word("ip6=[fc08::1]:other_token", ":")
+     */
+    if (*word == '[' && *last_ch == ']' && last_ch == first_close) {
+        word++;
+        *last_ch = '\0';
+    }
+
     return *word ? word : NULL;
 }
 
@@ -533,7 +544,7 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
     NMSettingConnection           *s_con;
     NMSettingIPConfig             *s_ip4 = NULL, *s_ip6 = NULL;
     gs_unref_hashtable GHashTable *ibft = NULL;
-    const char                    *tmp;
+    char                          *tmp;
     const char                    *tmp2;
     const char                    *tmp3;
     const char                    *kind;
@@ -578,15 +589,25 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
             kind       = tmp3;
         } else {
             /* <client-IP>:[<peer>]:<gateway-IP>:<netmask>:<client_hostname>:<kind> */
-            client_ip = tmp;
+
+            /* note: split here address and prefix to normalize IPs defined as
+             * [dead::beef]/64. Latter parsing would fail due to the '[]'. */
+            client_ip = get_word(&tmp, '/');
+
             if (client_ip) {
-                client_ip_family = get_ip_address_family(client_ip, TRUE);
+                client_ip_family = get_ip_address_family(client_ip, FALSE);
                 if (client_ip_family == AF_UNSPEC) {
                     _LOGW(LOGD_CORE, "Invalid IP address '%s'.", client_ip);
                     return;
                 }
             }
 
+            if (!nm_str_is_empty(tmp)) {
+                gboolean is_ipv4 = client_ip_family == AF_INET;
+
+                client_ip_prefix = _nm_utils_ascii_str_to_int64(tmp, 10, 0, is_ipv4 ? 32 : 128, -1);
+            }
+
             peer            = tmp2;
             gateway_ip      = get_word(&argument, ':');
             netmask         = get_word(&argument, ':');
@@ -661,11 +682,7 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
         NMIPAddress *address = NULL;
         NMIPAddr     addr;
 
-        if (nm_inet_parse_with_prefix_bin(client_ip_family,
-                                          client_ip,
-                                          NULL,
-                                          &addr,
-                                          client_ip_prefix == -1 ? &client_ip_prefix : NULL)) {
+        if (nm_inet_parse_bin(client_ip_family, client_ip, NULL, &addr)) {
             if (client_ip_prefix == -1) {
                 switch (client_ip_family) {
                 case AF_INET:
@@ -905,14 +922,25 @@ reader_parse_controller(Reader     *reader,
 
         opts = get_word(&argument, ':');
         while (opts && *opts) {
-            gs_free_error GError *error = NULL;
-            char                 *opt;
-            const char           *opt_name;
-
+            gs_free_error GError             *error = NULL;
+            char                             *tmp;
+            const char                       *opt_name;
+            char                             *opt;
+            const char                       *opt_value;
+            nm_auto_unref_ptrarray GPtrArray *opt_values     = g_ptr_array_new();
+            gs_free char                     *opt_normalized = NULL;
+
+            opt_name = get_word(&opts, '=');
             opt      = get_word(&opts, ',');
-            opt_name = get_word(&opt, '=');
 
-            if (!_nm_setting_bond_validate_option(opt_name, opt, &error)) {
+            /* Normalize: convert ';' to ',' and remove '[]' from IPv6 addresses */
+            tmp = opt;
+            while ((opt_value = get_word(&tmp, ';')))
+                g_ptr_array_add(opt_values, (gpointer) opt_value);
+            g_ptr_array_add(opt_values, NULL);
+            opt_normalized = g_strjoinv(",", (char **) opt_values->pdata);
+
+            if (!_nm_setting_bond_validate_option(opt_name, opt_normalized, &error)) {
                 _LOGW(LOGD_CORE,
                       "Ignoring invalid bond option: %s%s%s = %s%s%s: %s",
                       NM_PRINT_FMT_QUOTE_STRING(opt_name),
@@ -920,7 +948,7 @@ reader_parse_controller(Reader     *reader,
                       error->message);
                 continue;
             }
-            nm_setting_bond_add_option(s_bond, opt_name, opt);
+            nm_setting_bond_add_option(s_bond, opt_name, opt_normalized);
         }
 
         mtu = get_word(&argument, ':');
diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c
index a0100764ca..cd7b1069b6 100644
--- a/src/nm-initrd-generator/tests/test-cmdline-reader.c
+++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c
@@ -597,7 +597,7 @@ static void
 test_if_ip6_manual(void)
 {
     gs_unref_hashtable GHashTable *connections = NULL;
-    const char *const             *ARGV = NM_MAKE_STRV("ip=[2001:0db8::02]/64::[2001:0db8::01]::"
+    const char *const             *ARGV = NM_MAKE_STRV("ip=[2001:0db8::02]/56::[2001:0db8::01]::"
                                                        "hostname0.example.com:eth4::[2001:0db8::53]");
     NMConnection                  *connection;
     NMSettingIPConfig             *s_ip4;
@@ -633,7 +633,7 @@ test_if_ip6_manual(void)
     ip_addr = nm_setting_ip_config_get_address(s_ip6, 0);
     g_assert(ip_addr);
     g_assert_cmpstr(nm_ip_address_get_address(ip_addr), ==, "2001:db8::2");
-    g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 64);
+    g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 56);
     g_assert_cmpstr(nm_setting_ip_config_get_gateway(s_ip6), ==, "2001:db8::1");
     g_assert_cmpstr(nm_setting_ip_config_get_dhcp_hostname(s_ip6), ==, NULL);
 }
@@ -975,8 +975,8 @@ static void
 test_bond(void)
 {
     gs_unref_hashtable GHashTable *connections = NULL;
-    const char *const             *ARGV        = NM_MAKE_STRV("rd.route=192.0.2.53::bong0",
-                                           "bond=bong0:eth0,eth1:mode=balance-rr:9000",
+    const char *const             *ARGV        = NM_MAKE_STRV("rd.route=192.0.2.53::bond0",
+                                           "bond=bond0:eth0,eth1:mode=balance-rr:9000",
                                            "nameserver=203.0.113.53");
     NMConnection                  *connection;
     NMSettingConnection           *s_con;
@@ -990,12 +990,12 @@ test_bond(void)
     connections = _parse_cons(ARGV);
     g_assert_cmpint(g_hash_table_size(connections), ==, 3);
 
-    connection = g_hash_table_lookup(connections, "bong0");
+    connection = g_hash_table_lookup(connections, "bond0");
     nmtst_assert_connection_verifies_without_normalization(connection);
     g_assert_cmpstr(nm_connection_get_connection_type(connection),
                     ==,
                     NM_SETTING_BOND_SETTING_NAME);
-    g_assert_cmpstr(nm_connection_get_id(connection), ==, "bong0");
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "bond0");
     controller_uuid = nm_connection_get_uuid(connection);
     g_assert(controller_uuid);
 
@@ -1162,6 +1162,118 @@ test_bond_ip(void)
                     NM_CONNECTION_MULTI_CONNECT_SINGLE);
 }
 
+static void
+test_bond_ip6_option(void)
+{
+    /* Test that IPv6 addresses within [] are parsed fine in different positions */
+
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const             *ARGV =
+        NM_MAKE_STRV("bond=bond0:eth0,eth1:arp_interval=100,ns_ip6_target=[fc08::1]",
+                     "bond=bond1:eth2,eth3:arp_interval=100,ns_ip6_target=[fc08::1]:9000",
+                     "bond=bond2:eth4,eth5:ns_ip6_target=[fc08::1],arp_interval=100");
+    NMConnection  *connection;
+    NMSettingBond *s_bond;
+
+    connections = _parse_cons(ARGV);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 9);
+
+    connection = g_hash_table_lookup(connections, "bond0");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"), ==, "fc08::1");
+
+    connection = g_hash_table_lookup(connections, "bond1");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"), ==, "fc08::1");
+
+    connection = g_hash_table_lookup(connections, "bond2");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"), ==, "fc08::1");
+}
+
+static void
+test_bond_multi_values_option(void)
+{
+    /* Test that semicolon-separated multi-valued options are parsed fine in different positions */
+
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const             *ARGV =
+        NM_MAKE_STRV("bond=bond0:eth0,eth1:arp_interval=100,ns_ip6_target=[fc08::1];[fc08::2]",
+                     "bond=bond1:eth2,eth3:arp_interval=100,ns_ip6_target=[fc08::1];[fc08::2]:9000",
+                     "bond=bond2:eth4,eth5:ns_ip6_target=[fc08::1];[fc08::2],arp_interval=100",
+                     "bond=bond3:eth6,eth7:arp_interval=100,arp_ip_target=10.0.0.1;10.0.0.2",
+                     "bond=bond4:eth8,eth9:arp_interval=100,arp_ip_target=10.0.0.1;10.0.0.2:9000",
+                     "bond=bond5:eth10,eth11:arp_ip_target=10.0.0.1;10.0.0.2,arp_interval=100");
+    NMConnection  *connection;
+    NMSettingBond *s_bond;
+
+    connections = _parse_cons(ARGV);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 18);
+
+    connection = g_hash_table_lookup(connections, "bond0");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"),
+                    ==,
+                    "fc08::1,fc08::2");
+
+    connection = g_hash_table_lookup(connections, "bond1");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"),
+                    ==,
+                    "fc08::1,fc08::2");
+
+    connection = g_hash_table_lookup(connections, "bond2");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "ns_ip6_target"),
+                    ==,
+                    "fc08::1,fc08::2");
+
+    connection = g_hash_table_lookup(connections, "bond3");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "arp_ip_target"),
+                    ==,
+                    "10.0.0.1,10.0.0.2");
+
+    connection = g_hash_table_lookup(connections, "bond4");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "arp_ip_target"),
+                    ==,
+                    "10.0.0.1,10.0.0.2");
+
+    connection = g_hash_table_lookup(connections, "bond5");
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 3);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "arp_ip_target"),
+                    ==,
+                    "10.0.0.1,10.0.0.2");
+}
+
 static void
 test_bond_default(void)
 {
@@ -2701,6 +2813,8 @@ main(int argc, char **argv)
     g_test_add_func("/initrd/cmdline/bootdev", test_bootdev);
     g_test_add_func("/initrd/cmdline/bond", test_bond);
     g_test_add_func("/initrd/cmdline/bond/ip", test_bond_ip);
+    g_test_add_func("/initrd/cmdline/bond/ip6-option", test_bond_ip6_option);
+    g_test_add_func("/initrd/cmdline/bond/multi-values-option", test_bond_multi_values_option);
     g_test_add_func("/initrd/cmdline/bond/default", test_bond_default);
     g_test_add_func("/initrd/cmdline/team", test_team);
     g_test_add_func("/initrd/cmdline/vlan", test_vlan);
diff --git a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
index 9aa1751e7e..77e6c4278a 100644
--- a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
+++ b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
@@ -629,7 +629,7 @@
                   alias="type"
                   nmcli-description="Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc)."
                   format="string"
-                  values="6lowpan, 802-11-olpc-mesh, 802-11-wireless, 802-3-ethernet, adsl, bluetooth, bond, bridge, cdma, dummy, generic, gsm, hsr, infiniband, ip-tunnel, ipvlan, loopback, macsec, macvlan, ovs-bridge, ovs-dpdk, ovs-interface, ovs-patch, ovs-port, pppoe, team, tun, veth, vlan, vpn, vrf, vxlan, wifi-p2p, wimax, wireguard, wpan" />
+                  values="6lowpan, 802-11-olpc-mesh, 802-11-wireless, 802-3-ethernet, adsl, bluetooth, bond, bridge, cdma, dummy, generic, gsm, hsr, infiniband, ip-tunnel, ipvlan, loopback, macsec, macvlan, ovs-bridge, ovs-interface, ovs-port, pppoe, team, tun, veth, vlan, vpn, vrf, vxlan, wifi-p2p, wimax, wireguard, wpan" />
         <property name="interface-name"
                   alias="ifname"
                   nmcli-description="The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface."
@@ -1698,7 +1698,7 @@
                   format="choice (NMSettingMacvlanMode)"
                   values="vepa (1), bridge (2), private (3), passthru (4), source (5)" />
         <property name="promiscuous"
-                  nmcli-description="Whether the interface should be put in promiscuous mode."
+                  nmcli-description="Whether the parent interface should be put in promiscuous mode (true by default)."
                   format="boolean"
                   values="true/yes/on, false/no/off" />
         <property name="tap"
diff --git a/src/tests/client/test-client.check-on-disk/test_002.expected b/src/tests/client/test-client.check-on-disk/test_002.expected
index 0cfe9634f5..11c8bb9c7a 100644
--- a/src/tests/client/test-client.check-on-disk/test_002.expected
+++ b/src/tests/client/test-client.check-on-disk/test_002.expected
@@ -1,87 +1,89 @@
-size: 376
+size: 382
 location: src/tests/client/test-client.py:test_002()/1
 cmd: $NMCLI d
 lang: C
 returncode: 0
-stdout: 258 bytes
+stdout: 264 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan0   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan0   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 391
+size: 390
 location: src/tests/client/test-client.py:test_002()/2
 cmd: $NMCLI d
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 263 bytes
+stdout: 262 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  --         
+DEVICE  TYPE      STATE       CONNECTION 
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan0   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 977
+size: 983
 location: src/tests/client/test-client.py:test_002()/3
 cmd: $NMCLI -f all d
 lang: C
 returncode: 0
-stdout: 852 bytes
+stdout: 858 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --        --       
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --        --       
-wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --        --       
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --        --       
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --        --       
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --        --       
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --        --       
+wlan0   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --        --       
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --        --       
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --        --       
 
 <<<
-size: 992
+size: 991
 location: src/tests/client/test-client.py:test_002()/4
 cmd: $NMCLI -f all d
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 857 bytes
+stdout: 856 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --        --       
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --        --       
-wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --        --       
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --        --       
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --        --       
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --        --       
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --        --       
+wlan0   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --        --       
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --        --       
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --        --       
 
 <<<
-size: 738
+size: 791
 location: src/tests/client/test-client.py:test_002()/5
 cmd: $NMCLI 
 lang: C
 returncode: 0
-stdout: 621 bytes
+stdout: 674 bytes
 >>>
-eth0: unavailable
+eth0: disconnected
 	"eth0"
+	1 connection available
 	ethernet (virtual), 65:2E:D3:9E:0A:0D, hw
 
-eth1: unavailable
+eth1: disconnected
 	"eth1"
+	1 connection available
 	ethernet (virtual), 47:D5:6B:65:FD:6A, hw
 
-wlan0: unavailable
+wlan0: disconnected
 	"wlan0"
 	wifi (virtual), 3D:99:1D:8B:74:4D, hw
 
-wlan1: unavailable
+wlan1: disconnected
 	"wlan1"
 	wifi (virtual), 99:09:77:FD:FE:1D, hw
 
-wlan1: unavailable
+wlan1: disconnected
 	"wlan1"
 	wifi (virtual), 5D:30:4A:EC:3F:61, hw
 
@@ -94,30 +96,32 @@ Use "nmcli device show" to get complete information about known devices and
 Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage details.
 
 <<<
-size: 811
+size: 873
 location: src/tests/client/test-client.py:test_002()/6
 cmd: $NMCLI 
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 684 bytes
+stdout: 746 bytes
 >>>
-eth0: niedostępne
+eth0: rozłączono
 	"eth0"
+	1 połączenie jest dostępne
 	ethernet (virtual), 65:2E:D3:9E:0A:0D, sprzęt
 
-eth1: niedostępne
+eth1: rozłączono
 	"eth1"
+	1 połączenie jest dostępne
 	ethernet (virtual), 47:D5:6B:65:FD:6A, sprzęt
 
-wlan0: niedostępne
+wlan0: rozłączono
 	"wlan0"
 	wifi (virtual), 3D:99:1D:8B:74:4D, sprzęt
 
-wlan1: niedostępne
+wlan1: rozłączono
 	"wlan1"
 	wifi (virtual), 99:09:77:FD:FE:1D, sprzęt
 
-wlan1: niedostępne
+wlan1: rozłączono
 	"wlan1"
 	wifi (virtual), 5D:30:4A:EC:3F:61, sprzęt
 
diff --git a/src/tests/client/test-client.check-on-disk/test_003.expected b/src/tests/client/test-client.check-on-disk/test_003.expected
index 3dda2bcfbd..7094583ff0 100644
--- a/src/tests/client/test-client.check-on-disk/test_003.expected
+++ b/src/tests/client/test-client.check-on-disk/test_003.expected
@@ -1868,34 +1868,34 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 1408
+size: 1414
 location: src/tests/client/test-client.py:test_003()/43
 cmd: $NMCLI -f ALL dev status
 lang: C
 returncode: 0
-stdout: 1272 bytes
+stdout: 1278 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan0   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1424
+size: 1422
 location: src/tests/client/test-client.py:test_003()/44
 cmd: $NMCLI -f ALL dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1278 bytes
+stdout: 1276 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan0   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 172
@@ -2960,34 +2960,34 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 1408
+size: 1414
 location: src/tests/client/test-client.py:test_003()/68
 cmd: $NMCLI -f ALL dev status
 lang: C
 returncode: 0
-stdout: 1272 bytes
+stdout: 1278 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
-eth1    ethernet  connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
-wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+wlan0   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1425
+size: 1422
 location: src/tests/client/test-client.py:test_003()/69
 cmd: $NMCLI -f ALL dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1279 bytes
+stdout: 1276 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
-eth1    ethernet  połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
-wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+wlan0   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 172
@@ -3298,42 +3298,42 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 1399
+size: 1405
 location: src/tests/client/test-client.py:test_003()/76
 cmd: $NMCLI -f all d
 lang: C
 returncode: 0
-stdout: 1272 bytes
+stdout: 1278 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth1    ethernet  connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
-wlan0   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth1    ethernet  connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+wlan0   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1416
+size: 1413
 location: src/tests/client/test-client.py:test_003()/77
 cmd: $NMCLI -f all d
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1279 bytes
+stdout: 1276 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth1    ethernet  połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
-wlan0   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth1    ethernet  połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+wlan0   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 759
+size: 762
 location: src/tests/client/test-client.py:test_003()/78
 cmd: $NMCLI 
 lang: C
 returncode: 0
-stdout: 641 bytes
+stdout: 644 bytes
 >>>
 eth1: connected to ethernet
 	"eth1"
@@ -3343,15 +3343,15 @@ eth0: connected to ethernet
 	"eth0"
 	ethernet (virtual), C0:61:AE:26:4D:D7, hw
 
-wlan0: unavailable
+wlan0: disconnected
 	"wlan0"
 	wifi (virtual), DC:39:87:BA:3E:5D, hw
 
-wlan1: unavailable
+wlan1: disconnected
 	"wlan1"
 	wifi (virtual), AC:4E:5B:7B:57:49, hw
 
-wlan1: unavailable
+wlan1: disconnected
 	"wlan1"
 	wifi (virtual), 24:C4:52:BC:3D:37, hw
 
@@ -3379,15 +3379,15 @@ eth0: połączono do ethernet
 	"eth0"
 	ethernet (virtual), C0:61:AE:26:4D:D7, sprzęt
 
-wlan0: niedostępne
+wlan0: rozłączono
 	"wlan0"
 	wifi (virtual), DC:39:87:BA:3E:5D, sprzęt
 
-wlan1: niedostępne
+wlan1: rozłączono
 	"wlan1"
 	wifi (virtual), AC:4E:5B:7B:57:49, sprzęt
 
-wlan1: niedostępne
+wlan1: rozłączono
 	"wlan1"
 	wifi (virtual), 24:C4:52:BC:3D:37, sprzęt
 
diff --git a/src/tests/client/test-client.check-on-disk/test_004.expected b/src/tests/client/test-client.check-on-disk/test_004.expected
index 5ba751ce8e..c57ea772ca 100644
--- a/src/tests/client/test-client.check-on-disk/test_004.expected
+++ b/src/tests/client/test-client.check-on-disk/test_004.expected
@@ -970,12 +970,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 786
+size: 886
 location: src/tests/client/test-client.py:test_004()/23
 cmd: $NMCLI 
 lang: C
 returncode: 0
-stdout: 668 bytes
+stdout: 768 bytes
 >>>
 con-vpn-1 VPN connection
 	VPN
@@ -985,20 +985,24 @@ wlan0: connected to con-vpn-1
 	wifi (virtual), 13:E0:74:85:7C:D9, hw
 	VPN
 
-eth0: unavailable
+eth0: disconnected
 	"eth0"
+	1 connection available
 	ethernet (virtual), AB:B7:BF:E2:48:E8, hw
 
-eth1: unavailable
+eth1: disconnected
 	"eth1"
+	1 connection available
 	ethernet (virtual), E7:78:B1:93:2B:22, hw
 
-wlan1: unavailable
+wlan1: disconnected
 	"wlan1"
+	1 connection available
 	wifi (virtual), 21:E9:64:81:8C:A8, hw
 
-wlan1: unavailable
+wlan1: disconnected
 	"wlan1"
+	1 connection available
 	wifi (virtual), 71:52:AD:63:5C:7C, hw
 
 DNS configuration:
@@ -1010,12 +1014,12 @@ Use "nmcli device show" to get complete information about known devices and
 Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage details.
 
 <<<
-size: 862
+size: 986
 location: src/tests/client/test-client.py:test_004()/24
 cmd: $NMCLI 
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 734 bytes
+stdout: 858 bytes
 >>>
 Połączenie VPN con-vpn-1
 	VPN
@@ -1025,20 +1029,24 @@ wlan0: połączono do con-vpn-1
 	wifi (virtual), 13:E0:74:85:7C:D9, sprzęt
 	VPN
 
-eth0: niedostępne
+eth0: rozłączono
 	"eth0"
+	1 połączenie jest dostępne
 	ethernet (virtual), AB:B7:BF:E2:48:E8, sprzęt
 
-eth1: niedostępne
+eth1: rozłączono
 	"eth1"
+	1 połączenie jest dostępne
 	ethernet (virtual), E7:78:B1:93:2B:22, sprzęt
 
-wlan1: niedostępne
+wlan1: rozłączono
 	"wlan1"
+	1 połączenie jest dostępne
 	wifi (virtual), 21:E9:64:81:8C:A8, sprzęt
 
-wlan1: niedostępne
+wlan1: rozłączono
 	"wlan1"
+	1 połączenie jest dostępne
 	wifi (virtual), 71:52:AD:63:5C:7C, sprzęt
 
 DNS configuration:
@@ -1974,72 +1982,72 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 381
+size: 387
 location: src/tests/client/test-client.py:test_004()/37
 cmd: $NMCLI dev s
 lang: C
 returncode: 0
-stdout: 258 bytes
+stdout: 264 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-wlan0   wifi      connected    con-vpn-1  
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+wlan0   wifi      connected     con-vpn-1  
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 397
+size: 395
 location: src/tests/client/test-client.py:test_004()/38
 cmd: $NMCLI dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 264 bytes
+stdout: 262 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-wlan0   wifi      połączono    con-vpn-1  
-eth0    ethernet  niedostępne  --         
-eth1    ethernet  niedostępne  --         
-wlan1   wifi      niedostępne  --         
-wlan1   wifi      niedostępne  --         
+DEVICE  TYPE      STATE       CONNECTION 
+wlan0   wifi      połączono   con-vpn-1  
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 1408
+size: 1414
 location: src/tests/client/test-client.py:test_004()/39
 cmd: $NMCLI -f all dev status
 lang: C
 returncode: 0
-stdout: 1272 bytes
+stdout: 1278 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1424
+size: 1422
 location: src/tests/client/test-client.py:test_004()/40
 cmd: $NMCLI -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1278 bytes
+stdout: 1276 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 8042
+size: 8046
 location: src/tests/client/test-client.py:test_004()/41
 cmd: $NMCLI dev show
 lang: C
 returncode: 0
-stdout: 7915 bytes
+stdout: 7919 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2070,7 +2078,7 @@ GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               on
@@ -2096,7 +2104,7 @@ GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               on
@@ -2127,7 +2135,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.GATEWAY:                            192.168.57.160
@@ -2156,7 +2164,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.ADDRESS[1]:                         192.168.97.124/29
@@ -2216,7 +2224,7 @@ GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               włączone
@@ -2242,7 +2250,7 @@ GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               włączone
@@ -2273,7 +2281,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.GATEWAY:                            192.168.57.160
@@ -2302,7 +2310,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.ADDRESS[1]:                         192.168.97.124/29
@@ -2326,12 +2334,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 22797
+size: 22801
 location: src/tests/client/test-client.py:test_004()/43
 cmd: $NMCLI -f all dev show
 lang: C
 returncode: 0
-stdout: 22662 bytes
+stdout: 22666 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2448,7 +2456,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -2517,7 +2525,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -2593,7 +2601,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -2691,7 +2699,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -2880,7 +2888,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -2949,7 +2957,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -3025,7 +3033,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -3123,7 +3131,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -5406,72 +5414,72 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 557
+size: 579
 location: src/tests/client/test-client.py:test_004()/87
 cmd: $NMCLI --color yes dev s
 lang: C
 returncode: 0
-stdout: 422 bytes
+stdout: 444 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-wlan0   wifi      connected    con-vpn-1  
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+wlan0   wifi      connected     con-vpn-1  
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 573
+size: 587
 location: src/tests/client/test-client.py:test_004()/88
 cmd: $NMCLI --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 428 bytes
+stdout: 442 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-wlan0   wifi      połączono    con-vpn-1  
-eth0    ethernet  niedostępne  --         
-eth1    ethernet  niedostępne  --         
-wlan1   wifi      niedostępne  --         
-wlan1   wifi      niedostępne  --         
+DEVICE  TYPE      STATE       CONNECTION 
+wlan0   wifi      połączono   con-vpn-1  
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 1789
+size: 1831
 location: src/tests/client/test-client.py:test_004()/89
 cmd: $NMCLI --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1641 bytes
+stdout: 1683 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1805
+size: 1839
 location: src/tests/client/test-client.py:test_004()/90
 cmd: $NMCLI --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1647 bytes
+stdout: 1681 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 8054
+size: 8058
 location: src/tests/client/test-client.py:test_004()/91
 cmd: $NMCLI --color yes dev show
 lang: C
 returncode: 0
-stdout: 7915 bytes
+stdout: 7919 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5502,7 +5510,7 @@ GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               on
@@ -5528,7 +5536,7 @@ GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               on
@@ -5559,7 +5567,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.GATEWAY:                            192.168.57.160
@@ -5588,7 +5596,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.ADDRESS[1]:                         192.168.97.124/29
@@ -5648,7 +5656,7 @@ GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               włączone
@@ -5674,7 +5682,7 @@ GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               włączone
@@ -5705,7 +5713,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.GATEWAY:                            192.168.57.160
@@ -5734,7 +5742,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.ADDRESS[1]:                         192.168.97.124/29
@@ -5758,12 +5766,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 23133
+size: 23137
 location: src/tests/client/test-client.py:test_004()/93
 cmd: $NMCLI --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 22986 bytes
+stdout: 22990 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5880,7 +5888,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -5949,7 +5957,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -6025,7 +6033,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -6123,7 +6131,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -6312,7 +6320,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -6381,7 +6389,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -6457,7 +6465,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -6555,7 +6563,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -7112,34 +7120,34 @@ WIFI-PROPERTIES.MESH:                   nie
 WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
-size: 648
+size: 660
 location: src/tests/client/test-client.py:test_004()/103
 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 489 bytes
+stdout: 501 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
 wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
-eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
-eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
+eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
+eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 658
+size: 670
 location: src/tests/client/test-client.py:test_004()/104
 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 489 bytes
+stdout: 501 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
 wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
-eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
-eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
+eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
+eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
 size: 2720
@@ -8922,88 +8930,88 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 520
+size: 527
 location: src/tests/client/test-client.py:test_004()/137
 cmd: $NMCLI --pretty dev s
 lang: C
 returncode: 0
-stdout: 387 bytes
+stdout: 394 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        CONNECTION 
-----------------------------------------------------------------
-wlan0   wifi      connected    con-vpn-1  
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+-----------------------------------------------------------------
+wlan0   wifi      connected     con-vpn-1  
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 529
+size: 526
 location: src/tests/client/test-client.py:test_004()/138
 cmd: $NMCLI --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 386 bytes
+stdout: 383 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        CONNECTION 
---------------------------------------------------------------
-wlan0   wifi      połączono    con-vpn-1  
-eth0    ethernet  niedostępne  --         
-eth1    ethernet  niedostępne  --         
-wlan1   wifi      niedostępne  --         
-wlan1   wifi      niedostępne  --         
+DEVICE  TYPE      STATE       CONNECTION 
+-------------------------------------------------------------
+wlan0   wifi      połączono   con-vpn-1  
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 1716
+size: 1723
 location: src/tests/client/test-client.py:test_004()/139
 cmd: $NMCLI --pretty -f all dev status
 lang: C
 returncode: 0
-stdout: 1570 bytes
+stdout: 1577 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1725
+size: 1722
 location: src/tests/client/test-client.py:test_004()/140
 cmd: $NMCLI --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1569 bytes
+stdout: 1566 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 12868
+size: 12872
 location: src/tests/client/test-client.py:test_004()/141
 cmd: $NMCLI --pretty dev show
 lang: C
 returncode: 0
-stdout: 12730 bytes
+stdout: 12734 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9053,7 +9061,7 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -9092,7 +9100,7 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -9136,7 +9144,7 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -9177,7 +9185,7 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -9261,7 +9269,7 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -9300,7 +9308,7 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -9344,7 +9352,7 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -9385,7 +9393,7 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -9414,12 +9422,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 27782
+size: 27786
 location: src/tests/client/test-client.py:test_004()/143
 cmd: $NMCLI --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 27637 bytes
+stdout: 27641 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9554,7 +9562,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -9635,7 +9643,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -9723,7 +9731,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -9834,7 +9842,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -10050,7 +10058,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -10131,7 +10139,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -10219,7 +10227,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -10330,7 +10338,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -13026,88 +13034,88 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 696
+size: 719
 location: src/tests/client/test-client.py:test_004()/187
 cmd: $NMCLI --pretty --color yes dev s
 lang: C
 returncode: 0
-stdout: 551 bytes
+stdout: 574 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        CONNECTION 
-----------------------------------------------------------------
-wlan0   wifi      connected    con-vpn-1  
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+-----------------------------------------------------------------
+wlan0   wifi      connected     con-vpn-1  
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 705
+size: 718
 location: src/tests/client/test-client.py:test_004()/188
 cmd: $NMCLI --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 550 bytes
+stdout: 563 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        CONNECTION 
---------------------------------------------------------------
-wlan0   wifi      połączono    con-vpn-1  
-eth0    ethernet  niedostępne  --         
-eth1    ethernet  niedostępne  --         
-wlan1   wifi      niedostępne  --         
-wlan1   wifi      niedostępne  --         
+DEVICE  TYPE      STATE       CONNECTION 
+-------------------------------------------------------------
+wlan0   wifi      połączono   con-vpn-1  
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 2097
+size: 2140
 location: src/tests/client/test-client.py:test_004()/189
 cmd: $NMCLI --pretty --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1939 bytes
+stdout: 1982 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 2106
+size: 2139
 location: src/tests/client/test-client.py:test_004()/190
 cmd: $NMCLI --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1938 bytes
+stdout: 1971 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 12880
+size: 12884
 location: src/tests/client/test-client.py:test_004()/191
 cmd: $NMCLI --pretty --color yes dev show
 lang: C
 returncode: 0
-stdout: 12730 bytes
+stdout: 12734 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13157,7 +13165,7 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -13196,7 +13204,7 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -13240,7 +13248,7 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -13281,7 +13289,7 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -13365,7 +13373,7 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -13404,7 +13412,7 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -13448,7 +13456,7 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -13489,7 +13497,7 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -13518,12 +13526,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 28118
+size: 28122
 location: src/tests/client/test-client.py:test_004()/193
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 27961 bytes
+stdout: 27965 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13658,7 +13666,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -13739,7 +13747,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -13827,7 +13835,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -13938,7 +13946,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -14154,7 +14162,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -14235,7 +14243,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -14323,7 +14331,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -14434,7 +14442,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -15078,12 +15086,12 @@ WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 804
+size: 816
 location: src/tests/client/test-client.py:test_004()/203
 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 636 bytes
+stdout: 648 bytes
 >>>
 =====================
   Status of devices
@@ -15091,18 +15099,18 @@ stdout: 636 bytes
 DEVICE  TYPE      DBUS-PATH                                 
 ----------------------------------------------------------------------------------
 wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
-eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
-eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
+eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
+eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 807
+size: 819
 location: src/tests/client/test-client.py:test_004()/204
 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 629 bytes
+stdout: 641 bytes
 >>>
 ===================
   Stan urządzenia
@@ -15110,10 +15118,10 @@ stdout: 629 bytes
 DEVICE  TYPE      DBUS-PATH                                 
 --------------------------------------------------------------------------------
 wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
-eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
-eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
+eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
+eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
 size: 3794
@@ -17046,68 +17054,68 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 265
+size: 269
 location: src/tests/client/test-client.py:test_004()/237
 cmd: $NMCLI --terse dev s
 lang: C
 returncode: 0
-stdout: 133 bytes
+stdout: 137 bytes
 >>>
 wlan0:wifi:connected:con-vpn-1
-eth0:ethernet:unavailable:
-eth1:ethernet:unavailable:
-wlan1:wifi:unavailable:
-wlan1:wifi:unavailable:
+eth0:ethernet:disconnected:
+eth1:ethernet:disconnected:
+wlan1:wifi:disconnected:
+wlan1:wifi:disconnected:
 
 <<<
-size: 275
+size: 279
 location: src/tests/client/test-client.py:test_004()/238
 cmd: $NMCLI --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 133 bytes
+stdout: 137 bytes
 >>>
 wlan0:wifi:connected:con-vpn-1
-eth0:ethernet:unavailable:
-eth1:ethernet:unavailable:
-wlan1:wifi:unavailable:
-wlan1:wifi:unavailable:
+eth0:ethernet:disconnected:
+eth1:ethernet:disconnected:
+wlan1:wifi:disconnected:
+wlan1:wifi:disconnected:
 
 <<<
-size: 663
+size: 667
 location: src/tests/client/test-client.py:test_004()/239
 cmd: $NMCLI --terse -f all dev status
 lang: C
 returncode: 0
-stdout: 519 bytes
+stdout: 523 bytes
 >>>
 wlan0:wifi:connected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
-eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
+eth0:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 673
+size: 677
 location: src/tests/client/test-client.py:test_004()/240
 cmd: $NMCLI --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 519 bytes
+stdout: 523 bytes
 >>>
 wlan0:wifi:connected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
-eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
+eth0:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 4535
+size: 4539
 location: src/tests/client/test-client.py:test_004()/241
 cmd: $NMCLI --terse dev show
 lang: C
 returncode: 0
-stdout: 4399 bytes
+stdout: 4403 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17138,7 +17146,7 @@ GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -17164,7 +17172,7 @@ GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -17195,7 +17203,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.GATEWAY:192.168.57.160
@@ -17224,7 +17232,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.ADDRESS[1]:192.168.97.124/29
@@ -17248,12 +17256,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 4545
+size: 4549
 location: src/tests/client/test-client.py:test_004()/242
 cmd: $NMCLI --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4399 bytes
+stdout: 4403 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17284,7 +17292,7 @@ GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -17310,7 +17318,7 @@ GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -17341,7 +17349,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.GATEWAY:192.168.57.160
@@ -17370,7 +17378,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.ADDRESS[1]:192.168.97.124/29
@@ -17394,12 +17402,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 13208
+size: 13212
 location: src/tests/client/test-client.py:test_004()/243
 cmd: $NMCLI --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 13064 bytes
+stdout: 13068 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17516,7 +17524,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -17585,7 +17593,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -17661,7 +17669,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -17759,7 +17767,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -17826,12 +17834,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 13254
+size: 13258
 location: src/tests/client/test-client.py:test_004()/244
 cmd: $NMCLI --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 13100 bytes
+stdout: 13104 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17948,7 +17956,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -18017,7 +18025,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -18093,7 +18101,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -18191,7 +18199,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -20448,68 +20456,68 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 441
+size: 461
 location: src/tests/client/test-client.py:test_004()/287
 cmd: $NMCLI --terse --color yes dev s
 lang: C
 returncode: 0
-stdout: 297 bytes
+stdout: 317 bytes
 >>>
 wlan0:wifi:connected:con-vpn-1
-eth0:ethernet:unavailable:
-eth1:ethernet:unavailable:
-wlan1:wifi:unavailable:
-wlan1:wifi:unavailable:
+eth0:ethernet:disconnected:
+eth1:ethernet:disconnected:
+wlan1:wifi:disconnected:
+wlan1:wifi:disconnected:
 
 <<<
-size: 451
+size: 471
 location: src/tests/client/test-client.py:test_004()/288
 cmd: $NMCLI --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 297 bytes
+stdout: 317 bytes
 >>>
 wlan0:wifi:connected:con-vpn-1
-eth0:ethernet:unavailable:
-eth1:ethernet:unavailable:
-wlan1:wifi:unavailable:
-wlan1:wifi:unavailable:
+eth0:ethernet:disconnected:
+eth1:ethernet:disconnected:
+wlan1:wifi:disconnected:
+wlan1:wifi:disconnected:
 
 <<<
-size: 1044
+size: 1084
 location: src/tests/client/test-client.py:test_004()/289
 cmd: $NMCLI --terse --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 888 bytes
+stdout: 928 bytes
 >>>
 wlan0:wifi:connected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
-eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
+eth0:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 1054
+size: 1094
 location: src/tests/client/test-client.py:test_004()/290
 cmd: $NMCLI --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 888 bytes
+stdout: 928 bytes
 >>>
 wlan0:wifi:connected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
-eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
+eth0:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 4547
+size: 4551
 location: src/tests/client/test-client.py:test_004()/291
 cmd: $NMCLI --terse --color yes dev show
 lang: C
 returncode: 0
-stdout: 4399 bytes
+stdout: 4403 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -20540,7 +20548,7 @@ GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -20566,7 +20574,7 @@ GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -20597,7 +20605,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.GATEWAY:192.168.57.160
@@ -20626,7 +20634,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.ADDRESS[1]:192.168.97.124/29
@@ -20650,12 +20658,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 4557
+size: 4561
 location: src/tests/client/test-client.py:test_004()/292
 cmd: $NMCLI --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4399 bytes
+stdout: 4403 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -20686,7 +20694,7 @@ GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -20712,7 +20720,7 @@ GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -20743,7 +20751,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.GATEWAY:192.168.57.160
@@ -20772,7 +20780,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.ADDRESS[1]:192.168.97.124/29
@@ -20796,12 +20804,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 13544
+size: 13548
 location: src/tests/client/test-client.py:test_004()/293
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 13388 bytes
+stdout: 13392 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -20918,7 +20926,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -20987,7 +20995,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -21063,7 +21071,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -21161,7 +21169,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -21228,12 +21236,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 13590
+size: 13594
 location: src/tests/client/test-client.py:test_004()/294
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 13424 bytes
+stdout: 13428 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -21350,7 +21358,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -21419,7 +21427,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -21495,7 +21503,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -21593,7 +21601,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -22150,32 +22158,32 @@ WIFI-PROPERTIES.MESH:no
 WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 561
+size: 573
 location: src/tests/client/test-client.py:test_004()/303
 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 394 bytes
+stdout: 406 bytes
 >>>
 wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
-eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
-eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
-wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
-wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
+eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
+eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
+wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
+wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 571
+size: 583
 location: src/tests/client/test-client.py:test_004()/304
 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 394 bytes
+stdout: 406 bytes
 >>>
 wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
-eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
-eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
-wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
-wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
+eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
+eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
+wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
+wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 1773
@@ -23162,72 +23170,72 @@ GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STA
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
-size: 397
+size: 403
 location: src/tests/client/test-client.py:test_004()/337
 cmd: $NMCLI --mode tabular dev s
 lang: C
 returncode: 0
-stdout: 258 bytes
+stdout: 264 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-wlan0   wifi      connected    con-vpn-1  
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+wlan0   wifi      connected     con-vpn-1  
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 413
+size: 411
 location: src/tests/client/test-client.py:test_004()/338
 cmd: $NMCLI --mode tabular dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 264 bytes
+stdout: 262 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-wlan0   wifi      połączono    con-vpn-1  
-eth0    ethernet  niedostępne  --         
-eth1    ethernet  niedostępne  --         
-wlan1   wifi      niedostępne  --         
-wlan1   wifi      niedostępne  --         
+DEVICE  TYPE      STATE       CONNECTION 
+wlan0   wifi      połączono   con-vpn-1  
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 1424
+size: 1430
 location: src/tests/client/test-client.py:test_004()/339
 cmd: $NMCLI --mode tabular -f all dev status
 lang: C
 returncode: 0
-stdout: 1272 bytes
+stdout: 1278 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1440
+size: 1438
 location: src/tests/client/test-client.py:test_004()/340
 cmd: $NMCLI --mode tabular -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1278 bytes
+stdout: 1276 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 6557
+size: 6565
 location: src/tests/client/test-client.py:test_004()/341
 cmd: $NMCLI --mode tabular dev show
 lang: C
 returncode: 0
-stdout: 6414 bytes
+stdout: 6422 bytes
 >>>
 DEVICE 
 wlan0  
@@ -23268,8 +23276,8 @@ AB:B7:BF:E2:48:E8
 MTU 
 0   
 
-STATE            
-20 (unavailable) 
+STATE             
+30 (disconnected) 
 
 CONNECTION 
 --         
@@ -23298,8 +23306,8 @@ E7:78:B1:93:2B:22
 MTU 
 0   
 
-STATE            
-20 (unavailable) 
+STATE             
+30 (disconnected) 
 
 CONNECTION 
 --         
@@ -23328,8 +23336,8 @@ HWADDR
 MTU 
 0   
 
-STATE            
-20 (unavailable) 
+STATE             
+30 (disconnected) 
 
 CONNECTION 
 --         
@@ -23355,8 +23363,8 @@ HWADDR
 MTU 
 0   
 
-STATE            
-20 (unavailable) 
+STATE             
+30 (disconnected) 
 
 CONNECTION 
 --         
@@ -23371,12 +23379,12 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y  --       
 
 <<<
-size: 6581
+size: 6577
 location: src/tests/client/test-client.py:test_004()/342
 cmd: $NMCLI --mode tabular dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6428 bytes
+stdout: 6424 bytes
 >>>
 DEVICE 
 wlan0  
@@ -23417,8 +23425,8 @@ AB:B7:BF:E2:48:E8
 MTU 
 0   
 
-STATE            
-20 (niedostępne) 
+STATE           
+30 (rozłączono) 
 
 CONNECTION 
 --         
@@ -23447,8 +23455,8 @@ E7:78:B1:93:2B:22
 MTU 
 0   
 
-STATE            
-20 (niedostępne) 
+STATE           
+30 (rozłączono) 
 
 CONNECTION 
 --         
@@ -23477,8 +23485,8 @@ HWADDR
 MTU 
 0   
 
-STATE            
-20 (niedostępne) 
+STATE           
+30 (rozłączono) 
 
 CONNECTION 
 --         
@@ -23504,8 +23512,8 @@ HWADDR
 MTU 
 0   
 
-STATE            
-20 (niedostępne) 
+STATE           
+30 (rozłączono) 
 
 CONNECTION 
 --         
@@ -23520,12 +23528,12 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y  --       
 
 <<<
-size: 16323
+size: 16331
 location: src/tests/client/test-client.py:test_004()/343
 cmd: $NMCLI --mode tabular -f all dev show
 lang: C
 returncode: 0
-stdout: 16172 bytes
+stdout: 16180 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -23559,8 +23567,8 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -23586,8 +23594,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --    eth1      no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --    eth1      no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -23613,8 +23621,8 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -23643,8 +23651,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -23673,12 +23681,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 16485
+size: 16481
 location: src/tests/client/test-client.py:test_004()/344
 cmd: $NMCLI --mode tabular -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 16324 bytes
+stdout: 16320 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -23712,8 +23720,8 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -23739,8 +23747,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --    eth1      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --    eth1      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -23766,8 +23774,8 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -23796,8 +23804,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -24816,72 +24824,72 @@ GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STA
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
-size: 573
+size: 595
 location: src/tests/client/test-client.py:test_004()/387
 cmd: $NMCLI --mode tabular --color yes dev s
 lang: C
 returncode: 0
-stdout: 422 bytes
+stdout: 444 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-wlan0   wifi      connected    con-vpn-1  
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+wlan0   wifi      connected     con-vpn-1  
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 589
+size: 603
 location: src/tests/client/test-client.py:test_004()/388
 cmd: $NMCLI --mode tabular --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 428 bytes
+stdout: 442 bytes
 >>>
-DEVICE  TYPE      STATE        CONNECTION 
-wlan0   wifi      połączono    con-vpn-1  
-eth0    ethernet  niedostępne  --         
-eth1    ethernet  niedostępne  --         
-wlan1   wifi      niedostępne  --         
-wlan1   wifi      niedostępne  --         
+DEVICE  TYPE      STATE       CONNECTION 
+wlan0   wifi      połączono   con-vpn-1  
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 1805
+size: 1847
 location: src/tests/client/test-client.py:test_004()/389
 cmd: $NMCLI --mode tabular --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1641 bytes
+stdout: 1683 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1821
+size: 1855
 location: src/tests/client/test-client.py:test_004()/390
 cmd: $NMCLI --mode tabular --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1647 bytes
+stdout: 1681 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 6569
+size: 6577
 location: src/tests/client/test-client.py:test_004()/391
 cmd: $NMCLI --mode tabular --color yes dev show
 lang: C
 returncode: 0
-stdout: 6414 bytes
+stdout: 6422 bytes
 >>>
 DEVICE 
 wlan0  
@@ -24922,8 +24930,8 @@ AB:B7:BF:E2:48:E8
 MTU 
 0   
 
-STATE            
-20 (unavailable) 
+STATE             
+30 (disconnected) 
 
 CONNECTION 
 --         
@@ -24952,8 +24960,8 @@ E7:78:B1:93:2B:22
 MTU 
 0   
 
-STATE            
-20 (unavailable) 
+STATE             
+30 (disconnected) 
 
 CONNECTION 
 --         
@@ -24982,8 +24990,8 @@ HWADDR
 MTU 
 0   
 
-STATE            
-20 (unavailable) 
+STATE             
+30 (disconnected) 
 
 CONNECTION 
 --         
@@ -25009,8 +25017,8 @@ HWADDR
 MTU 
 0   
 
-STATE            
-20 (unavailable) 
+STATE             
+30 (disconnected) 
 
 CONNECTION 
 --         
@@ -25025,12 +25033,12 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y  --       
 
 <<<
-size: 6593
+size: 6589
 location: src/tests/client/test-client.py:test_004()/392
 cmd: $NMCLI --mode tabular --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6428 bytes
+stdout: 6424 bytes
 >>>
 DEVICE 
 wlan0  
@@ -25071,8 +25079,8 @@ AB:B7:BF:E2:48:E8
 MTU 
 0   
 
-STATE            
-20 (niedostępne) 
+STATE           
+30 (rozłączono) 
 
 CONNECTION 
 --         
@@ -25101,8 +25109,8 @@ E7:78:B1:93:2B:22
 MTU 
 0   
 
-STATE            
-20 (niedostępne) 
+STATE           
+30 (rozłączono) 
 
 CONNECTION 
 --         
@@ -25131,8 +25139,8 @@ HWADDR
 MTU 
 0   
 
-STATE            
-20 (niedostępne) 
+STATE           
+30 (rozłączono) 
 
 CONNECTION 
 --         
@@ -25158,8 +25166,8 @@ HWADDR
 MTU 
 0   
 
-STATE            
-20 (niedostępne) 
+STATE           
+30 (rozłączono) 
 
 CONNECTION 
 --         
@@ -25174,12 +25182,12 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y  --       
 
 <<<
-size: 16695
+size: 16703
 location: src/tests/client/test-client.py:test_004()/393
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 16532 bytes
+stdout: 16540 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -25213,8 +25221,8 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -25240,8 +25248,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --    eth1      no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --    eth1      no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
@@ -25267,8 +25275,8 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -25297,8 +25305,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
@@ -25327,12 +25335,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 16857
+size: 16853
 location: src/tests/client/test-client.py:test_004()/394
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 16684 bytes
+stdout: 16680 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -25366,8 +25374,8 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -25393,8 +25401,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --    eth1      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --    eth1      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
@@ -25420,8 +25428,8 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -25450,8 +25458,8 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
@@ -25698,34 +25706,34 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
 <<<
-size: 663
+size: 675
 location: src/tests/client/test-client.py:test_004()/403
 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 489 bytes
+stdout: 501 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
 wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
-eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
-eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
+eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
+eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 673
+size: 685
 location: src/tests/client/test-client.py:test_004()/404
 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 489 bytes
+stdout: 501 bytes
 >>>
 DEVICE  TYPE      DBUS-PATH                                 
 wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
-eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
-eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
+eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
+eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
 size: 2735
@@ -26554,88 +26562,88 @@ GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STA
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
-size: 535
+size: 542
 location: src/tests/client/test-client.py:test_004()/437
 cmd: $NMCLI --mode tabular --pretty dev s
 lang: C
 returncode: 0
-stdout: 387 bytes
+stdout: 394 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        CONNECTION 
-----------------------------------------------------------------
-wlan0   wifi      connected    con-vpn-1  
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+-----------------------------------------------------------------
+wlan0   wifi      connected     con-vpn-1  
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 544
+size: 541
 location: src/tests/client/test-client.py:test_004()/438
 cmd: $NMCLI --mode tabular --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 386 bytes
+stdout: 383 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        CONNECTION 
---------------------------------------------------------------
-wlan0   wifi      połączono    con-vpn-1  
-eth0    ethernet  niedostępne  --         
-eth1    ethernet  niedostępne  --         
-wlan1   wifi      niedostępne  --         
-wlan1   wifi      niedostępne  --         
+DEVICE  TYPE      STATE       CONNECTION 
+-------------------------------------------------------------
+wlan0   wifi      połączono   con-vpn-1  
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 1731
+size: 1738
 location: src/tests/client/test-client.py:test_004()/439
 cmd: $NMCLI --mode tabular --pretty -f all dev status
 lang: C
 returncode: 0
-stdout: 1570 bytes
+stdout: 1577 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1740
+size: 1737
 location: src/tests/client/test-client.py:test_004()/440
 cmd: $NMCLI --mode tabular --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1569 bytes
+stdout: 1566 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 10187
+size: 10199
 location: src/tests/client/test-client.py:test_004()/441
 cmd: $NMCLI --mode tabular --pretty dev show
 lang: C
 returncode: 0
-stdout: 10034 bytes
+stdout: 10046 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -26695,9 +26703,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (unavailable) 
+STATE             
+-------------------
+30 (disconnected) 
 
 CONNECTION 
 ------------
@@ -26738,9 +26746,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (unavailable) 
+STATE             
+-------------------
+30 (disconnected) 
 
 CONNECTION 
 ------------
@@ -26781,9 +26789,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (unavailable) 
+STATE             
+-------------------
+30 (disconnected) 
 
 CONNECTION 
 ------------
@@ -26820,9 +26828,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (unavailable) 
+STATE             
+-------------------
+30 (disconnected) 
 
 CONNECTION 
 ------------
@@ -26841,12 +26849,12 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y  --       
 
 <<<
-size: 10358
+size: 10350
 location: src/tests/client/test-client.py:test_004()/442
 cmd: $NMCLI --mode tabular --pretty dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 10195 bytes
+stdout: 10187 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -26906,9 +26914,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (niedostępne) 
+STATE           
+-----------------
+30 (rozłączono) 
 
 CONNECTION 
 ------------
@@ -26949,9 +26957,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (niedostępne) 
+STATE           
+-----------------
+30 (rozłączono) 
 
 CONNECTION 
 ------------
@@ -26992,9 +27000,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (niedostępne) 
+STATE           
+-----------------
+30 (rozłączono) 
 
 CONNECTION 
 ------------
@@ -27031,9 +27039,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (niedostępne) 
+STATE           
+-----------------
+30 (rozłączono) 
 
 CONNECTION 
 ------------
@@ -27052,12 +27060,12 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y  --       
 
 <<<
-size: 24771
+size: 24783
 location: src/tests/client/test-client.py:test_004()/443
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 24611 bytes
+stdout: 24623 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -27107,9 +27115,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -27146,9 +27154,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 =========================
   Device details (eth1)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --    eth1      no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --    eth1      no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -27185,9 +27193,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -27228,9 +27236,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -27268,12 +27276,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 25135
+size: 25127
 location: src/tests/client/test-client.py:test_004()/444
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 24965 bytes
+stdout: 24957 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -27323,9 +27331,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -27362,9 +27370,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==================================
   Informacje o urządzeniu (eth1)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --    eth1      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --    eth1      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -27401,9 +27409,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -27444,9 +27452,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -28862,88 +28870,88 @@ GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STA
 GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
-size: 711
+size: 734
 location: src/tests/client/test-client.py:test_004()/487
 cmd: $NMCLI --mode tabular --pretty --color yes dev s
 lang: C
 returncode: 0
-stdout: 551 bytes
+stdout: 574 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        CONNECTION 
-----------------------------------------------------------------
-wlan0   wifi      connected    con-vpn-1  
-eth0    ethernet  unavailable  --         
-eth1    ethernet  unavailable  --         
-wlan1   wifi      unavailable  --         
-wlan1   wifi      unavailable  --         
+DEVICE  TYPE      STATE         CONNECTION 
+-----------------------------------------------------------------
+wlan0   wifi      connected     con-vpn-1  
+eth0    ethernet  disconnected  --         
+eth1    ethernet  disconnected  --         
+wlan1   wifi      disconnected  --         
+wlan1   wifi      disconnected  --         
 
 <<<
-size: 720
+size: 733
 location: src/tests/client/test-client.py:test_004()/488
 cmd: $NMCLI --mode tabular --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 550 bytes
+stdout: 563 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        CONNECTION 
---------------------------------------------------------------
-wlan0   wifi      połączono    con-vpn-1  
-eth0    ethernet  niedostępne  --         
-eth1    ethernet  niedostępne  --         
-wlan1   wifi      niedostępne  --         
-wlan1   wifi      niedostępne  --         
+DEVICE  TYPE      STATE       CONNECTION 
+-------------------------------------------------------------
+wlan0   wifi      połączono   con-vpn-1  
+eth0    ethernet  rozłączono  --         
+eth1    ethernet  rozłączono  --         
+wlan1   wifi      rozłączono  --         
+wlan1   wifi      rozłączono  --         
 
 <<<
-size: 2112
+size: 2155
 location: src/tests/client/test-client.py:test_004()/489
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1939 bytes
+stdout: 1982 bytes
 >>>
 =====================
   Status of devices
 =====================
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 2121
+size: 2154
 location: src/tests/client/test-client.py:test_004()/490
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1938 bytes
+stdout: 1971 bytes
 >>>
 ===================
   Stan urządzenia
 ===================
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
-eth0    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2 
+eth0    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  --          --                                    --                                                 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 10199
+size: 10211
 location: src/tests/client/test-client.py:test_004()/491
 cmd: $NMCLI --mode tabular --pretty --color yes dev show
 lang: C
 returncode: 0
-stdout: 10034 bytes
+stdout: 10046 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -29003,9 +29011,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (unavailable) 
+STATE             
+-------------------
+30 (disconnected) 
 
 CONNECTION 
 ------------
@@ -29046,9 +29054,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (unavailable) 
+STATE             
+-------------------
+30 (disconnected) 
 
 CONNECTION 
 ------------
@@ -29089,9 +29097,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (unavailable) 
+STATE             
+-------------------
+30 (disconnected) 
 
 CONNECTION 
 ------------
@@ -29128,9 +29136,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (unavailable) 
+STATE             
+-------------------
+30 (disconnected) 
 
 CONNECTION 
 ------------
@@ -29149,12 +29157,12 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y  --       
 
 <<<
-size: 10370
+size: 10362
 location: src/tests/client/test-client.py:test_004()/492
 cmd: $NMCLI --mode tabular --pretty --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 10195 bytes
+stdout: 10187 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -29214,9 +29222,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (niedostępne) 
+STATE           
+-----------------
+30 (rozłączono) 
 
 CONNECTION 
 ------------
@@ -29257,9 +29265,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (niedostępne) 
+STATE           
+-----------------
+30 (rozłączono) 
 
 CONNECTION 
 ------------
@@ -29300,9 +29308,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (niedostępne) 
+STATE           
+-----------------
+30 (rozłączono) 
 
 CONNECTION 
 ------------
@@ -29339,9 +29347,9 @@ MTU
 -----
 0   
 
-STATE            
-------------------
-20 (niedostępne) 
+STATE           
+-----------------
+30 (rozłączono) 
 
 CONNECTION 
 ------------
@@ -29360,12 +29368,12 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y  --       
 
 <<<
-size: 25143
+size: 25155
 location: src/tests/client/test-client.py:test_004()/493
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 24971 bytes
+stdout: 24983 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -29415,9 +29423,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -29454,9 +29462,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 =========================
   Device details (eth1)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --    eth1      no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --    eth1      no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -29493,9 +29501,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -29536,9 +29544,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE              REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    30 (disconnected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --    wlan1     no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
@@ -29576,12 +29584,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 25507
+size: 25499
 location: src/tests/client/test-client.py:test_004()/494
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25325 bytes
+stdout: 25317 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -29631,9 +29639,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -29670,9 +29678,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==================================
   Informacje o urządzeniu (eth1)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --    eth1      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --    eth1      nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -29709,9 +29717,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -29752,9 +29760,9 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    30 (rozłączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --    wlan1     nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
@@ -30084,12 +30092,12 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
 <<<
-size: 819
+size: 831
 location: src/tests/client/test-client.py:test_004()/503
 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 636 bytes
+stdout: 648 bytes
 >>>
 =====================
   Status of devices
@@ -30097,18 +30105,18 @@ stdout: 636 bytes
 DEVICE  TYPE      DBUS-PATH                                 
 ----------------------------------------------------------------------------------
 wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
-eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
-eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
+eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
+eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 822
+size: 834
 location: src/tests/client/test-client.py:test_004()/504
 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 629 bytes
+stdout: 641 bytes
 >>>
 ===================
   Stan urządzenia
@@ -30116,10 +30124,10 @@ stdout: 629 bytes
 DEVICE  TYPE      DBUS-PATH                                 
 --------------------------------------------------------------------------------
 wlan0   wifi      /org/freedesktop/NetworkManager/Devices/3 
-eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
-eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
-wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
+eth0    ethernet  /org/freedesktop/NetworkManager/Devices/1 
+eth1    ethernet  /org/freedesktop/NetworkManager/Devices/2 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4 
+wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
 size: 3809
@@ -31010,68 +31018,68 @@ stdout: 195 bytes
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 
 <<<
-size: 280
+size: 284
 location: src/tests/client/test-client.py:test_004()/537
 cmd: $NMCLI --mode tabular --terse dev s
 lang: C
 returncode: 0
-stdout: 133 bytes
+stdout: 137 bytes
 >>>
 wlan0:wifi:connected:con-vpn-1
-eth0:ethernet:unavailable:
-eth1:ethernet:unavailable:
-wlan1:wifi:unavailable:
-wlan1:wifi:unavailable:
+eth0:ethernet:disconnected:
+eth1:ethernet:disconnected:
+wlan1:wifi:disconnected:
+wlan1:wifi:disconnected:
 
 <<<
-size: 290
+size: 294
 location: src/tests/client/test-client.py:test_004()/538
 cmd: $NMCLI --mode tabular --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 133 bytes
+stdout: 137 bytes
 >>>
 wlan0:wifi:connected:con-vpn-1
-eth0:ethernet:unavailable:
-eth1:ethernet:unavailable:
-wlan1:wifi:unavailable:
-wlan1:wifi:unavailable:
+eth0:ethernet:disconnected:
+eth1:ethernet:disconnected:
+wlan1:wifi:disconnected:
+wlan1:wifi:disconnected:
 
 <<<
-size: 678
+size: 682
 location: src/tests/client/test-client.py:test_004()/539
 cmd: $NMCLI --mode tabular --terse -f all dev status
 lang: C
 returncode: 0
-stdout: 519 bytes
+stdout: 523 bytes
 >>>
 wlan0:wifi:connected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
-eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
+eth0:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 688
+size: 692
 location: src/tests/client/test-client.py:test_004()/540
 cmd: $NMCLI --mode tabular --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 519 bytes
+stdout: 523 bytes
 >>>
 wlan0:wifi:connected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
-eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
+eth0:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 3101
+size: 3105
 location: src/tests/client/test-client.py:test_004()/541
 cmd: $NMCLI --mode tabular --terse dev show
 lang: C
 returncode: 0
-stdout: 2950 bytes
+stdout: 2954 bytes
 >>>
 wlan0
 wifi
@@ -31087,7 +31095,7 @@ eth0
 ethernet
 AB\:B7\:BF\:E2\:48\:E8
 0
-20 (unavailable)
+30 (disconnected)
 
 
 WIRED-PROPERTIES:on:
@@ -31098,7 +31106,7 @@ eth1
 ethernet
 E7\:78\:B1\:93\:2B\:22
 0
-20 (unavailable)
+30 (disconnected)
 
 
 WIRED-PROPERTIES:on:
@@ -31109,7 +31117,7 @@ wlan1
 wifi
 21\:E9\:64\:81\:8C\:A8
 0
-20 (unavailable)
+30 (disconnected)
 
 
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar::
@@ -31119,19 +31127,19 @@ wlan1
 wifi
 71\:52\:AD\:63\:5C\:7C
 0
-20 (unavailable)
+30 (disconnected)
 
 
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar::192.168.60.60 | 192.168.63.92
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y:
 
 <<<
-size: 3111
+size: 3115
 location: src/tests/client/test-client.py:test_004()/542
 cmd: $NMCLI --mode tabular --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2950 bytes
+stdout: 2954 bytes
 >>>
 wlan0
 wifi
@@ -31147,7 +31155,7 @@ eth0
 ethernet
 AB\:B7\:BF\:E2\:48\:E8
 0
-20 (unavailable)
+30 (disconnected)
 
 
 WIRED-PROPERTIES:on:
@@ -31158,7 +31166,7 @@ eth1
 ethernet
 E7\:78\:B1\:93\:2B\:22
 0
-20 (unavailable)
+30 (disconnected)
 
 
 WIRED-PROPERTIES:on:
@@ -31169,7 +31177,7 @@ wlan1
 wifi
 21\:E9\:64\:81\:8C\:A8
 0
-20 (unavailable)
+30 (disconnected)
 
 
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar::
@@ -31179,19 +31187,19 @@ wlan1
 wifi
 71\:52\:AD\:63\:5C\:7C
 0
-20 (unavailable)
+30 (disconnected)
 
 
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar::192.168.60.60 | 192.168.63.92
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y:
 
 <<<
-size: 6842
+size: 6846
 location: src/tests/client/test-client.py:test_004()/543
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 6684 bytes
+stdout: 6688 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
@@ -31206,7 +31214,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
@@ -31216,7 +31224,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::eth1:no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::eth1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
@@ -31226,7 +31234,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
@@ -31237,7 +31245,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
@@ -31248,12 +31256,12 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 6888
+size: 6892
 location: src/tests/client/test-client.py:test_004()/544
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6720 bytes
+stdout: 6724 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
@@ -31268,7 +31276,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
@@ -31278,7 +31286,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::eth1:no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::eth1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
@@ -31288,7 +31296,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
@@ -31299,7 +31307,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
@@ -31948,68 +31956,68 @@ stdout: 195 bytes
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 
 <<<
-size: 456
+size: 476
 location: src/tests/client/test-client.py:test_004()/587
 cmd: $NMCLI --mode tabular --terse --color yes dev s
 lang: C
 returncode: 0
-stdout: 297 bytes
+stdout: 317 bytes
 >>>
 wlan0:wifi:connected:con-vpn-1
-eth0:ethernet:unavailable:
-eth1:ethernet:unavailable:
-wlan1:wifi:unavailable:
-wlan1:wifi:unavailable:
+eth0:ethernet:disconnected:
+eth1:ethernet:disconnected:
+wlan1:wifi:disconnected:
+wlan1:wifi:disconnected:
 
 <<<
-size: 466
+size: 486
 location: src/tests/client/test-client.py:test_004()/588
 cmd: $NMCLI --mode tabular --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 297 bytes
+stdout: 317 bytes
 >>>
 wlan0:wifi:connected:con-vpn-1
-eth0:ethernet:unavailable:
-eth1:ethernet:unavailable:
-wlan1:wifi:unavailable:
-wlan1:wifi:unavailable:
+eth0:ethernet:disconnected:
+eth1:ethernet:disconnected:
+wlan1:wifi:disconnected:
+wlan1:wifi:disconnected:
 
 <<<
-size: 1059
+size: 1099
 location: src/tests/client/test-client.py:test_004()/589
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 888 bytes
+stdout: 928 bytes
 >>>
 wlan0:wifi:connected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
-eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
+eth0:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 1069
+size: 1109
 location: src/tests/client/test-client.py:test_004()/590
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 888 bytes
+stdout: 928 bytes
 >>>
 wlan0:wifi:connected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/3:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2
-eth0:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
-eth1:ethernet:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
-wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
+eth0:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/1:::
+eth1:ethernet:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/2:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/4:::
+wlan1:wifi:disconnected:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5:::
 
 <<<
-size: 3113
+size: 3117
 location: src/tests/client/test-client.py:test_004()/591
 cmd: $NMCLI --mode tabular --terse --color yes dev show
 lang: C
 returncode: 0
-stdout: 2950 bytes
+stdout: 2954 bytes
 >>>
 wlan0
 wifi
@@ -32025,7 +32033,7 @@ eth0
 ethernet
 AB\:B7\:BF\:E2\:48\:E8
 0
-20 (unavailable)
+30 (disconnected)
 
 
 WIRED-PROPERTIES:on:
@@ -32036,7 +32044,7 @@ eth1
 ethernet
 E7\:78\:B1\:93\:2B\:22
 0
-20 (unavailable)
+30 (disconnected)
 
 
 WIRED-PROPERTIES:on:
@@ -32047,7 +32055,7 @@ wlan1
 wifi
 21\:E9\:64\:81\:8C\:A8
 0
-20 (unavailable)
+30 (disconnected)
 
 
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar::
@@ -32057,19 +32065,19 @@ wlan1
 wifi
 71\:52\:AD\:63\:5C\:7C
 0
-20 (unavailable)
+30 (disconnected)
 
 
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar::192.168.60.60 | 192.168.63.92
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y:
 
 <<<
-size: 3123
+size: 3127
 location: src/tests/client/test-client.py:test_004()/592
 cmd: $NMCLI --mode tabular --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2950 bytes
+stdout: 2954 bytes
 >>>
 wlan0
 wifi
@@ -32085,7 +32093,7 @@ eth0
 ethernet
 AB\:B7\:BF\:E2\:48\:E8
 0
-20 (unavailable)
+30 (disconnected)
 
 
 WIRED-PROPERTIES:on:
@@ -32096,7 +32104,7 @@ eth1
 ethernet
 E7\:78\:B1\:93\:2B\:22
 0
-20 (unavailable)
+30 (disconnected)
 
 
 WIRED-PROPERTIES:on:
@@ -32107,7 +32115,7 @@ wlan1
 wifi
 21\:E9\:64\:81\:8C\:A8
 0
-20 (unavailable)
+30 (disconnected)
 
 
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar::
@@ -32117,19 +32125,19 @@ wlan1
 wifi
 71\:52\:AD\:63\:5C\:7C
 0
-20 (unavailable)
+30 (disconnected)
 
 
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar::192.168.60.60 | 192.168.63.92
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y:
 
 <<<
-size: 7214
+size: 7218
 location: src/tests/client/test-client.py:test_004()/593
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 7044 bytes
+stdout: 7048 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
@@ -32144,7 +32152,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
@@ -32154,7 +32162,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::eth1:no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::eth1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
@@ -32164,7 +32172,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
@@ -32175,7 +32183,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
@@ -32186,12 +32194,12 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 7260
+size: 7264
 location: src/tests/client/test-client.py:test_004()/594
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7080 bytes
+stdout: 7084 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
@@ -32206,7 +32214,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
@@ -32216,7 +32224,7 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::eth1:no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::eth1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
@@ -32226,7 +32234,7 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
@@ -32237,7 +32245,7 @@ IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:30 (disconnected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::wlan1:no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
@@ -32374,32 +32382,32 @@ GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virt
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
 
 <<<
-size: 576
+size: 588
 location: src/tests/client/test-client.py:test_004()/603
 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 394 bytes
+stdout: 406 bytes
 >>>
 wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
-eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
-eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
-wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
-wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
+eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
+eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
+wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
+wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 586
+size: 598
 location: src/tests/client/test-client.py:test_004()/604
 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 394 bytes
+stdout: 406 bytes
 >>>
 wlan0:wifi:/org/freedesktop/NetworkManager/Devices/3
-eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
-eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
-wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
-wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
+eth0:ethernet:/org/freedesktop/NetworkManager/Devices/1
+eth1:ethernet:/org/freedesktop/NetworkManager/Devices/2
+wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
+wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 1788
@@ -33650,12 +33658,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 1082
+size: 1086
 location: src/tests/client/test-client.py:test_004()/637
 cmd: $NMCLI --mode multiline dev s
 lang: C
 returncode: 0
-stdout: 941 bytes
+stdout: 945 bytes
 >>>
 DEVICE:                                 wlan0
 TYPE:                                   wifi
@@ -33663,19 +33671,19 @@ STATE:                                  connected
 CONNECTION:                             con-vpn-1
 DEVICE:                                 eth0
 TYPE:                                   ethernet
-STATE:                                  unavailable
+STATE:                                  disconnected
 CONNECTION:                             --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
-STATE:                                  unavailable
+STATE:                                  disconnected
 CONNECTION:                             --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  unavailable
+STATE:                                  disconnected
 CONNECTION:                             --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  unavailable
+STATE:                                  disconnected
 CONNECTION:                             --
 
 <<<
@@ -33692,28 +33700,28 @@ STATE:                                  połączono
 CONNECTION:                             con-vpn-1
 DEVICE:                                 eth0
 TYPE:                                   ethernet
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 CONNECTION:                             --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 CONNECTION:                             --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 CONNECTION:                             --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 CONNECTION:                             --
 
 <<<
-size: 2497
+size: 2501
 location: src/tests/client/test-client.py:test_004()/639
 cmd: $NMCLI --mode multiline -f all dev status
 lang: C
 returncode: 0
-stdout: 2343 bytes
+stdout: 2347 bytes
 >>>
 DEVICE:                                 wlan0
 TYPE:                                   wifi
@@ -33726,7 +33734,7 @@ CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:                                 eth0
 TYPE:                                   ethernet
-STATE:                                  unavailable
+STATE:                                  disconnected
 IP4-CONNECTIVITY:                       unknown
 IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -33735,7 +33743,7 @@ CON-UUID:                               --
 CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
-STATE:                                  unavailable
+STATE:                                  disconnected
 IP4-CONNECTIVITY:                       unknown
 IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
@@ -33744,7 +33752,7 @@ CON-UUID:                               --
 CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  unavailable
+STATE:                                  disconnected
 IP4-CONNECTIVITY:                       unknown
 IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
@@ -33753,7 +33761,7 @@ CON-UUID:                               --
 CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  unavailable
+STATE:                                  disconnected
 IP4-CONNECTIVITY:                       unknown
 IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
@@ -33780,7 +33788,7 @@ CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:                                 eth0
 TYPE:                                   ethernet
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 IP4-CONNECTIVITY:                       nieznane
 IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -33789,7 +33797,7 @@ CON-UUID:                               --
 CON-PATH:                               --
 DEVICE:                                 eth1
 TYPE:                                   ethernet
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 IP4-CONNECTIVITY:                       nieznane
 IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
@@ -33798,7 +33806,7 @@ CON-UUID:                               --
 CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 IP4-CONNECTIVITY:                       nieznane
 IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
@@ -33807,7 +33815,7 @@ CON-UUID:                               --
 CON-PATH:                               --
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 IP4-CONNECTIVITY:                       nieznane
 IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
@@ -33816,12 +33824,12 @@ CON-UUID:                               --
 CON-PATH:                               --
 
 <<<
-size: 8060
+size: 8064
 location: src/tests/client/test-client.py:test_004()/641
 cmd: $NMCLI --mode multiline dev show
 lang: C
 returncode: 0
-stdout: 7915 bytes
+stdout: 7919 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33852,7 +33860,7 @@ GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               on
@@ -33878,7 +33886,7 @@ GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               on
@@ -33909,7 +33917,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.GATEWAY:                            192.168.57.160
@@ -33938,7 +33946,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.ADDRESS[1]:                         192.168.97.124/29
@@ -33998,7 +34006,7 @@ GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               włączone
@@ -34024,7 +34032,7 @@ GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               włączone
@@ -34055,7 +34063,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.GATEWAY:                            192.168.57.160
@@ -34084,7 +34092,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.ADDRESS[1]:                         192.168.97.124/29
@@ -34108,12 +34116,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 22815
+size: 22819
 location: src/tests/client/test-client.py:test_004()/643
 cmd: $NMCLI --mode multiline -f all dev show
 lang: C
 returncode: 0
-stdout: 22662 bytes
+stdout: 22666 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34230,7 +34238,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -34299,7 +34307,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -34375,7 +34383,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -34473,7 +34481,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -34662,7 +34670,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -34731,7 +34739,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -34807,7 +34815,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -34905,7 +34913,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -37592,70 +37600,70 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 1259
+size: 1279
 location: src/tests/client/test-client.py:test_004()/687
 cmd: $NMCLI --mode multiline --color yes dev s
 lang: C
 returncode: 0
-stdout: 1105 bytes
+stdout: 1125 bytes
 >>>
 DEVICE:                                 wlan0
 TYPE:                                   wifi
 STATE:                                  connected
 CONNECTION:                             con-vpn-1
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-STATE:                                  unavailable
-CONNECTION:                             --
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-STATE:                                  unavailable
-CONNECTION:                             --
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  unavailable
-CONNECTION:                             --
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  unavailable
-CONNECTION:                             --
-
-<<<
-size: 1275
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+STATE:                                  disconnected
+CONNECTION:                             --
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+STATE:                                  disconnected
+CONNECTION:                             --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  disconnected
+CONNECTION:                             --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  disconnected
+CONNECTION:                             --
+
+<<<
+size: 1291
 location: src/tests/client/test-client.py:test_004()/688
 cmd: $NMCLI --mode multiline --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1111 bytes
+stdout: 1127 bytes
 >>>
 DEVICE:                                 wlan0
 TYPE:                                   wifi
 STATE:                                  połączono
 CONNECTION:                             con-vpn-1
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-STATE:                                  niedostępne
-CONNECTION:                             --
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-STATE:                                  niedostępne
-CONNECTION:                             --
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  niedostępne
-CONNECTION:                             --
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  niedostępne
-CONNECTION:                             --
-
-<<<
-size: 2878
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+STATE:                                  rozłączono
+CONNECTION:                             --
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+STATE:                                  rozłączono
+CONNECTION:                             --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  rozłączono
+CONNECTION:                             --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  rozłączono
+CONNECTION:                             --
+
+<<<
+size: 2918
 location: src/tests/client/test-client.py:test_004()/689
 cmd: $NMCLI --mode multiline --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 2712 bytes
+stdout: 2752 bytes
 >>>
 DEVICE:                                 wlan0
 TYPE:                                   wifi
@@ -37666,50 +37674,50 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Dev
 CONNECTION:                             con-vpn-1
 CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-STATE:                                  unavailable
-IP4-CONNECTIVITY:                       unknown
-IP6-CONNECTIVITY:                       unknown
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-STATE:                                  unavailable
-IP4-CONNECTIVITY:                       unknown
-IP6-CONNECTIVITY:                       unknown
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  unavailable
-IP4-CONNECTIVITY:                       unknown
-IP6-CONNECTIVITY:                       unknown
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  unavailable
-IP4-CONNECTIVITY:                       unknown
-IP6-CONNECTIVITY:                       unknown
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
-
-<<<
-size: 2904
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+STATE:                                  disconnected
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+STATE:                                  disconnected
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  disconnected
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  disconnected
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+
+<<<
+size: 2940
 location: src/tests/client/test-client.py:test_004()/690
 cmd: $NMCLI --mode multiline --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2728 bytes
+stdout: 2764 bytes
 >>>
 DEVICE:                                 wlan0
 TYPE:                                   wifi
@@ -37720,50 +37728,50 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Dev
 CONNECTION:                             con-vpn-1
 CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-STATE:                                  niedostępne
-IP4-CONNECTIVITY:                       nieznane
-IP6-CONNECTIVITY:                       nieznane
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-STATE:                                  niedostępne
-IP4-CONNECTIVITY:                       nieznane
-IP6-CONNECTIVITY:                       nieznane
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  niedostępne
-IP4-CONNECTIVITY:                       nieznane
-IP6-CONNECTIVITY:                       nieznane
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  niedostępne
-IP4-CONNECTIVITY:                       nieznane
-IP6-CONNECTIVITY:                       nieznane
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
-
-<<<
-size: 8072
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+STATE:                                  rozłączono
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+STATE:                                  rozłączono
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  rozłączono
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  rozłączono
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+
+<<<
+size: 8076
 location: src/tests/client/test-client.py:test_004()/691
 cmd: $NMCLI --mode multiline --color yes dev show
 lang: C
 returncode: 0
-stdout: 7915 bytes
+stdout: 7919 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -37794,7 +37802,7 @@ GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               on
@@ -37820,7 +37828,7 @@ GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               on
@@ -37851,7 +37859,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.GATEWAY:                            192.168.57.160
@@ -37880,7 +37888,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.ADDRESS[1]:                         192.168.97.124/29
@@ -37940,7 +37948,7 @@ GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               włączone
@@ -37966,7 +37974,7 @@ GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 WIRED-PROPERTIES.CARRIER:               włączone
@@ -37997,7 +38005,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.GATEWAY:                            192.168.57.160
@@ -38026,7 +38034,7 @@ GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.CONNECTION:                     --
 GENERAL.CON-PATH:                       --
 IP4.ADDRESS[1]:                         192.168.97.124/29
@@ -38050,12 +38058,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 23151
+size: 23155
 location: src/tests/client/test-client.py:test_004()/693
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 22986 bytes
+stdout: 22990 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -38172,7 +38180,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -38241,7 +38249,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -38317,7 +38325,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -38415,7 +38423,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -38604,7 +38612,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -38673,7 +38681,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -38749,7 +38757,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -38847,7 +38855,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -39404,52 +39412,52 @@ WIFI-PROPERTIES.MESH:                   nie
 WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
-size: 1170
+size: 1183
 location: src/tests/client/test-client.py:test_004()/703
 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 994 bytes
+stdout: 1006 bytes
 >>>
 DEVICE:                                 wlan0
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-
-<<<
-size: 1180
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
+
+<<<
+size: 1193
 location: src/tests/client/test-client.py:test_004()/704
 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 994 bytes
+stdout: 1006 bytes
 >>>
 DEVICE:                                 wlan0
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 4642
@@ -41618,12 +41626,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1701
+size: 1705
 location: src/tests/client/test-client.py:test_004()/737
 cmd: $NMCLI --mode multiline --pretty dev s
 lang: C
 returncode: 0
-stdout: 1550 bytes
+stdout: 1554 bytes
 >>>
 ===============================================================================
                                Status of devices
@@ -41635,22 +41643,22 @@ CONNECTION:                             con-vpn-1
 -------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
-STATE:                                  unavailable
+STATE:                                  disconnected
 CONNECTION:                             --
 -------------------------------------------------------------------------------
 DEVICE:                                 eth1
 TYPE:                                   ethernet
-STATE:                                  unavailable
+STATE:                                  disconnected
 CONNECTION:                             --
 -------------------------------------------------------------------------------
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  unavailable
+STATE:                                  disconnected
 CONNECTION:                             --
 -------------------------------------------------------------------------------
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  unavailable
+STATE:                                  disconnected
 CONNECTION:                             --
 -------------------------------------------------------------------------------
 
@@ -41672,32 +41680,32 @@ CONNECTION:                             con-vpn-1
 -------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 CONNECTION:                             --
 -------------------------------------------------------------------------------
 DEVICE:                                 eth1
 TYPE:                                   ethernet
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 CONNECTION:                             --
 -------------------------------------------------------------------------------
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 CONNECTION:                             --
 -------------------------------------------------------------------------------
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 CONNECTION:                             --
 -------------------------------------------------------------------------------
 
 <<<
-size: 3115
+size: 3119
 location: src/tests/client/test-client.py:test_004()/739
 cmd: $NMCLI --mode multiline --pretty -f all dev status
 lang: C
 returncode: 0
-stdout: 2952 bytes
+stdout: 2956 bytes
 >>>
 ===============================================================================
                                Status of devices
@@ -41714,7 +41722,7 @@ CON-PATH:                               /org/freedesktop/NetworkManager/ActiveCo
 -------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
-STATE:                                  unavailable
+STATE:                                  disconnected
 IP4-CONNECTIVITY:                       unknown
 IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -41724,7 +41732,7 @@ CON-PATH:                               --
 -------------------------------------------------------------------------------
 DEVICE:                                 eth1
 TYPE:                                   ethernet
-STATE:                                  unavailable
+STATE:                                  disconnected
 IP4-CONNECTIVITY:                       unknown
 IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
@@ -41734,7 +41742,7 @@ CON-PATH:                               --
 -------------------------------------------------------------------------------
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  unavailable
+STATE:                                  disconnected
 IP4-CONNECTIVITY:                       unknown
 IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
@@ -41744,7 +41752,7 @@ CON-PATH:                               --
 -------------------------------------------------------------------------------
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  unavailable
+STATE:                                  disconnected
 IP4-CONNECTIVITY:                       unknown
 IP6-CONNECTIVITY:                       unknown
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
@@ -41776,7 +41784,7 @@ CON-PATH:                               /org/freedesktop/NetworkManager/ActiveCo
 -------------------------------------------------------------------------------
 DEVICE:                                 eth0
 TYPE:                                   ethernet
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 IP4-CONNECTIVITY:                       nieznane
 IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
@@ -41786,7 +41794,7 @@ CON-PATH:                               --
 -------------------------------------------------------------------------------
 DEVICE:                                 eth1
 TYPE:                                   ethernet
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 IP4-CONNECTIVITY:                       nieznane
 IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
@@ -41796,7 +41804,7 @@ CON-PATH:                               --
 -------------------------------------------------------------------------------
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 IP4-CONNECTIVITY:                       nieznane
 IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
@@ -41806,7 +41814,7 @@ CON-PATH:                               --
 -------------------------------------------------------------------------------
 DEVICE:                                 wlan1
 TYPE:                                   wifi
-STATE:                                  niedostępne
+STATE:                                  rozłączono
 IP4-CONNECTIVITY:                       nieznane
 IP6-CONNECTIVITY:                       nieznane
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
@@ -41816,12 +41824,12 @@ CON-PATH:                               --
 -------------------------------------------------------------------------------
 
 <<<
-size: 12885
+size: 12889
 location: src/tests/client/test-client.py:test_004()/741
 cmd: $NMCLI --mode multiline --pretty dev show
 lang: C
 returncode: 0
-stdout: 12730 bytes
+stdout: 12734 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -41871,7 +41879,7 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -41910,7 +41918,7 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -41954,7 +41962,7 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -41995,7 +42003,7 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -42079,7 +42087,7 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -42118,7 +42126,7 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -42162,7 +42170,7 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -42203,7 +42211,7 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -42232,12 +42240,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 27799
+size: 27803
 location: src/tests/client/test-client.py:test_004()/743
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 27637 bytes
+stdout: 27641 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42372,7 +42380,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -42453,7 +42461,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -42541,7 +42549,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -42652,7 +42660,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -42868,7 +42876,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -42949,7 +42957,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -43037,7 +43045,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -43148,7 +43156,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -46262,12 +46270,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1877
+size: 1897
 location: src/tests/client/test-client.py:test_004()/787
 cmd: $NMCLI --mode multiline --pretty --color yes dev s
 lang: C
 returncode: 0
-stdout: 1714 bytes
+stdout: 1734 bytes
 >>>
 ===============================================================================
                                Status of devices
@@ -46277,34 +46285,34 @@ TYPE:                                   wifi
 STATE:                                  connected
 CONNECTION:                             con-vpn-1
 -------------------------------------------------------------------------------
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-STATE:                                  unavailable
-CONNECTION:                             --
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+STATE:                                  disconnected
+CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-STATE:                                  unavailable
-CONNECTION:                             --
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+STATE:                                  disconnected
+CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  unavailable
-CONNECTION:                             --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  disconnected
+CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  unavailable
-CONNECTION:                             --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  disconnected
+CONNECTION:                             --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1893
+size: 1909
 location: src/tests/client/test-client.py:test_004()/788
 cmd: $NMCLI --mode multiline --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1720 bytes
+stdout: 1736 bytes
 >>>
 ===============================================================================
                                 Stan urządzenia
@@ -46314,34 +46322,34 @@ TYPE:                                   wifi
 STATE:                                  połączono
 CONNECTION:                             con-vpn-1
 -------------------------------------------------------------------------------
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-STATE:                                  niedostępne
-CONNECTION:                             --
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+STATE:                                  rozłączono
+CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-STATE:                                  niedostępne
-CONNECTION:                             --
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+STATE:                                  rozłączono
+CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  niedostępne
-CONNECTION:                             --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  rozłączono
+CONNECTION:                             --
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  niedostępne
-CONNECTION:                             --
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  rozłączono
+CONNECTION:                             --
 -------------------------------------------------------------------------------
 
 <<<
-size: 3496
+size: 3536
 location: src/tests/client/test-client.py:test_004()/789
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 3321 bytes
+stdout: 3361 bytes
 >>>
 ===============================================================================
                                Status of devices
@@ -46356,54 +46364,54 @@ CONNECTION:                             con-vpn-1
 CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 -------------------------------------------------------------------------------
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-STATE:                                  unavailable
-IP4-CONNECTIVITY:                       unknown
-IP6-CONNECTIVITY:                       unknown
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
--------------------------------------------------------------------------------
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-STATE:                                  unavailable
-IP4-CONNECTIVITY:                       unknown
-IP6-CONNECTIVITY:                       unknown
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
--------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  unavailable
-IP4-CONNECTIVITY:                       unknown
-IP6-CONNECTIVITY:                       unknown
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
--------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  unavailable
-IP4-CONNECTIVITY:                       unknown
-IP6-CONNECTIVITY:                       unknown
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
--------------------------------------------------------------------------------
-
-<<<
-size: 3522
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+STATE:                                  disconnected
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+-------------------------------------------------------------------------------
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+STATE:                                  disconnected
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+-------------------------------------------------------------------------------
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  disconnected
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+-------------------------------------------------------------------------------
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  disconnected
+IP4-CONNECTIVITY:                       unknown
+IP6-CONNECTIVITY:                       unknown
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+-------------------------------------------------------------------------------
+
+<<<
+size: 3558
 location: src/tests/client/test-client.py:test_004()/790
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3337 bytes
+stdout: 3373 bytes
 >>>
 ===============================================================================
                                 Stan urządzenia
@@ -46418,54 +46426,54 @@ CONNECTION:                             con-vpn-1
 CON-UUID:                               UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:                               /org/freedesktop/NetworkManager/ActiveConnection/2
 -------------------------------------------------------------------------------
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-STATE:                                  niedostępne
-IP4-CONNECTIVITY:                       nieznane
-IP6-CONNECTIVITY:                       nieznane
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
--------------------------------------------------------------------------------
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-STATE:                                  niedostępne
-IP4-CONNECTIVITY:                       nieznane
-IP6-CONNECTIVITY:                       nieznane
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
--------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  niedostępne
-IP4-CONNECTIVITY:                       nieznane
-IP6-CONNECTIVITY:                       nieznane
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
--------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-STATE:                                  niedostępne
-IP4-CONNECTIVITY:                       nieznane
-IP6-CONNECTIVITY:                       nieznane
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
-CONNECTION:                             --
-CON-UUID:                               --
-CON-PATH:                               --
--------------------------------------------------------------------------------
-
-<<<
-size: 12897
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+STATE:                                  rozłączono
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+-------------------------------------------------------------------------------
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+STATE:                                  rozłączono
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+-------------------------------------------------------------------------------
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  rozłączono
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+-------------------------------------------------------------------------------
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+STATE:                                  rozłączono
+IP4-CONNECTIVITY:                       nieznane
+IP6-CONNECTIVITY:                       nieznane
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
+CONNECTION:                             --
+CON-UUID:                               --
+CON-PATH:                               --
+-------------------------------------------------------------------------------
+
+<<<
+size: 12901
 location: src/tests/client/test-client.py:test_004()/791
 cmd: $NMCLI --mode multiline --pretty --color yes dev show
 lang: C
 returncode: 0
-stdout: 12730 bytes
+stdout: 12734 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -46515,7 +46523,7 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -46554,7 +46562,7 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -46598,7 +46606,7 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -46639,7 +46647,7 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -46723,7 +46731,7 @@ GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -46762,7 +46770,7 @@ GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -46806,7 +46814,7 @@ GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -46847,7 +46855,7 @@ GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 -------------------------------------------------------------------------------
 GENERAL.MTU:                            0
 -------------------------------------------------------------------------------
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 -------------------------------------------------------------------------------
 GENERAL.CONNECTION:                     --
 -------------------------------------------------------------------------------
@@ -46876,12 +46884,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 28135
+size: 28139
 location: src/tests/client/test-client.py:test_004()/793
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 27961 bytes
+stdout: 27965 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -47016,7 +47024,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -47097,7 +47105,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -47185,7 +47193,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -47296,7 +47304,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (unavailable)
+GENERAL.STATE:                          30 (disconnected)
 GENERAL.REASON:                         0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:               0 (unknown)
 GENERAL.IP6-CONNECTIVITY:               0 (unknown)
@@ -47512,7 +47520,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         AB:B7:BF:E2:48:E8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -47593,7 +47601,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         E7:78:B1:93:2B:22
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -47681,7 +47689,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         21:E9:64:81:8C:A8
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -47792,7 +47800,7 @@ GENERAL.DRIVER-VERSION:                 --
 GENERAL.FIRMWARE-VERSION:               --
 GENERAL.HWADDR:                         71:52:AD:63:5C:7C
 GENERAL.MTU:                            0
-GENERAL.STATE:                          20 (niedostępne)
+GENERAL.STATE:                          30 (rozłączono)
 GENERAL.REASON:                         0 (Nie podano przyczyny)
 GENERAL.IP4-CONNECTIVITY:               0 (nieznane)
 GENERAL.IP6-CONNECTIVITY:               0 (nieznane)
@@ -48436,12 +48444,12 @@ WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 1789
+size: 1801
 location: src/tests/client/test-client.py:test_004()/803
 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 1603 bytes
+stdout: 1615 bytes
 >>>
 ===============================================================================
                                Status of devices
@@ -48450,30 +48458,30 @@ DEVICE:                                 wlan0
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 -------------------------------------------------------------------------------
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 -------------------------------------------------------------------------------
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 -------------------------------------------------------------------------------
 
 <<<
-size: 1799
+size: 1811
 location: src/tests/client/test-client.py:test_004()/804
 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1603 bytes
+stdout: 1615 bytes
 >>>
 ===============================================================================
                                 Stan urządzenia
@@ -48482,21 +48490,21 @@ DEVICE:                                 wlan0
 TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/3
 -------------------------------------------------------------------------------
-DEVICE:                                 eth0
-TYPE:                                   ethernet
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
+DEVICE:                                 eth0
+TYPE:                                   ethernet
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/1
 -------------------------------------------------------------------------------
-DEVICE:                                 eth1
-TYPE:                                   ethernet
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
+DEVICE:                                 eth1
+TYPE:                                   ethernet
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/2
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/4
 -------------------------------------------------------------------------------
-DEVICE:                                 wlan1
-TYPE:                                   wifi
-DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
+DEVICE:                                 wlan1
+TYPE:                                   wifi
+DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 -------------------------------------------------------------------------------
 
 <<<
@@ -50822,12 +50830,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 427
+size: 431
 location: src/tests/client/test-client.py:test_004()/837
 cmd: $NMCLI --mode multiline --terse dev s
 lang: C
 returncode: 0
-stdout: 278 bytes
+stdout: 282 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
@@ -50835,28 +50843,28 @@ STATE:connected
 CONNECTION:con-vpn-1
 DEVICE:eth0
 TYPE:ethernet
-STATE:unavailable
+STATE:disconnected
 CONNECTION:
 DEVICE:eth1
 TYPE:ethernet
-STATE:unavailable
+STATE:disconnected
 CONNECTION:
 DEVICE:wlan1
 TYPE:wifi
-STATE:unavailable
+STATE:disconnected
 CONNECTION:
 DEVICE:wlan1
 TYPE:wifi
-STATE:unavailable
+STATE:disconnected
 CONNECTION:
 
 <<<
-size: 437
+size: 441
 location: src/tests/client/test-client.py:test_004()/838
 cmd: $NMCLI --mode multiline --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 278 bytes
+stdout: 282 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
@@ -50864,28 +50872,28 @@ STATE:connected
 CONNECTION:con-vpn-1
 DEVICE:eth0
 TYPE:ethernet
-STATE:unavailable
+STATE:disconnected
 CONNECTION:
 DEVICE:eth1
 TYPE:ethernet
-STATE:unavailable
+STATE:disconnected
 CONNECTION:
 DEVICE:wlan1
 TYPE:wifi
-STATE:unavailable
+STATE:disconnected
 CONNECTION:
 DEVICE:wlan1
 TYPE:wifi
-STATE:unavailable
+STATE:disconnected
 CONNECTION:
 
 <<<
-size: 1135
+size: 1139
 location: src/tests/client/test-client.py:test_004()/839
 cmd: $NMCLI --mode multiline --terse -f all dev status
 lang: C
 returncode: 0
-stdout: 974 bytes
+stdout: 978 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
@@ -50898,7 +50906,7 @@ CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:eth0
 TYPE:ethernet
-STATE:unavailable
+STATE:disconnected
 IP4-CONNECTIVITY:unknown
 IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
@@ -50907,7 +50915,7 @@ CON-UUID:
 CON-PATH:
 DEVICE:eth1
 TYPE:ethernet
-STATE:unavailable
+STATE:disconnected
 IP4-CONNECTIVITY:unknown
 IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
@@ -50916,7 +50924,7 @@ CON-UUID:
 CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
-STATE:unavailable
+STATE:disconnected
 IP4-CONNECTIVITY:unknown
 IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
@@ -50925,7 +50933,7 @@ CON-UUID:
 CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
-STATE:unavailable
+STATE:disconnected
 IP4-CONNECTIVITY:unknown
 IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
@@ -50934,12 +50942,12 @@ CON-UUID:
 CON-PATH:
 
 <<<
-size: 1145
+size: 1149
 location: src/tests/client/test-client.py:test_004()/840
 cmd: $NMCLI --mode multiline --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 974 bytes
+stdout: 978 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
@@ -50952,7 +50960,7 @@ CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 DEVICE:eth0
 TYPE:ethernet
-STATE:unavailable
+STATE:disconnected
 IP4-CONNECTIVITY:unknown
 IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
@@ -50961,7 +50969,7 @@ CON-UUID:
 CON-PATH:
 DEVICE:eth1
 TYPE:ethernet
-STATE:unavailable
+STATE:disconnected
 IP4-CONNECTIVITY:unknown
 IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
@@ -50970,7 +50978,7 @@ CON-UUID:
 CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
-STATE:unavailable
+STATE:disconnected
 IP4-CONNECTIVITY:unknown
 IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
@@ -50979,7 +50987,7 @@ CON-UUID:
 CON-PATH:
 DEVICE:wlan1
 TYPE:wifi
-STATE:unavailable
+STATE:disconnected
 IP4-CONNECTIVITY:unknown
 IP6-CONNECTIVITY:unknown
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
@@ -50988,12 +50996,12 @@ CON-UUID:
 CON-PATH:
 
 <<<
-size: 4552
+size: 4556
 location: src/tests/client/test-client.py:test_004()/841
 cmd: $NMCLI --mode multiline --terse dev show
 lang: C
 returncode: 0
-stdout: 4399 bytes
+stdout: 4403 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -51024,7 +51032,7 @@ GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -51050,7 +51058,7 @@ GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -51081,7 +51089,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.GATEWAY:192.168.57.160
@@ -51110,7 +51118,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.ADDRESS[1]:192.168.97.124/29
@@ -51134,12 +51142,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 4562
+size: 4566
 location: src/tests/client/test-client.py:test_004()/842
 cmd: $NMCLI --mode multiline --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4399 bytes
+stdout: 4403 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -51170,7 +51178,7 @@ GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -51196,7 +51204,7 @@ GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -51227,7 +51235,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.GATEWAY:192.168.57.160
@@ -51256,7 +51264,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.ADDRESS[1]:192.168.97.124/29
@@ -51280,12 +51288,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 13225
+size: 13229
 location: src/tests/client/test-client.py:test_004()/843
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 13064 bytes
+stdout: 13068 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -51402,7 +51410,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -51471,7 +51479,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -51547,7 +51555,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -51645,7 +51653,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -51712,12 +51720,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 13271
+size: 13275
 location: src/tests/client/test-client.py:test_004()/844
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 13100 bytes
+stdout: 13104 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -51834,7 +51842,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -51903,7 +51911,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -51979,7 +51987,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -52077,7 +52085,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -54764,70 +54772,70 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 603
+size: 623
 location: src/tests/client/test-client.py:test_004()/887
 cmd: $NMCLI --mode multiline --terse --color yes dev s
 lang: C
 returncode: 0
-stdout: 442 bytes
+stdout: 462 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
 STATE:connected
 CONNECTION:con-vpn-1
-DEVICE:eth0
-TYPE:ethernet
-STATE:unavailable
-CONNECTION:
-DEVICE:eth1
-TYPE:ethernet
-STATE:unavailable
-CONNECTION:
-DEVICE:wlan1
-TYPE:wifi
-STATE:unavailable
-CONNECTION:
-DEVICE:wlan1
-TYPE:wifi
-STATE:unavailable
-CONNECTION:
-
-<<<
-size: 613
+DEVICE:eth0
+TYPE:ethernet
+STATE:disconnected
+CONNECTION:
+DEVICE:eth1
+TYPE:ethernet
+STATE:disconnected
+CONNECTION:
+DEVICE:wlan1
+TYPE:wifi
+STATE:disconnected
+CONNECTION:
+DEVICE:wlan1
+TYPE:wifi
+STATE:disconnected
+CONNECTION:
+
+<<<
+size: 633
 location: src/tests/client/test-client.py:test_004()/888
 cmd: $NMCLI --mode multiline --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 442 bytes
+stdout: 462 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
 STATE:connected
 CONNECTION:con-vpn-1
-DEVICE:eth0
-TYPE:ethernet
-STATE:unavailable
-CONNECTION:
-DEVICE:eth1
-TYPE:ethernet
-STATE:unavailable
-CONNECTION:
-DEVICE:wlan1
-TYPE:wifi
-STATE:unavailable
-CONNECTION:
-DEVICE:wlan1
-TYPE:wifi
-STATE:unavailable
-CONNECTION:
-
-<<<
-size: 1517
+DEVICE:eth0
+TYPE:ethernet
+STATE:disconnected
+CONNECTION:
+DEVICE:eth1
+TYPE:ethernet
+STATE:disconnected
+CONNECTION:
+DEVICE:wlan1
+TYPE:wifi
+STATE:disconnected
+CONNECTION:
+DEVICE:wlan1
+TYPE:wifi
+STATE:disconnected
+CONNECTION:
+
+<<<
+size: 1557
 location: src/tests/client/test-client.py:test_004()/889
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
 lang: C
 returncode: 0
-stdout: 1343 bytes
+stdout: 1383 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
@@ -54838,50 +54846,50 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 CONNECTION:con-vpn-1
 CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-DEVICE:eth0
-TYPE:ethernet
-STATE:unavailable
-IP4-CONNECTIVITY:unknown
-IP6-CONNECTIVITY:unknown
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
-CONNECTION:
-CON-UUID:
-CON-PATH:
-DEVICE:eth1
-TYPE:ethernet
-STATE:unavailable
-IP4-CONNECTIVITY:unknown
-IP6-CONNECTIVITY:unknown
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
-CONNECTION:
-CON-UUID:
-CON-PATH:
-DEVICE:wlan1
-TYPE:wifi
-STATE:unavailable
-IP4-CONNECTIVITY:unknown
-IP6-CONNECTIVITY:unknown
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
-CONNECTION:
-CON-UUID:
-CON-PATH:
-DEVICE:wlan1
-TYPE:wifi
-STATE:unavailable
-IP4-CONNECTIVITY:unknown
-IP6-CONNECTIVITY:unknown
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
-CONNECTION:
-CON-UUID:
-CON-PATH:
-
-<<<
-size: 1527
+DEVICE:eth0
+TYPE:ethernet
+STATE:disconnected
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
+CONNECTION:
+CON-UUID:
+CON-PATH:
+DEVICE:eth1
+TYPE:ethernet
+STATE:disconnected
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
+CONNECTION:
+CON-UUID:
+CON-PATH:
+DEVICE:wlan1
+TYPE:wifi
+STATE:disconnected
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
+CONNECTION:
+CON-UUID:
+CON-PATH:
+DEVICE:wlan1
+TYPE:wifi
+STATE:disconnected
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
+CONNECTION:
+CON-UUID:
+CON-PATH:
+
+<<<
+size: 1567
 location: src/tests/client/test-client.py:test_004()/890
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1343 bytes
+stdout: 1383 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
@@ -54892,50 +54900,50 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 CONNECTION:con-vpn-1
 CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-DEVICE:eth0
-TYPE:ethernet
-STATE:unavailable
-IP4-CONNECTIVITY:unknown
-IP6-CONNECTIVITY:unknown
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
-CONNECTION:
-CON-UUID:
-CON-PATH:
-DEVICE:eth1
-TYPE:ethernet
-STATE:unavailable
-IP4-CONNECTIVITY:unknown
-IP6-CONNECTIVITY:unknown
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
-CONNECTION:
-CON-UUID:
-CON-PATH:
-DEVICE:wlan1
-TYPE:wifi
-STATE:unavailable
-IP4-CONNECTIVITY:unknown
-IP6-CONNECTIVITY:unknown
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
-CONNECTION:
-CON-UUID:
-CON-PATH:
-DEVICE:wlan1
-TYPE:wifi
-STATE:unavailable
-IP4-CONNECTIVITY:unknown
-IP6-CONNECTIVITY:unknown
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
-CONNECTION:
-CON-UUID:
-CON-PATH:
-
-<<<
-size: 4564
+DEVICE:eth0
+TYPE:ethernet
+STATE:disconnected
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
+CONNECTION:
+CON-UUID:
+CON-PATH:
+DEVICE:eth1
+TYPE:ethernet
+STATE:disconnected
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
+CONNECTION:
+CON-UUID:
+CON-PATH:
+DEVICE:wlan1
+TYPE:wifi
+STATE:disconnected
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
+CONNECTION:
+CON-UUID:
+CON-PATH:
+DEVICE:wlan1
+TYPE:wifi
+STATE:disconnected
+IP4-CONNECTIVITY:unknown
+IP6-CONNECTIVITY:unknown
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
+CONNECTION:
+CON-UUID:
+CON-PATH:
+
+<<<
+size: 4568
 location: src/tests/client/test-client.py:test_004()/891
 cmd: $NMCLI --mode multiline --terse --color yes dev show
 lang: C
 returncode: 0
-stdout: 4399 bytes
+stdout: 4403 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -54966,7 +54974,7 @@ GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -54992,7 +55000,7 @@ GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -55023,7 +55031,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.GATEWAY:192.168.57.160
@@ -55052,7 +55060,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.ADDRESS[1]:192.168.97.124/29
@@ -55076,12 +55084,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 4574
+size: 4578
 location: src/tests/client/test-client.py:test_004()/892
 cmd: $NMCLI --mode multiline --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4399 bytes
+stdout: 4403 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -55112,7 +55120,7 @@ GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -55138,7 +55146,7 @@ GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 WIRED-PROPERTIES.CARRIER:on
@@ -55169,7 +55177,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.GATEWAY:192.168.57.160
@@ -55198,7 +55206,7 @@ GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.CONNECTION:
 GENERAL.CON-PATH:
 IP4.ADDRESS[1]:192.168.97.124/29
@@ -55222,12 +55230,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 13561
+size: 13565
 location: src/tests/client/test-client.py:test_004()/893
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 13388 bytes
+stdout: 13392 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -55344,7 +55352,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -55413,7 +55421,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -55489,7 +55497,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -55587,7 +55595,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -55654,12 +55662,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 13607
+size: 13611
 location: src/tests/client/test-client.py:test_004()/894
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 13424 bytes
+stdout: 13428 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -55776,7 +55784,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:AB:B7:BF:E2:48:E8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -55845,7 +55853,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:E7:78:B1:93:2B:22
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -55921,7 +55929,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:21:E9:64:81:8C:A8
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -56019,7 +56027,7 @@ GENERAL.DRIVER-VERSION:
 GENERAL.FIRMWARE-VERSION:
 GENERAL.HWADDR:71:52:AD:63:5C:7C
 GENERAL.MTU:0
-GENERAL.STATE:20 (unavailable)
+GENERAL.STATE:30 (disconnected)
 GENERAL.REASON:0 (No reason given)
 GENERAL.IP4-CONNECTIVITY:0 (unknown)
 GENERAL.IP6-CONNECTIVITY:0 (unknown)
@@ -56576,52 +56584,52 @@ WIFI-PROPERTIES.MESH:no
 WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 688
+size: 700
 location: src/tests/client/test-client.py:test_004()/903
 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
-stdout: 504 bytes
+stdout: 516 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
-DEVICE:eth0
-TYPE:ethernet
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
-DEVICE:eth1
-TYPE:ethernet
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
-DEVICE:wlan1
-TYPE:wifi
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
-DEVICE:wlan1
-TYPE:wifi
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
-
-<<<
-size: 698
+DEVICE:eth0
+TYPE:ethernet
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
+DEVICE:eth1
+TYPE:ethernet
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
+DEVICE:wlan1
+TYPE:wifi
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
+DEVICE:wlan1
+TYPE:wifi
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
+
+<<<
+size: 710
 location: src/tests/client/test-client.py:test_004()/904
 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 504 bytes
+stdout: 516 bytes
 >>>
 DEVICE:wlan0
 TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
-DEVICE:eth0
-TYPE:ethernet
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
-DEVICE:eth1
-TYPE:ethernet
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
-DEVICE:wlan1
-TYPE:wifi
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
-DEVICE:wlan1
-TYPE:wifi
-DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
+DEVICE:eth0
+TYPE:ethernet
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
+DEVICE:eth1
+TYPE:ethernet
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
+DEVICE:wlan1
+TYPE:wifi
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
+DEVICE:wlan1
+TYPE:wifi
+DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 2278
@@ -57835,34 +57843,34 @@ stdout: 106 bytes
 Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/4)
 
 <<<
-size: 1412
+size: 1418
 location: src/tests/client/test-client.py:test_004()/930
 cmd: $NMCLI -f all device status
 lang: C
 returncode: 0
-stdout: 1272 bytes
+stdout: 1278 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  con-xx2     UUID-con-xx2-REPLACED-REPLACED-REPLA  /org/freedesktop/NetworkManager/ActiveConnection/3 
-wlan0   wifi      connected    unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-xx1     UUID-con-xx1-REPLACED-REPLACED-REPLA  /org/freedesktop/NetworkManager/ActiveConnection/4 
-eth1    ethernet  unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE         IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/1  con-xx2     UUID-con-xx2-REPLACED-REPLACED-REPLA  /org/freedesktop/NetworkManager/ActiveConnection/3 
+wlan0   wifi      connected     unknown           unknown           /org/freedesktop/NetworkManager/Devices/3  con-xx1     UUID-con-xx1-REPLACED-REPLACED-REPLA  /org/freedesktop/NetworkManager/ActiveConnection/4 
+eth1    ethernet  disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      disconnected  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 1429
+size: 1426
 location: src/tests/client/test-client.py:test_004()/931
 cmd: $NMCLI -f all device status
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1279 bytes
+stdout: 1276 bytes
 >>>
-DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
-eth0    ethernet  połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  con-xx2     UUID-con-xx2-REPLACED-REPLACED-REPLA  /org/freedesktop/NetworkManager/ActiveConnection/3 
-wlan0   wifi      połączono    nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-xx1     UUID-con-xx1-REPLACED-REPLACED-REPLA  /org/freedesktop/NetworkManager/ActiveConnection/4 
-eth1    ethernet  niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
-wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+DEVICE  TYPE      STATE       IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth0    ethernet  połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/1  con-xx2     UUID-con-xx2-REPLACED-REPLACED-REPLA  /org/freedesktop/NetworkManager/ActiveConnection/3 
+wlan0   wifi      połączono   nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/3  con-xx1     UUID-con-xx1-REPLACED-REPLACED-REPLA  /org/freedesktop/NetworkManager/ActiveConnection/4 
+eth1    ethernet  rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
 size: 2074
diff --git a/src/tests/client/test-client.py b/src/tests/client/test-client.py
index ff734d1ab3..62b72b795f 100755
--- a/src/tests/client/test-client.py
+++ b/src/tests/client/test-client.py
@@ -2445,8 +2445,11 @@ class TestNmCloudSetup(unittest.TestCase):
         return f
 
     def _mock_devices(self):
-        # Add a device with an active connection that has IPv4 configured
-        self.ctx.srv.op_AddObj("WiredDevice", iface="eth0", mac="cc:00:00:00:00:01")
+        self.ctx.srv.op_AddObj("WiredDevice", iface="eth0", mac=self._mac1)
+        self.ctx.srv.op_AddObj("WiredDevice", iface="eth1", mac=self._mac2)
+
+    def _mock_connection1(self):
+        # Active connection that has IPv4 configured for device1
         self.ctx.srv.addAndActivateConnection(
             {
                 "connection": {"type": "802-3-ethernet", "id": "con-eth0"},
@@ -2456,8 +2459,8 @@ class TestNmCloudSetup(unittest.TestCase):
             delay=0,
         )
 
+    def _mock_connection2(self):
         # The second connection has no IPv4
-        self.ctx.srv.op_AddObj("WiredDevice", iface="eth1", mac="cc:00:00:00:00:02")
         self.ctx.srv.addAndActivateConnection(
             {"connection": {"type": "802-3-ethernet", "id": "con-eth1"}},
             "/org/freedesktop/NetworkManager/Devices/2",
@@ -2465,13 +2468,18 @@ class TestNmCloudSetup(unittest.TestCase):
             delay=0,
         )
 
+    def _mock_connections(self):
+        self._mock_devices()
+        self._mock_connection1()
+        self._mock_connection2()
+
     def _mock_path(self, path, body):
         self.md_conn.request("PUT", path, body=body)
         self.md_conn.getresponse().read()
 
     @cloud_setup_test
     def test_aliyun(self):
-        self._mock_devices()
+        self._mock_connections()
 
         _aliyun_meta = "/2016-01-01/meta-data/"
         _aliyun_macs = _aliyun_meta + "network/interfaces/macs/"
@@ -2527,12 +2535,15 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider aliyun detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: start fetching meta data")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
         # One of the devices has no IPv4 configuration to be modified
-        pexp.expect("device has no suitable applied connection. Skip")
+        pexp.expect("skip applied connection due to missing IPv4 configuration")
         # The other one was lacking an address set it up.
         pexp.expect("some changes were applied for provider aliyun")
         (exitstatus, signalstatus, valgrind_log) = self.ctx.cmd_close_pexpect(pexp)
@@ -2555,7 +2566,10 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider aliyun detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
@@ -2572,7 +2586,7 @@ class TestNmCloudSetup(unittest.TestCase):
 
     @cloud_setup_test
     def test_azure(self):
-        self._mock_devices()
+        self._mock_connections()
 
         _azure_meta = "/metadata/instance"
         _azure_iface = _azure_meta + "/network/interface/"
@@ -2616,7 +2630,10 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider azure detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("found azure interfaces: 2")
         pexp.expect(r"interface\[0]: found a matching device with hwaddr")
         pexp.expect(
@@ -2628,7 +2645,7 @@ class TestNmCloudSetup(unittest.TestCase):
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
         # One of the devices has no IPv4 configuration to be modified
-        pexp.expect("device has no suitable applied connection. Skip")
+        pexp.expect("skip applied connection due to missing IPv4 configuration")
         # The other one was lacking an address set it up.
         pexp.expect("some changes were applied for provider azure")
         (exitstatus, signalstatus, valgrind_log) = self.ctx.cmd_close_pexpect(pexp)
@@ -2651,7 +2668,10 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider azure detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
@@ -2668,7 +2688,7 @@ class TestNmCloudSetup(unittest.TestCase):
 
     @cloud_setup_test
     def test_ec2(self):
-        self._mock_devices()
+        self._mock_connections()
 
         _ec2_macs = "/2018-09-24/meta-data/network/interfaces/macs/"
         self._mock_path("/latest/meta-data/", "ami-id\n")
@@ -2702,12 +2722,15 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider ec2 detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
         # One of the devices has no IPv4 configuration to be modified
-        pexp.expect("device has no suitable applied connection. Skip")
+        pexp.expect("skip applied connection due to missing IPv4 configuration")
         # The other one was lacking an address set it up.
         pexp.expect("some changes were applied for provider ec2")
         (exitstatus, signalstatus, valgrind_log) = self.ctx.cmd_close_pexpect(pexp)
@@ -2730,7 +2753,10 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider ec2 detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
@@ -2747,7 +2773,7 @@ class TestNmCloudSetup(unittest.TestCase):
 
     @cloud_setup_test
     def test_gcp(self):
-        self._mock_devices()
+        self._mock_connections()
 
         gcp_meta = "/computeMetadata/v1/instance/"
         gcp_iface = gcp_meta + "network-interfaces/"
@@ -2772,13 +2798,16 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider GCP detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("found GCP interfaces: 2")
         pexp.expect(r"GCP interface\[0]: found a requested device with hwaddr")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
         # One of the devices has no IPv4 configuration to be modified
-        pexp.expect("device has no suitable applied connection. Skip")
+        pexp.expect("skip applied connection due to missing IPv4 configuration")
         # The other one was lacking an address set it up.
         pexp.expect("some changes were applied for provider GCP")
         (exitstatus, signalstatus, valgrind_log) = self.ctx.cmd_close_pexpect(pexp)
@@ -2801,7 +2830,10 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider GCP detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
@@ -2818,7 +2850,7 @@ class TestNmCloudSetup(unittest.TestCase):
 
     @cloud_setup_test
     def test_oci(self):
-        self._mock_devices()
+        self._mock_connections()
 
         oci_meta = "/opc/v2/"
         self._mock_path(oci_meta + "instance", "{}")
@@ -2864,12 +2896,15 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider oci detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
         # One of the devices has no IPv4 configuration to be modified
-        pexp.expect("device has no suitable applied connection. Skip")
+        pexp.expect("skip applied connection due to missing IPv4 configuration")
         # The other one was lacking an address set it up.
         pexp.expect("some changes were applied for provider oci")
         (exitstatus, signalstatus, valgrind_log) = self.ctx.cmd_close_pexpect(pexp)
@@ -2892,7 +2927,10 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider oci detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
@@ -2909,7 +2947,7 @@ class TestNmCloudSetup(unittest.TestCase):
 
     @cloud_setup_test
     def test_oci_vlans(self):
-        self._mock_devices()
+        self._mock_connections()
 
         oci_meta = "/opc/v2/"
         self._mock_path(oci_meta + "instance", "{}")
@@ -2966,17 +3004,23 @@ class TestNmCloudSetup(unittest.TestCase):
         )
 
         pexp.expect("provider oci detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
 
         # No configuration for the ethernets
         pexp.expect('configuring "eth0"')
-        pexp.expect("device has no suitable applied connection. Skip")
+        pexp.expect("skip applied connection due to missing IPv4 configuration")
 
         # Setting up the VLAN
-        pexp.expect("creating macvlan2 connection for VLAN 700 on CC:00:00:00:00:01...")
+        pexp.expect(
+            "creating macvlan2 connection for VLAN 700 on %s..."
+            % (TestNmCloudSetup._mac1.upper())
+        )
         pexp.expect("creating vlan connection for VLAN 700 on C0:00:00:00:00:10...")
         pexp.expect("some changes were applied for provider oci")
 
@@ -3008,12 +3052,15 @@ class TestNmCloudSetup(unittest.TestCase):
 
         # Just the same ol' thing, just no changes this time
         pexp.expect("provider oci detected")
-        pexp.expect("found interfaces: CC:00:00:00:00:01, CC:00:00:00:00:02")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
         pexp.expect("get-config: starting")
         pexp.expect("get-config: success")
         pexp.expect("meta data received")
         pexp.expect('configuring "eth0"')
-        pexp.expect("device has no suitable applied connection. Skip")
+        pexp.expect("skip applied connection due to missing IPv4 configuration")
         pexp.expect("no changes were applied for provider oci")
 
         (exitstatus, signalstatus, valgrind_log) = self.ctx.cmd_close_pexpect(pexp)
@@ -3024,6 +3071,89 @@ class TestNmCloudSetup(unittest.TestCase):
         )
         self.assertEqual(exitstatus, 0, "Unexpectedly returned a non-zero status")
 
+    @cloud_setup_test
+    def test_oci_vm_vnic(self):
+        # One device unconnected, and one with a connection that needs changes
+        self._mock_devices()
+        self._mock_connection2()
+
+        oci_meta = "/opc/v2/"
+        self._mock_path(oci_meta + "instance", "{}")
+        self._mock_path(
+            oci_meta + "vnics",
+            """
+        [
+          {
+            "macAddr": "%s",
+            "privateIp": "%s",
+            "subnetCidrBlock": "172.31.16.0/20",
+            "virtualRouterIp": "172.31.16.1",
+            "vlanTag": 1337,
+            "vnicId": "ocid1.vnic.oc1.cz-adamov1.foobarbaz"
+          },
+          {
+            "macAddr": "%s",
+            "privateIp": "%s",
+            "subnetCidrBlock": "172.31.166.0/20",
+            "virtualRouterIp": "172.31.166.1",
+            "vlanTag": 8086,
+            "vnicId": "ocid1.vnic.oc1.uk-hogwarts.expelliarmus"
+          }
+        ]
+        """
+            % (
+                TestNmCloudSetup._mac1,
+                TestNmCloudSetup._ip1,
+                TestNmCloudSetup._mac2,
+                TestNmCloudSetup._ip2,
+            ),
+        )
+
+        pexp = self.ctx.cmd_call_pexpect(
+            ENV_NM_TEST_CLIENT_CLOUD_SETUP_PATH,
+            [],
+            {
+                "NM_CLOUD_SETUP_OCI_HOST": self.md_url,
+                "NM_CLOUD_SETUP_LOG": "trace",
+                "NM_CLOUD_SETUP_OCI": "yes",
+            },
+        )
+
+        pexp.expect("provider oci detected")
+        pexp.expect(
+            "found interfaces: %s, %s"
+            % (TestNmCloudSetup._mac1.upper(), TestNmCloudSetup._mac2.upper())
+        )
+        pexp.expect("get-config: starting")
+        pexp.expect("get-config: success")
+        pexp.expect("meta data received")
+
+        # First device lacks a connection: a new one will be created
+        pexp.expect('config device eth0: connection "connection-2"')
+
+        # Second device is skipped because it's activated without IPv4
+        pexp.expect(
+            "config device CC:00:00:00:00:02: skip applied connection due to missing IPv4 configuration"
+        )
+
+        # Finished!
+        pexp.expect("some changes were applied for provider oci")
+
+        (exitstatus, signalstatus, valgrind_log) = self.ctx.cmd_close_pexpect(pexp)
+        Util.valgrind_check_log(valgrind_log, "test_oci_vm_vnic")
+        self.assertIsNone(
+            signalstatus,
+            "Unexpectedly got " + Util.signal_no_to_str(signalstatus or 0),
+        )
+        self.assertEqual(exitstatus, 0, "Unexpectedly returned a non-zero status")
+
+        # TODO: Actually check the contents of the connection
+        # Probably needs changes to the mock service API
+        conn_macvlan = self.ctx.srv.findConnections(con_id="connection-3")
+        assert conn_macvlan is not None
+        conn_vlan = self.ctx.srv.findConnections(con_id="connection-4")
+        assert conn_vlan is not None
+
 
 ###############################################################################
 
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py
index 8a42633204..8d39aef78e 100755
--- a/tools/test-networkmanager-service.py
+++ b/tools/test-networkmanager-service.py
@@ -868,7 +868,7 @@ class Device(ExportedObj):
         self.activation_state_change_delay_ms = 50
         self.hwaddr = hwaddr is None if "" else hwaddr
 
-        self.prp_state = NM.DeviceState.UNAVAILABLE
+        self.prp_state = NM.DeviceState.DISCONNECTED
 
         if devtype == NM.DeviceType.MODEM:
             udi = "/org/freedesktop/ModemManager1/Modem/0"


More information about the Pkg-utopia-maintainers mailing list