diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 7c2b202607..260086b713 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -290,17 +290,17 @@ check_if_bond_slave(shvarFile *ifcfg, NMSettingConnection *s_con) { gs_free char *value = NULL; const char *v; - const char *master; + const char *controller; v = svGetValueStr(ifcfg, "MASTER_UUID", &value); if (!v) v = svGetValueStr(ifcfg, "MASTER", &value); if (v) { - master = nm_setting_connection_get_controller(s_con); - if (master) { + controller = nm_setting_connection_get_controller(s_con); + if (controller) { PARSE_WARNING("Already configured as slave of %s. Ignoring MASTER{_UUID}=\"%s\"", - master, + controller, v); return; } @@ -323,7 +323,7 @@ check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con) { gs_free char *value = NULL; const char *v; - const char *master; + const char *controller; v = svGetValueStr(ifcfg, "TEAM_MASTER_UUID", &value); if (!v) @@ -331,10 +331,10 @@ check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con) if (!v) return; - master = nm_setting_connection_get_controller(s_con); - if (master) { + controller = nm_setting_connection_get_controller(s_con); + if (controller) { PARSE_WARNING("Already configured as slave of %s. Ignoring TEAM_MASTER{_UUID}=\"%s\"", - master, + controller, v); return; } @@ -6683,7 +6683,7 @@ connection_from_file_full(const char *filename, gs_free char *bond_options = NULL; if (svGetValueStr(main_ifcfg, "BONDING_OPTS", &bond_options)) { - /* initscripts consider these as bond masters */ + /* initscripts consider these as bond controllers */ g_free(type); type = g_strdup(TYPE_BOND); } diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index f4598e2d13..59115d0288 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -2161,7 +2161,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg, const cha { guint32 n, i; nm_auto_free_gstring GString *str = NULL; - const char *master, *master_iface = NULL, *type; + const char *controller, *controller_iface = NULL, *type; int vint; gint32 vint32; NMSettingConnectionMdns mdns; @@ -2191,7 +2191,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg, const cha vint = nm_setting_connection_get_multi_connect(s_con); svSetValueInt64_cond(ifcfg, "MULTI_CONNECT", vint != NM_CONNECTION_MULTI_CONNECT_DEFAULT, vint); - /* Only save the value for master connections */ + /* Only save the value for controller connections */ type = nm_setting_connection_get_connection_type(s_con); if (_nm_connection_type_is_master(type)) { NMSettingConnectionAutoconnectSlaves autoconnect_slaves; @@ -2251,50 +2251,50 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg, const cha mud_url = nm_setting_connection_get_mud_url(s_con); svSetValue(ifcfg, "MUD_URL", mud_url); - master = nm_setting_connection_get_controller(s_con); - if (master) { + controller = nm_setting_connection_get_controller(s_con); + if (controller) { /* The reader prefers the *_UUID variants, however we still try to resolve * it into an interface name, so that legacy tooling is not confused. */ if (!nm_utils_get_testing()) { /* This is conditional for easier testing. */ - master_iface = nm_manager_iface_for_uuid(NM_MANAGER_GET, master); + controller_iface = nm_manager_iface_for_uuid(NM_MANAGER_GET, controller); } - if (!master_iface) { - master_iface = master; - master = NULL; + if (!controller_iface) { + controller_iface = controller; + controller = NULL; } if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_BOND_SETTING_NAME)) { - svSetValueStr(ifcfg, "MASTER_UUID", master); - svSetValueStr(ifcfg, "MASTER", master_iface); + svSetValueStr(ifcfg, "MASTER_UUID", controller); + svSetValueStr(ifcfg, "MASTER", controller_iface); svSetValueStr(ifcfg, "SLAVE", "yes"); } else if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_BRIDGE_SETTING_NAME)) { - svSetValueStr(ifcfg, "BRIDGE_UUID", master); - svSetValueStr(ifcfg, "BRIDGE", master_iface); + svSetValueStr(ifcfg, "BRIDGE_UUID", controller); + svSetValueStr(ifcfg, "BRIDGE", controller_iface); } else if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_TEAM_SETTING_NAME)) { - svSetValueStr(ifcfg, "TEAM_MASTER_UUID", master); - svSetValueStr(ifcfg, "TEAM_MASTER", master_iface); + svSetValueStr(ifcfg, "TEAM_MASTER_UUID", controller); + svSetValueStr(ifcfg, "TEAM_MASTER", controller_iface); if (NM_IN_STRSET(type, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_VLAN_SETTING_NAME)) svUnsetValue(ifcfg, "TYPE"); } else if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_OVS_PORT_SETTING_NAME)) { - svSetValueStr(ifcfg, "OVS_PORT_UUID", master); - svSetValueStr(ifcfg, "OVS_PORT", master_iface); + svSetValueStr(ifcfg, "OVS_PORT_UUID", controller); + svSetValueStr(ifcfg, "OVS_PORT", controller_iface); } else if (nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_VRF_SETTING_NAME)) { - svSetValueStr(ifcfg, "VRF_UUID", master); - svSetValueStr(ifcfg, "VRF", master_iface); + svSetValueStr(ifcfg, "VRF_UUID", controller); + svSetValueStr(ifcfg, "VRF", controller_iface); } else { - _LOGW("don't know how to set master for a %s slave", + _LOGW("don't know how to set controller for a %s slave", nm_setting_connection_get_port_type(s_con)); } } if (nm_streq0(type, NM_SETTING_TEAM_SETTING_NAME)) svSetValueStr(ifcfg, "DEVICETYPE", TYPE_TEAM); - else if (master_iface + else if (controller_iface && nm_streq0(nm_setting_connection_get_port_type(s_con), NM_SETTING_TEAM_SETTING_NAME)) svSetValueStr(ifcfg, "DEVICETYPE", TYPE_TEAM_PORT); diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 40a188531b..cc709b1d1b 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -2212,7 +2212,7 @@ test_read_dns_options(void) } static void -test_clear_master(void) +test_clear_controller(void) { nmtst_auto_unlinkfile char *testfile = NULL; gs_free char *keyfile = NULL; @@ -2239,7 +2239,7 @@ test_clear_master(void) TEST_IFCFG_DIR "/ifcfg-System_test-bridge-component-a.cexpected", &testfile); - /* 3. clear master and slave-type */ + /* 3. clear controller and slave-type */ g_object_set(s_con, NM_SETTING_CONNECTION_MASTER, NULL, @@ -8990,7 +8990,7 @@ test_write_fcoe_mode(gconstpointer user_data) } static void -test_read_team_master(gconstpointer user_data) +test_read_team_controller(gconstpointer user_data) { const char *const PATH_NAME = user_data; gs_unref_object NMConnection *connection = NULL; @@ -9013,7 +9013,7 @@ test_read_team_master(gconstpointer user_data) } static void -test_read_team_master_invalid(gconstpointer user_data) +test_read_team_controller_invalid(gconstpointer user_data) { const char *const PATH_NAME = user_data; gs_free_error GError *error = NULL; @@ -9029,7 +9029,7 @@ test_read_team_master_invalid(gconstpointer user_data) } static void -test_write_team_master(void) +test_write_team_controller(void) { nmtst_auto_unlinkfile char *testfile = NULL; gs_unref_object NMConnection *connection = NULL; @@ -9252,7 +9252,7 @@ test_team_reread_slave(void) "type=vlan\n" "autoconnect=false\n" "interface-name=enp31s0f1-142\n" - "master=team142\n" + "controller=team142\n" "permissions=\n" "slave-type=team\n" "\n" @@ -10534,7 +10534,7 @@ main(int argc, char **argv) test_write_wired_static_ip6_only_gw); g_test_add_func(TPATH "ip6/disabled", test_write_ip6_disabled); g_test_add_func(TPATH "read-dns-options", test_read_dns_options); - g_test_add_func(TPATH "clear-master", test_clear_master); + g_test_add_func(TPATH "clear-controller", test_clear_controller); nmtst_add_test_func(TPATH "read-static", test_read_wired_static, @@ -10892,33 +10892,33 @@ main(int argc, char **argv) (gpointer) NM_SETTING_DCB_FCOE_MODE_VN2VN, test_write_fcoe_mode); - g_test_add_func(TPATH "bond/read-master", test_read_bond_main); - g_test_add_func(TPATH "bond/read-master-eth-type", test_read_bond_eth_type); + g_test_add_func(TPATH "bond/read-controller", test_read_bond_main); + g_test_add_func(TPATH "bond/read-controller-eth-type", test_read_bond_eth_type); g_test_add_func(TPATH "bond/read-slave", test_read_bond_slave); g_test_add_func(TPATH "bond/read-slave-ib", test_read_bond_slave_ib); - g_test_add_func(TPATH "bond/write-master", test_write_bond_main); + g_test_add_func(TPATH "bond/write-controller", test_write_bond_main); g_test_add_func(TPATH "bond/write-slave", test_write_bond_slave); g_test_add_func(TPATH "bond/write-slave-ib", test_write_bond_slave_ib); g_test_add_func(TPATH "bond/bonding-opts-numeric-mode", test_read_bond_opts_mode_numeric); g_test_add_func(TPATH "bond/read-bond-port", test_read_bond_port); g_test_add_func(TPATH "bond/write-bond-port", test_write_bond_port); - g_test_add_func(TPATH "bridge/read-master", test_read_bridge_main); - g_test_add_func(TPATH "bridge/write-master", test_write_bridge_main); + g_test_add_func(TPATH "bridge/read-controller", test_read_bridge_main); + g_test_add_func(TPATH "bridge/write-controller", test_write_bridge_main); g_test_add_func(TPATH "bridge/read-component", test_read_bridge_component); g_test_add_func(TPATH "bridge/write-component", test_write_bridge_component); g_test_add_func(TPATH "bridge/read-missing-stp", test_read_bridge_missing_stp); - g_test_add_data_func(TPATH "team/read-master-1", - TEST_IFCFG_DIR "/ifcfg-test-team-master-1", - test_read_team_master); - g_test_add_data_func(TPATH "team/read-master-2", - TEST_IFCFG_DIR "/ifcfg-test-team-master-2", - test_read_team_master); - g_test_add_data_func(TPATH "team/read-master-invalid", - TEST_IFCFG_DIR "/ifcfg-test-team-master-invalid", - test_read_team_master_invalid); - g_test_add_func(TPATH "team/write-master", test_write_team_master); + g_test_add_data_func(TPATH "team/read-controller-1", + TEST_IFCFG_DIR "/ifcfg-test-team-controller-1", + test_read_team_controller); + g_test_add_data_func(TPATH "team/read-controller-2", + TEST_IFCFG_DIR "/ifcfg-test-team-controller-2", + test_read_team_controller); + g_test_add_data_func(TPATH "team/read-controller-invalid", + TEST_IFCFG_DIR "/ifcfg-test-team-controller-invalid", + test_read_team_controller_invalid); + g_test_add_func(TPATH "team/write-controller", test_write_team_controller); g_test_add_data_func(TPATH "team/read-port-1", TEST_IFCFG_DIR "/ifcfg-test-team-port-1", test_read_team_port); diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component index f5463ed004..95da3d461d 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component @@ -2,7 +2,7 @@ id=Test Bridge Component uuid=d7b4f96c-c45e-4298-bef8-f48574f8c1c0 type=802-3-ethernet -master=br0 +controller=br0 slave-type=bridge [802-3-ethernet] diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 index d3122d5395..226edfe244 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 @@ -1,4 +1,4 @@ [connection] type=802-3-ethernet -master=br0 +controller=br0 slave-type=bridge diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 index eb1cdacebd..820608f8c2 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 @@ -1,5 +1,5 @@ [connection] -master=br0 +controller=br0 [802-3-ethernet] diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 index 7419e97dd2..4027fec167 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 @@ -1,4 +1,4 @@ [connection] -master=br0 +controller=br0 slave-type=bridge [802-3-ethernet] diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 index 626b6f6840..a9acf205ff 100644 --- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 +++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 @@ -1,4 +1,4 @@ [connection] type=802-3-ethernet -master=br0 +controller=br0 [bridge-port]