New upstream version 1.27.90 upstream/1.27.90

1 files changed, 1611 insertions, 1370 deletions

diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index 7787cf5e..6de4dd9d 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2018 Red Hat, Inc.
  */
@@ -21,1402 +21,1593 @@
 #include "nm-test-utils-core.h"
 
 static void
-test_auto (void)
+test_auto(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=auto");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingWired *s_wired;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "default_connection");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	g_assert (!nm_connection_get_setting_vlan (connection));
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "Wired Connection");
-	g_assert_cmpint (nm_setting_connection_get_timestamp (s_con), ==, 0);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_MULTIPLE);
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
-
-	g_assert (nm_setting_connection_get_autoconnect (s_con));
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-	g_assert (!nm_setting_wired_get_mac_address (s_wired));
-	g_assert_cmpint (nm_setting_wired_get_mtu (s_wired), ==, 0);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 0);
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip4));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 0);
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip6), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("ip=auto");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    NMSettingWired *               s_wired;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "default_connection");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    g_assert(!nm_connection_get_setting_vlan(connection));
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "Wired Connection");
+    g_assert_cmpint(nm_setting_connection_get_timestamp(s_con), ==, 0);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_MULTIPLE);
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1);
+
+    g_assert(nm_setting_connection_get_autoconnect(s_con));
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+    g_assert(!nm_setting_wired_get_mac_address(s_wired));
+    g_assert_cmpint(nm_setting_wired_get_mtu(s_wired), ==, 0);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 0);
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip4), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip4));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 0);
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip6), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
 }
 
 static void
-test_if_auto_with_mtu (void)
+test_if_auto_with_mtu(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=eth0:auto:1666");
-	NMConnection *connection;
-	NMSettingWired *s_wired;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-	g_assert_cmpint (nm_setting_wired_get_mtu (s_wired), ==, 1666);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("ip=eth0:auto:1666");
+    NMConnection *                 connection;
+    NMSettingWired *               s_wired;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+    g_assert_cmpint(nm_setting_wired_get_mtu(s_wired), ==, 1666);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
 }
 
-
 static void
-test_if_dhcp6 (void)
+test_if_dhcp6(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=eth1:dhcp6");
-	NMConnection *connection;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eth1");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth1");
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_DISABLED);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("ip=eth1:dhcp6");
+    NMConnection *                 connection;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eth1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth1");
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4),
+                    ==,
+                    NM_SETTING_IP4_CONFIG_METHOD_DISABLED);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
 }
 
+static void
+test_if_auto_with_mtu_and_mac(void)
+{
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV = NM_MAKE_STRV("ip=eth2:auto6:2048:00:53:ef:12:34:56");
+    NMConnection *                 connection;
+    NMSettingWired *               s_wired;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eth2");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth2");
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+    g_assert_cmpint(nm_setting_wired_get_mtu(s_wired), ==, 2048);
+    g_assert_cmpstr(nm_setting_wired_get_cloned_mac_address(s_wired), ==, "00:53:EF:12:34:56");
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4),
+                    ==,
+                    NM_SETTING_IP4_CONFIG_METHOD_DISABLED);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+}
 
 static void
-test_if_auto_with_mtu_and_mac (void)
+test_if_ip4_manual(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=eth2:auto6:2048:00:53:ef:12:34:56");
-	NMConnection *connection;
-	NMSettingWired *s_wired;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eth2");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth2");
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-	g_assert_cmpint (nm_setting_wired_get_mtu (s_wired), ==, 2048);
-	g_assert_cmpstr (nm_setting_wired_get_cloned_mac_address (s_wired), ==, "00:53:EF:12:34:56");
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_DISABLED);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV = NM_MAKE_STRV("ip=192.0.2.2::192.0.2.1:255.255.255.0:"
+                                           "hostname0.example.com:eth3:none:192.0.2.53",
+                                           "ip=203.0.113.2::203.0.113.1:26:"
+                                           "hostname1.example.com:eth4");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    NMIPAddress *                  ip_addr;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, "hostname1.example.com");
+
+    connection = g_hash_table_lookup(connections, "eth3");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth3");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4),
+                    ==,
+                    NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip4, 0), ==, "192.0.2.53");
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 0);
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip4), ==, 1);
+    ip_addr = nm_setting_ip_config_get_address(s_ip4, 0);
+    g_assert(ip_addr);
+    g_assert_cmpstr(nm_ip_address_get_address(ip_addr), ==, "192.0.2.2");
+    g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 24);
+    g_assert_cmpstr(nm_setting_ip_config_get_gateway(s_ip4), ==, "192.0.2.1");
+    g_assert_cmpstr(nm_setting_ip_config_get_dhcp_hostname(s_ip4), ==, "hostname0.example.com");
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(nm_setting_ip_config_get_may_fail(s_ip6));
+
+    connection = g_hash_table_lookup(connections, "eth4");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth4");
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4),
+                    ==,
+                    NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 0);
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 0);
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip4), ==, 1);
+    ip_addr = nm_setting_ip_config_get_address(s_ip4, 0);
+    g_assert(ip_addr);
+    g_assert_cmpstr(nm_ip_address_get_address(ip_addr), ==, "203.0.113.2");
+    g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 26);
+    g_assert_cmpstr(nm_setting_ip_config_get_gateway(s_ip4), ==, "203.0.113.1");
+    g_assert_cmpstr(nm_setting_ip_config_get_dhcp_hostname(s_ip4), ==, "hostname1.example.com");
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(nm_setting_ip_config_get_may_fail(s_ip6));
 }
 
+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]::"
+                                           "hostname0.example.com:eth4::[2001:0db8::53]");
+    NMConnection *                 connection;
+    NMSettingIPConfig *            s_ip6;
+    NMIPAddress *                  ip_addr;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, "hostname0.example.com");
+
+    connection = g_hash_table_lookup(connections, "eth4");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth4");
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6),
+                    ==,
+                    NM_SETTING_IP6_CONFIG_METHOD_MANUAL);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip6, 0), ==, "2001:db8::53");
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 0);
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip6), ==, 1);
+    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_cmpstr(nm_setting_ip_config_get_gateway(s_ip6), ==, "2001:db8::1");
+    g_assert_cmpstr(nm_setting_ip_config_get_dhcp_hostname(s_ip6), ==, "hostname0.example.com");
+}
 
 static void
-test_if_ip4_manual (void)
+test_if_mac_ifname(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=192.0.2.2::192.0.2.1:255.255.255.0:"
-	                                       "hostname0.example.com:eth3:none:192.0.2.53",
-	                                       "ip=203.0.113.2::203.0.113.1:26:"
-	                                       "hostname1.example.com:eth4");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMIPAddress *ip_addr;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, "hostname1.example.com");
-
-	connection = g_hash_table_lookup (connections, "eth3");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth3");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 1);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip4, 0), ==, "192.0.2.53");
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 0);
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 1);
-	ip_addr = nm_setting_ip_config_get_address (s_ip4, 0);
-	g_assert (ip_addr);
-	g_assert_cmpstr (nm_ip_address_get_address (ip_addr), ==, "192.0.2.2");
-	g_assert_cmpint (nm_ip_address_get_prefix (ip_addr), ==, 24);
-	g_assert_cmpstr (nm_setting_ip_config_get_gateway (s_ip4), ==, "192.0.2.1");
-	g_assert_cmpstr (nm_setting_ip_config_get_dhcp_hostname (s_ip4), ==, "hostname0.example.com");
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (nm_setting_ip_config_get_may_fail (s_ip6));
-
-	connection = g_hash_table_lookup (connections, "eth4");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth4");
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 0);
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 0);
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 1);
-	ip_addr = nm_setting_ip_config_get_address (s_ip4, 0);
-	g_assert (ip_addr);
-	g_assert_cmpstr (nm_ip_address_get_address (ip_addr), ==, "203.0.113.2");
-	g_assert_cmpint (nm_ip_address_get_prefix (ip_addr), ==, 26);
-	g_assert_cmpstr (nm_setting_ip_config_get_gateway (s_ip4), ==, "203.0.113.1");
-	g_assert_cmpstr (nm_setting_ip_config_get_dhcp_hostname (s_ip4), ==, "hostname1.example.com");
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (nm_setting_ip_config_get_may_fail (s_ip6));
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV = NM_MAKE_STRV("ip=[2001:0db8::42]/64::[2001:0db8::01]::"
+                                           "hostname0:00-11-22-33-44-55::[2001:0db8::53]");
+    NMConnection *                 connection;
+    NMSettingIPConfig *            s_ip6;
+    NMSettingWired *               s_wired;
+    NMIPAddress *                  ip_addr;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, "hostname0");
+
+    connection = g_hash_table_lookup(connections, "00:11:22:33:44:55");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "00:11:22:33:44:55");
+    g_assert_cmpstr(nm_connection_get_interface_name(connection), ==, NULL);
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+    g_assert_cmpstr(nm_setting_wired_get_mac_address(s_wired), ==, "00:11:22:33:44:55");
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6),
+                    ==,
+                    NM_SETTING_IP6_CONFIG_METHOD_MANUAL);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip6, 0), ==, "2001:db8::53");
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 0);
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip6), ==, 1);
+    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::42");
+    g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 64);
+    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), ==, "hostname0");
 }
 
 static void
