summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Giudici <fgiudici@redhat.com>2016-12-06 11:23:06 +0100
committerFrancesco Giudici <fgiudici@redhat.com>2016-12-14 16:21:26 +0100
commit6bf69d0fa16c65c61fc10ae5a1e7a7fdb3ef031c (patch)
tree7410654ae4cda5703b93d9693fd90b3900322973
parent2852b509456d9e8caf6338fdc7d9cff1da76484e (diff)
downloadNetworkManager-fg/dhcp_hostname_bgo775622.tar.gz
ifcfg-rh/tests: add ipv6 hostname legacy support read testfg/dhcp_hostname_bgo775622
-rw-r--r--Makefile.am1
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback12
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c16
3 files changed, 29 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 1daf7287dd..3eeb7b1329 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1885,6 +1885,7 @@ EXTRA_DIST += \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback
new file mode 100644
index 0000000000..d38e762e20
--- /dev/null
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback
@@ -0,0 +1,12 @@
+# Intel Corporation 82540EP Gigabit Ethernet Controller (Mobile)
+TYPE=Ethernet
+DEVICE=eth0
+HWADDR=00:11:22:33:44:ee
+BOOTPROTO=dhcp
+ONBOOT=yes
+IPV6INIT=yes
+IPV6_AUTOCONF=yes
+USERCTL=yes
+NM_CONTROLLED=yes
+PEERDNS=no
+DHCP_HOSTNAME="fully.qualified.domain"
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 9a9d48d3e9..0beaf457f2 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -3917,6 +3917,21 @@ test_read_write_wired_dhcp_send_hostname (void)
}
static void
+test_read_wired_dhcpv6_hostname_fallback (void)
+{
+ gs_unref_object NMConnection *connection = NULL;
+ NMSettingIPConfig *s_ip6;
+
+ connection = _connection_from_file (TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback",
+ NULL, TYPE_ETHERNET, NULL);
+
+ s_ip6 = nm_connection_get_setting_ip6_config (connection);
+ g_assert (s_ip6);
+ g_assert (nm_setting_ip_config_get_dhcp_send_hostname (s_ip6) == TRUE);
+ g_assert_cmpstr (nm_setting_ip_config_get_dhcp_hostname (s_ip6), ==, "fully.qualified.domain");
+}
+
+static void
test_write_wired_static_ip6_only (void)
{
nmtst_auto_unlinkfile char *testfile = NULL;
@@ -8838,6 +8853,7 @@ int main (int argc, char **argv)
g_test_add_func (TPATH "read-dhcp-plus-ip", test_read_wired_dhcp_plus_ip);
g_test_add_func (TPATH "read-shared-plus-ip", test_read_wired_shared_plus_ip);
g_test_add_func (TPATH "read-dhcp-send-hostname", test_read_write_wired_dhcp_send_hostname);
+ g_test_add_func (TPATH "read-dhcpv6-hostname-fallback", test_read_wired_dhcpv6_hostname_fallback);
g_test_add_func (TPATH "read-global-gateway", test_read_wired_global_gateway);
g_test_add_func (TPATH "read-global-gateway-ignore", test_read_wired_global_gateway_ignore);
g_test_add_func (TPATH "read-obsolete-gateway-n", test_read_wired_obsolete_gateway_n);