Skip to content
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

Fix IPv6 Infoblox tests #17340

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix IPv6 Infoblox tests #17340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 11 additions & 12 deletions tests/foreman/destructive/test_infoblox.py
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dhcp_isc_package on line 23 is now also unused

Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@
infoblox_dns_package = 'rubygem-smart_proxy_dns_infoblox'

params = [
(
'enable-foreman-proxy-plugin-dhcp-remote-isc',
{'foreman-proxy-dhcp': 'true'},
f'rpm -q {dhcp_isc_package}',
),
(
'enable-foreman-proxy-plugin-dhcp-infoblox',
{
Expand Down Expand Up @@ -89,7 +84,7 @@
@pytest.mark.parametrize(
('command_args', 'command_opts', 'rpm_command'),
params,
ids=['isc_dhcp', 'infoblox_dhcp', 'infoblox_dns'],
ids=['infoblox_dhcp', 'infoblox_dns'],
)
def test_plugin_installation(target_sat, command_args, command_opts, rpm_command):
"""Check that external DNS and DHCP plugins install correctly
Expand Down Expand Up @@ -183,12 +178,16 @@ def test_infoblox_end_to_end(

macaddress = gen_mac(multicast=False)
# using the domain name as defined in Infoblox DNS
domain = module_target_sat.api.Domain(
name=settings.infoblox.domain,
location=[module_location],
dns=module_provisioning_capsule.id,
organization=[module_sca_manifest_org],
).create()
domain = (
settings.infoblox.domain
if settings.server.is_ipv6
else module_target_sat.api.Domain(
name=settings.infoblox.domain,
location=[module_location],
dns=module_provisioning_capsule.id,
organization=[module_sca_manifest_org],
).create()
)
subnet = module_target_sat.api.Subnet(
location=[module_location],
organization=[module_sca_manifest_org],
Expand Down
Loading