-test_if_ip6_manual (void)
+test_multiple_merge(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=[2001:0db8::02]/64::[2001:0db8::01]::"
-	                                       "hostname0.example.com:eth4::[2001:0db8::53]");
-	NMConnection *connection;
-	NMSettingIPConfig *s_ip6;
-	NMIPAddress *ip_addr;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, "hostname0.example.com");
-
-	connection = g_hash_table_lookup (connections, "eth4");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth4");
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_MANUAL);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 1);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip6, 0), ==, "2001:db8::53");
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 0);
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip6), ==, 1);
-	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_cmpstr (nm_setting_ip_config_get_gateway (s_ip6), ==, "2001:db8::1");
-	g_assert_cmpstr (nm_setting_ip_config_get_dhcp_hostname (s_ip6), ==, "hostname0.example.com");
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *ARGV = NM_MAKE_STRV("ip=192.0.2.2:::::eth0", "ip=[2001:db8::2]:::56::eth0");
+    NMConnection *     connection;
+    NMSettingConnection *s_con;
+    NMSettingWired *     s_wired;
+    NMSettingIPConfig *  s_ip4;
+    NMSettingIPConfig *  s_ip6;
+    NMIPAddress *        ip_addr;
+    gs_free char *       hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1);
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4),
+                    ==,
+                    NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip4), ==, 1);
+    ip_addr = nm_setting_ip_config_get_address(s_ip4, 0);
+    g_assert(ip_addr);
+    g_assert_cmpstr(nm_ip_address_get_address(ip_addr), ==, "192.0.2.2");
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6),
+                    ==,
+                    NM_SETTING_IP6_CONFIG_METHOD_MANUAL);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip6), ==, 1);
+    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), ==, 56);
 }
 
 static void
-test_multiple_merge (void)
+test_multiple_bootdev(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=192.0.2.2:::::eth0",
-	                                       "ip=[2001:db8::2]:::::eth0");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingWired *s_wired;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMIPAddress *ip_addr;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 1);
-	ip_addr = nm_setting_ip_config_get_address (s_ip4, 0);
-	g_assert (ip_addr);
-	g_assert_cmpstr (nm_ip_address_get_address (ip_addr), ==, "192.0.2.2");
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_MANUAL);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip6), ==, 1);
-	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");
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV =
+        NM_MAKE_STRV("nameserver=1.2.3.4", "ip=eth3:auto6", "ip=eth4:dhcp", "bootdev=eth4");
+    NMConnection *       connection;
+    NMSettingConnection *s_con;
+    NMSettingIPConfig *  s_ip4;
+    NMSettingIPConfig *  s_ip6;
+    gs_free char *       hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eth3");
+    g_assert(connection);
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1);
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+
+    connection = g_hash_table_lookup(connections, "eth4");
+    g_assert(connection);
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
+                    ==,
+                    NMI_WAIT_DEVICE_TIMEOUT_MS);
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip4, 0), ==, "1.2.3.4");
 }
 
 static void
-test_multiple_bootdev (void)
+test_bootdev(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("nameserver=1.2.3.4",
-	                                       "ip=eth3:auto6",
-	                                       "ip=eth4:dhcp",
-	                                       "bootdev=eth4");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eth3");
-	g_assert (connection);
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-
-	connection = g_hash_table_lookup (connections, "eth4");
-	g_assert (connection);
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 1);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip4, 0), ==, "1.2.3.4");
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("vlan=vlan2:ens5", "bootdev=ens3");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "ens3");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "ens3");
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "ens3");
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
+                    ==,
+                    NMI_WAIT_DEVICE_TIMEOUT_MS);
+
+    connection = g_hash_table_lookup(connections, "vlan2");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_VLAN_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "vlan2");
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "vlan2");
 }
 
 static void
-test_bootdev (void)
+test_some_more(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("vlan=vlan2:ens5", "bootdev=ens3");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "ens3");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "ens3");
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "ens3");
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout(s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-
-	connection = g_hash_table_lookup (connections, "vlan2");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_VLAN_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "vlan2");
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "vlan2");
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("bootdev=eth1",
+                                           "hail",
+                                           "nameserver=[2001:DB8:3::53]",
+                                           "satan",
+                                           "nameserver=192.0.2.53",
+                                           "worship",
+                                           "doom",
+                                           "rd.peerdns=0",
+                                           "rd.route=[2001:DB8:3::/48]:[2001:DB8:2::1]:ens10");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    NMSettingWired *               s_wired;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    NMIPRoute *                    ip_route;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eth1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "eth1");
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip4), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip4, 0), ==, "192.0.2.53");
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 1);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip6, 0), ==, "2001:db8:3::53");
+
+    connection = g_hash_table_lookup(connections, "ens10");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "ens10");
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "ens10");
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+    g_assert(!nm_setting_wired_get_mac_address(s_wired));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip6, 0), ==, "2001:db8:3::53");
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 1);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
+    ip_route = nm_setting_ip_config_get_route(s_ip6, 0);
+    g_assert_cmpstr(nm_ip_route_get_dest(ip_route), ==, "2001:db8:3::");
+    g_assert_cmpint(nm_ip_route_get_family(ip_route), ==, AF_INET6);
+    g_assert_cmpint(nm_ip_route_get_metric(ip_route), ==, -1);
+    g_assert_cmpstr(nm_ip_route_get_next_hop(ip_route), ==, "2001:db8:2::1");
+    g_assert_cmpint(nm_ip_route_get_prefix(ip_route), ==, 48);
 }
 
 static void
-test_some_more (void)
+test_bond(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("bootdev=eth1", "hail", "nameserver=[2001:DB8:3::53]",
-	                                       "satan", "nameserver=192.0.2.53", "worship",
-	                                       "doom", "rd.peerdns=0",
-	                                       "rd.route=[2001:DB8:3::/48]:[2001:DB8:2::1]:ens10");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingWired *s_wired;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMIPRoute *ip_route;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eth1");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth1");
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eth1");
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 1);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip4, 0), ==, "192.0.2.53");
-
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 1);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip6, 0), ==, "2001:db8:3::53");
-
-
-	connection = g_hash_table_lookup (connections, "ens10");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "ens10");
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "ens10");
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-	g_assert (!nm_setting_wired_get_mac_address (s_wired));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 1);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip6, 0), ==, "2001:db8:3::53");
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 1);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
-	ip_route = nm_setting_ip_config_get_route (s_ip6, 0);
-	g_assert_cmpstr (nm_ip_route_get_dest (ip_route), ==, "2001:db8:3::");
-	g_assert_cmpint (nm_ip_route_get_family (ip_route), ==, AF_INET6);
-	g_assert_cmpint (nm_ip_route_get_metric (ip_route), ==, -1);
-	g_assert_cmpstr (nm_ip_route_get_next_hop (ip_route), ==, "2001:db8:2::1");
-	g_assert_cmpint (nm_ip_route_get_prefix (ip_route), ==, 48);
+    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",
+                                           "nameserver=203.0.113.53");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    NMSettingBond *                s_bond;
+    NMIPRoute *                    ip_route;
+    const char *                   master_uuid;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 3);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "bong0");
+    g_assert(connection);
+    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");
+    master_uuid = nm_connection_get_uuid(connection);
+    g_assert(master_uuid);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip4, 0), ==, "203.0.113.53");
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 1);
+    ip_route = nm_setting_ip_config_get_route(s_ip4, 0);
+    g_assert_cmpstr(nm_ip_route_get_dest(ip_route), ==, "192.0.2.53");
+    g_assert_cmpint(nm_ip_route_get_family(ip_route), ==, AF_INET);
+    g_assert_cmpint(nm_ip_route_get_metric(ip_route), ==, -1);
+    g_assert(!nm_ip_route_get_next_hop(ip_route));
+    g_assert_cmpint(nm_ip_route_get_prefix(ip_route), ==, 32);
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 0);
+
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 1);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "mode"), ==, "balance-rr");
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
+
+    connection = g_hash_table_lookup(connections, "eth1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth1");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
 }
 
 static void
-test_bond (void)
+test_bond_ip(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",
-	                                       "nameserver=203.0.113.53");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMSettingBond *s_bond;
-	NMIPRoute *ip_route;
-	const char *master_uuid;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "bong0");
-	g_assert (connection);
-	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");
-	master_uuid = nm_connection_get_uuid (connection);
-	g_assert (master_uuid);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 1);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip4, 0), ==, "203.0.113.53");
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 1);
-	ip_route = nm_setting_ip_config_get_route (s_ip4, 0);
-	g_assert_cmpstr (nm_ip_route_get_dest (ip_route), ==, "192.0.2.53");
-	g_assert_cmpint (nm_ip_route_get_family (ip_route), ==, AF_INET);
-	g_assert_cmpint (nm_ip_route_get_metric (ip_route), ==, -1);
-	g_assert (!nm_ip_route_get_next_hop (ip_route));
-	g_assert_cmpint (nm_ip_route_get_prefix (ip_route), ==, 32);
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 0);
-
-	s_bond = nm_connection_get_setting_bond (connection);
-	g_assert (s_bond);
-	g_assert_cmpint (nm_setting_bond_get_num_options (s_bond), ==, 1);
-	g_assert_cmpstr (nm_setting_bond_get_option_by_name (s_bond, "mode"), ==, "balance-rr");
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth0");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BOND_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
-
-	connection = g_hash_table_lookup (connections, "eth1");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth1");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth1");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BOND_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV =
+        NM_MAKE_STRV("bond=bond0:eth0,eth1",
+                     "ip=192.168.1.1::192.168.1.254:24::bond0:none:1480:01:02:03:04:05:06",
+                     "nameserver=4.8.15.16");
+    NMConnection *       connection;
+    NMSettingConnection *s_con;
+    NMSettingIPConfig *  s_ip4;
+    NMSettingIPConfig *  s_ip6;
+    NMSettingWired *     s_wired;
+    NMSettingBond *      s_bond;
+    NMIPAddress *        ip_addr;
+    const char *         master_uuid;
+    gs_free char *       hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 3);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "bond0");
+    g_assert(connection);
+    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), ==, "bond0");
+    master_uuid = nm_connection_get_uuid(connection);
+    g_assert(master_uuid);
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+    g_assert_cmpint(nm_setting_wired_get_mtu(s_wired), ==, 1480);
+    g_assert_cmpstr(nm_setting_wired_get_cloned_mac_address(s_wired), ==, "01:02:03:04:05:06");
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4),
+                    ==,
+                    NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip4), ==, 1);
+    ip_addr = nm_setting_ip_config_get_address(s_ip4, 0);
+    g_assert(ip_addr);
+    g_assert_cmpstr(nm_ip_address_get_address(ip_addr), ==, "192.168.1.1");
+    g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 24);
+    g_assert_cmpstr(nm_setting_ip_config_get_gateway(s_ip4), ==, "192.168.1.254");
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip4, 0), ==, "4.8.15.16");
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 0);
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 0);
+
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 1);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "mode"), ==, "balance-rr");
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
+
+    connection = g_hash_table_lookup(connections, "eth1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth1");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
 }
 
 static void
-test_bond_ip (void)
+test_bond_default(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("bond=bond0:eth0,eth1",
-	                                       "ip=192.168.1.1::192.168.1.254:24::bond0:none:1480:01:02:03:04:05:06",
-	                                       "nameserver=4.8.15.16");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMSettingWired *s_wired;
-	NMSettingBond *s_bond;
-	NMIPAddress *ip_addr;
-	const char *master_uuid;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "bond0");
-	g_assert (connection);
-	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), ==, "bond0");
-	master_uuid = nm_connection_get_uuid (connection);
-	g_assert (master_uuid);
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-	g_assert_cmpint (nm_setting_wired_get_mtu (s_wired), ==, 1480);
-	g_assert_cmpstr (nm_setting_wired_get_cloned_mac_address (s_wired), ==, "01:02:03:04:05:06");
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
-	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 1);
-	ip_addr = nm_setting_ip_config_get_address (s_ip4, 0);
-	g_assert (ip_addr);
-	g_assert_cmpstr (nm_ip_address_get_address (ip_addr), ==, "192.168.1.1");
-	g_assert_cmpint (nm_ip_address_get_prefix (ip_addr), ==, 24);
-	g_assert_cmpstr (nm_setting_ip_config_get_gateway (s_ip4), ==, "192.168.1.254");
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 1);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip4, 0), ==, "4.8.15.16");
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 0);
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 0);
-
-	s_bond = nm_connection_get_setting_bond (connection);
-	g_assert (s_bond);
-	g_assert_cmpint (nm_setting_bond_get_num_options (s_bond), ==, 1);
-	g_assert_cmpstr (nm_setting_bond_get_option_by_name (s_bond, "mode"), ==, "balance-rr");
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth0");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BOND_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
-
-	connection = g_hash_table_lookup (connections, "eth1");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth1");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth1");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BOND_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("bond");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    NMSettingBond *                s_bond;
+    const char *                   master_uuid;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "bond0");
+
+    g_assert(connection);
+    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), ==, "bond0");
+    master_uuid = nm_connection_get_uuid(connection);
+    g_assert(master_uuid);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 0);
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 0);
+
+    s_bond = nm_connection_get_setting_bond(connection);
+    g_assert(s_bond);
+    g_assert_cmpint(nm_setting_bond_get_num_options(s_bond), ==, 1);
+    g_assert_cmpstr(nm_setting_bond_get_option_by_name(s_bond, "mode"), ==, "balance-rr");
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
 }
 
 static void
