New upstream version 1.48.8 upstream/1.48.8

16 files changed, 110 insertions, 111 deletions

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 7c2b2026..81964de6 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
@@ -286,21 +286,21 @@ _cert_set_from_ifcfg(gpointer    setting,
 /*****************************************************************************/
 
 static void
-check_if_bond_slave(shvarFile *ifcfg, NMSettingConnection *s_con)
+check_if_bond_port(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) {
-            PARSE_WARNING("Already configured as slave of %s. Ignoring MASTER{_UUID}=\"%s\"",
-                          master,
+        controller = nm_setting_connection_get_controller(s_con);
+        if (controller) {
+            PARSE_WARNING("Already configured as port of %s. Ignoring MASTER{_UUID}=\"%s\"",
+                          controller,
                           v);
             return;
         }
@@ -319,11 +319,11 @@ check_if_bond_slave(shvarFile *ifcfg, NMSettingConnection *s_con)
 }
 
 static void
-check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con)
+check_if_team_port(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) {
-        PARSE_WARNING("Already configured as slave of %s. Ignoring TEAM_MASTER{_UUID}=\"%s\"",
-                      master,
+    controller = nm_setting_connection_get_controller(s_con);
+    if (controller) {
+        PARSE_WARNING("Already configured as port of %s. Ignoring TEAM_MASTER{_UUID}=\"%s\"",
+                      controller,
                       v);
         return;
     }
@@ -508,9 +508,7 @@ make_connection_setting(const char *file,
         const char *old_value;
 
         if ((old_value = nm_setting_connection_get_controller(s_con))) {
-            PARSE_WARNING("Already configured as slave of %s. Ignoring BRIDGE=\"%s\"",
-                          old_value,
-                          v);
+            PARSE_WARNING("Already configured as port of %s. Ignoring BRIDGE=\"%s\"", old_value, v);
         } else {
             g_object_set(s_con, NM_SETTING_CONNECTION_CONTROLLER, v, NULL);
             g_object_set(s_con,
@@ -520,8 +518,8 @@ make_connection_setting(const char *file,
         }
     }
 
-    check_if_bond_slave(ifcfg, s_con);
-    check_if_team_slave(ifcfg, s_con);
+    check_if_bond_port(ifcfg, s_con);
+    check_if_team_port(ifcfg, s_con);
 
     nm_clear_g_free(&value);
     v = svGetValueStr(ifcfg, "OVS_PORT_UUID", &value);
@@ -531,7 +529,7 @@ make_connection_setting(const char *file,
         const char *old_value;
 
         if ((old_value = nm_setting_connection_get_controller(s_con))) {
-            PARSE_WARNING("Already configured as slave of %s. Ignoring OVS_PORT=\"%s\"",
+            PARSE_WARNING("Already configured as port of %s. Ignoring OVS_PORT=\"%s\"",
                           old_value,
                           v);
         } else {
@@ -551,7 +549,7 @@ make_connection_setting(const char *file,
         const char *old_value;
 
         if ((old_value = nm_setting_connection_get_controller(s_con))) {
-            PARSE_WARNING("Already configured as slave of %s. Ignoring VRF{_UUID}=\"%s\"",
+            PARSE_WARNING("Already configured as port of %s. Ignoring VRF{_UUID}=\"%s\"",
                           old_value,
                           v);
         } else {
@@ -6683,7 +6681,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 f4598e2d..21f31d8b 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,16 +2191,16 @@ 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;
-        autoconnect_slaves = nm_setting_connection_get_autoconnect_slaves(s_con);
+    if (_nm_connection_type_is_controller(type)) {
+        NMTernary autoconnect_ports;
+        autoconnect_ports = nm_setting_connection_get_autoconnect_ports(s_con);
         svSetValueStr(ifcfg,
                       "AUTOCONNECT_SLAVES",
-                      autoconnect_slaves == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES  ? "yes"
-                      : autoconnect_slaves == NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO ? "no"
-                                                                                          : NULL);
+                      autoconnect_ports == NM_TERNARY_TRUE    ? "yes"
+                      : autoconnect_ports == NM_TERNARY_FALSE ? "no"
+                                                              : NULL);
     }
     switch (nm_setting_connection_get_lldp(s_con)) {
     case NM_SETTING_CONNECTION_LLDP_ENABLE_RX:
@@ -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 port",
                   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);
 
@@ -3056,7 +3056,7 @@ write_ip4_aliases(NMConnection *connection, const char *base_ifcfg_path)
 
     s_ip4 = nm_connection_get_setting_ip4_config(connection);
     if (!s_ip4) {
-        /* slave-type: no alias files */
+        /* port-type: no alias files */
         return;
     }
 
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected
index b01372af..f79e5a07 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected
@@ -5,7 +5,7 @@ REORDER_HDR=yes
 GVRP=no
 MVRP=no
 HWADDR=
-NAME=team-slave-enp31s0f1-142
+NAME=team-port-enp31s0f1-142
 UUID=74f435bb-ede4-415a-9d48-f580b60eba04
 DEVICE=enp31s0f1-142
 ONBOOT=no
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-bond0
index c0de645d..c0de645d 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-bond0
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib
index 5bd9a3a8..5bd9a3a8 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-1
index 209447b8..209447b8 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-1
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-2
index 26e448cc..26e448cc 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-2
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-invalid
index 41c0f25c..41c0f25c 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-invalid
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 40a18853..334662c3 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;
@@ -2221,7 +2221,7 @@ test_clear_master(void)
     char                         *unmanaged = NULL;
     shvarFile                    *f;
 
-    /* 1. load the bridge slave connection from disk */
+    /* 1. load the bridge port connection from disk */
     connection = _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bridge-component",
                                        NULL,
                                        TYPE_ETHERNET,
@@ -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 port-type */
     g_object_set(s_con,
                  NM_SETTING_CONNECTION_MASTER,
                  NULL,
@@ -8251,13 +8251,15 @@ test_write_bond_main(void)
 }
 
 static void
-test_read_bond_slave(void)
+test_read_bond_port(void)
 {
     gs_unref_object NMConnection *connection = NULL;
     NMSettingConnection          *s_con;
 
-    connection =
-        _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-slave", NULL, TYPE_ETHERNET, NULL);
+    connection = _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-port-bond0",
+                                       NULL,
+                                       TYPE_ETHERNET,
+                                       NULL);
     g_test_assert_expected_messages();
 
     s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION);
@@ -8268,7 +8270,7 @@ test_read_bond_slave(void)
 }
 
 static void
-test_write_bond_slave(void)
+test_write_bond_port(void)
 {
     nmtst_auto_unlinkfile char   *testfile   = NULL;
     gs_unref_object NMConnection *connection = NULL;
@@ -8309,7 +8311,7 @@ test_write_bond_slave(void)
 }
 
 static void
-test_read_bond_port(void)
+test_read_bond_port_setting(void)
 {
     gs_unref_object NMConnection *connection = NULL;
     NMSettingConnection          *s_con      = NULL;
@@ -8327,7 +8329,7 @@ test_read_bond_port(void)
 }
 
 static void
-test_write_bond_port(void)
+test_write_bond_port_setting(void)
 {
     nmtst_auto_unlinkfile char   *testfile   = NULL;
     gs_unref_object NMConnection *connection = NULL;
@@ -8548,13 +8550,12 @@ test_write_infiniband(gconstpointer test_data)
 }
 
 static void
-test_read_bond_slave_ib(void)
+test_read_bond_port_ib(void)
 {
     gs_unref_object NMConnection *connection = NULL;
     NMSettingConnection          *s_con;
 
-    connection =
-        _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-slave-ib", NULL, NULL, NULL);
+    connection = _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-port-ib", NULL, NULL, NULL);
 
     s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION);
 
@@ -8563,7 +8564,7 @@ test_read_bond_slave_ib(void)
 }
 
 static void
-test_write_bond_slave_ib(void)
+test_write_bond_port_ib(void)
 {
     nmtst_auto_unlinkfile char   *testfile   = NULL;
     gs_unref_object NMConnection *connection = NULL;
@@ -8990,7 +8991,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 +9014,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 +9030,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;
@@ -9236,7 +9237,7 @@ test_read_team_port_empty_config(void)
 }
 
 static void
-test_team_reread_slave(void)
+test_team_reread_port(void)
 {
     nmtst_auto_unlinkfile char   *testfile     = NULL;
     gs_unref_object NMConnection *connection_1 = NULL;
@@ -9247,14 +9248,14 @@ test_team_reread_slave(void)
 
     connection_1 =
         nmtst_create_connection_from_keyfile("[connection]\n"
-                                             "id=team-slave-enp31s0f1-142\n"
+                                             "id=team-port-enp31s0f1-142\n"
                                              "uuid=74f435bb-ede4-415a-9d48-f580b60eba04\n"
                                              "type=vlan\n"
                                              "autoconnect=false\n"
                                              "interface-name=enp31s0f1-142\n"
-                                             "master=team142\n"
+                                             "controller=team142\n"
                                              "permissions=\n"
-                                             "slave-type=team\n"
+                                             "port-type=team\n"
                                              "\n"
                                              "[vlan]\n"
                                              "egress-priority-map=\n"
@@ -9262,10 +9263,10 @@ test_team_reread_slave(void)
                                              "id=142\n"
                                              "ingress-priority-map=\n"
                                              "parent=enp31s0f1\n",
-                                             "/test_team_reread_slave");
+                                             "/test_team_reread_port");
 
     /* to double-check keyfile syntax, re-create the connection by hand. */
-    connection_2 = nmtst_create_minimal_connection("team-slave-enp31s0f1-142",
+    connection_2 = nmtst_create_minimal_connection("team-port-enp31s0f1-142",
                                                    "74f435bb-ede4-415a-9d48-f580b60eba04",
                                                    NM_SETTING_VLAN_SETTING_NAME,
                                                    &s_con);
@@ -9297,7 +9298,7 @@ test_team_reread_slave(void)
     _writer_new_connection_reread((nmtst_get_rand_uint32() % 2) ? connection_1 : connection_2,
                                   TEST_SCRATCH_DIR,
                                   &testfile,
-                                  TEST_IFCFG_DIR "/ifcfg-team-slave-enp31s0f1-142.cexpected",
+                                  TEST_IFCFG_DIR "/ifcfg-team-port-enp31s0f1-142.cexpected",
                                   &reread,
                                   &reread_same);
     _assert_reread_same((nmtst_get_rand_uint32() % 2) ? connection_1 : connection_2, reread);
@@ -10534,7 +10535,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 +10893,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-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-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/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-port", test_read_bond_port);
+    g_test_add_func(TPATH "bond/read-port-ib", test_read_bond_port_ib);
+    g_test_add_func(TPATH "bond/write-controller", test_write_bond_main);
+    g_test_add_func(TPATH "bond/write-port", test_write_bond_port);
+    g_test_add_func(TPATH "bond/write-port-ib", test_write_bond_port_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 "bond/read-bond-port", test_read_bond_port_setting);
+    g_test_add_func(TPATH "bond/write-bond-port_setting", test_write_bond_port_setting);
 
-    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);
@@ -10928,7 +10929,7 @@ main(int argc, char **argv)
     g_test_add_func(TPATH "team/write-port", test_write_team_port);
     g_test_add_func(TPATH "team/write-infiniband-port", test_write_team_infiniband_port);
     g_test_add_func(TPATH "team/read-port-empty-config", test_read_team_port_empty_config);
-    g_test_add_func(TPATH "team/reread-slave", test_team_reread_slave);
+    g_test_add_func(TPATH "team/reread-port", test_team_reread_port);
 
     g_test_add_func(TPATH "proxy/read-proxy-basic", test_read_proxy_basic);
     g_test_add_func(TPATH "proxy/write-proxy-basic", test_write_proxy_basic);
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 f5463ed0..0837f978 100644
--- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component
@@ -2,8 +2,8 @@
 id=Test Bridge Component
 uuid=d7b4f96c-c45e-4298-bef8-f48574f8c1c0
 type=802-3-ethernet
-master=br0
-slave-type=bridge
+controller=br0
+port-type=bridge
 
 [802-3-ethernet]
 mac-address=00:22:15:59:62:97
diff --git a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_1
index d3122d53..c801f164 100644
--- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_1
@@ -1,4 +1,4 @@
 [connection]
 type=802-3-ethernet
-master=br0
-slave-type=bridge
+controller=br0
+port-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_port_2
index eb1cdace..820608f8 100644
--- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_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_port_3 b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_3
new file mode 100644
index 00000000..9e3f9402
--- /dev/null
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_3
@@ -0,0 +1,4 @@
+[connection]
+controller=br0
+port-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_port_4
index 626b6f68..a9acf205 100644
--- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4
+++ b/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_port_4
@@ -1,4 +1,4 @@
 [connection]
 type=802-3-ethernet
-master=br0
+controller=br0
 [bridge-port]
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
deleted file mode 100644
index 7419e97d..00000000
--- a/src/core/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3
+++ /dev/null
@@ -1,4 +0,0 @@
-[connection]
-master=br0
-slave-type=bridge
-[802-3-ethernet]
diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
index e3e5f84f..f999105a 100644
--- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
+++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
@@ -2346,13 +2346,13 @@ test_read_minimal(void)
 }
 
 static void
-test_read_minimal_slave(void)
+test_read_minimal_port(void)
 {
     gs_unref_object NMConnection *connection    = NULL;
     gs_unref_object NMConnection *con_archetype = NULL;
     NMSettingConnection          *s_con;
 
-    con_archetype = nmtst_create_minimal_connection("Test_minimal_slave_x",
+    con_archetype = nmtst_create_minimal_connection("Test_minimal_port_x",
                                                     "a56b4ca5-7075-43d4-82c7-5d0cb15f7654",
                                                     NM_SETTING_WIRED_SETTING_NAME,
                                                     &s_con);
@@ -2364,7 +2364,7 @@ test_read_minimal_slave(void)
                  NULL);
     nmtst_connection_normalize(con_archetype);
 
-    connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_slave_1");
+    connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_port_1");
     g_object_set(s_con,
                  NM_SETTING_CONNECTION_ID,
                  nm_connection_get_id(connection),
@@ -2374,7 +2374,7 @@ test_read_minimal_slave(void)
     nmtst_assert_connection_equals(con_archetype, FALSE, connection, FALSE);
     g_clear_object(&connection);
 
-    connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_slave_2");
+    connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_port_2");
     g_object_set(s_con,
                  NM_SETTING_CONNECTION_ID,
                  nm_connection_get_id(connection),
@@ -2384,7 +2384,7 @@ test_read_minimal_slave(void)
     nmtst_assert_connection_equals(con_archetype, FALSE, connection, FALSE);
     g_clear_object(&connection);
 
-    connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_slave_3");
+    connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_port_3");
     g_object_set(s_con,
                  NM_SETTING_CONNECTION_ID,
                  nm_connection_get_id(connection),
@@ -2394,7 +2394,7 @@ test_read_minimal_slave(void)
     nmtst_assert_connection_equals(con_archetype, FALSE, connection, FALSE);
     g_clear_object(&connection);
 
-    connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_slave_4");
+    connection = keyfile_read_connection_from_file(TEST_KEYFILES_DIR "/Test_minimal_port_4");
     g_object_set(s_con,
                  NM_SETTING_CONNECTION_ID,
                  nm_connection_get_id(connection),
@@ -2921,7 +2921,7 @@ main(int argc, char **argv)
     g_test_add_func("/keyfile/test_read_missing_id_uuid", test_read_missing_id_uuid);
 
     g_test_add_func("/keyfile/test_read_minimal", test_read_minimal);
-    g_test_add_func("/keyfile/test_read_minimal_slave", test_read_minimal_slave);
+    g_test_add_func("/keyfile/test_read_minimal_port", test_read_minimal_port);
 
     g_test_add_func("/keyfile/test_read_enum_property", test_read_enum_property);
     g_test_add_func("/keyfile/test_write_enum_property", test_write_enum_property);