New upstream version 1.48.8 upstream/1.48.8

7 files changed, 17 insertions, 17 deletions

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);