From bebcc7ab17b99fd59c68f8a7c3ffdca0c994e0cc Mon Sep 17 00:00:00 2001 From: Ujjwal Nasra <125353741+unasra@users.noreply.github.com> Date: Thu, 30 Jan 2025 10:37:24 +0530 Subject: [PATCH] Refactor : Renaming Bloxone Python Client to Universal DDI Python Client (#67) * updated python-client occurences , changed env variables * Resolved linter errors * added alias for csp_url * Reverted bloxone.py * updated documentation * Modified Exclude statements * updated requirements --- plugins/doc_fragments/common.py | 12 ++-- plugins/module_utils/modules.py | 57 ++++++++++--------- plugins/modules/dns_auth_nsg.py | 4 +- plugins/modules/dns_auth_nsg_info.py | 2 +- plugins/modules/dns_auth_zone.py | 4 +- plugins/modules/dns_auth_zone_info.py | 2 +- plugins/modules/dns_delegation.py | 4 +- plugins/modules/dns_delegation_info.py | 2 +- plugins/modules/dns_forward_nsg.py | 2 +- plugins/modules/dns_forward_zone.py | 4 +- plugins/modules/dns_forward_zone_info.py | 2 +- plugins/modules/dns_record.py | 2 +- plugins/modules/dns_view.py | 4 +- plugins/modules/dns_view_info.py | 2 +- plugins/modules/infra_join_token.py | 4 +- plugins/modules/infra_join_token_info.py | 2 +- plugins/modules/ipam_address.py | 4 +- plugins/modules/ipam_address_block.py | 4 +- plugins/modules/ipam_address_block_info.py | 2 +- plugins/modules/ipam_address_info.py | 2 +- plugins/modules/ipam_host.py | 4 +- plugins/modules/ipam_host_info.py | 2 +- plugins/modules/ipam_ip_space.py | 4 +- plugins/modules/ipam_ip_space_info.py | 2 +- .../ipam_next_available_address_block_info.py | 2 +- .../modules/ipam_next_available_ip_info.py | 2 +- plugins/modules/ipam_subnet.py | 4 +- plugins/modules/ipam_subnet_info.py | 2 +- requirements.txt | 2 +- test-requirements.txt | 2 +- tests/integration/requirements.txt | 2 +- .../targets/dns_a_record/tasks/main.yml | 4 +- .../targets/dns_a_record_info/tasks/main.yml | 4 +- .../targets/dns_auth_nsg/tasks/main.yml | 4 +- .../targets/dns_auth_nsg_info/tasks/main.yml | 4 +- .../targets/dns_auth_zone/tasks/main.yml | 4 +- .../targets/dns_auth_zone_info/tasks/main.yml | 4 +- .../targets/dns_delegation/tasks/main.yml | 4 +- .../dns_delegation_info/tasks/main.yml | 4 +- .../targets/dns_forward_nsg/tasks/main.yml | 4 +- .../dns_forward_nsg_info/tasks/main.yml | 4 +- .../targets/dns_forward_zone/tasks/main.yml | 4 +- .../dns_forward_zone_info/tasks/main.yml | 4 +- .../targets/dns_view/tasks/main.yml | 4 +- .../targets/dns_view_info/tasks/main.yml | 4 +- .../targets/infra_join_token/tasks/main.yml | 4 +- .../infra_join_token_info/tasks/main.yml | 4 +- .../targets/ipam_address/tasks/main.yml | 4 +- .../targets/ipam_address_block/tasks/main.yml | 4 +- .../ipam_address_block_info/tasks/main.yml | 4 +- .../targets/ipam_address_info/tasks/main.yml | 4 +- .../targets/ipam_host/tasks/main.yml | 4 +- .../targets/ipam_host_info/tasks/main.yml | 4 +- .../targets/ipam_ip_space/tasks/main.yml | 4 +- .../targets/ipam_ip_space_info/tasks/main.yml | 4 +- .../tasks/main.yml | 4 +- .../tasks/main.yml | 4 +- .../targets/ipam_subnet/tasks/main.yml | 4 +- .../targets/ipam_subnet_info/tasks/main.yml | 4 +- .../setup_address_block/tasks/main.yml | 4 +- .../targets/setup_auth_zone/tasks/cleanup.yml | 4 +- .../targets/setup_auth_zone/tasks/main.yml | 4 +- .../setup_auth_zone_rmz/tasks/cleanup.yml | 4 +- .../setup_auth_zone_rmz/tasks/main.yml | 4 +- .../targets/setup_ip_space/tasks/cleanup.yml | 4 +- .../targets/setup_ip_space/tasks/main.yml | 4 +- .../targets/setup_subnet/tasks/main.yml | 4 +- .../targets/setup_view/tasks/cleanup.yml | 4 +- .../targets/setup_view/tasks/main.yml | 4 +- 69 files changed, 152 insertions(+), 149 deletions(-) diff --git a/plugins/doc_fragments/common.py b/plugins/doc_fragments/common.py index b4d686b4..1ef82261 100644 --- a/plugins/doc_fragments/common.py +++ b/plugins/doc_fragments/common.py @@ -7,16 +7,16 @@ class ModuleDocFragment: DOCUMENTATION = r""" options: - api_key: + portal_key: description: - - The API token for authentication against Infoblox BloxOne API. If not set, the environment variable E(BLOXONE_API_KEY) will be used. + - The API token for authentication against Infoblox BloxOne API. If not set, the environment variable E(INFOBLOX_PORTAL_KEY) will be used. type: str - aliases: [ bloxone_api_key ] + aliases: [ infoblox_portal_key, api_key ] - csp_url: + portal_url: description: - - The Infoblox Cloud Services Portal (CSP) URL. If not set, the environment variable E(BLOXONE_CSP_URL) will be used. + - The Infoblox Cloud Services Portal (CSP) URL. If not set, the environment variable E(INFOBLOX_PORTAL_URL) will be used. type: str - aliases: [ bloxone_csp_url ] + aliases: [ infoblox_portal_url, csp_url ] default: 'https://csp.infoblox.com' """ diff --git a/plugins/module_utils/modules.py b/plugins/module_utils/modules.py index b3beb5c2..fa91fa0c 100644 --- a/plugins/module_utils/modules.py +++ b/plugins/module_utils/modules.py @@ -11,19 +11,19 @@ from ansible.module_utils.basic import AnsibleModule, env_fallback, missing_required_lib try: - import bloxone_client + import universal_ddi_client - HAS_BLOXONE_CLIENT = True - BLOXONE_CLIENT_IMP_ERR = None + HAS_UNIVERSAL_DDI_CLIENT = True + UNIVERSAL_DDI_CLIENT_IMP_ERR = None except ImportError: - HAS_BLOXONE_CLIENT = False - BLOXONE_CLIENT_IMP_ERR = traceback.format_exc() + HAS_UNIVERSAL_DDI_CLIENT = False + UNIVERSAL_DDI_CLIENT_IMP_ERR = traceback.format_exc() class BloxoneAnsibleModule(AnsibleModule): def __init__(self, *args, **kwargs): # Add common arguments to the module argument_spec - args_full = bloxone_client_common_argument_spec() + args_full = universal_ddi_client_common_argument_spec() try: args_full.update(kwargs["argument_spec"]) except (TypeError, NameError): @@ -33,13 +33,13 @@ def __init__(self, *args, **kwargs): super(BloxoneAnsibleModule, self).__init__(*args, **kwargs) self._client = None - if not HAS_BLOXONE_CLIENT: + if not HAS_UNIVERSAL_DDI_CLIENT: self.fail_json( msg=missing_required_lib( - "bloxone_client", - url="https://github.com/infobloxopen/bloxone-python-client", + "universal_ddi_client", + url="https://github.com/infobloxopen/universal-ddi-python-client", ), - exception=BLOXONE_CLIENT_IMP_ERR, + exception=UNIVERSAL_DDI_CLIENT_IMP_ERR, ) @property @@ -61,15 +61,18 @@ def validate_readonly_on_update(self, existing, update_body, fields): return update_body -def bloxone_client_common_argument_spec(): +def universal_ddi_client_common_argument_spec(): return dict( - api_key=dict( - type="str", aliases=["bloxone_api_key"], fallback=(env_fallback, ["BLOXONE_API_KEY"]), no_log=True + portal_key=dict( + type="str", + aliases=["infoblox_portal_key", "api_key"], + fallback=(env_fallback, ["INFOBLOX_PORTAL_KEY"]), + no_log=True, ), - csp_url=dict( + portal_url=dict( type="str", - aliases=["bloxone_csp_url"], - fallback=(env_fallback, ["BLOXONE_CSP_URL"]), + aliases=["infoblox_portal_url", "csp_url"], + fallback=(env_fallback, ["INFOBLOX_PORTAL_URL"]), default="https://csp.infoblox.com", ), ) @@ -77,23 +80,23 @@ def bloxone_client_common_argument_spec(): def _get_client(module): config = _get_client_config(module) - client = bloxone_client.ApiClient(config) + client = universal_ddi_client.ApiClient(config) return client def _get_client_config(module): - csp_url = module.params.get("csp_url") - api_key = module.params.get("api_key") + portal_url = module.params.get("portal_url") + portal_key = module.params.get("portal_key") # Use None for empty values, so that the client can handle it - if not csp_url: - csp_url = None - if not api_key: - api_key = None - - config = bloxone_client.Configuration( - csp_url=csp_url, - api_key=api_key, + if not portal_url: + portal_url = None + if not portal_key: + portal_key = None + + config = universal_ddi_client.Configuration( + csp_url=portal_url, + api_key=portal_key, client_name="ansible", ) config.debug = True diff --git a/plugins/modules/dns_auth_nsg.py b/plugins/modules/dns_auth_nsg.py index 3e8155eb..5ee03a14 100644 --- a/plugins/modules/dns_auth_nsg.py +++ b/plugins/modules/dns_auth_nsg.py @@ -415,8 +415,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import AuthNSG, AuthNsgApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -425,7 +425,7 @@ class AuthNsgModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(AuthNsgModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = AuthNSG.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/dns_auth_nsg_info.py b/plugins/modules/dns_auth_nsg_info.py index e9de2f88..d29f19ae 100644 --- a/plugins/modules/dns_auth_nsg_info.py +++ b/plugins/modules/dns_auth_nsg_info.py @@ -280,8 +280,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import AuthNsgApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/dns_auth_zone.py b/plugins/modules/dns_auth_zone.py index ed37660a..06f0fc38 100644 --- a/plugins/modules/dns_auth_zone.py +++ b/plugins/modules/dns_auth_zone.py @@ -1968,8 +1968,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import AuthZone, AuthZoneApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -1978,7 +1978,7 @@ class AuthZoneModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(AuthZoneModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = AuthZone.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/dns_auth_zone_info.py b/plugins/modules/dns_auth_zone_info.py index 0c058f20..0b5b55d6 100644 --- a/plugins/modules/dns_auth_zone_info.py +++ b/plugins/modules/dns_auth_zone_info.py @@ -1391,8 +1391,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import AuthZoneApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/dns_delegation.py b/plugins/modules/dns_delegation.py index 1d5ebb14..d8dd35e2 100644 --- a/plugins/modules/dns_delegation.py +++ b/plugins/modules/dns_delegation.py @@ -182,8 +182,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import Delegation, DelegationApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -192,7 +192,7 @@ class DelegationModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(DelegationModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = Delegation.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/dns_delegation_info.py b/plugins/modules/dns_delegation_info.py index c7f48e35..85bb9109 100644 --- a/plugins/modules/dns_delegation_info.py +++ b/plugins/modules/dns_delegation_info.py @@ -153,8 +153,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import DelegationApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/dns_forward_nsg.py b/plugins/modules/dns_forward_nsg.py index f881c3af..363df8cd 100644 --- a/plugins/modules/dns_forward_nsg.py +++ b/plugins/modules/dns_forward_nsg.py @@ -192,7 +192,7 @@ class ForwardNsgModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(ForwardNsgModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = ForwardNSG.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/dns_forward_zone.py b/plugins/modules/dns_forward_zone.py index 0bb3a3df..813ce1f8 100644 --- a/plugins/modules/dns_forward_zone.py +++ b/plugins/modules/dns_forward_zone.py @@ -259,8 +259,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import ForwardZone, ForwardZoneApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -269,7 +269,7 @@ class ForwardZoneModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(ForwardZoneModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = ForwardZone.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/dns_forward_zone_info.py b/plugins/modules/dns_forward_zone_info.py index a43f2ef8..47774d1a 100644 --- a/plugins/modules/dns_forward_zone_info.py +++ b/plugins/modules/dns_forward_zone_info.py @@ -209,8 +209,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import ForwardZoneApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/dns_record.py b/plugins/modules/dns_record.py index 22976a61..1aa439a0 100644 --- a/plugins/modules/dns_record.py +++ b/plugins/modules/dns_record.py @@ -838,7 +838,7 @@ class RecordModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(RecordModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = Record.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/dns_view.py b/plugins/modules/dns_view.py index f249fa4e..d3f09a35 100644 --- a/plugins/modules/dns_view.py +++ b/plugins/modules/dns_view.py @@ -3775,8 +3775,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import View, ViewApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -3785,7 +3785,7 @@ class ViewModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(ViewModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = View.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/dns_view_info.py b/plugins/modules/dns_view_info.py index 37299c2a..290dd94e 100644 --- a/plugins/modules/dns_view_info.py +++ b/plugins/modules/dns_view_info.py @@ -2629,8 +2629,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from dns_config import ViewApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/infra_join_token.py b/plugins/modules/infra_join_token.py index 8aa062f7..103ce960 100644 --- a/plugins/modules/infra_join_token.py +++ b/plugins/modules/infra_join_token.py @@ -74,8 +74,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from infra_provision import JoinToken, UIJoinTokenApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -84,7 +84,7 @@ class JoinTokenModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(JoinTokenModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = JoinToken.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/infra_join_token_info.py b/plugins/modules/infra_join_token_info.py index f5244355..6b2d6fa1 100644 --- a/plugins/modules/infra_join_token_info.py +++ b/plugins/modules/infra_join_token_info.py @@ -69,8 +69,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from infra_provision import UIJoinTokenApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/ipam_address.py b/plugins/modules/ipam_address.py index af939da2..4778d415 100644 --- a/plugins/modules/ipam_address.py +++ b/plugins/modules/ipam_address.py @@ -347,8 +347,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import Address, AddressApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -358,7 +358,7 @@ def __init__(self, *args, **kwargs): super(AddressModule, self).__init__(*args, **kwargs) self.next_available_id = self.params.get("next_available_id") - exclude = ["state", "csp_url", "api_key", "id", "next_available_id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id", "next_available_id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = Address.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/ipam_address_block.py b/plugins/modules/ipam_address_block.py index a369d5af..1972d07e 100644 --- a/plugins/modules/ipam_address_block.py +++ b/plugins/modules/ipam_address_block.py @@ -2340,8 +2340,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import AddressBlock, AddressBlockApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -2357,7 +2357,7 @@ def __init__(self, *args, **kwargs): self.params["address"], netmask = self.params["address"].split("/") self.params["cidr"] = int(netmask) - exclude = ["state", "csp_url", "api_key", "id", "next_available_id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id", "next_available_id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = AddressBlock.from_dict(self._payload_params) diff --git a/plugins/modules/ipam_address_block_info.py b/plugins/modules/ipam_address_block_info.py index a03e9d92..d57b6aff 100644 --- a/plugins/modules/ipam_address_block_info.py +++ b/plugins/modules/ipam_address_block_info.py @@ -1642,8 +1642,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import AddressBlockApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/ipam_address_info.py b/plugins/modules/ipam_address_info.py index e4e4df5e..ceffcd76 100644 --- a/plugins/modules/ipam_address_info.py +++ b/plugins/modules/ipam_address_info.py @@ -288,8 +288,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import AddressApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/ipam_host.py b/plugins/modules/ipam_host.py index 02db3c0d..2b48635c 100644 --- a/plugins/modules/ipam_host.py +++ b/plugins/modules/ipam_host.py @@ -238,8 +238,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import IpamHost, IpamHostApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -248,7 +248,7 @@ class IpamHostModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(IpamHostModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = IpamHost.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/ipam_host_info.py b/plugins/modules/ipam_host_info.py index 01c32aca..414d2fdf 100644 --- a/plugins/modules/ipam_host_info.py +++ b/plugins/modules/ipam_host_info.py @@ -174,8 +174,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import IpamHostApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/ipam_ip_space.py b/plugins/modules/ipam_ip_space.py index 5b52105f..5e380e5b 100644 --- a/plugins/modules/ipam_ip_space.py +++ b/plugins/modules/ipam_ip_space.py @@ -2485,8 +2485,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import IPSpace, IpSpaceApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -2495,7 +2495,7 @@ class IPSpaceModule(BloxoneAnsibleModule): def __init__(self, *args, **kwargs): super(IPSpaceModule, self).__init__(*args, **kwargs) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = IPSpace.from_dict(self._payload_params) self._existing = None diff --git a/plugins/modules/ipam_ip_space_info.py b/plugins/modules/ipam_ip_space_info.py index d3ddba3e..5b6f2b26 100644 --- a/plugins/modules/ipam_ip_space_info.py +++ b/plugins/modules/ipam_ip_space_info.py @@ -1709,8 +1709,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import IpSpaceApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/ipam_next_available_address_block_info.py b/plugins/modules/ipam_next_available_address_block_info.py index 014f25da..e035c819 100644 --- a/plugins/modules/ipam_next_available_address_block_info.py +++ b/plugins/modules/ipam_next_available_address_block_info.py @@ -71,8 +71,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException from ipam import AddressBlockApi + from universal_ddi_client import ApiException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/ipam_next_available_ip_info.py b/plugins/modules/ipam_next_available_ip_info.py index e7aa6764..698036d7 100644 --- a/plugins/modules/ipam_next_available_ip_info.py +++ b/plugins/modules/ipam_next_available_ip_info.py @@ -87,8 +87,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException from ipam import AddressBlockApi, RangeApi, SubnetApi + from universal_ddi_client import ApiException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/plugins/modules/ipam_subnet.py b/plugins/modules/ipam_subnet.py index 377f273b..4ba84c0d 100644 --- a/plugins/modules/ipam_subnet.py +++ b/plugins/modules/ipam_subnet.py @@ -2392,8 +2392,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import Subnet, SubnetApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule @@ -2406,7 +2406,7 @@ def __init__(self, *args, **kwargs): self.params["address"], netmask = self.params["address"].split("/") self.params["cidr"] = int(netmask) - exclude = ["state", "csp_url", "api_key", "id"] + exclude = ["state", "csp_url", "api_key", "portal_url", "portal_key", "id"] self._payload_params = {k: v for k, v in self.params.items() if v is not None and k not in exclude} self._payload = Subnet.from_dict(self._payload_params) diff --git a/plugins/modules/ipam_subnet_info.py b/plugins/modules/ipam_subnet_info.py index b5f062a0..80420f78 100644 --- a/plugins/modules/ipam_subnet_info.py +++ b/plugins/modules/ipam_subnet_info.py @@ -1676,8 +1676,8 @@ from ansible_collections.infoblox.bloxone.plugins.module_utils.modules import BloxoneAnsibleModule try: - from bloxone_client import ApiException, NotFoundException from ipam import SubnetApi + from universal_ddi_client import ApiException, NotFoundException except ImportError: pass # Handled by BloxoneAnsibleModule diff --git a/requirements.txt b/requirements.txt index 7c1840e5..82fa1379 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ requests >= 2.22.0 -bloxone-python-client @ git+https://github.com/infobloxopen/bloxone-python-client@fac16a90 +universal-ddi-python-client @ git+https://github.com/infobloxopen/universal-ddi-python-client diff --git a/test-requirements.txt b/test-requirements.txt index 967cfddf..139fd823 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1 @@ -bloxone-python-client @ git+https://github.com/infobloxopen/bloxone-python-client@fac16a90 +universal-ddi-python-client @ git+https://github.com/infobloxopen/universal-ddi-python-client diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt index 967cfddf..139fd823 100644 --- a/tests/integration/requirements.txt +++ b/tests/integration/requirements.txt @@ -1 +1 @@ -bloxone-python-client @ git+https://github.com/infobloxopen/bloxone-python-client@fac16a90 +universal-ddi-python-client @ git+https://github.com/infobloxopen/universal-ddi-python-client diff --git a/tests/integration/targets/dns_a_record/tasks/main.yml b/tests/integration/targets/dns_a_record/tasks/main.yml index e010ff8d..f372391e 100644 --- a/tests/integration/targets/dns_a_record/tasks/main.yml +++ b/tests/integration/targets/dns_a_record/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create an A record with a random name to avoid conflicts diff --git a/tests/integration/targets/dns_a_record_info/tasks/main.yml b/tests/integration/targets/dns_a_record_info/tasks/main.yml index 16c31e31..e450dd62 100644 --- a/tests/integration/targets/dns_a_record_info/tasks/main.yml +++ b/tests/integration/targets/dns_a_record_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random A record name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_auth_nsg/tasks/main.yml b/tests/integration/targets/dns_auth_nsg/tasks/main.yml index cb0a96f0..d675f0eb 100644 --- a/tests/integration/targets/dns_auth_nsg/tasks/main.yml +++ b/tests/integration/targets/dns_auth_nsg/tasks/main.yml @@ -6,8 +6,8 @@ - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_auth_nsg_info/tasks/main.yml b/tests/integration/targets/dns_auth_nsg_info/tasks/main.yml index f9068cad..3d27b688 100644 --- a/tests/integration/targets/dns_auth_nsg_info/tasks/main.yml +++ b/tests/integration/targets/dns_auth_nsg_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - ansible.builtin.set_fact: auth_nsg_name: "test-auth-nsg-{{ 999999 | random | string }}" diff --git a/tests/integration/targets/dns_auth_zone/tasks/main.yml b/tests/integration/targets/dns_auth_zone/tasks/main.yml index 8a0b6712..ecf1d2eb 100644 --- a/tests/integration/targets/dns_auth_zone/tasks/main.yml +++ b/tests/integration/targets/dns_auth_zone/tasks/main.yml @@ -7,8 +7,8 @@ - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Auth Zone name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_auth_zone_info/tasks/main.yml b/tests/integration/targets/dns_auth_zone_info/tasks/main.yml index 34ef6b23..c10ef82f 100644 --- a/tests/integration/targets/dns_auth_zone_info/tasks/main.yml +++ b/tests/integration/targets/dns_auth_zone_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Auth Zone name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_delegation/tasks/main.yml b/tests/integration/targets/dns_delegation/tasks/main.yml index c066c45d..b54be970 100644 --- a/tests/integration/targets/dns_delegation/tasks/main.yml +++ b/tests/integration/targets/dns_delegation/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Delegation name to avoid conflicts diff --git a/tests/integration/targets/dns_delegation_info/tasks/main.yml b/tests/integration/targets/dns_delegation_info/tasks/main.yml index 7258a66b..f6178c64 100644 --- a/tests/integration/targets/dns_delegation_info/tasks/main.yml +++ b/tests/integration/targets/dns_delegation_info/tasks/main.yml @@ -5,8 +5,8 @@ - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_forward_nsg/tasks/main.yml b/tests/integration/targets/dns_forward_nsg/tasks/main.yml index f4514a20..32f4d2cd 100644 --- a/tests/integration/targets/dns_forward_nsg/tasks/main.yml +++ b/tests/integration/targets/dns_forward_nsg/tasks/main.yml @@ -2,8 +2,8 @@ - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Forward Zone name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_forward_nsg_info/tasks/main.yml b/tests/integration/targets/dns_forward_nsg_info/tasks/main.yml index 77d2f26c..3ba2cc73 100644 --- a/tests/integration/targets/dns_forward_nsg_info/tasks/main.yml +++ b/tests/integration/targets/dns_forward_nsg_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Forward Zone name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_forward_zone/tasks/main.yml b/tests/integration/targets/dns_forward_zone/tasks/main.yml index 89345b51..874564c6 100644 --- a/tests/integration/targets/dns_forward_zone/tasks/main.yml +++ b/tests/integration/targets/dns_forward_zone/tasks/main.yml @@ -7,8 +7,8 @@ - - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Forward Zone FQDN to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_forward_zone_info/tasks/main.yml b/tests/integration/targets/dns_forward_zone_info/tasks/main.yml index 70d671ed..3191dfab 100644 --- a/tests/integration/targets/dns_forward_zone_info/tasks/main.yml +++ b/tests/integration/targets/dns_forward_zone_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Forward Zone name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_view/tasks/main.yml b/tests/integration/targets/dns_view/tasks/main.yml index 152404fd..5d2db9b9 100644 --- a/tests/integration/targets/dns_view/tasks/main.yml +++ b/tests/integration/targets/dns_view/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random View name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/dns_view_info/tasks/main.yml b/tests/integration/targets/dns_view_info/tasks/main.yml index 792b7a6e..7dd1aeef 100644 --- a/tests/integration/targets/dns_view_info/tasks/main.yml +++ b/tests/integration/targets/dns_view_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random View name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/infra_join_token/tasks/main.yml b/tests/integration/targets/infra_join_token/tasks/main.yml index 93fa0c19..7cd143a3 100644 --- a/tests/integration/targets/infra_join_token/tasks/main.yml +++ b/tests/integration/targets/infra_join_token/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random name to avoid conflicts diff --git a/tests/integration/targets/infra_join_token_info/tasks/main.yml b/tests/integration/targets/infra_join_token_info/tasks/main.yml index a516819d..78a6d5cd 100644 --- a/tests/integration/targets/infra_join_token_info/tasks/main.yml +++ b/tests/integration/targets/infra_join_token_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - ansible.builtin.set_fact: diff --git a/tests/integration/targets/ipam_address/tasks/main.yml b/tests/integration/targets/ipam_address/tasks/main.yml index 65a52e4e..2d9558e6 100644 --- a/tests/integration/targets/ipam_address/tasks/main.yml +++ b/tests/integration/targets/ipam_address/tasks/main.yml @@ -5,8 +5,8 @@ - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - ansible.builtin.set_fact: tag_value: "site-{{ 999999 | random | string }}" diff --git a/tests/integration/targets/ipam_address_block/tasks/main.yml b/tests/integration/targets/ipam_address_block/tasks/main.yml index 4fc24274..11ecf98e 100644 --- a/tests/integration/targets/ipam_address_block/tasks/main.yml +++ b/tests/integration/targets/ipam_address_block/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random IP space name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/ipam_address_block_info/tasks/main.yml b/tests/integration/targets/ipam_address_block_info/tasks/main.yml index 28a88003..cc956704 100644 --- a/tests/integration/targets/ipam_address_block_info/tasks/main.yml +++ b/tests/integration/targets/ipam_address_block_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random IP space name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/ipam_address_info/tasks/main.yml b/tests/integration/targets/ipam_address_info/tasks/main.yml index 94d23027..8acb48fb 100644 --- a/tests/integration/targets/ipam_address_info/tasks/main.yml +++ b/tests/integration/targets/ipam_address_info/tasks/main.yml @@ -2,8 +2,8 @@ - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - ansible.builtin.set_fact: tag_value: "site-{{ 999999 | random | string }}" diff --git a/tests/integration/targets/ipam_host/tasks/main.yml b/tests/integration/targets/ipam_host/tasks/main.yml index b4e1a96a..ad295c07 100644 --- a/tests/integration/targets/ipam_host/tasks/main.yml +++ b/tests/integration/targets/ipam_host/tasks/main.yml @@ -5,8 +5,8 @@ - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create an random Host name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/ipam_host_info/tasks/main.yml b/tests/integration/targets/ipam_host_info/tasks/main.yml index 6533abfe..28b80057 100644 --- a/tests/integration/targets/ipam_host_info/tasks/main.yml +++ b/tests/integration/targets/ipam_host_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - ansible.builtin.set_fact: name: "test-host-{{ 999999 | random | string }}" diff --git a/tests/integration/targets/ipam_ip_space/tasks/main.yml b/tests/integration/targets/ipam_ip_space/tasks/main.yml index af05210d..5c4bc78d 100644 --- a/tests/integration/targets/ipam_ip_space/tasks/main.yml +++ b/tests/integration/targets/ipam_ip_space/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random IP space name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/ipam_ip_space_info/tasks/main.yml b/tests/integration/targets/ipam_ip_space_info/tasks/main.yml index faee20f2..ef34c9d2 100644 --- a/tests/integration/targets/ipam_ip_space_info/tasks/main.yml +++ b/tests/integration/targets/ipam_ip_space_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - ansible.builtin.set_fact: name: "test-ip-space-{{ 999999 | random | string }}" diff --git a/tests/integration/targets/ipam_next_available_address_block_info/tasks/main.yml b/tests/integration/targets/ipam_next_available_address_block_info/tasks/main.yml index 92e4a06e..fb4da7c6 100644 --- a/tests/integration/targets/ipam_next_available_address_block_info/tasks/main.yml +++ b/tests/integration/targets/ipam_next_available_address_block_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - name: "Create an Address Block" infoblox.bloxone.ipam_address_block: diff --git a/tests/integration/targets/ipam_next_available_ip_info/tasks/main.yml b/tests/integration/targets/ipam_next_available_ip_info/tasks/main.yml index 98926c6b..15479bdd 100644 --- a/tests/integration/targets/ipam_next_available_ip_info/tasks/main.yml +++ b/tests/integration/targets/ipam_next_available_ip_info/tasks/main.yml @@ -5,8 +5,8 @@ - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - name: Get Information about Next Available IP in Address Block infoblox.bloxone.ipam_next_available_ip_info: diff --git a/tests/integration/targets/ipam_subnet/tasks/main.yml b/tests/integration/targets/ipam_subnet/tasks/main.yml index 254ca4aa..1d61213b 100644 --- a/tests/integration/targets/ipam_subnet/tasks/main.yml +++ b/tests/integration/targets/ipam_subnet/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random IP space name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/ipam_subnet_info/tasks/main.yml b/tests/integration/targets/ipam_subnet_info/tasks/main.yml index eff8a622..4cb1e1f1 100644 --- a/tests/integration/targets/ipam_subnet_info/tasks/main.yml +++ b/tests/integration/targets/ipam_subnet_info/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random IP space name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/setup_address_block/tasks/main.yml b/tests/integration/targets/setup_address_block/tasks/main.yml index da553c3f..2648839d 100644 --- a/tests/integration/targets/setup_address_block/tasks/main.yml +++ b/tests/integration/targets/setup_address_block/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Address Block to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/setup_auth_zone/tasks/cleanup.yml b/tests/integration/targets/setup_auth_zone/tasks/cleanup.yml index f8d3c578..c9f91c45 100644 --- a/tests/integration/targets/setup_auth_zone/tasks/cleanup.yml +++ b/tests/integration/targets/setup_auth_zone/tasks/cleanup.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - name: "Delete an Auth Zone" infoblox.bloxone.dns_auth_zone: diff --git a/tests/integration/targets/setup_auth_zone/tasks/main.yml b/tests/integration/targets/setup_auth_zone/tasks/main.yml index 4a97c709..7b4ac7bb 100644 --- a/tests/integration/targets/setup_auth_zone/tasks/main.yml +++ b/tests/integration/targets/setup_auth_zone/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random View name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/setup_auth_zone_rmz/tasks/cleanup.yml b/tests/integration/targets/setup_auth_zone_rmz/tasks/cleanup.yml index fb15cecb..e698303d 100644 --- a/tests/integration/targets/setup_auth_zone_rmz/tasks/cleanup.yml +++ b/tests/integration/targets/setup_auth_zone_rmz/tasks/cleanup.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - name: "Delete the Reverse Mapping Zone" diff --git a/tests/integration/targets/setup_auth_zone_rmz/tasks/main.yml b/tests/integration/targets/setup_auth_zone_rmz/tasks/main.yml index ca5c5baa..95a2b5af 100644 --- a/tests/integration/targets/setup_auth_zone_rmz/tasks/main.yml +++ b/tests/integration/targets/setup_auth_zone_rmz/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - name: Create Reverse Mapping Zone diff --git a/tests/integration/targets/setup_ip_space/tasks/cleanup.yml b/tests/integration/targets/setup_ip_space/tasks/cleanup.yml index e9706626..9062cb30 100644 --- a/tests/integration/targets/setup_ip_space/tasks/cleanup.yml +++ b/tests/integration/targets/setup_ip_space/tasks/cleanup.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - name: "Delete IP space" infoblox.bloxone.ipam_ip_space: diff --git a/tests/integration/targets/setup_ip_space/tasks/main.yml b/tests/integration/targets/setup_ip_space/tasks/main.yml index ebc8497d..ea43c231 100644 --- a/tests/integration/targets/setup_ip_space/tasks/main.yml +++ b/tests/integration/targets/setup_ip_space/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random IP space name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/setup_subnet/tasks/main.yml b/tests/integration/targets/setup_subnet/tasks/main.yml index 02c2c375..bb9a44c0 100644 --- a/tests/integration/targets/setup_subnet/tasks/main.yml +++ b/tests/integration/targets/setup_subnet/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random Subnet name to avoid conflicts - ansible.builtin.set_fact: diff --git a/tests/integration/targets/setup_view/tasks/cleanup.yml b/tests/integration/targets/setup_view/tasks/cleanup.yml index 383dd675..d5317527 100644 --- a/tests/integration/targets/setup_view/tasks/cleanup.yml +++ b/tests/integration/targets/setup_view/tasks/cleanup.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: - name: "Delete DNS View" infoblox.bloxone.dns_view: diff --git a/tests/integration/targets/setup_view/tasks/main.yml b/tests/integration/targets/setup_view/tasks/main.yml index affcedd8..ef0898cf 100644 --- a/tests/integration/targets/setup_view/tasks/main.yml +++ b/tests/integration/targets/setup_view/tasks/main.yml @@ -1,8 +1,8 @@ --- - module_defaults: group/infoblox.bloxone.all: - csp_url: "{{ csp_url }}" - api_key: "{{ api_key }}" + portal_url: "{{ portal_url }}" + portal_key: "{{ portal_key }}" block: # Create a random View name to avoid conflicts - ansible.builtin.set_fact: