fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-10 04:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: ensure master is cleared when updating a connection

Browse source 
If the connection is not a slave we must clear any existing variable
indicating the connection's master.

https://bugzilla.redhat.com/show_bug.cgi?id=1355656
This commit is contained in:
Beniamino Galvani 2016-08-04 12:04:06 +02:00
parent 45cd3302dc
commit 2750714802
2 changed files with 84 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1733,6 +1733,69 @@ test_read_dns_options (void)
g_object_unref (connection);
}
static void
test_clear_master (void)
{
NMSettingConnection *s_con;
NMConnection *connection;
char *unmanaged = NULL;
char *testfile = NULL, *keyfile;
GError *error = NULL;
gboolean success;
shvarFile *f;
char *val;
/* 1. load the bridge slave connection from disk */
connection = _connection_from_file (TEST_IFCFG_DIR "/network-scripts/ifcfg-test-bridge-component",
NULL, TYPE_ETHERNET, &unmanaged);
g_assert_cmpstr (unmanaged, ==, NULL);
s_con = nm_connection_get_setting_connection (connection);
g_assert (s_con);
g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, "br0");
g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, "bridge");
/* 2. write the connection to a new file */
_writer_new_connection (connection,
TEST_SCRATCH_DIR "/network-scripts/",
&testfile);
/* 3. clear master and slave-type */
g_object_set (s_con,
NM_SETTING_CONNECTION_MASTER, NULL,
NM_SETTING_CONNECTION_SLAVE_TYPE, NULL,
NULL);
g_assert_cmpstr (nm_setting_connection_get_master (s_con), ==, NULL);
g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NULL);
/* 4. update the connection on disk */
keyfile = utils_get_keys_path (testfile);
success = writer_update_connection (connection,
TEST_SCRATCH_DIR "/network-scripts/",
testfile,
keyfile,
&error);
g_assert_no_error (error);
g_assert (success);
unlink (keyfile);
g_free (keyfile);
/* 5. check that BRIDGE variable has been removed */
f = svOpenFile (testfile, &error);
g_assert_no_error (error);
g_assert (f);
val = svGetValue (f, "BRIDGE", FALSE);
g_assert (!val);
svCloseFile (f);
unlink (testfile);
g_free (testfile);
g_object_unref (connection);
}
static void
test_write_dns_options (void)
{
@ -8781,6 +8844,7 @@ int main (int argc, char **argv)
g_test_add_data_func (TPATH "static-ip6-only-gw/2001:db8:8:4::2", "2001:db8:8:4::2", test_write_wired_static_ip6_only_gw);
g_test_add_data_func (TPATH "static-ip6-only-gw/::ffff:255.255.255.255", "::ffff:255.255.255.255", test_write_wired_static_ip6_only_gw);
g_test_add_func (TPATH "read-dns-options", test_read_dns_options);
g_test_add_func (TPATH "clear-master", test_clear_master);
nmtst_add_test_func (TPATH "read-static", test_read_wired_static, TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-static", "System test-wired-static", GINT_TO_POINTER (TRUE));
nmtst_add_test_func (TPATH "read-static-bootproto", test_read_wired_static, TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wired-static-bootproto", "System test-wired-static-bootproto", GINT_TO_POINTER (FALSE));

26
src/settings/plugins/ifcfg-rh/writer.c
View file

@ -1430,7 +1430,6 @@ write_team_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wired,
svSetValue (ifcfg, "DEVICE", iface, FALSE);
config = nm_setting_team_get_config (s_team);
svSetValue (ifcfg, "TEAM_CONFIG", config, FALSE);
svSetValue (ifcfg, "DEVICETYPE", TYPE_TEAM, FALSE);
*wired = write_wired_for_virtual (connection, ifcfg);
@ -1808,6 +1807,10 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
const char *master, *type;
char *tmp;
gint i_int;
const char *v_master = NULL;
const char *v_slave = NULL;
const char *v_bridge = NULL;
const char *v_team_master = NULL;
svSetValue (ifcfg, "NAME", nm_setting_connection_get_id (s_con), FALSE);
svSetValue (ifcfg, "UUID", nm_setting_connection_get_uuid (s_con), FALSE);
@ -1876,17 +1879,28 @@ write_connection_setting (NMSettingConnection *s_con, shvarFile *ifcfg)
master = nm_setting_connection_get_master (s_con);
if (master) {
if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME)) {
svSetValue (ifcfg, "MASTER", master, FALSE);
svSetValue (ifcfg, "SLAVE", "yes", FALSE);
v_master = master;
v_slave = "yes";
} else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME))
svSetValue (ifcfg, "BRIDGE", master, FALSE);
v_bridge = master;
else if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_TEAM_SETTING_NAME)) {
svSetValue (ifcfg, "TEAM_MASTER", master, FALSE);
svSetValue (ifcfg, "DEVICETYPE", TYPE_TEAM_PORT, FALSE);
v_team_master = master;
svSetValue (ifcfg, "TYPE", NULL, FALSE);
}
}
svSetValue (ifcfg, "MASTER", v_master, FALSE);
svSetValue (ifcfg, "SLAVE", v_slave, FALSE);
svSetValue (ifcfg, "BRIDGE", v_bridge, FALSE);
svSetValue (ifcfg, "TEAM_MASTER", v_team_master, FALSE);
if (nm_streq0 (type, NM_SETTING_TEAM_SETTING_NAME))
svSetValue (ifcfg, "DEVICETYPE", TYPE_TEAM, FALSE);
else if (master && nm_setting_connection_is_slave_type (s_con, NM_SETTING_TEAM_SETTING_NAME))
svSetValue (ifcfg, "DEVICETYPE", TYPE_TEAM_PORT, FALSE);
else
svSetValue (ifcfg, "DEVICETYPE", NULL, FALSE);
/* secondary connection UUIDs */
svSetValue (ifcfg, "SECONDARY_UUIDS", NULL, FALSE);
n = nm_setting_connection_get_num_secondaries (s_con);