-test_bond_default (void)
+test_bridge(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("bond");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMSettingBond *s_bond;
-	const char *master_uuid;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "bond0");
-
-	g_assert (connection);
-	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), ==, "bond0");
-	master_uuid = nm_connection_get_uuid (connection);
-	g_assert (master_uuid);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 0);
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 0);
-
-	s_bond = nm_connection_get_setting_bond (connection);
-	g_assert (s_bond);
-	g_assert_cmpint (nm_setting_bond_get_num_options (s_bond), ==, 1);
-	g_assert_cmpstr (nm_setting_bond_get_option_by_name (s_bond, "mode"), ==, "balance-rr");
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth0");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BOND_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("bridge=bridge0:eth0,eth1",
+                                           "rd.route=192.0.2.53::bridge0",
+                                           "rd.net.timeout.dhcp=10");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    NMSettingBridge *              s_bridge;
+    NMIPRoute *                    ip_route;
+    const char *                   master_uuid;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 3);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "bridge0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_connection_type(connection),
+                    ==,
+                    NM_SETTING_BRIDGE_SETTING_NAME);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "bridge0");
+    master_uuid = nm_connection_get_uuid(connection);
+    g_assert(master_uuid);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 1);
+    g_assert_cmpint(nm_setting_ip_config_get_dhcp_timeout(s_ip4), ==, 10);
+    ip_route = nm_setting_ip_config_get_route(s_ip4, 0);
+    g_assert_cmpstr(nm_ip_route_get_dest(ip_route), ==, "192.0.2.53");
+    g_assert_cmpint(nm_ip_route_get_family(ip_route), ==, AF_INET);
+    g_assert_cmpint(nm_ip_route_get_metric(ip_route), ==, -1);
+    g_assert(!nm_ip_route_get_next_hop(ip_route));
+    g_assert_cmpint(nm_ip_route_get_prefix(ip_route), ==, 32);
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 0);
+    g_assert_cmpint(nm_setting_ip_config_get_dhcp_timeout(s_ip6), ==, 10);
+
+    s_bridge = nm_connection_get_setting_bridge(connection);
+    g_assert(s_bridge);
+    g_assert_cmpint(nm_setting_bridge_get_stp(s_bridge), ==, FALSE);
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con),
+                    ==,
+                    NM_SETTING_BRIDGE_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
+
+    connection = g_hash_table_lookup(connections, "eth1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth1");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con),
+                    ==,
+                    NM_SETTING_BRIDGE_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
 }
 
 static void
-test_bridge (void)
+test_bridge_default(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("bridge=bridge0:eth0,eth1",
-	                                       "rd.route=192.0.2.53::bridge0",
-	                                       "rd.net.timeout.dhcp=10");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMSettingBridge *s_bridge;
-	NMIPRoute *ip_route;
-	const char *master_uuid;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "bridge0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_connection_type (connection), ==, NM_SETTING_BRIDGE_SETTING_NAME);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "bridge0");
-	master_uuid = nm_connection_get_uuid (connection);
-	g_assert (master_uuid);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 1);
-	g_assert_cmpint (nm_setting_ip_config_get_dhcp_timeout(s_ip4), ==, 10);
-	ip_route = nm_setting_ip_config_get_route (s_ip4, 0);
-	g_assert_cmpstr (nm_ip_route_get_dest (ip_route), ==, "192.0.2.53");
-	g_assert_cmpint (nm_ip_route_get_family (ip_route), ==, AF_INET);
-	g_assert_cmpint (nm_ip_route_get_metric (ip_route), ==, -1);
-	g_assert (!nm_ip_route_get_next_hop (ip_route));
-	g_assert_cmpint (nm_ip_route_get_prefix (ip_route), ==, 32);
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 0);
-	g_assert_cmpint (nm_setting_ip_config_get_dhcp_timeout(s_ip6), ==, 10);
-
-
-	s_bridge = nm_connection_get_setting_bridge (connection);
-	g_assert (s_bridge);
-	g_assert_cmpint (nm_setting_bridge_get_stp (s_bridge), ==, FALSE);
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth0");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
-
-	connection = g_hash_table_lookup (connections, "eth1");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth1");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth1");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("bridge");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    NMSettingBridge *              s_bridge;
+    const char *                   master_uuid;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "br0");
+
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_connection_type(connection),
+                    ==,
+                    NM_SETTING_BRIDGE_SETTING_NAME);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "br0");
+    master_uuid = nm_connection_get_uuid(connection);
+    g_assert(master_uuid);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 0);
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 0);
+
+    s_bridge = nm_connection_get_setting_bridge(connection);
+    g_assert(s_bridge);
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con),
+                    ==,
+                    NM_SETTING_BRIDGE_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
 }
 
 static void
-test_bridge_default (void)
+test_bridge_ip(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("bridge");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMSettingBridge *s_bridge;
-	const char *master_uuid;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "br0");
-
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_connection_type (connection), ==, NM_SETTING_BRIDGE_SETTING_NAME);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "br0");
-	master_uuid = nm_connection_get_uuid (connection);
-	g_assert (master_uuid);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 0);
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 0);
-
-	s_bridge = nm_connection_get_setting_bridge (connection);
-	g_assert (s_bridge);
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth0");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV =
+        NM_MAKE_STRV("ip=bridge123:auto:1280:00:11:22:33:CA:fe",
+                     "bridge=bridge123:eth0,eth1,eth2,eth3,eth4,eth5,eth6,eth7,eth8,eth9");
+    NMConnection *       connection;
+    NMSettingConnection *s_con;
+    NMSettingIPConfig *  s_ip4;
+    NMSettingIPConfig *  s_ip6;
+    NMSettingWired *     s_wired;
+    NMSettingBridge *    s_bridge;
+    const char *         master_uuid;
+    gs_free char *       hostname = NULL;
+    guint                i;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 11);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "bridge123");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_connection_type(connection),
+                    ==,
+                    NM_SETTING_BRIDGE_SETTING_NAME);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "bridge123");
+    master_uuid = nm_connection_get_uuid(connection);
+    g_assert(master_uuid);
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(s_wired);
+    g_assert_cmpint(nm_setting_wired_get_mtu(s_wired), ==, 1280);
+    g_assert_cmpstr(nm_setting_wired_get_cloned_mac_address(s_wired), ==, "00:11:22:33:CA:FE");
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+
+    s_bridge = nm_connection_get_setting_bridge(connection);
+    g_assert(s_bridge);
+
+    for (i = 0; i < 10; i++) {
+        char ifname[16];
+
+        nm_sprintf_buf(ifname, "eth%u", i);
+
+        connection = g_hash_table_lookup(connections, ifname);
+        g_assert(connection);
+        nmtst_assert_connection_verifies_without_normalization(connection);
+        g_assert_cmpstr(nm_connection_get_id(connection), ==, ifname);
+
+        s_con = nm_connection_get_setting_connection(connection);
+        g_assert(s_con);
+        g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                        ==,
+                        NM_SETTING_WIRED_SETTING_NAME);
+        g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, ifname);
+        g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con),
+                        ==,
+                        NM_SETTING_BRIDGE_SETTING_NAME);
+        g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+        g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                        ==,
+                        NM_CONNECTION_MULTI_CONNECT_SINGLE);
+    }
 }
 
 static void
-test_bridge_ip (void)
+test_team(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=bridge123:auto:1280:00:11:22:33:CA:fe",
-	                                       "bridge=bridge123:eth0,eth1,eth2,eth3,eth4,eth5,eth6,eth7,eth8,eth9");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMSettingWired *s_wired;
-	NMSettingBridge *s_bridge;
-	const char *master_uuid;
-	gs_free char *hostname = NULL;
-	guint i;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 11);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "bridge123");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_connection_type (connection), ==, NM_SETTING_BRIDGE_SETTING_NAME);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "bridge123");
-	master_uuid = nm_connection_get_uuid (connection);
-	g_assert (master_uuid);
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (s_wired);
-	g_assert_cmpint (nm_setting_wired_get_mtu (s_wired), ==, 1280);
-	g_assert_cmpstr (nm_setting_wired_get_cloned_mac_address (s_wired), ==, "00:11:22:33:CA:FE");
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-
-	s_bridge = nm_connection_get_setting_bridge (connection);
-	g_assert (s_bridge);
-
-	for (i = 0; i < 10; i++) {
-		char ifname[16];
-
-		nm_sprintf_buf (ifname, "eth%u", i);
-
-		connection = g_hash_table_lookup (connections, ifname);
-		g_assert (connection);
-		nmtst_assert_connection_verifies_without_normalization (connection);
-		g_assert_cmpstr (nm_connection_get_id (connection), ==, ifname);
-
-		s_con = nm_connection_get_setting_connection (connection);
-		g_assert (s_con);
-		g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-		g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, ifname);
-		g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME);
-		g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-		g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
-	}
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV = NM_MAKE_STRV("team=team0:eth0,eth1", "ip=team0:dhcp6");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    NMSettingTeam *                s_team;
+    const char *                   master_uuid;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 3);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "team0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_connection_type(connection),
+                    ==,
+                    NM_SETTING_TEAM_SETTING_NAME);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "team0");
+    master_uuid = nm_connection_get_uuid(connection);
+    g_assert(master_uuid);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4),
+                    ==,
+                    NM_SETTING_IP4_CONFIG_METHOD_DISABLED);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip4), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip4));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 0);
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip6), ==, 0);
+    g_assert(!nm_setting_ip_config_get_gateway(s_ip6));
+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip6), ==, 0);
+
+    s_team = nm_connection_get_setting_team(connection);
+    g_assert(s_team);
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
+
+    connection = g_hash_table_lookup(connections, "eth1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth1");
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth1");
+    g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_TEAM_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, master_uuid);
+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),
+                    ==,
+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);
 }
 
 static void
