Skip to content

Fix Discovery provisioning tests #20638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shubhamsg199 merged 2 commits into from
Mar 19, 2026
Merged

Fix Discovery provisioning tests #20638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e37d856
Fix Discovery provisioning tests
archanaserver Jan 15, 2026
6fe1c92
Apply SAT-33477 workaround to UI tests
archanaserver Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pytest_fixtures/component/provision_pxe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ def module_provisioning_sat(
remote_execution_proxy=[module_provisioning_capsule.id],
domain=[domain.id],
).create()
if provisioning_type == 'discovery':
for host in sat.api.DiscoveredHost().search():
host.delete()

if sat.network_type == NetworkType.IPV4:
assert sat.execute('cat /dev/null > /var/lib/dhcpd/dhcpd.leases').status == 0
assert sat.execute('systemctl restart dhcpd').status == 0
Expand Down
4 changes: 0 additions & 4 deletions tests/foreman/api/test_discoveredhost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,10 +438,6 @@ def test_positive_reboot_all_pxe_hosts(
)

discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
discovered_host.hostgroup = provisioning_hostgroup
discovered_host.location = provisioning_hostgroup.location[0]
discovered_host.organization = provisioning_hostgroup.organization[0]
discovered_host.build = True
result = sat.api.DiscoveredHost(id=discovered_host.id).reboot_all()
assert 'Unable to perform reboot' not in result

Expand Down
52 changes: 44 additions & 8 deletions tests/foreman/ui/test_discoveredhost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,28 @@ def test_positive_custom_provision_pxe_host(
delay=20,
)
discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
discovered_host.hostgroup = provisioning_hostgroup
discovered_host.location = provisioning_hostgroup.location[0]
discovered_host.organization = provisioning_hostgroup.organization[0]
discovered_host.build = True
if is_open('SAT-33477') and (
sat.cli.DiscoveredHost.list(
{
'organization-id': module_org.id,
'location-id': module_location.id,
}
)
== []
):
with sat.ui_session() as temp_session:
temp_session.organization.select(org_name='Any organization')
temp_session.location.select(loc_name='Any location')
temp_session.discoveredhosts.apply_action(
'Assign Organization',
discovered_host.name,
values=dict(organization=module_org.name),
)
temp_session.discoveredhosts.apply_action(
'Assign Location',
discovered_host.name,
values=dict(location=module_location.name),
)

discovered_host_name = discovered_host.name
domain_name = provisioning_hostgroup.domain.read().name
Expand Down Expand Up @@ -325,10 +343,28 @@ def test_positive_auto_provision_host_with_rule(
delay=20,
)
discovered_host = sat.api.DiscoveredHost().search(query={'mac': mac})[0]
discovered_host.hostgroup = provisioning_hostgroup
discovered_host.location = provisioning_hostgroup.location[0]
discovered_host.organization = provisioning_hostgroup.organization[0]
discovered_host.build = True
if is_open('SAT-33477') and (
sat.cli.DiscoveredHost.list(
{
'organization-id': module_org.id,
'location-id': module_location.id,
}
)
== []
):
with sat.ui_session() as temp_session:
temp_session.organization.select(org_name='Any organization')
temp_session.location.select(loc_name='Any location')
temp_session.discoveredhosts.apply_action(
'Assign Organization',
discovered_host.name,
values=dict(organization=module_org.name),
)
temp_session.discoveredhosts.apply_action(
'Assign Location',
discovered_host.name,
values=dict(location=module_location.name),
)

discovered_host_name = discovered_host.name
domain_name = provisioning_hostgroup.domain.read().name
Expand Down
Loading