Skip to content

Commit

Permalink
Merge pull request #5720 from r0x0d/remove-deprecation-warning-messages
Browse files Browse the repository at this point in the history 
Replace deprecated methods to avoid warnings
  • Loading branch information
@KKoukiou
KKoukiou authored Jun 25, 2024
2 parents 55a4f0f + d77c7ce commit cc99d36
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions pyanaconda/modules/network/device_configuration.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pyanaconda/modules/network/initialization.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions pyanaconda/modules/network/nm_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
58 changes: 29 additions & 29 deletions tests/unit_tests/pyanaconda_tests/modules/network/test_module_network_nm_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down Expand Up @@ -444,33 +444,33 @@ 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,
},
{
"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,
Expand All @@ -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",
Expand Down Expand Up @@ -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",
}],
""),
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit cc99d36

Please sign in to comment.