-test_team (void)
+test_ibft_ip_dev(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("team=team0:eth0,eth1", "ip=team0:dhcp6");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	NMSettingTeam *s_team;
-	const char *master_uuid;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "team0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_connection_type (connection), ==, NM_SETTING_TEAM_SETTING_NAME);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "team0");
-	master_uuid = nm_connection_get_uuid (connection);
-	g_assert (master_uuid);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_DISABLED);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip4));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip4), ==, 0);
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 0);
-	g_assert (!nm_setting_ip_config_get_gateway (s_ip6));
-	g_assert_cmpint (nm_setting_ip_config_get_num_routes (s_ip6), ==, 0);
-
-	s_team = nm_connection_get_setting_team (connection);
-	g_assert (s_team);
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth0");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_TEAM_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
-
-	connection = g_hash_table_lookup (connections, "eth1");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth1");
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth1");
-	g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_TEAM_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, master_uuid);
-	g_assert_cmpint (nm_setting_connection_get_multi_connect (s_con), ==, NM_CONNECTION_MULTI_CONNECT_SINGLE);
+    const char *const *ARGV                    = NM_MAKE_STRV("ip=eth0:ibft");
+    gs_unref_hashtable GHashTable *connections = NULL;
+    NMSettingConnection *          s_con;
+    NMConnection *                 connection;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_VLAN_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, NULL);
 }
 
 static void
-test_ibft_ip_dev (void)
+test_ibft_ip_dev_mac(void)
 {
-	const char *const*ARGV = NM_MAKE_STRV ("ip=eth0:ibft");
-	gs_unref_hashtable GHashTable *connections = NULL;
-	NMSettingConnection *s_con;
-	NMConnection *connection;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_VLAN_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, NULL);
+    const char *const *ARGV                    = NM_MAKE_STRV("ip=00-53-06-66-ab-01:ibft");
+    gs_unref_hashtable GHashTable *connections = NULL;
+    NMSettingConnection *          s_con;
+    NMConnection *                 connection;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "00:53:06:66:AB:01");
+    g_assert(connection);
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, NULL);
 }
 
 static void
-_test_ibft_ip (const char *const*ARGV)
+_test_ibft_ip(const char *const *ARGV)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	NMConnection *connection;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "ibft0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "iBFT VLAN Connection 0");
-	g_assert_cmpstr (nm_connection_get_interface_name (connection), ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "ibft2");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "iBFT Connection 2");
-	g_assert_cmpstr (nm_connection_get_interface_name (connection), ==, NULL);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    NMConnection *                 connection;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "ibft0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "iBFT VLAN Connection 0");
+    g_assert_cmpstr(nm_connection_get_interface_name(connection), ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "ibft2");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "iBFT Connection 2");
+    g_assert_cmpstr(nm_connection_get_interface_name(connection), ==, NULL);
 }
 
 static void
-test_ibft_ip (void)
+test_ibft_ip(void)
 {
-	const char *const*ARGV = NM_MAKE_STRV ("ip=ibft");
+    const char *const *ARGV = NM_MAKE_STRV("ip=ibft");
 
-	_test_ibft_ip (ARGV);
+    _test_ibft_ip(ARGV);
 }
 
 static void
-test_ibft_rd_iscsi_ibft (void)
+test_ibft_rd_iscsi_ibft(void)
 {
-	const char *const*ARGV = NM_MAKE_STRV ("rd.iscsi.ibft");
+    const char *const *ARGV = NM_MAKE_STRV("rd.iscsi.ibft");
 
-	_test_ibft_ip (ARGV);
+    _test_ibft_ip(ARGV);
 }
 
 static void
-test_ignore_extra (void)
+test_ignore_extra(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("blabla", "extra", "lalala");
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 0);
-	g_assert_cmpstr (hostname, ==, NULL);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("blabla", "extra", "lalala");
+    gs_free char *                 hostname    = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 0);
+    g_assert_cmpstr(hostname, ==, NULL);
 }
 
 static void
-test_rd_znet (void)
+test_rd_znet(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*const ARGV = NM_MAKE_STRV ("ip=10.11.12.13::10.11.12.1:24:foo.example.com:enc800:none",
-	                                             "ip=slc600:dhcp",
-	                                             "rd.znet=qeth,0.0.0800,0.0.0801,0.0.0802,layer2=0,portno=1",
-	                                             "rd.znet=ctc,0.0.0600,0.0.0601,layer2=0,portno=0");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	NMSettingWired *s_wired;
-	const char *const*v_subchannels;
-	const NMUtilsNamedValue s390_options[] = {
-		{ .name = "layer2", .value_str = "0" },
-		{ .name = "portno", .value_str = "1" },
-	};
-	int i_s390_options_keys;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, "foo.example.com");
-
-	connection = g_hash_table_lookup (connections, "enc800");
-	g_assert (NM_IS_CONNECTION (connection));
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (NM_IS_SETTING_CONNECTION (s_con));
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "enc800");
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "enc800");
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (NM_IS_SETTING_WIRED (s_wired));
-
-	v_subchannels = nm_setting_wired_get_s390_subchannels (s_wired);
-	g_assert (v_subchannels);
-	g_assert_cmpstr (v_subchannels[0], ==, "0.0.0800");
-	g_assert_cmpstr (v_subchannels[1], ==, "0.0.0801");
-	g_assert_cmpstr (v_subchannels[2], ==, "0.0.0802");
-	g_assert_cmpstr (v_subchannels[3], ==, NULL);
-
-	g_assert_cmpint (nm_setting_wired_get_num_s390_options (s_wired), ==, G_N_ELEMENTS (s390_options));
-	for (i_s390_options_keys = 0; i_s390_options_keys < G_N_ELEMENTS (s390_options); i_s390_options_keys++) {
-		const NMUtilsNamedValue *s390_option = &s390_options[i_s390_options_keys];
-		const char *k;
-		const char *v;
-		const char *v2;
-
-		g_assert (s390_option->name);
-		g_assert (s390_option->value_str);
-		v = nm_setting_wired_get_s390_option_by_key (s_wired, s390_option->name);
-		g_assert (v);
-		g_assert_cmpstr (v, ==, s390_option->value_str);
-
-		if (!nm_setting_wired_get_s390_option (s_wired, i_s390_options_keys, &k, &v2))
-			g_assert_not_reached ();
-		g_assert_cmpstr (k, ==, s390_option->name);
-		g_assert (v == v2);
-		g_assert_cmpstr (v2, ==, s390_option->value_str);
-	}
-
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	connection = g_hash_table_lookup (connections, "slc600");
-	g_assert (NM_IS_CONNECTION (connection));
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (NM_IS_SETTING_CONNECTION (s_con));
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "slc600");
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "slc600");
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (NM_IS_SETTING_WIRED (s_wired));
-
-	v_subchannels = nm_setting_wired_get_s390_subchannels (s_wired);
-	g_assert (v_subchannels);
-	g_assert_cmpstr (v_subchannels[0], ==, "0.0.0600");
-	g_assert_cmpstr (v_subchannels[1], ==, "0.0.0601");
-	g_assert_cmpstr (v_subchannels[2], ==, NULL);
-
-	nmtst_assert_connection_verifies_without_normalization (connection);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *const       ARGV =
+        NM_MAKE_STRV("ip=10.11.12.13::10.11.12.1:24:foo.example.com:enc800:none",
+                     "ip=slc600:dhcp",
+                     "rd.znet=qeth,0.0.0800,0.0.0801,0.0.0802,layer2=0,portno=1",
+                     "rd.znet=ctc,0.0.0600,0.0.0601,layer2=0,portno=0");
+    NMConnection *          connection;
+    NMSettingConnection *   s_con;
+    NMSettingWired *        s_wired;
+    const char *const *     v_subchannels;
+    const NMUtilsNamedValue s390_options[] = {
+        {.name = "layer2", .value_str = "0"},
+        {.name = "portno", .value_str = "1"},
+    };
+    int           i_s390_options_keys;
+    gs_free char *hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, "foo.example.com");
+
+    connection = g_hash_table_lookup(connections, "enc800");
+    g_assert(NM_IS_CONNECTION(connection));
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(NM_IS_SETTING_CONNECTION(s_con));
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "enc800");
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "enc800");
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(NM_IS_SETTING_WIRED(s_wired));
+
+    v_subchannels = nm_setting_wired_get_s390_subchannels(s_wired);
+    g_assert(v_subchannels);
+    g_assert_cmpstr(v_subchannels[0], ==, "0.0.0800");
+    g_assert_cmpstr(v_subchannels[1], ==, "0.0.0801");
+    g_assert_cmpstr(v_subchannels[2], ==, "0.0.0802");
+    g_assert_cmpstr(v_subchannels[3], ==, NULL);
+
+    g_assert_cmpint(nm_setting_wired_get_num_s390_options(s_wired), ==, G_N_ELEMENTS(s390_options));
+    for (i_s390_options_keys = 0; i_s390_options_keys < G_N_ELEMENTS(s390_options);
+         i_s390_options_keys++) {
+        const NMUtilsNamedValue *s390_option = &s390_options[i_s390_options_keys];
+        const char *             k;
+        const char *             v;
+        const char *             v2;
+
+        g_assert(s390_option->name);
+        g_assert(s390_option->value_str);
+        v = nm_setting_wired_get_s390_option_by_key(s_wired, s390_option->name);
+        g_assert(v);
+        g_assert_cmpstr(v, ==, s390_option->value_str);
+
+        if (!nm_setting_wired_get_s390_option(s_wired, i_s390_options_keys, &k, &v2))
+            g_assert_not_reached();
+        g_assert_cmpstr(k, ==, s390_option->name);
+        g_assert(v == v2);
+        g_assert_cmpstr(v2, ==, s390_option->value_str);
+    }
+
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    connection = g_hash_table_lookup(connections, "slc600");
+    g_assert(NM_IS_CONNECTION(connection));
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(NM_IS_SETTING_CONNECTION(s_con));
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "slc600");
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "slc600");
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(NM_IS_SETTING_WIRED(s_wired));
+
+    v_subchannels = nm_setting_wired_get_s390_subchannels(s_wired);
+    g_assert(v_subchannels);
+    g_assert_cmpstr(v_subchannels[0], ==, "0.0.0600");
+    g_assert_cmpstr(v_subchannels[1], ==, "0.0.0601");
+    g_assert_cmpstr(v_subchannels[2], ==, NULL);
+
+    nmtst_assert_connection_verifies_without_normalization(connection);
 }
 
 static void
