From e96d74409128c6a977e31f24fad9b267d2feb9a1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 9 Aug 2024 18:57:15 +0200 Subject: New upstream version 1.48.8 --- .../ifcfg-team-port-enp31s0f1-142.cexpected | 13 +++ .../ifcfg-team-slave-enp31s0f1-142.cexpected | 13 --- .../network-scripts/ifcfg-test-bond-port-bond0 | 6 ++ .../tests/network-scripts/ifcfg-test-bond-port-ib | 7 ++ .../tests/network-scripts/ifcfg-test-bond-slave | 6 -- .../tests/network-scripts/ifcfg-test-bond-slave-ib | 7 -- .../network-scripts/ifcfg-test-team-controller-1 | 6 ++ .../network-scripts/ifcfg-test-team-controller-2 | 5 ++ .../ifcfg-test-team-controller-invalid | 4 + .../tests/network-scripts/ifcfg-test-team-master-1 | 6 -- .../tests/network-scripts/ifcfg-test-team-master-2 | 5 -- .../network-scripts/ifcfg-test-team-master-invalid | 4 - .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 93 +++++++++++----------- 13 files changed, 88 insertions(+), 87 deletions(-) create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected delete mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-bond0 create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib delete mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave delete mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-1 create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-2 create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-invalid delete mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 delete mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 delete mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid (limited to 'src/core/settings/plugins/ifcfg-rh/tests') diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected new file mode 100644 index 00000000..f79e5a07 --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-port-enp31s0f1-142.cexpected @@ -0,0 +1,13 @@ +VLAN=yes +PHYSDEV=enp31s0f1 +VLAN_ID=142 +REORDER_HDR=yes +GVRP=no +MVRP=no +HWADDR= +NAME=team-port-enp31s0f1-142 +UUID=74f435bb-ede4-415a-9d48-f580b60eba04 +DEVICE=enp31s0f1-142 +ONBOOT=no +TEAM_MASTER=team142 +DEVICETYPE=TeamPort 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-slave-enp31s0f1-142.cexpected deleted file mode 100644 index b01372af..00000000 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected +++ /dev/null @@ -1,13 +0,0 @@ -VLAN=yes -PHYSDEV=enp31s0f1 -VLAN_ID=142 -REORDER_HDR=yes -GVRP=no -MVRP=no -HWADDR= -NAME=team-slave-enp31s0f1-142 -UUID=74f435bb-ede4-415a-9d48-f580b60eba04 -DEVICE=enp31s0f1-142 -ONBOOT=no -TEAM_MASTER=team142 -DEVICETYPE=TeamPort diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-bond0 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-bond0 new file mode 100644 index 00000000..c0de645d --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-bond0 @@ -0,0 +1,6 @@ +DEVICE=eth0 +HWADDR=00:22:15:59:62:97 +ONBOOT=no +MASTER=bond0 +# This should be ignored +BOOTPROTO=dhcp diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib new file mode 100644 index 00000000..5bd9a3a8 --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-port-ib @@ -0,0 +1,7 @@ +TYPE=InfiniBand +DEVICE=ib0 +HWADDR=80:00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:00:11:22 +ONBOOT=no +MASTER=bond0 +# This should be ignored +BOOTPROTO=dhcp 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-slave deleted file mode 100644 index c0de645d..00000000 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave +++ /dev/null @@ -1,6 +0,0 @@ -DEVICE=eth0 -HWADDR=00:22:15:59:62:97 -ONBOOT=no -MASTER=bond0 -# This should be ignored -BOOTPROTO=dhcp 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-slave-ib deleted file mode 100644 index 5bd9a3a8..00000000 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib +++ /dev/null @@ -1,7 +0,0 @@ -TYPE=InfiniBand -DEVICE=ib0 -HWADDR=80:00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:00:11:22 -ONBOOT=no -MASTER=bond0 -# This should be ignored -BOOTPROTO=dhcp diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-1 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-1 new file mode 100644 index 00000000..209447b8 --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-1 @@ -0,0 +1,6 @@ +DEVICE=team0 +ONBOOT=no +DEVICETYPE=Team +BOOTPROTO=dhcp +TEAM_CONFIG="{\"device\": \"team0\", \"link_watch\": {\"name\": \"ethtool\"}}" + diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-2 new file mode 100644 index 00000000..26e448cc --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-2 @@ -0,0 +1,5 @@ +DEVICE=team0 +ONBOOT=no +BOOTPROTO=dhcp +TEAM_CONFIG="{\"device\": \"team0\", \"link_watch\": {\"name\": \"ethtool\"}}" + diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-invalid b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-invalid new file mode 100644 index 00000000..41c0f25c --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-controller-invalid @@ -0,0 +1,4 @@ +DEVICE=team0 +ONBOOT=no +BOOTPROTO=dhcp +TEAM_CONFIG="{ foobar }x" 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-master-1 deleted file mode 100644 index 209447b8..00000000 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 +++ /dev/null @@ -1,6 +0,0 @@ -DEVICE=team0 -ONBOOT=no -DEVICETYPE=Team -BOOTPROTO=dhcp -TEAM_CONFIG="{\"device\": \"team0\", \"link_watch\": {\"name\": \"ethtool\"}}" - 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-master-2 deleted file mode 100644 index 26e448cc..00000000 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 +++ /dev/null @@ -1,5 +0,0 @@ -DEVICE=team0 -ONBOOT=no -BOOTPROTO=dhcp -TEAM_CONFIG="{\"device\": \"team0\", \"link_watch\": {\"name\": \"ethtool\"}}" - 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-master-invalid deleted file mode 100644 index 41c0f25c..00000000 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid +++ /dev/null @@ -1,4 +0,0 @@ -DEVICE=team0 -ONBOOT=no -BOOTPROTO=dhcp -TEAM_CONFIG="{ foobar }x" 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); -- cgit 1.3.0-6-gf8a5