diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am b/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am index 206b206e1..9a2d899a1 100644 --- a/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am +++ b/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am @@ -2,6 +2,7 @@ EXTRA_DIST = \ ifcfg-test-minimal \ ifcfg-test-nm-controlled \ ifcfg-test-wired-static \ + ifcfg-test-wired-static-bootproto \ ifcfg-test-wired-dhcp \ ifcfg-test-wired-global-gateway \ network-test-wired-global-gateway \ diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto b/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto new file mode 100644 index 000000000..ee821503e --- /dev/null +++ b/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto @@ -0,0 +1,15 @@ +# Intel Corporation 82540EP Gigabit Ethernet Controller (Mobile) +TYPE=Ethernet +DEVICE=eth0 +HWADDR=00:11:22:33:44:ee +BOOTPROTO=static +ONBOOT=yes +USERCTL=yes +IPV6INIT=no +MTU=1492 +NM_CONTROLLED=yes +DNS1=4.2.2.1 +DNS2=4.2.2.2 +IPADDR=192.168.1.5 +NETMASK=255.255.255.0 +GATEWAY=192.168.1.1 diff --git a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 4d8314598..83ffee4bc 100644 --- a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -413,10 +413,8 @@ test_read_unmanaged (void) g_object_unref (connection); } -#define TEST_IFCFG_WIRED_STATIC TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-static" - static void -test_read_wired_static (void) +test_read_wired_static (const char *file, const char *expected_id) { NMConnection *connection; NMSettingConnection *s_con; @@ -429,7 +427,6 @@ test_read_wired_static (void) const GByteArray *array; char expected_mac_address[ETH_ALEN] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0xee }; const char *tmp; - const char *expected_id = "System test-wired-static"; const char *expected_dns1 = "4.2.2.1"; const char *expected_dns2 = "4.2.2.2"; struct in_addr addr; @@ -437,7 +434,7 @@ test_read_wired_static (void) const char *expected_address1_gw = "192.168.1.1"; NMIP4Address *ip4_addr; - connection = connection_from_file (TEST_IFCFG_WIRED_STATIC, + connection = connection_from_file (file, NULL, TYPE_ETHERNET, NULL, @@ -446,46 +443,46 @@ test_read_wired_static (void) &error, &ignore_error); ASSERT (connection != NULL, - "wired-static-read", "failed to read %s: %s", TEST_IFCFG_WIRED_STATIC, error->message); + "wired-static-read", "failed to read %s: %s", file, error->message); ASSERT (nm_connection_verify (connection, &error), - "wired-static-verify", "failed to verify %s: %s", TEST_IFCFG_WIRED_STATIC, error->message); + "wired-static-verify", "failed to verify %s: %s", file, error->message); ASSERT (unmanaged == FALSE, - "wired-static-verify", "failed to verify %s: unexpected unmanaged value", TEST_IFCFG_WIRED_STATIC); + "wired-static-verify", "failed to verify %s: unexpected unmanaged value", file); /* ===== CONNECTION SETTING ===== */ s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); ASSERT (s_con != NULL, "wired-static-verify-connection", "failed to verify %s: missing %s setting", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_CONNECTION_SETTING_NAME); /* ID */ tmp = nm_setting_connection_get_id (s_con); ASSERT (tmp != NULL, "wired-static-verify-connection", "failed to verify %s: missing %s / %s key", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_ID); ASSERT (strcmp (tmp, expected_id) == 0, "wired-static-verify-connection", "failed to verify %s: unexpected %s / %s key value", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_ID); /* Timestamp */ ASSERT (nm_setting_connection_get_timestamp (s_con) == 0, "wired-static-verify-connection", "failed to verify %s: unexpected %s /%s key value", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_TIMESTAMP); /* Autoconnect */ ASSERT (nm_setting_connection_get_autoconnect (s_con) == TRUE, "wired-static-verify-connection", "failed to verify %s: unexpected %s /%s key value", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_AUTOCONNECT); @@ -494,30 +491,30 @@ test_read_wired_static (void) s_wired = NM_SETTING_WIRED (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRED)); ASSERT (s_wired != NULL, "wired-static-verify-wired", "failed to verify %s: missing %s setting", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_WIRED_SETTING_NAME); /* MAC address */ array = nm_setting_wired_get_mac_address (s_wired); ASSERT (array != NULL, "wired-static-verify-wired", "failed to verify %s: missing %s / %s key", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS); ASSERT (array->len == ETH_ALEN, "wired-static-verify-wired", "failed to verify %s: unexpected %s / %s key value length", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS); ASSERT (memcmp (array->data, &expected_mac_address[0], sizeof (expected_mac_address)) == 0, "wired-static-verify-wired", "failed to verify %s: unexpected %s / %s key value", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS); ASSERT (nm_setting_wired_get_mtu (s_wired) == 1492, "wired-static-verify-wired", "failed to verify %s: unexpected %s / %s key value", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU); @@ -526,49 +523,49 @@ test_read_wired_static (void) s_ip4 = NM_SETTING_IP4_CONFIG (nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG)); ASSERT (s_ip4 != NULL, "wired-static-verify-ip4", "failed to verify %s: missing %s setting", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME); /* Method */ tmp = nm_setting_ip4_config_get_method (s_ip4); ASSERT (strcmp (tmp, NM_SETTING_IP4_CONFIG_METHOD_MANUAL) == 0, "wired-static-verify-ip4", "failed to verify %s: unexpected %s / %s key value", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_METHOD); /* DNS Addresses */ ASSERT (nm_setting_ip4_config_get_num_dns (s_ip4) == 2, "wired-static-verify-ip4", "failed to verify %s: unexpected %s / %s key value", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS); ASSERT (inet_pton (AF_INET, expected_dns1, &addr) > 0, "wired-static-verify-ip4", "failed to verify %s: couldn't convert DNS IP address #1", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS); ASSERT (nm_setting_ip4_config_get_dns (s_ip4, 0) == addr.s_addr, "wired-static-verify-ip4", "failed to verify %s: unexpected %s / %s key value #1", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS); ASSERT (inet_pton (AF_INET, expected_dns2, &addr) > 0, "wired-static-verify-ip4", "failed to verify %s: couldn't convert DNS IP address #2", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS); ASSERT (nm_setting_ip4_config_get_dns (s_ip4, 1) == addr.s_addr, "wired-static-verify-ip4", "failed to verify %s: unexpected %s / %s key value #2", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS); ASSERT (nm_setting_ip4_config_get_num_addresses (s_ip4) == 1, "wired-static-verify-ip4", "failed to verify %s: unexpected %s / %s key value", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS); @@ -576,35 +573,35 @@ test_read_wired_static (void) ip4_addr = nm_setting_ip4_config_get_address (s_ip4, 0); ASSERT (ip4_addr, "wired-static-verify-ip4", "failed to verify %s: missing IP4 address #1", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); ASSERT (nm_ip4_address_get_prefix (ip4_addr) == 24, "wired-static-verify-ip4", "failed to verify %s: unexpected IP4 address #1 prefix", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); ASSERT (inet_pton (AF_INET, expected_address1, &addr) > 0, "wired-static-verify-ip4", "failed to verify %s: couldn't convert IP address #1", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS); ASSERT (nm_ip4_address_get_address (ip4_addr) == addr.s_addr, "wired-static-verify-ip4", "failed to verify %s: unexpected IP4 address #1", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); ASSERT (inet_pton (AF_INET, expected_address1_gw, &addr) > 0, "wired-static-verify-ip4", "failed to verify %s: couldn't convert IP address #1 gateway", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); ASSERT (nm_ip4_address_get_gateway (ip4_addr) == addr.s_addr, "wired-static-verify-ip4", "failed to verify %s: unexpected IP4 address #1 gateway", - TEST_IFCFG_WIRED_STATIC, + file, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); @@ -5624,6 +5621,9 @@ test_write_mobile_broadband (gboolean gsm) #define TEST_IFCFG_WIFI_OPEN_SSID_LONG_HEX TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wifi-open-ssid-long-hex" +#define TEST_IFCFG_WIRED_STATIC TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-static" +#define TEST_IFCFG_WIRED_STATIC_BOOTPROTO TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-static-bootproto" + #define DEFAULT_HEX_PSK "7d308b11df1b4243b0f78e5f3fc68cdbb9a264ed0edf4c188edf329ff5b467f0" int main (int argc, char **argv) @@ -5641,7 +5641,8 @@ int main (int argc, char **argv) /* The tests */ test_read_unmanaged (); test_read_minimal (); - test_read_wired_static (); + test_read_wired_static (TEST_IFCFG_WIRED_STATIC, "System test-wired-static"); + test_read_wired_static (TEST_IFCFG_WIRED_STATIC_BOOTPROTO, "System test-wired-static-bootproto"); test_read_wired_dhcp (); test_read_wired_global_gateway (); test_read_wired_never_default ();