-test_rd_znet_legacy (void)
+test_rd_znet_legacy(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*const ARGV = NM_MAKE_STRV ("ip=10.11.12.13::10.11.12.1:24:foo.example.com:eth0:none",
-	                                             "rd.znet=qeth,0.0.0800,0.0.0801,0.0.0802,layer2=0,portno=1",
-	                                             "rd.znet=ctc,0.0.0600,0.0.0601,layer2=0,portno=0",
-	                                             "ip=ctc0:dhcp",
-	                                             "net.ifnames=0");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, "foo.example.com");
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (NM_IS_CONNECTION (connection));
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (NM_IS_SETTING_CONNECTION (s_con));
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "eth0");
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eth0");
-
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	connection = g_hash_table_lookup (connections, "ctc0");
-	g_assert (NM_IS_CONNECTION (connection));
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (NM_IS_SETTING_CONNECTION (s_con));
-	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
-	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "ctc0");
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "ctc0");
-
-	nmtst_assert_connection_verifies_without_normalization (connection);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *const       ARGV =
+        NM_MAKE_STRV("ip=10.11.12.13::10.11.12.1:24:foo.example.com:eth0:none",
+                     "rd.znet=qeth,0.0.0800,0.0.0801,0.0.0802,layer2=0,portno=1",
+                     "rd.znet=ctc,0.0.0600,0.0.0601,layer2=0,portno=0",
+                     "ip=ctc0:dhcp",
+                     "net.ifnames=0");
+    NMConnection *       connection;
+    NMSettingConnection *s_con;
+    gs_free char *       hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, "foo.example.com");
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(NM_IS_CONNECTION(connection));
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(NM_IS_SETTING_CONNECTION(s_con));
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "eth0");
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "eth0");
+
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    connection = g_hash_table_lookup(connections, "ctc0");
+    g_assert(NM_IS_CONNECTION(connection));
+
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(NM_IS_SETTING_CONNECTION(s_con));
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRED_SETTING_NAME);
+    g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, "ctc0");
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "ctc0");
+
+    nmtst_assert_connection_verifies_without_normalization(connection);
 }
 
 static void
-test_rd_znet_no_ip (void)
+test_rd_znet_no_ip(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*const ARGV = NM_MAKE_STRV ("rd.znet=qeth,0.0.0800,0.0.0801,0.0.0802,layer2=0,portno=1");
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 0);
-	g_assert_cmpstr (hostname, ==, NULL);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *const       ARGV =
+        NM_MAKE_STRV("rd.znet=qeth,0.0.0800,0.0.0801,0.0.0802,layer2=0,portno=1");
+    gs_free char *hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 0);
+    g_assert_cmpstr(hostname, ==, NULL);
 }
 
 static void
-test_bootif_ip (void)
+test_bootif_ip(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("BOOTIF=00:53:AB:cd:02:03",
-	                                       "ip=dhcp");
-	NMConnection *connection;
-	NMSettingWired *s_wired;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "default_connection");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "Wired Connection");
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert_cmpstr (nm_setting_wired_get_mac_address (s_wired), ==, "00:53:AB:CD:02:03");
-	g_assert (s_wired);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert (!nm_setting_ip_config_get_may_fail (s_ip4));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV = NM_MAKE_STRV("BOOTIF=00:53:AB:cd:02:03", "ip=dhcp");
+    NMConnection *                 connection;
+    NMSettingWired *               s_wired;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "default_connection");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "Wired Connection");
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert_cmpstr(nm_setting_wired_get_mac_address(s_wired), ==, "00:53:AB:CD:02:03");
+    g_assert(s_wired);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert(!nm_setting_ip_config_get_may_fail(s_ip4));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
 }
 
 static void
-test_neednet (void)
+test_neednet(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("rd.neednet",
-	                                       "ip=eno1:dhcp",
-	                                       "ip=172.25.1.100::172.25.1.1:24::eno2",
-	                                       "bridge=br0:eno3");
-	NMConnection *connection;
-	NMSettingConnection *s_con;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 4);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eno1");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno1");
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-
-	connection = g_hash_table_lookup (connections, "eno2");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno2");
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-
-	connection = g_hash_table_lookup (connections, "eno3");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "eno3");
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, NMI_WAIT_DEVICE_TIMEOUT_MS);
-
-	connection = g_hash_table_lookup (connections, "br0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, "br0");
-	g_assert_cmpint (nm_setting_connection_get_wait_device_timeout (s_con), ==, -1);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("rd.neednet",
+                                           "ip=eno1:dhcp",
+                                           "ip=172.25.1.100::172.25.1.1:24::eno2",
+                                           "bridge=br0:eno3");
+    NMConnection *                 connection;
+    NMSettingConnection *          s_con;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 4);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eno1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "eno1");
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
+                    ==,
+                    NMI_WAIT_DEVICE_TIMEOUT_MS);
+
+    connection = g_hash_table_lookup(connections, "eno2");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "eno2");
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
+                    ==,
+                    NMI_WAIT_DEVICE_TIMEOUT_MS);
+
+    connection = g_hash_table_lookup(connections, "eno3");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "eno3");
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
+                    ==,
+                    NMI_WAIT_DEVICE_TIMEOUT_MS);
+
+    connection = g_hash_table_lookup(connections, "br0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "br0");
+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1);
 }
 
 static void
