From d77c7ce0a5f44c10817369ea01f2065bff0b60bb Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 21 Jun 2024 14:53:15 -0300 Subject: [PATCH] Replace deprecated methods to avoid warnings Both get_master and get_slave_type are deprecated functions and were emitting warning messages in journalctl for anaconda. This patch is replacing them for their counterpart, get_controller and get_port_type to avoid the warnings. --- .../modules/network/device_configuration.py | 4 +- pyanaconda/modules/network/initialization.py | 6 +- pyanaconda/modules/network/nm_client.py | 8 +-- .../network/test_module_network_nm_client.py | 58 +++++++++---------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pyanaconda/modules/network/device_configuration.py b/pyanaconda/modules/network/device_configuration.py index eaea7838421..fae09cc0bb2 100644 --- a/pyanaconda/modules/network/device_configuration.py +++ b/pyanaconda/modules/network/device_configuration.py @@ -249,7 +249,7 @@ def _find_connection_uuid_of_device(self, device): for c in cons: # Ignore port connections - if c.get_setting_connection() and c.get_setting_connection().get_slave_type(): + if c.get_setting_connection() and c.get_setting_connection().get_port_type(): continue candidate_uuid = c.get_uuid() # In case of multiple connections choose the config connection @@ -345,7 +345,7 @@ def _should_add_connection(self, connection): # Ignore port connections elif device_type == NM.DeviceType.ETHERNET: - if con_setting and con_setting.get_master(): + if con_setting and con_setting.get_controller(): decline_reason = "port connection" # Wireless settings are handled in scope of configuration of its device diff --git a/pyanaconda/modules/network/initialization.py b/pyanaconda/modules/network/initialization.py index 5679ad26939..13f3700c17e 100644 --- a/pyanaconda/modules/network/initialization.py +++ b/pyanaconda/modules/network/initialization.py @@ -183,14 +183,14 @@ def _select_persistent_connection_for_device(self, device, cons, allow_ports=Fal if ac: con = ac.get_connection() if con.get_interface_name() == iface and con in cons: - if allow_ports or not con.get_setting_connection().get_master(): + if allow_ports or not con.get_setting_connection().get_controller(): return con else: log.debug("%s: active connection for %s can't be used as persistent", self.name, iface) for con in cons: if con.get_interface_name() == iface: - if allow_ports or not con.get_setting_connection().get_master(): + if allow_ports or not con.get_setting_connection().get_controller(): return con return None @@ -254,7 +254,7 @@ def _run(self, nm_client): dumped_con = None - device_is_port = any(con.get_setting_connection().get_master() + device_is_port = any(con.get_setting_connection().get_controller() for con in available_cons) if device_is_port: # We have to dump persistent ifcfg files for ports created in initramfs diff --git a/pyanaconda/modules/network/nm_client.py b/pyanaconda/modules/network/nm_client.py index ce933065530..bf50eadb96b 100644 --- a/pyanaconda/modules/network/nm_client.py +++ b/pyanaconda/modules/network/nm_client.py @@ -1406,9 +1406,9 @@ def get_ports_from_connections(nm_client, port_types, controller_specs): """ ports = set() for con in nm_client.get_connections(): - if con.get_setting_connection().get_slave_type() not in port_types: + if con.get_setting_connection().get_port_type() not in port_types: continue - if con.get_setting_connection().get_master() in controller_specs: + if con.get_setting_connection().get_controller() in controller_specs: iface = get_iface_from_connection(nm_client, con.get_uuid()) name = con.get_id() ports.add((name, iface, con.get_uuid())) @@ -1441,7 +1441,7 @@ def get_config_file_connection_of_device(nm_client, device_name, device_hwaddr=N if con_type == NM_CONNECTION_TYPE_ETHERNET: # Ignore ports - if con.get_setting_connection().get_master(): + if con.get_setting_connection().get_controller(): continue interface_name = con.get_interface_name() @@ -1502,7 +1502,7 @@ def get_kickstart_network_data(connection, nm_client, network_data_class): """ # no network command for non-virtual device ports if connection.get_connection_type() not in (NM_CONNECTION_TYPE_BOND, NM_CONNECTION_TYPE_TEAM): - if connection.get_setting_connection().get_master(): + if connection.get_setting_connection().get_controller(): return None # no support for wireless diff --git a/tests/unit_tests/pyanaconda_tests/modules/network/test_module_network_nm_client.py b/tests/unit_tests/pyanaconda_tests/modules/network/test_module_network_nm_client.py index ccb7876c666..71abfbe747d 100644 --- a/tests/unit_tests/pyanaconda_tests/modules/network/test_module_network_nm_client.py +++ b/tests/unit_tests/pyanaconda_tests/modules/network/test_module_network_nm_client.py @@ -70,26 +70,26 @@ def test_get_ports_from_connections(self, get_iface_from_connection): cons_specs = [ { - "get_setting_connection.return_value.get_slave_type.return_value": "", - "get_setting_connection.return_value.get_master.return_value": "", + "get_setting_connection.return_value.get_port_type.return_value": "", + "get_setting_connection.return_value.get_controller.return_value": "", "get_id.return_value": "ens3", "get_uuid.return_value": ENS3_UUID, }, { - "get_setting_connection.return_value.get_slave_type.return_value": "team", - "get_setting_connection.return_value.get_master.return_value": "team0", + "get_setting_connection.return_value.get_port_type.return_value": "team", + "get_setting_connection.return_value.get_controller.return_value": "team0", "get_id.return_value": "team_0_slave_1", "get_uuid.return_value": ENS7_UUID, }, { - "get_setting_connection.return_value.get_slave_type.return_value": "team", - "get_setting_connection.return_value.get_master.return_value": "team0", + "get_setting_connection.return_value.get_port_type.return_value": "team", + "get_setting_connection.return_value.get_controller.return_value": "team0", "get_id.return_value": "team_0_slave_2", "get_uuid.return_value": ENS8_UUID, }, { - "get_setting_connection.return_value.get_slave_type.return_value": "team", - "get_setting_connection.return_value.get_master.return_value": TEAM1_UUID, + "get_setting_connection.return_value.get_port_type.return_value": "team", + "get_setting_connection.return_value.get_controller.return_value": TEAM1_UUID, "get_id.return_value": "ens11", "get_uuid.return_value": ENS11_UUID, }, @@ -444,13 +444,13 @@ def test_get_config_file_connection_of_device(self, is_s390, get_iface_from_hwad "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_interface_name.return_value": "ens3", "get_setting_wired.return_value.get_mac_address.return_value": None, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": ENS3_UUID, }, { "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_setting_wired.return_value.get_mac_address.return_value": HWADDR_ENS3, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_interface_name.return_value": None, "get_uuid.return_value": ENS3_UUID2, }, @@ -458,19 +458,19 @@ def test_get_config_file_connection_of_device(self, is_s390, get_iface_from_hwad "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_interface_name.return_value": "ens7", "get_setting_wired.return_value.get_mac_address.return_value": None, - "get_setting_connection.return_value.get_master.return_value": "team0", + "get_setting_connection.return_value.get_controller.return_value": "team0", "get_uuid.return_value": ENS7_SLAVE_UUID, }, { "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_interface_name.return_value": "ens7", - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_setting_wired.return_value.get_mac_address.return_value": None, "get_uuid.return_value": ENS7_UUID, }, { "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_setting_wired.return_value.get_mac_address.return_value": HWADDR_ENS8, "get_interface_name.return_value": None, "get_uuid.return_value": ENS8_UUID, @@ -479,19 +479,19 @@ def test_get_config_file_connection_of_device(self, is_s390, get_iface_from_hwad "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_interface_name.return_value": "ens9", "get_setting_wired.return_value.get_mac_address.return_value": None, - "get_setting_connection.return_value.get_master.return_value": "team0", + "get_setting_connection.return_value.get_controller.return_value": "team0", "get_uuid.return_value": ENS9_SLAVE_UUID, }, { "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_setting_wired.return_value.get_mac_address.return_value": HWADDR_ENS11, "get_interface_name.return_value": None, "get_uuid.return_value": ENS11_UUID, }, { "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_setting_wired.return_value.get_mac_address.return_value": None, "get_interface_name.return_value": None, "get_id.return_value": "ens12", @@ -668,7 +668,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, cons_to_test = [ ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, - "get_setting_connection.return_value.get_master.return_value": "team0", + "get_setting_connection.return_value.get_controller.return_value": "team0", "get_interface_name.return_value": "ens3", }], ""), @@ -680,7 +680,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_setting_wired.return_value.get_mtu.return_value": 1500, "get_uuid.return_value": ENS3_UUID, "get_setting_ip4_config.return_value.get_method.return_value": NM.SETTING_IP4_CONFIG_METHOD_AUTO, @@ -701,7 +701,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_setting_wired.return_value.get_mtu.return_value": None, "get_uuid.return_value": ENS3_UUID, "get_setting_ip4_config.return_value.get_method.return_value": NM.SETTING_IP4_CONFIG_METHOD_AUTO, @@ -721,7 +721,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_setting_connection.return_value.get_autoconnect.return_value": False, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": ENS7_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_method.return_value": NM.SETTING_IP4_CONFIG_METHOD_MANUAL, @@ -745,7 +745,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": ENS7_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_dhcp_hostname.return_value": None, @@ -770,7 +770,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_BOND, "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": BOND0_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_num_dns.return_value": 0, @@ -792,7 +792,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_BRIDGE, "get_setting_connection.return_value.get_autoconnect.return_value": False, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": BRIDGE0_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_num_dns.return_value": 0, @@ -813,7 +813,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_TEAM, "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": TEAM0_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_num_dns.return_value": 0, @@ -836,7 +836,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, "get_connection_type.return_value": NM_CONNECTION_TYPE_VLAN, "get_setting_connection.return_value.get_interface_name.return_value": "vlan233", "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": VLAN223_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_num_dns.return_value": 0, @@ -860,7 +860,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, "get_connection_type.return_value": NM_CONNECTION_TYPE_VLAN, "get_setting_connection.return_value.get_interface_name.return_value": "vlan233", "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": VLAN223_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_num_dns.return_value": 0, @@ -884,7 +884,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, "get_connection_type.return_value": NM_CONNECTION_TYPE_VLAN, "get_setting_connection.return_value.get_interface_name.return_value": None, "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": VLAN223_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_num_dns.return_value": 0, @@ -909,7 +909,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_BOND, "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": "bridge1", + "get_setting_connection.return_value.get_controller.return_value": "bridge1", "get_uuid.return_value": BOND0_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value": None, @@ -921,7 +921,7 @@ def test_get_kicstart_network_data(self, get_iface_from_connection, ([{ "get_connection_type.return_value": NM_CONNECTION_TYPE_ETHERNET, "get_setting_connection.return_value.get_autoconnect.return_value": True, - "get_setting_connection.return_value.get_master.return_value": None, + "get_setting_connection.return_value.get_controller.return_value": None, "get_uuid.return_value": ENS3_UUID, "get_setting_wired.return_value.get_mtu.return_value": None, "get_setting_ip4_config.return_value.get_method.return_value": NM.SETTING_IP4_CONFIG_METHOD_AUTO,