Skip to content

Commit

Permalink
Fix failing provisioning tests due to the sat workflow update (#17595)
Browse files Browse the repository at this point in the history
Fix failing provisioning tests due to the workflow update
  • Loading branch information
shubhamsg199 authored Feb 14, 2025
1 parent 3ee1624 commit 7126841
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pytest_fixtures/component/provision_capsule_pxe.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def capsule_provisioning_sat(
)

broker_data_out = Box(**broker_data_out['data_out'])
provisioning_interface = ipaddress.ip_interface(broker_data_out.provisioning_addr_ipv4)
provisioning_interface = ipaddress.ip_interface(broker_data_out.provisioning_addr_ip)
provisioning_network = provisioning_interface.network
# TODO: investigate DNS setup issue on Satellite,
# we might need to set up Sat's DNS server as the primary one on the Sat host
Expand All @@ -69,7 +69,7 @@ def capsule_provisioning_sat(
organization=[module_sca_manifest_org],
network=str(provisioning_network.network_address),
mask=str(provisioning_network.netmask),
gateway=broker_data_out.provisioning_gw_ipv4,
gateway=broker_data_out.provisioning_gw_ip,
from_=broker_data_out.provisioning_host_range_start,
to=broker_data_out.provisioning_host_range_end,
dns_primary=provisioning_upstream_dns_primary,
Expand Down Expand Up @@ -119,7 +119,7 @@ def capsule_provisioning_hostgroup(
module_capsule_configured,
):
capsule = module_capsule_configured.nailgun_smart_proxy
provisioning_ip = capsule_provisioning_sat.broker_data.provisioning_addr_ipv4
provisioning_ip = capsule_provisioning_sat.broker_data.provisioning_addr_ip
provisioning_ip = ipaddress.ip_interface(provisioning_ip).ip
return capsule_provisioning_sat.sat.api.HostGroup(
organization=[module_sca_manifest_org],
Expand Down
4 changes: 2 additions & 2 deletions pytest_fixtures/component/provision_pxe.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def module_provisioning_sat(
)

broker_data_out = Box(**broker_data_out['data_out'])
provisioning_interface = ipaddress.ip_interface(broker_data_out.provisioning_addr_ipv4)
provisioning_interface = ipaddress.ip_interface(broker_data_out.provisioning_addr_ip)
provisioning_network = provisioning_interface.network
# TODO: investigate DNS setup issue on Satellite,
# we might need to set up Sat's DNS server as the primary one on the Sat host
Expand All @@ -197,7 +197,7 @@ def module_provisioning_sat(
organization=[module_sca_manifest_org],
network=str(provisioning_network.network_address),
mask=str(provisioning_network.netmask),
gateway=broker_data_out.provisioning_gw_ipv4,
gateway=broker_data_out.provisioning_gw_ip,
from_=broker_data_out.provisioning_host_range_start,
to=broker_data_out.provisioning_host_range_end,
dns_primary=provisioning_upstream_dns_primary,
Expand Down

0 comments on commit 7126841

Please sign in to comment.