-test_bootif_no_ip (void)
+test_bootif_no_ip(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("BOOTIF=00:53:AB:cd:02:03");
-	NMConnection *connection;
-	NMSettingWired *s_wired;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "default_connection");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "Wired Connection");
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert_cmpstr (nm_setting_wired_get_mac_address (s_wired), ==, "00:53:AB:CD:02:03");
-	g_assert (s_wired);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (nm_setting_ip_config_get_may_fail (s_ip4));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (nm_setting_ip_config_get_may_fail (s_ip6));
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV        = NM_MAKE_STRV("BOOTIF=00:53:AB:cd:02:03");
+    NMConnection *                 connection;
+    NMSettingWired *               s_wired;
+    NMSettingIPConfig *            s_ip4;
+    NMSettingIPConfig *            s_ip6;
+    gs_free char *                 hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "default_connection");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "Wired Connection");
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert_cmpstr(nm_setting_wired_get_mac_address(s_wired), ==, "00:53:AB:CD:02:03");
+    g_assert(s_wired);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(nm_setting_ip_config_get_may_fail(s_ip4));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(nm_setting_ip_config_get_may_fail(s_ip6));
 }
 
 static void
-test_bootif_hwtype (void)
+test_bootif_hwtype(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=eth0:dhcp",
-	                                       "BOOTIF=01-00-53-AB-cd-02-03");
-	NMConnection *connection;
-	NMSettingWired *s_wired;
-	NMSettingIPConfig *s_ip4;
-	NMSettingIPConfig *s_ip6;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 2);
-	g_assert_cmpstr (hostname, ==, NULL);
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "eth0");
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert (!nm_setting_wired_get_mac_address (s_wired));
-	g_assert (s_wired);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert (!nm_setting_ip_config_get_may_fail (s_ip4));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-
-	connection = g_hash_table_lookup (connections, "bootif_connection");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-	g_assert_cmpstr (nm_connection_get_id (connection), ==, "BOOTIF Connection");
-
-	s_wired = nm_connection_get_setting_wired (connection);
-	g_assert_cmpstr (nm_setting_wired_get_mac_address (s_wired), ==, "00:53:AB:CD:02:03");
-	g_assert (s_wired);
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip4);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip4));
-	g_assert (nm_setting_ip_config_get_may_fail (s_ip4));
-
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip6);
-	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
-	g_assert (!nm_setting_ip_config_get_ignore_auto_dns (s_ip6));
-	g_assert (nm_setting_ip_config_get_may_fail (s_ip6));
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *ARGV = NM_MAKE_STRV("ip=eth0:dhcp", "BOOTIF=01-00-53-AB-cd-02-03");
+    NMConnection *     connection;
+    NMSettingWired *   s_wired;
+    NMSettingIPConfig *s_ip4;
+    NMSettingIPConfig *s_ip6;
+    gs_free char *     hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 2);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "eth0");
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert(!nm_setting_wired_get_mac_address(s_wired));
+    g_assert(s_wired);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert(!nm_setting_ip_config_get_may_fail(s_ip4));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+
+    connection = g_hash_table_lookup(connections, "bootif_connection");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "BOOTIF Connection");
+
+    s_wired = nm_connection_get_setting_wired(connection);
+    g_assert_cmpstr(nm_setting_wired_get_mac_address(s_wired), ==, "00:53:AB:CD:02:03");
+    g_assert(s_wired);
+
+    s_ip4 = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip4);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));
+    g_assert(nm_setting_ip_config_get_may_fail(s_ip4));
+
+    s_ip6 = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip6);
+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);
+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip6));
+    g_assert(nm_setting_ip_config_get_may_fail(s_ip6));
 }
 
 /* Check that nameservers are assigned to all existing
@@ -1424,103 +1615,153 @@ test_bootif_hwtype (void)
  * family.
  */
 static void
-test_nameserver (void)
+test_nameserver(void)
+{
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *            ARGV =
+        NM_MAKE_STRV("nameserver=1.1.1.1",
+                     "ip=eth0:dhcp",
+                     "ip=eth1:auto6",
+                     "ip=10.11.12.13::10.11.12.1:24:foo.example.com:eth2:none",
+                     "nameserver=1.0.0.1",
+                     "nameserver=[2606:4700:4700::1111]");
+    NMConnection *     connection;
+    NMSettingIPConfig *s_ip;
+    gs_free char *     hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 3);
+    g_assert_cmpstr(hostname, ==, "foo.example.com");
+
+    connection = g_hash_table_lookup(connections, "eth0");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    s_ip = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip);
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip), ==, 2);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip, 0), ==, "1.1.1.1");
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip, 1), ==, "1.0.0.1");
+
+    connection = g_hash_table_lookup(connections, "eth1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    s_ip = nm_connection_get_setting_ip6_config(connection);
+    g_assert(s_ip);
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip), ==, 1);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip, 0), ==, "2606:4700:4700::1111");
+
+    connection = g_hash_table_lookup(connections, "eth2");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+
+    s_ip = nm_connection_get_setting_ip4_config(connection);
+    g_assert(s_ip);
+    g_assert_cmpint(nm_setting_ip_config_get_num_dns(s_ip), ==, 2);
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip, 0), ==, "1.1.1.1");
+    g_assert_cmpstr(nm_setting_ip_config_get_dns(s_ip, 1), ==, "1.0.0.1");
+}
+
+static void
+test_bootif_off(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("nameserver=1.1.1.1",
-	                                       "ip=eth0:dhcp",
-	                                       "ip=eth1:auto6",
-	                                       "ip=10.11.12.13::10.11.12.1:24:foo.example.com:eth2:none",
-	                                       "nameserver=1.0.0.1",
-	                                       "nameserver=[2606:4700:4700::1111]");
-	NMConnection *connection;
-	NMSettingIPConfig *s_ip;
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 3);
-	g_assert_cmpstr (hostname, ==, "foo.example.com");
-
-	connection = g_hash_table_lookup (connections, "eth0");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	s_ip = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip);
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip), ==, 2);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip, 0), ==, "1.1.1.1");
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip, 1), ==, "1.0.0.1");
-
-	connection = g_hash_table_lookup (connections, "eth1");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	s_ip = nm_connection_get_setting_ip6_config (connection);
-	g_assert (s_ip);
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip), ==, 1);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip, 0), ==, "2606:4700:4700::1111");
-
-	connection = g_hash_table_lookup (connections, "eth2");
-	g_assert (connection);
-	nmtst_assert_connection_verifies_without_normalization (connection);
-
-	s_ip = nm_connection_get_setting_ip4_config (connection);
-	g_assert (s_ip);
-	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip), ==, 2);
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip, 0), ==, "1.1.1.1");
-	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip, 1), ==, "1.0.0.1");
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const *ARGV     = NM_MAKE_STRV("BOOTIF=01-00-53-AB-cd-02-03", "rd.bootif=0");
+    gs_free char *     hostname = NULL;
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 0);
+    g_assert_cmpstr(hostname, ==, NULL);
 }
 
 static void
