fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 16:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: update test files not to use obsolete GATEWAY<n> variables

Browse source 
But add a dedicated test reading GATEWAY1 to ensure we are still backwards
compatible.
(cherry picked from commit 233498e0a4)
This commit is contained in:
Jiří Klimeš 2014-12-16 13:09:06 +01:00
parent ffdbf5ab0f
commit 29e6b7628d
6 changed files with 50 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
View file

@ -14,6 +14,7 @@ EXTRA_DIST = \
ifcfg-test-wired-dhcp6-only \
ifcfg-test-wired-global-gateway \
network-test-wired-global-gateway \
ifcfg-test-wired-obsolete-gateway-n \
ifcfg-test-wired-never-default \
network-test-wired-never-default \
ifcfg-test-wired-defroute-no \

6
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip
View file

@ -15,11 +15,11 @@ DNS3=1:2:3:4::a
DNS4=1:2:3:4::b
# additional IPs
IPADDR0=1.2.3.4
PREFIX0=24
GATEWAY0=1.1.1.1
IPADDR=1.2.3.4
PREFIX=24
IPADDR1=9.8.7.6
PREFIX1=16
GATEWAY=1.1.1.1
IPV6ADDR="1001:abba::1234/56"
IPV6ADDR_SECONDARIES="2001:abba::2234/64 3001:abba::3234/96"

2
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1
View file

@ -5,8 +5,8 @@ HWADDR=00:11:22:33:44:ee
BOOTPROTO=none
IPADDR0=1.2.3.4
PREFIX0=24
GATEWAY0=1.1.1.1
IPADDR1=9.8.7.6
PREFIX1=16
IPADDR2=3.3.3.3
PREFIX2=8
GATEWAY=1.1.1.1

3
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2
View file

@ -5,10 +5,7 @@ HWADDR=00:11:22:33:44:ee
BOOTPROTO=none
IPADDR=1.2.3.4
PREFIX=24
GATEWAY=1.1.1.1
IPADDR2=9.8.7.6
PREFIX2=16
GATEWAY2=5.5.5.5
IPADDR3=3.3.3.3
PREFIX3=8
GATEWAY3=7.7.7.7

13
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n Normal file
View file

@ -0,0 +1,13 @@
# GATEWAY<N> is obsolete, but we read it for backwards compatibility
TYPE=Ethernet
DEVICE=eth0
HWADDR=00:11:22:33:44:ee
BOOTPROTO=none
ONBOOT=yes
# manual IP
IPADDR1=1.2.3.4
PREFIX1=24
GATEWAY1=1.1.1.1

32
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -868,6 +868,37 @@ test_read_wired_global_gateway (void)
g_object_unref (connection);
}
static void
test_read_wired_obsolete_gateway_n (void)
{
NMConnection *connection;
NMSettingIPConfig *s_ip4;
GError *error = NULL;
NMIPAddress *ip4_addr;
connection = connection_from_file_test (TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-obsolete-gateway-n",
NULL, TYPE_ETHERNET, NULL,
&error);
nmtst_assert_connection_verifies_without_normalization (connection);
/* ===== IPv4 SETTING ===== */
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);
/* IP addresses */
g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 1);
ip4_addr = nm_setting_ip_config_get_address (s_ip4, 0);
g_assert (ip4_addr);
g_assert_cmpint (nm_ip_address_get_prefix (ip4_addr), ==, 24);
g_assert_cmpstr (nm_ip_address_get_address (ip4_addr), ==, "1.2.3.4");
/* Gateway */
g_assert_cmpstr (nm_setting_ip_config_get_gateway (s_ip4), ==, "1.1.1.1");
g_object_unref (connection);
}
static void
test_read_wired_never_default (void)
{
@ -12406,6 +12437,7 @@ int main (int argc, char **argv)
g_test_add_func (TPATH "shared-plus-ip", test_read_wired_shared_plus_ip);
g_test_add_func (TPATH "dhcp-send-hostname", test_read_write_wired_dhcp_send_hostname);
g_test_add_func (TPATH "global-gateway", test_read_wired_global_gateway);
g_test_add_func (TPATH "obsolete-gateway-n", test_read_wired_obsolete_gateway_n);
g_test_add_func (TPATH "never-default", test_read_wired_never_default);
test_read_wired_defroute_no ();
test_read_wired_defroute_no_gatewaydev_yes ();