|
26 | 26 | infoblox_dns_package = 'rubygem-smart_proxy_dns_infoblox'
|
27 | 27 |
|
28 | 28 | params = [
|
29 |
| - ( |
30 |
| - 'enable-foreman-proxy-plugin-dhcp-remote-isc', |
31 |
| - {'foreman-proxy-dhcp': 'true'}, |
32 |
| - f'rpm -q {dhcp_isc_package}', |
33 |
| - ), |
34 | 29 | (
|
35 | 30 | 'enable-foreman-proxy-plugin-dhcp-infoblox',
|
36 | 31 | {
|
|
89 | 84 | @pytest.mark.parametrize(
|
90 | 85 | ('command_args', 'command_opts', 'rpm_command'),
|
91 | 86 | params,
|
92 |
| - ids=['isc_dhcp', 'infoblox_dhcp', 'infoblox_dns'], |
| 87 | + ids=['infoblox_dhcp', 'infoblox_dns'], |
93 | 88 | )
|
94 | 89 | def test_plugin_installation(target_sat, command_args, command_opts, rpm_command):
|
95 | 90 | """Check that external DNS and DHCP plugins install correctly
|
@@ -183,12 +178,16 @@ def test_infoblox_end_to_end(
|
183 | 178 |
|
184 | 179 | macaddress = gen_mac(multicast=False)
|
185 | 180 | # using the domain name as defined in Infoblox DNS
|
186 |
| - domain = module_target_sat.api.Domain( |
187 |
| - name=settings.infoblox.domain, |
188 |
| - location=[module_location], |
189 |
| - dns=module_provisioning_capsule.id, |
190 |
| - organization=[module_sca_manifest_org], |
191 |
| - ).create() |
| 181 | + domain = ( |
| 182 | + settings.infoblox.domain |
| 183 | + if settings.server.is_ipv6 |
| 184 | + else module_target_sat.api.Domain( |
| 185 | + name=settings.infoblox.domain, |
| 186 | + location=[module_location], |
| 187 | + dns=module_provisioning_capsule.id, |
| 188 | + organization=[module_sca_manifest_org], |
| 189 | + ).create() |
| 190 | + ) |
192 | 191 | subnet = module_target_sat.api.Subnet(
|
193 | 192 | location=[module_location],
|
194 | 193 | organization=[module_sca_manifest_org],
|
|
0 commit comments