-test_bootif_off (void)
+test_dhcp_vendor_class_id(void)
 {
-	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("BOOTIF=01-00-53-AB-cd-02-03", "rd.bootif=0");
-	gs_free char *hostname = NULL;
-
-	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
-	g_assert (connections);
-	g_assert_cmpint (g_hash_table_size (connections), ==, 0);
-	g_assert_cmpstr (hostname, ==, NULL);
+    gs_unref_hashtable GHashTable *connections = NULL;
+    const char *const * ARGV = NM_MAKE_STRV("rd.net.dhcp.vendor-class=testvci", "ip=eno1:dhcp");
+    NMConnection *      connection;
+    NMSettingIP4Config *s_ip4;
+    gs_free char *      hostname          = NULL;
+    gs_free char *      vci_long          = NULL;
+    char                vci_arg_long[512] = {0};
+
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    g_assert(connections);
+    g_assert_cmpint(g_hash_table_size(connections), ==, 1);
+    g_assert_cmpstr(hostname, ==, NULL);
+
+    connection = g_hash_table_lookup(connections, "eno1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_ip4 = NM_SETTING_IP4_CONFIG(nm_connection_get_setting_ip4_config(connection));
+    g_assert_cmpstr(nm_setting_ip4_config_get_dhcp_vendor_class_identifier(s_ip4), ==, "testvci");
+
+    nm_clear_pointer(&connections, g_hash_table_unref);
+
+    ARGV        = NM_MAKE_STRV("rd.net.dhcp.vendor-class", "ip=eno1:dhcp");
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    connection  = g_hash_table_lookup(connections, "eno1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_ip4 = NM_SETTING_IP4_CONFIG(nm_connection_get_setting_ip4_config(connection));
+    g_assert(nm_setting_ip4_config_get_dhcp_vendor_class_identifier(s_ip4) == NULL);
+
+    nm_clear_pointer(&connections, g_hash_table_unref);
+
+    memset(vci_arg_long, 'A', 400);
+    vci_long    = g_strdup_printf("rd.net.dhcp.vendor-class=%s", vci_arg_long);
+    ARGV        = NM_MAKE_STRV(vci_long, "ip=eno1:dhcp");
+    connections = nmi_cmdline_reader_parse(TEST_INITRD_DIR "/sysfs", ARGV, &hostname);
+    connection  = g_hash_table_lookup(connections, "eno1");
+    g_assert(connection);
+    nmtst_assert_connection_verifies_without_normalization(connection);
+    s_ip4 = NM_SETTING_IP4_CONFIG(nm_connection_get_setting_ip4_config(connection));
+    g_assert(nm_setting_ip4_config_get_dhcp_vendor_class_identifier(s_ip4) == NULL);
 }
 
-NMTST_DEFINE ();
+NMTST_DEFINE();
 
-int main (int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-	nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
-
-	g_test_add_func ("/initrd/cmdline/auto", test_auto);
-	g_test_add_func ("/initrd/cmdline/if_auto_with_mtu", test_if_auto_with_mtu);
-	g_test_add_func ("/initrd/cmdline/if_dhcp6", test_if_dhcp6);
-	g_test_add_func ("/initrd/cmdline/if_auto_with_mtu_and_mac", test_if_auto_with_mtu_and_mac);
-	g_test_add_func ("/initrd/cmdline/if_ip4_manual", test_if_ip4_manual);
-	g_test_add_func ("/initrd/cmdline/if_ip6_manual", test_if_ip6_manual);
-	g_test_add_func ("/initrd/cmdline/multiple/merge", test_multiple_merge);
-	g_test_add_func ("/initrd/cmdline/multiple/bootdev", test_multiple_bootdev);
-	g_test_add_func ("/initrd/cmdline/nameserver", test_nameserver);
-	g_test_add_func ("/initrd/cmdline/some_more", test_some_more);
-	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/default", test_bond_default);
-	g_test_add_func ("/initrd/cmdline/team", test_team);
-	g_test_add_func ("/initrd/cmdline/bridge", test_bridge);
-	g_test_add_func ("/initrd/cmdline/bridge/default", test_bridge_default);
-	g_test_add_func ("/initrd/cmdline/bridge/ip", test_bridge_ip);
-	g_test_add_func ("/initrd/cmdline/ibft/ip_dev", test_ibft_ip_dev);
-	g_test_add_func ("/initrd/cmdline/ibft/ip", test_ibft_ip);
-	g_test_add_func ("/initrd/cmdline/ibft/rd_iscsi_ibft", test_ibft_rd_iscsi_ibft);
-	g_test_add_func ("/initrd/cmdline/ignore_extra", test_ignore_extra);
-	g_test_add_func ("/initrd/cmdline/rd_znet", test_rd_znet);
-	g_test_add_func ("/initrd/cmdline/rd_znet/legacy", test_rd_znet_legacy);
-	g_test_add_func ("/initrd/cmdline/rd_znet/no_ip", test_rd_znet_no_ip);
-	g_test_add_func ("/initrd/cmdline/bootif/ip", test_bootif_ip);
-	g_test_add_func ("/initrd/cmdline/bootif/no_ip", test_bootif_no_ip);
-	g_test_add_func ("/initrd/cmdline/bootif/hwtype", test_bootif_hwtype);
-	g_test_add_func ("/initrd/cmdline/bootif/off", test_bootif_off);
-	g_test_add_func ("/initrd/cmdline/neednet", test_neednet);
-
-	return g_test_run ();
+    nmtst_init_assert_logging(&argc, &argv, "INFO", "DEFAULT");
+
+    g_test_add_func("/initrd/cmdline/auto", test_auto);
+    g_test_add_func("/initrd/cmdline/if_auto_with_mtu", test_if_auto_with_mtu);
+    g_test_add_func("/initrd/cmdline/if_dhcp6", test_if_dhcp6);
+    g_test_add_func("/initrd/cmdline/if_auto_with_mtu_and_mac", test_if_auto_with_mtu_and_mac);
+    g_test_add_func("/initrd/cmdline/if_ip4_manual", test_if_ip4_manual);
+    g_test_add_func("/initrd/cmdline/if_ip6_manual", test_if_ip6_manual);
+    g_test_add_func("/initrd/cmdline/if_mac_ifname", test_if_mac_ifname);
+    g_test_add_func("/initrd/cmdline/multiple/merge", test_multiple_merge);
+    g_test_add_func("/initrd/cmdline/multiple/bootdev", test_multiple_bootdev);
+    g_test_add_func("/initrd/cmdline/nameserver", test_nameserver);
+    g_test_add_func("/initrd/cmdline/some_more", test_some_more);
+    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/default", test_bond_default);
+    g_test_add_func("/initrd/cmdline/team", test_team);
+    g_test_add_func("/initrd/cmdline/bridge", test_bridge);
+    g_test_add_func("/initrd/cmdline/bridge/default", test_bridge_default);
+    g_test_add_func("/initrd/cmdline/bridge/ip", test_bridge_ip);
+    g_test_add_func("/initrd/cmdline/ibft/ip_dev", test_ibft_ip_dev);
+    g_test_add_func("/initrd/cmdline/ibft/ip_dev_mac", test_ibft_ip_dev_mac);
+    g_test_add_func("/initrd/cmdline/ibft/ip", test_ibft_ip);
+    g_test_add_func("/initrd/cmdline/ibft/rd_iscsi_ibft", test_ibft_rd_iscsi_ibft);
+    g_test_add_func("/initrd/cmdline/ignore_extra", test_ignore_extra);
+    g_test_add_func("/initrd/cmdline/rd_znet", test_rd_znet);
+    g_test_add_func("/initrd/cmdline/rd_znet/legacy", test_rd_znet_legacy);
+    g_test_add_func("/initrd/cmdline/rd_znet/no_ip", test_rd_znet_no_ip);
+    g_test_add_func("/initrd/cmdline/bootif/ip", test_bootif_ip);
+    g_test_add_func("/initrd/cmdline/bootif/no_ip", test_bootif_no_ip);
+    g_test_add_func("/initrd/cmdline/bootif/hwtype", test_bootif_hwtype);
+    g_test_add_func("/initrd/cmdline/bootif/off", test_bootif_off);
+    g_test_add_func("/initrd/cmdline/neednet", test_neednet);
+    g_test_add_func("/initrd/cmdline/dhcp/vendor_class_id", test_dhcp_vendor_class_id);
+
+    return g_test_run();
 }