From 25394eeafb001768a9e947033d17d7862f116684 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 24 Mar 2020 23:14:53 +0100 Subject: [PATCH] Fix imports and installing dependencies in CI, part 1 (#41) * Fix ovirt collection name (ovirt.ovirt_collection, not ovirt.ovirt). * Fix kubernetes module_utils references. * Fix broken f5 imports on community.general side. The imports in that collection are still broken and will still cause failures. * Fix Cisco ACI and MSO modules imports. * Fix check_point.mgmt dependency, fix imports. * Fix fortimanager imports. * Fix cisco intersight imports. * Fix ovirt module docs fragments. * Fix usage of _ in unit tests to avoid sanity failures. * Fix Cisco module docs fragments. * Fix netapp.ontap module docs fragment name. * Fix documentation. * Fix some boilerplate (the ones not mentioned in ignore.txt). --- galaxy.yml | 2 +- plugins/module_utils/kubevirt.py | 4 ++-- plugins/module_utils/network/f5/iworkflow.py | 4 ++-- plugins/module_utils/network/f5/urls.py | 2 +- .../cloud/kubevirt/kubevirt_cdi_upload.py | 4 ++-- .../modules/cloud/kubevirt/kubevirt_preset.py | 2 +- .../modules/cloud/kubevirt/kubevirt_pvc.py | 4 ++-- plugins/modules/cloud/kubevirt/kubevirt_rs.py | 2 +- .../cloud/kubevirt/kubevirt_template.py | 2 +- plugins/modules/cloud/kubevirt/kubevirt_vm.py | 2 +- .../cloud/ovirt/ovirt_affinity_label_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_api_facts.py | 4 ++-- .../cloud/ovirt/ovirt_cluster_facts.py | 4 ++-- .../cloud/ovirt/ovirt_datacenter_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_disk_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_event_facts.py | 4 ++-- .../ovirt/ovirt_external_provider_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_group_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_host_facts.py | 4 ++-- .../cloud/ovirt/ovirt_host_storage_facts.py | 4 ++-- .../cloud/ovirt/ovirt_network_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_nic_facts.py | 4 ++-- .../cloud/ovirt/ovirt_permission_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_quota_facts.py | 4 ++-- .../ovirt/ovirt_scheduling_policy_facts.py | 4 ++-- .../cloud/ovirt/ovirt_snapshot_facts.py | 4 ++-- .../cloud/ovirt/ovirt_storage_domain_facts.py | 4 ++-- .../ovirt/ovirt_storage_template_facts.py | 4 ++-- .../cloud/ovirt/ovirt_storage_vm_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_tag_facts.py | 4 ++-- .../cloud/ovirt/ovirt_template_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_user_facts.py | 4 ++-- plugins/modules/cloud/ovirt/ovirt_vm_facts.py | 4 ++-- .../modules/cloud/ovirt/ovirt_vmpool_facts.py | 4 ++-- .../network/aci/aci_interface_policy_fc.py | 4 ++-- .../network/aci/aci_interface_policy_l2.py | 4 ++-- .../network/aci/aci_interface_policy_lldp.py | 4 ++-- .../network/aci/aci_interface_policy_mcp.py | 4 ++-- .../aci/aci_interface_policy_port_channel.py | 4 ++-- .../aci/aci_interface_policy_port_security.py | 4 ++-- ...o_schema_template_external_epg_contract.py | 4 ++-- ...mso_schema_template_external_epg_subnet.py | 4 ++-- .../check_point/checkpoint_access_rule.py | 2 +- .../network/check_point/checkpoint_host.py | 2 +- .../modules/network/check_point/cp_publish.py | 2 +- .../network/eric_eccli/eric_eccli_command.py | 6 +++--- .../modules/network/f5/bigip_asm_policy.py | 16 +++++++-------- .../modules/network/f5/bigip_device_info.py | 20 +++++++++---------- .../network/f5/bigip_device_traffic_group.py | 14 ++++++------- plugins/modules/network/f5/bigip_facts.py | 4 ++-- .../network/f5/bigip_firewall_address_list.py | 16 +++++++-------- .../network/f5/bigip_firewall_port_list.py | 14 ++++++------- plugins/modules/network/f5/bigip_gtm_facts.py | 8 ++++---- .../modules/network/f5/bigip_lx_package.py | 12 +++++------ .../modules/network/f5/bigiq_device_info.py | 16 +++++++-------- .../network/fortimanager/fmgr_device.py | 12 +++++------ .../fortimanager/fmgr_device_config.py | 12 +++++------ .../network/fortimanager/fmgr_device_group.py | 12 +++++------ .../fmgr_device_provision_template.py | 12 +++++------ .../fortimanager/fmgr_fwobj_address.py | 10 +++++----- .../network/fortimanager/fmgr_fwobj_ippool.py | 14 ++++++------- .../fortimanager/fmgr_fwobj_ippool6.py | 14 ++++++------- .../fortimanager/fmgr_fwobj_service.py | 12 +++++------ .../network/fortimanager/fmgr_fwobj_vip.py | 16 +++++++-------- .../network/fortimanager/fmgr_fwpol_ipv4.py | 16 +++++++-------- .../fortimanager/fmgr_fwpol_package.py | 12 +++++------ .../modules/network/fortimanager/fmgr_ha.py | 12 +++++------ .../network/fortimanager/fmgr_provisioning.py | 2 +- .../network/fortimanager/fmgr_query.py | 12 +++++------ .../network/fortimanager/fmgr_script.py | 12 +++++------ .../fortimanager/fmgr_secprof_appctrl.py | 14 ++++++------- .../network/fortimanager/fmgr_secprof_av.py | 14 ++++++------- .../network/fortimanager/fmgr_secprof_dns.py | 16 +++++++-------- .../network/fortimanager/fmgr_secprof_ips.py | 14 ++++++------- .../fmgr_secprof_profile_group.py | 16 +++++++-------- .../fortimanager/fmgr_secprof_proxy.py | 14 ++++++------- .../network/fortimanager/fmgr_secprof_spam.py | 14 ++++++------- .../fortimanager/fmgr_secprof_ssl_ssh.py | 16 +++++++-------- .../network/fortimanager/fmgr_secprof_voip.py | 14 ++++++------- .../network/fortimanager/fmgr_secprof_waf.py | 16 +++++++-------- .../fortimanager/fmgr_secprof_wanopt.py | 14 ++++++------- .../network/fortimanager/fmgr_secprof_web.py | 16 +++++++-------- plugins/modules/network/icx/icx_command.py | 6 +++--- plugins/modules/network/voss/voss_command.py | 6 +++--- .../intersight/intersight_info.py | 2 +- .../storage/netapp/na_cdot_aggregate.py | 2 +- .../modules/storage/netapp/na_cdot_license.py | 2 +- plugins/modules/storage/netapp/na_cdot_lun.py | 2 +- .../modules/storage/netapp/na_cdot_qtree.py | 2 +- plugins/modules/storage/netapp/na_cdot_svm.py | 2 +- .../modules/storage/netapp/na_cdot_user.py | 2 +- .../storage/netapp/na_cdot_user_role.py | 2 +- .../modules/storage/netapp/na_cdot_volume.py | 2 +- .../interfaces_file/test_interfaces_file.py | 12 ++++++----- tests/utils/shippable/shippable.sh | 4 ++++ 95 files changed, 349 insertions(+), 343 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index 263736709b..0bd1a61470 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -11,7 +11,7 @@ tags: null #dependencies: # netapp.ontap: '>=0.1.0' # community.kubernetes: '>=0.1.0' -# ovirt.ovirt: '>=0.1.0' +# ovirt.ovirt_collection: '>=0.1.0' # ansible.netcommon: '>=0.1.0' # cisco.mso: '>=0.1.0' # ansible.posix: '>=0.1.0' diff --git a/plugins/module_utils/kubevirt.py b/plugins/module_utils/kubevirt.py index b47162b295..8c2e8285db 100644 --- a/plugins/module_utils/kubevirt.py +++ b/plugins/module_utils/kubevirt.py @@ -9,8 +9,8 @@ from distutils.version import Version from ansible.module_utils.common import dict_transformations from ansible.module_utils.common._collections_compat import Sequence -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.common import list_dict_str -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.raw import KubernetesRawModule +from ansible_collections.community.kubernetes.plugins.module_utils.common import list_dict_str +from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule import copy import re diff --git a/plugins/module_utils/network/f5/iworkflow.py b/plugins/module_utils/network/f5/iworkflow.py index d6dda32f6a..92496a4f63 100644 --- a/plugins/module_utils/network/f5/iworkflow.py +++ b/plugins/module_utils/network/f5/iworkflow.py @@ -20,8 +20,8 @@ try: from library.module_utils.network.f5.common import F5BaseClient from library.module_utils.network.f5.common import F5ModuleError except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5BaseClient - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5BaseClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError class F5Client(F5BaseClient): diff --git a/plugins/module_utils/network/f5/urls.py b/plugins/module_utils/network/f5/urls.py index cc4ab57786..ed6dc3b5aa 100644 --- a/plugins/module_utils/network/f5/urls.py +++ b/plugins/module_utils/network/f5/urls.py @@ -12,7 +12,7 @@ import re try: from library.module_utils.network.f5.common import F5ModuleError except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError _CLEAN_HEADER_REGEX_BYTE = re.compile(b'^\\S[^\\r\\n]*$|^$') _CLEAN_HEADER_REGEX_STR = re.compile(r'^\S[^\r\n]*$|^$') diff --git a/plugins/modules/cloud/kubevirt/kubevirt_cdi_upload.py b/plugins/modules/cloud/kubevirt/kubevirt_cdi_upload.py index e0032431f1..4f17102a4d 100644 --- a/plugins/modules/cloud/kubevirt/kubevirt_cdi_upload.py +++ b/plugins/modules/cloud/kubevirt/kubevirt_cdi_upload.py @@ -83,8 +83,8 @@ import traceback from collections import defaultdict -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.common import AUTH_ARG_SPEC -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.raw import KubernetesRawModule +from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC +from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule # 3rd party imports try: diff --git a/plugins/modules/cloud/kubevirt/kubevirt_preset.py b/plugins/modules/cloud/kubevirt/kubevirt_preset.py index c5032722f4..bee5bb0f85 100644 --- a/plugins/modules/cloud/kubevirt/kubevirt_preset.py +++ b/plugins/modules/cloud/kubevirt/kubevirt_preset.py @@ -92,7 +92,7 @@ import copy import traceback -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.common import AUTH_ARG_SPEC +from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC from ansible_collections.community.general.plugins.module_utils.kubevirt import ( virtdict, diff --git a/plugins/modules/cloud/kubevirt/kubevirt_pvc.py b/plugins/modules/cloud/kubevirt/kubevirt_pvc.py index 68bb2621d6..870b2377c3 100644 --- a/plugins/modules/cloud/kubevirt/kubevirt_pvc.py +++ b/plugins/modules/cloud/kubevirt/kubevirt_pvc.py @@ -254,8 +254,8 @@ import traceback from collections import defaultdict -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.common import AUTH_ARG_SPEC -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.raw import KubernetesRawModule +from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC +from ansible_collections.community.kubernetes.plugins.module_utils.raw import KubernetesRawModule from ansible_collections.community.general.plugins.module_utils.kubevirt import virtdict, KubeVirtRawModule diff --git a/plugins/modules/cloud/kubevirt/kubevirt_rs.py b/plugins/modules/cloud/kubevirt/kubevirt_rs.py index 8bc413fbb2..08ee1bca44 100644 --- a/plugins/modules/cloud/kubevirt/kubevirt_rs.py +++ b/plugins/modules/cloud/kubevirt/kubevirt_rs.py @@ -111,7 +111,7 @@ import copy import traceback -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.common import AUTH_ARG_SPEC +from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC from ansible_collections.community.general.plugins.module_utils.kubevirt import ( virtdict, diff --git a/plugins/modules/cloud/kubevirt/kubevirt_template.py b/plugins/modules/cloud/kubevirt/kubevirt_template.py index bc07fb2e3f..2e99cf1de5 100644 --- a/plugins/modules/cloud/kubevirt/kubevirt_template.py +++ b/plugins/modules/cloud/kubevirt/kubevirt_template.py @@ -205,7 +205,7 @@ kubevirt_template: import copy import traceback -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.common import AUTH_ARG_SPEC +from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC from ansible_collections.community.general.plugins.module_utils.kubevirt import ( virtdict, diff --git a/plugins/modules/cloud/kubevirt/kubevirt_vm.py b/plugins/modules/cloud/kubevirt/kubevirt_vm.py index ddcab20e98..d614c5dd88 100644 --- a/plugins/modules/cloud/kubevirt/kubevirt_vm.py +++ b/plugins/modules/cloud/kubevirt/kubevirt_vm.py @@ -249,7 +249,7 @@ kubevirt_vm: import copy import traceback -from ansible_collections.community.kubernetes.plugins.module_utils.k8s.common import AUTH_ARG_SPEC +from ansible_collections.community.kubernetes.plugins.module_utils.common import AUTH_ARG_SPEC from ansible_collections.community.general.plugins.module_utils.kubevirt import ( virtdict, KubeVirtRawModule, diff --git a/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py b/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py index dac9ac0dce..1afd6d722b 100644 --- a/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py @@ -55,7 +55,7 @@ options: description: - "Name of the host, which affinity labels should be listed." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -109,7 +109,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_api_facts.py b/plugins/modules/cloud/ovirt/ovirt_api_facts.py index 494c2ac5a9..4d005f8fe8 100644 --- a/plugins/modules/cloud/ovirt/ovirt_api_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_api_facts.py @@ -32,7 +32,7 @@ notes: which contains a information about oVirt/RHV API. You need to register the result with the I(register) keyword to use it." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -61,7 +61,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py b/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py index 0fa0ca37a2..db1018e098 100644 --- a/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py @@ -51,7 +51,7 @@ options: - "For example to search cluster X from datacenter Y use following pattern: name=X and datacenter=Y" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -80,7 +80,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py b/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py index 677aa21950..ce43b5f0e8 100644 --- a/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py @@ -35,7 +35,7 @@ options: - "Search term which is accepted by oVirt/RHV search backend." - "For example to search datacenter I(X) use following pattern: I(name=X)" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -63,7 +63,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_disk_facts.py b/plugins/modules/cloud/ovirt/ovirt_disk_facts.py index c8d119254d..541260690e 100644 --- a/plugins/modules/cloud/ovirt/ovirt_disk_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_disk_facts.py @@ -51,7 +51,7 @@ options: - "For example to search Disk X from storage Y use following pattern: name=X and storage.name=Y" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -79,7 +79,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_event_facts.py b/plugins/modules/cloud/ovirt/ovirt_event_facts.py index f328d3bf71..feebf779a1 100644 --- a/plugins/modules/cloud/ovirt/ovirt_event_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_event_facts.py @@ -74,7 +74,7 @@ options: default: true type: bool extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -112,7 +112,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py b/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py index bcbc1c8a96..7c7a665d40 100644 --- a/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py @@ -54,7 +54,7 @@ options: description: - "Name of the external provider, can be used as glob expression." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -92,7 +92,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_group_facts.py b/plugins/modules/cloud/ovirt/ovirt_group_facts.py index b4160b93ad..4eb8d7272e 100644 --- a/plugins/modules/cloud/ovirt/ovirt_group_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_group_facts.py @@ -50,7 +50,7 @@ options: - "Search term which is accepted by oVirt/RHV search backend." - "For example to search group X use following pattern: name=X" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -78,7 +78,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_host_facts.py b/plugins/modules/cloud/ovirt/ovirt_host_facts.py index 606f26a07b..06755d80e4 100644 --- a/plugins/modules/cloud/ovirt/ovirt_host_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_host_facts.py @@ -47,7 +47,7 @@ options: type: str extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -83,7 +83,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py b/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py index 5fdc0d19e7..022af94e16 100644 --- a/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py @@ -62,7 +62,7 @@ options: description: - "LUN id." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -98,7 +98,7 @@ except ImportError: from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_network_facts.py b/plugins/modules/cloud/ovirt/ovirt_network_facts.py index f0a9134ebe..e2731de2e8 100644 --- a/plugins/modules/cloud/ovirt/ovirt_network_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_network_facts.py @@ -50,7 +50,7 @@ options: - "Search term which is accepted by oVirt/RHV search backend." - "For example to search network starting with string vlan1 use: name=vlan1*" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -80,7 +80,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_nic_facts.py b/plugins/modules/cloud/ovirt/ovirt_nic_facts.py index d445ddbe70..872ad64b93 100644 --- a/plugins/modules/cloud/ovirt/ovirt_nic_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_nic_facts.py @@ -53,7 +53,7 @@ options: description: - "Name of the NIC, can be used as glob expression." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -83,7 +83,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_permission_facts.py b/plugins/modules/cloud/ovirt/ovirt_permission_facts.py index 4e29d61449..507cb5c988 100644 --- a/plugins/modules/cloud/ovirt/ovirt_permission_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_permission_facts.py @@ -61,7 +61,7 @@ options: - "Namespace of the authorization provider, where user/group resides." required: false extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -95,7 +95,7 @@ except ImportError: from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_link_name, diff --git a/plugins/modules/cloud/ovirt/ovirt_quota_facts.py b/plugins/modules/cloud/ovirt/ovirt_quota_facts.py index 9d2a349dff..c6ed3fa127 100644 --- a/plugins/modules/cloud/ovirt/ovirt_quota_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_quota_facts.py @@ -53,7 +53,7 @@ options: description: - "Name of the quota, can be used as glob expression." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -83,7 +83,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py b/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py index 988b38aecd..ddecba5508 100644 --- a/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py @@ -53,7 +53,7 @@ options: description: - "Name of the scheduling policy, can be used as glob expression." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -84,7 +84,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py b/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py index 8bf4e69cc9..1a27d05358 100644 --- a/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py @@ -41,7 +41,7 @@ options: description: - "Id of the snapshot we want to retrieve information about." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -72,7 +72,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py index dd42ffe4fd..f90225acf5 100644 --- a/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py @@ -51,7 +51,7 @@ options: - "For example to search storage domain X from datacenter Y use following pattern: name=X and datacenter=Y" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -80,7 +80,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py index 9bcc856cc2..a7d7d07195 100644 --- a/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py @@ -58,7 +58,7 @@ options: description: - "The storage domain name where the templates should be listed." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -87,7 +87,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py index 399a6727f2..617b382300 100644 --- a/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py @@ -58,7 +58,7 @@ options: description: - "The storage domain name where the virtual machines should be listed." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -87,7 +87,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_tag_facts.py b/plugins/modules/cloud/ovirt/ovirt_tag_facts.py index 05f97f69a9..7cf8f40a65 100644 --- a/plugins/modules/cloud/ovirt/ovirt_tag_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_tag_facts.py @@ -55,7 +55,7 @@ options: description: - "Name of the host, which tags should be listed." extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -98,7 +98,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_template_facts.py b/plugins/modules/cloud/ovirt/ovirt_template_facts.py index 31a9d2d1d8..6975b798dc 100644 --- a/plugins/modules/cloud/ovirt/ovirt_template_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_template_facts.py @@ -51,7 +51,7 @@ options: - "For example to search template X from datacenter Y use following pattern: name=X and datacenter=Y" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -80,7 +80,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_user_facts.py b/plugins/modules/cloud/ovirt/ovirt_user_facts.py index 03f4ce6634..5e3259fbb9 100644 --- a/plugins/modules/cloud/ovirt/ovirt_user_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_user_facts.py @@ -50,7 +50,7 @@ options: - "Search term which is accepted by oVirt/RHV search backend." - "For example to search user X use following pattern: name=X" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -78,7 +78,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_vm_facts.py b/plugins/modules/cloud/ovirt/ovirt_vm_facts.py index 9dd7c26fb0..471924f7a5 100644 --- a/plugins/modules/cloud/ovirt/ovirt_vm_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_vm_facts.py @@ -70,7 +70,7 @@ options: effect when the virtual machine is restarted. By default the value is set by engine." type: bool extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -107,7 +107,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py b/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py index e59b4073fd..466c86b803 100644 --- a/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py @@ -50,7 +50,7 @@ options: - "Search term which is accepted by oVirt/RHV search backend." - "For example to search vmpool X: name=X" extends_documentation_fragment: -- ovirt.ovirt.ovirt_info +- ovirt.ovirt_collection.ovirt_info ''' @@ -78,7 +78,7 @@ import traceback from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ovirt.ovirt.plugins.module_utils.ovirt import ( +from ansible_collections.ovirt.ovirt_collection.plugins.module_utils.ovirt import ( check_sdk, create_connection, get_dict_of_struct, diff --git a/plugins/modules/network/aci/aci_interface_policy_fc.py b/plugins/modules/network/aci/aci_interface_policy_fc.py index bf9128dabf..7297b72479 100644 --- a/plugins/modules/network/aci/aci_interface_policy_fc.py +++ b/plugins/modules/network/aci/aci_interface_policy_fc.py @@ -46,7 +46,7 @@ options: - The alias for the current object. This relates to the nameAlias field in ACI. type: str extends_documentation_fragment: -- cisco.aci.aci +- cisco.aci.modules seealso: - name: APIC Management Information Model reference @@ -174,7 +174,7 @@ url: ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.cisco.aci.plugins.module_utils.network.aci.aci import ACIModule, aci_argument_spec +from ansible_collections.cisco.aci.plugins.module_utils.aci import ACIModule, aci_argument_spec def main(): diff --git a/plugins/modules/network/aci/aci_interface_policy_l2.py b/plugins/modules/network/aci/aci_interface_policy_l2.py index f5d57e682a..d2ac475f27 100644 --- a/plugins/modules/network/aci/aci_interface_policy_l2.py +++ b/plugins/modules/network/aci/aci_interface_policy_l2.py @@ -57,7 +57,7 @@ options: - The alias for the current object. This relates to the nameAlias field in ACI. type: str extends_documentation_fragment: -- cisco.aci.aci +- cisco.aci.modules seealso: - name: APIC Management Information Model reference @@ -184,7 +184,7 @@ url: ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.cisco.aci.plugins.module_utils.network.aci.aci import ACIModule, aci_argument_spec +from ansible_collections.cisco.aci.plugins.module_utils.aci import ACIModule, aci_argument_spec # Mapping dicts are used to normalize the proposed data to what the APIC expects, which will keep diffs accurate QINQ_MAPPING = dict( diff --git a/plugins/modules/network/aci/aci_interface_policy_lldp.py b/plugins/modules/network/aci/aci_interface_policy_lldp.py index bc5aff2637..baec7e29e3 100644 --- a/plugins/modules/network/aci/aci_interface_policy_lldp.py +++ b/plugins/modules/network/aci/aci_interface_policy_lldp.py @@ -50,7 +50,7 @@ options: - The alias for the current object. This relates to the nameAlias field in ACI. type: str extends_documentation_fragment: -- cisco.aci.aci +- cisco.aci.modules seealso: - name: APIC Management Information Model reference @@ -179,7 +179,7 @@ url: ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.cisco.aci.plugins.module_utils.network.aci.aci import ACIModule, aci_argument_spec +from ansible_collections.cisco.aci.plugins.module_utils.aci import ACIModule, aci_argument_spec def main(): diff --git a/plugins/modules/network/aci/aci_interface_policy_mcp.py b/plugins/modules/network/aci/aci_interface_policy_mcp.py index 221d4a437b..054b7d811e 100644 --- a/plugins/modules/network/aci/aci_interface_policy_mcp.py +++ b/plugins/modules/network/aci/aci_interface_policy_mcp.py @@ -45,7 +45,7 @@ options: - The alias for the current object. This relates to the nameAlias field in ACI. type: str extends_documentation_fragment: -- cisco.aci.aci +- cisco.aci.modules seealso: - name: APIC Management Information Model reference @@ -173,7 +173,7 @@ url: ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.cisco.aci.plugins.module_utils.network.aci.aci import ACIModule, aci_argument_spec +from ansible_collections.cisco.aci.plugins.module_utils.aci import ACIModule, aci_argument_spec def main(): diff --git a/plugins/modules/network/aci/aci_interface_policy_port_channel.py b/plugins/modules/network/aci/aci_interface_policy_port_channel.py index e74269aebf..6700dd3fdf 100644 --- a/plugins/modules/network/aci/aci_interface_policy_port_channel.py +++ b/plugins/modules/network/aci/aci_interface_policy_port_channel.py @@ -94,7 +94,7 @@ options: - The alias for the current object. This relates to the nameAlias field in ACI. type: str extends_documentation_fragment: -- cisco.aci.aci +- cisco.aci.modules seealso: - name: APIC Management Information Model reference @@ -223,7 +223,7 @@ url: ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.cisco.aci.plugins.module_utils.network.aci.aci import ACIModule, aci_argument_spec +from ansible_collections.cisco.aci.plugins.module_utils.aci import ACIModule, aci_argument_spec def main(): diff --git a/plugins/modules/network/aci/aci_interface_policy_port_security.py b/plugins/modules/network/aci/aci_interface_policy_port_security.py index 5caf927644..8434e7d1d6 100644 --- a/plugins/modules/network/aci/aci_interface_policy_port_security.py +++ b/plugins/modules/network/aci/aci_interface_policy_port_security.py @@ -52,7 +52,7 @@ options: - The alias for the current object. This relates to the nameAlias field in ACI. type: str extends_documentation_fragment: -- cisco.aci.aci +- cisco.aci.modules seealso: - name: APIC Management Information Model reference @@ -181,7 +181,7 @@ url: ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.cisco.aci.plugins.module_utils.network.aci.aci import ACIModule, aci_argument_spec +from ansible_collections.cisco.aci.plugins.module_utils.aci import ACIModule, aci_argument_spec def main(): diff --git a/plugins/modules/network/aci/mso_schema_template_external_epg_contract.py b/plugins/modules/network/aci/mso_schema_template_external_epg_contract.py index 6a5b003605..679202b150 100644 --- a/plugins/modules/network/aci/mso_schema_template_external_epg_contract.py +++ b/plugins/modules/network/aci/mso_schema_template_external_epg_contract.py @@ -70,7 +70,7 @@ seealso: - module: cisco.mso.mso_schema_template_externalepg - module: cisco.mso.mso_schema_template_contract_filter extends_documentation_fragment: -- cisco.mso.mso +- cisco.mso.modules ''' @@ -132,7 +132,7 @@ RETURN = r''' ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.cisco.mso.plugins.module_utils.network.aci.mso import MSOModule, mso_argument_spec, mso_contractref_spec, issubset +from ansible_collections.cisco.mso.plugins.module_utils.mso import MSOModule, mso_argument_spec, mso_contractref_spec, issubset def main(): diff --git a/plugins/modules/network/aci/mso_schema_template_external_epg_subnet.py b/plugins/modules/network/aci/mso_schema_template_external_epg_subnet.py index c914452c22..1a736b96f5 100644 --- a/plugins/modules/network/aci/mso_schema_template_external_epg_subnet.py +++ b/plugins/modules/network/aci/mso_schema_template_external_epg_subnet.py @@ -57,7 +57,7 @@ options: notes: - Due to restrictions of the MSO REST API concurrent modifications to EPG subnets can be dangerous and corrupt data. extends_documentation_fragment: -- cisco.mso.mso +- cisco.mso.modules ''' @@ -115,7 +115,7 @@ RETURN = r''' ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.cisco.mso.plugins.module_utils.network.aci.mso import MSOModule, mso_argument_spec, mso_reference_spec, mso_subnet_spec +from ansible_collections.cisco.mso.plugins.module_utils.mso import MSOModule, mso_argument_spec, mso_reference_spec, mso_subnet_spec def main(): diff --git a/plugins/modules/network/check_point/checkpoint_access_rule.py b/plugins/modules/network/check_point/checkpoint_access_rule.py index 9aa78a53a9..c081734173 100644 --- a/plugins/modules/network/check_point/checkpoint_access_rule.py +++ b/plugins/modules/network/check_point/checkpoint_access_rule.py @@ -119,7 +119,7 @@ checkpoint_access_rules: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.check_point.mgmt.plugins.module_utils.network.checkpoint.checkpoint import checkpoint_argument_spec, publish, install_policy +from ansible_collections.check_point.mgmt.plugins.module_utils.checkpoint import checkpoint_argument_spec, publish, install_policy def get_access_rule(module, connection): diff --git a/plugins/modules/network/check_point/checkpoint_host.py b/plugins/modules/network/check_point/checkpoint_host.py index 0ee8999a6e..5d651c3007 100644 --- a/plugins/modules/network/check_point/checkpoint_host.py +++ b/plugins/modules/network/check_point/checkpoint_host.py @@ -93,7 +93,7 @@ checkpoint_hosts: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.check_point.mgmt.plugins.module_utils.network.checkpoint.checkpoint import checkpoint_argument_spec, publish, install_policy +from ansible_collections.check_point.mgmt.plugins.module_utils.checkpoint import checkpoint_argument_spec, publish, install_policy def get_host(module, connection): diff --git a/plugins/modules/network/check_point/cp_publish.py b/plugins/modules/network/check_point/cp_publish.py index 730bd3182b..cece9ee0d4 100644 --- a/plugins/modules/network/check_point/cp_publish.py +++ b/plugins/modules/network/check_point/cp_publish.py @@ -56,7 +56,7 @@ cp_publish: """ from ansible.module_utils.basic import AnsibleModule -from ansible_collections.check_point.mgmt.plugins.module_utils.network.checkpoint.checkpoint import checkpoint_argument_spec_for_commands, api_command +from ansible_collections.check_point.mgmt.plugins.module_utils.checkpoint import checkpoint_argument_spec_for_commands, api_command def main(): diff --git a/plugins/modules/network/eric_eccli/eric_eccli_command.py b/plugins/modules/network/eric_eccli/eric_eccli_command.py index 445b9a85f1..8b226feee0 100644 --- a/plugins/modules/network/eric_eccli/eric_eccli_command.py +++ b/plugins/modules/network/eric_eccli/eric_eccli_command.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'supported_by': 'community'} -DOCUMENTATION = ''' +DOCUMENTATION = """ --- module: eric_eccli_command author: Ericsson IPOS OAM team (@itercheng) @@ -34,7 +34,7 @@ options: the number of retries has expired. If a command sent to the device requires answering a prompt, it is possible to pass a dict containing I(command), I(answer) and I(prompt). - Common answers are 'y' or "\r" (carriage return, must be + Common answers are 'y' or "\\r" (carriage return, must be double quotes). See examples. type: list required: true @@ -80,7 +80,7 @@ notes: - For more information on using Ansible to manage Ericsson devices see the Ericsson documents. - "Starting with Ansible 2.5 we recommend using C(connection: network_cli)." - For more information please see the L(ERIC_ECCLI Platform Options guide,../network/user_guide/platform_eric_eccli.html). -''' +""" EXAMPLES = r""" tasks: diff --git a/plugins/modules/network/f5/bigip_asm_policy.py b/plugins/modules/network/f5/bigip_asm_policy.py index e15bf813a5..2217f0d780 100644 --- a/plugins/modules/network/f5/bigip_asm_policy.py +++ b/plugins/modules/network/f5/bigip_asm_policy.py @@ -248,14 +248,14 @@ try: from library.module_utils.network.f5.icontrol import tmos_version from library.module_utils.network.f5.icontrol import module_provisioned except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.bigip import F5RestClient - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import fq_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.icontrol import upload_file - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.icontrol import tmos_version - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.icontrol import module_provisioned + from ansible_collections.f5networks.f5_modules.plugins.module_utils.bigip import F5RestClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import AnsibleF5Parameters + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import fq_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.icontrol import upload_file + from ansible_collections.f5networks.f5_modules.plugins.module_utils.icontrol import tmos_version + from ansible_collections.f5networks.f5_modules.plugins.module_utils.icontrol import module_provisioned class Parameters(AnsibleF5Parameters): diff --git a/plugins/modules/network/f5/bigip_device_info.py b/plugins/modules/network/f5/bigip_device_info.py index d48a9200a7..957ecbd2be 100644 --- a/plugins/modules/network/f5/bigip_device_info.py +++ b/plugins/modules/network/f5/bigip_device_info.py @@ -7004,16 +7004,16 @@ try: from library.module_utils.network.f5.icontrol import tmos_version from library.module_utils.network.f5.urls import parseStats except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.bigip import F5RestClient - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import fq_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import flatten_boolean - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import transform_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.ipaddress import is_valid_ip - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.icontrol import modules_provisioned - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.icontrol import tmos_version + from ansible_collections.f5networks.f5_modules.plugins.module_utils.bigip import F5RestClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import AnsibleF5Parameters + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import fq_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import flatten_boolean + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import transform_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.ipaddress import is_valid_ip + from ansible_collections.f5networks.f5_modules.plugins.module_utils.icontrol import modules_provisioned + from ansible_collections.f5networks.f5_modules.plugins.module_utils.icontrol import tmos_version from ansible_collections.community.general.plugins.module_utils.network.f5.urls import parseStats diff --git a/plugins/modules/network/f5/bigip_device_traffic_group.py b/plugins/modules/network/f5/bigip_device_traffic_group.py index 95388c4e93..c5d459fb99 100644 --- a/plugins/modules/network/f5/bigip_device_traffic_group.py +++ b/plugins/modules/network/f5/bigip_device_traffic_group.py @@ -203,13 +203,13 @@ try: from library.module_utils.network.f5.common import transform_name from library.module_utils.network.f5.common import flatten_boolean except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.bigip import F5RestClient - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import fq_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import transform_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import flatten_boolean + from ansible_collections.f5networks.f5_modules.plugins.module_utils.bigip import F5RestClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import AnsibleF5Parameters + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import fq_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import transform_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import flatten_boolean class Parameters(AnsibleF5Parameters): diff --git a/plugins/modules/network/f5/bigip_facts.py b/plugins/modules/network/f5/bigip_facts.py index 94eb93547e..5dc9d498e9 100644 --- a/plugins/modules/network/f5/bigip_facts.py +++ b/plugins/modules/network/f5/bigip_facts.py @@ -104,8 +104,8 @@ try: from library.module_utils.network.f5.common import F5BaseClient except ImportError: from ansible_collections.community.general.plugins.module_utils.network.f5.legacy import bigip_api, bigsuds_found - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5BaseClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5BaseClient try: from suds import MethodNotFound, WebFault diff --git a/plugins/modules/network/f5/bigip_firewall_address_list.py b/plugins/modules/network/f5/bigip_firewall_address_list.py index 22e175c23e..9b1216965a 100644 --- a/plugins/modules/network/f5/bigip_firewall_address_list.py +++ b/plugins/modules/network/f5/bigip_firewall_address_list.py @@ -178,16 +178,16 @@ try: from library.module_utils.network.f5.ipaddress import is_valid_ip from library.module_utils.network.f5.ipaddress import is_valid_ip_interface except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.bigip import F5RestClient - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import fq_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import transform_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.bigip import F5RestClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import AnsibleF5Parameters + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import fq_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import transform_name from ansible_collections.ansible.netcommon.plugins.module_utils.compat.ipaddress import ip_address from ansible_collections.ansible.netcommon.plugins.module_utils.compat.ipaddress import ip_interface - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.ipaddress import is_valid_ip - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.ipaddress import is_valid_ip_interface + from ansible_collections.f5networks.f5_modules.plugins.module_utils.ipaddress import is_valid_ip + from ansible_collections.f5networks.f5_modules.plugins.module_utils.ipaddress import is_valid_ip_interface class Parameters(AnsibleF5Parameters): diff --git a/plugins/modules/network/f5/bigip_firewall_port_list.py b/plugins/modules/network/f5/bigip_firewall_port_list.py index 5c54370836..8f19495e65 100644 --- a/plugins/modules/network/f5/bigip_firewall_port_list.py +++ b/plugins/modules/network/f5/bigip_firewall_port_list.py @@ -185,13 +185,13 @@ try: from library.module_utils.network.f5.common import transform_name from library.module_utils.network.f5.icontrol import module_provisioned except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.bigip import F5RestClient - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import fq_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import transform_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.icontrol import module_provisioned + from ansible_collections.f5networks.f5_modules.plugins.module_utils.bigip import F5RestClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import AnsibleF5Parameters + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import fq_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import transform_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.icontrol import module_provisioned class Parameters(AnsibleF5Parameters): diff --git a/plugins/modules/network/f5/bigip_gtm_facts.py b/plugins/modules/network/f5/bigip_gtm_facts.py index b08b3dc4d2..7f93bc80ba 100644 --- a/plugins/modules/network/f5/bigip_gtm_facts.py +++ b/plugins/modules/network/f5/bigip_gtm_facts.py @@ -194,16 +194,16 @@ except ImportError: try: from library.module_utils.network.f5.common import F5BaseClient except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5BaseClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5BaseClient try: from library.module_utils.network.f5.common import F5ModuleError from library.module_utils.network.f5.common import AnsibleF5Parameters from library.module_utils.network.f5.common import f5_argument_spec except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import AnsibleF5Parameters + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec class F5Client(F5BaseClient): diff --git a/plugins/modules/network/f5/bigip_lx_package.py b/plugins/modules/network/f5/bigip_lx_package.py index 1c5b5d8451..2eb3b51b43 100644 --- a/plugins/modules/network/f5/bigip_lx_package.py +++ b/plugins/modules/network/f5/bigip_lx_package.py @@ -105,12 +105,12 @@ try: from library.module_utils.network.f5.icontrol import tmos_version from library.module_utils.network.f5.icontrol import upload_file except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.bigip import F5RestClient - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.icontrol import tmos_version - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.icontrol import upload_file + from ansible_collections.f5networks.f5_modules.plugins.module_utils.bigip import F5RestClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import AnsibleF5Parameters + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.icontrol import tmos_version + from ansible_collections.f5networks.f5_modules.plugins.module_utils.icontrol import upload_file class Parameters(AnsibleF5Parameters): diff --git a/plugins/modules/network/f5/bigiq_device_info.py b/plugins/modules/network/f5/bigiq_device_info.py index 5adcdac6c7..863fc4eccd 100644 --- a/plugins/modules/network/f5/bigiq_device_info.py +++ b/plugins/modules/network/f5/bigiq_device_info.py @@ -836,14 +836,14 @@ try: from library.module_utils.network.f5.ipaddress import is_valid_ip from library.module_utils.network.f5.common import transform_name except ImportError: - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.bigiq import F5RestClient - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import F5ModuleError - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import f5_argument_spec - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import fq_name - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import flatten_boolean - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.ipaddress import is_valid_ip - from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import transform_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.bigiq import F5RestClient + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import F5ModuleError + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import AnsibleF5Parameters + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import f5_argument_spec + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import fq_name + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import flatten_boolean + from ansible_collections.f5networks.f5_modules.plugins.module_utils.ipaddress import is_valid_ip + from ansible_collections.f5networks.f5_modules.plugins.module_utils.common import transform_name def parseStats(entry): diff --git a/plugins/modules/network/fortimanager/fmgr_device.py b/plugins/modules/network/fortimanager/fmgr_device.py index b1a0afad28..c5262d01c5 100644 --- a/plugins/modules/network/fortimanager/fmgr_device.py +++ b/plugins/modules/network/fortimanager/fmgr_device.py @@ -119,12 +119,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG def discover_device(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_device_config.py b/plugins/modules/network/fortimanager/fmgr_device_config.py index d61004bae7..150fc85a80 100644 --- a/plugins/modules/network/fortimanager/fmgr_device_config.py +++ b/plugins/modules/network/fortimanager/fmgr_device_config.py @@ -107,12 +107,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods def update_device_hostname(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_device_group.py b/plugins/modules/network/fortimanager/fmgr_device_group.py index 7a6bf74d2b..9112f5ff3f 100644 --- a/plugins/modules/network/fortimanager/fmgr_device_group.py +++ b/plugins/modules/network/fortimanager/fmgr_device_group.py @@ -126,12 +126,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG def get_groups(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_device_provision_template.py b/plugins/modules/network/fortimanager/fmgr_device_provision_template.py index c043f06bef..5c3da9487c 100644 --- a/plugins/modules/network/fortimanager/fmgr_device_provision_template.py +++ b/plugins/modules/network/fortimanager/fmgr_device_provision_template.py @@ -587,12 +587,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG def get_devprof(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_fwobj_address.py b/plugins/modules/network/fortimanager/fmgr_fwobj_address.py index fe3a9afbd5..58b23cf847 100644 --- a/plugins/modules/network/fortimanager/fmgr_fwobj_address.py +++ b/plugins/modules/network/fortimanager/fmgr_fwobj_address.py @@ -274,11 +274,11 @@ api_result: import re from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG def fmgr_fwobj_ipv4(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_fwobj_ippool.py b/plugins/modules/network/fortimanager/fmgr_fwobj_ippool.py index cb06bc47a6..d0c3e11faf 100644 --- a/plugins/modules/network/fortimanager/fmgr_fwobj_ippool.py +++ b/plugins/modules/network/fortimanager/fmgr_fwobj_ippool.py @@ -285,13 +285,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### diff --git a/plugins/modules/network/fortimanager/fmgr_fwobj_ippool6.py b/plugins/modules/network/fortimanager/fmgr_fwobj_ippool6.py index 05165419f9..45d1f471a2 100644 --- a/plugins/modules/network/fortimanager/fmgr_fwobj_ippool6.py +++ b/plugins/modules/network/fortimanager/fmgr_fwobj_ippool6.py @@ -126,13 +126,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict def fmgr_fwobj_ippool6_modify(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_fwobj_service.py b/plugins/modules/network/fortimanager/fmgr_fwobj_service.py index 7e4b518053..7ee1e62f8c 100644 --- a/plugins/modules/network/fortimanager/fmgr_fwobj_service.py +++ b/plugins/modules/network/fortimanager/fmgr_fwobj_service.py @@ -292,12 +292,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict def fmgr_fwobj_service_custom(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_fwobj_vip.py b/plugins/modules/network/fortimanager/fmgr_fwobj_vip.py index bf20660062..a03b4e0b0f 100644 --- a/plugins/modules/network/fortimanager/fmgr_fwobj_vip.py +++ b/plugins/modules/network/fortimanager/fmgr_fwobj_vip.py @@ -1757,14 +1757,14 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict def fmgr_firewall_vip_modify(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_fwpol_ipv4.py b/plugins/modules/network/fortimanager/fmgr_fwpol_ipv4.py index 387652fa22..27063bf276 100644 --- a/plugins/modules/network/fortimanager/fmgr_fwpol_ipv4.py +++ b/plugins/modules/network/fortimanager/fmgr_fwpol_ipv4.py @@ -970,14 +970,14 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict def fmgr_firewall_policy_modify(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_fwpol_package.py b/plugins/modules/network/fortimanager/fmgr_fwpol_package.py index 6a9e18a77c..d70b9b9fd8 100644 --- a/plugins/modules/network/fortimanager/fmgr_fwpol_package.py +++ b/plugins/modules/network/fortimanager/fmgr_fwpol_package.py @@ -216,12 +216,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods def fmgr_fwpol_package(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_ha.py b/plugins/modules/network/fortimanager/fmgr_ha.py index 81c7f75af3..cac6697453 100644 --- a/plugins/modules/network/fortimanager/fmgr_ha.py +++ b/plugins/modules/network/fortimanager/fmgr_ha.py @@ -137,12 +137,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG def fmgr_set_ha_mode(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_provisioning.py b/plugins/modules/network/fortimanager/fmgr_provisioning.py index 14fe81837e..28fa5fbabd 100644 --- a/plugins/modules/network/fortimanager/fmgr_provisioning.py +++ b/plugins/modules/network/fortimanager/fmgr_provisioning.py @@ -145,7 +145,7 @@ api_result: """ from ansible.module_utils.basic import AnsibleModule, env_fallback -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import AnsibleFortiManager +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import AnsibleFortiManager # check for pyFMG lib try: diff --git a/plugins/modules/network/fortimanager/fmgr_query.py b/plugins/modules/network/fortimanager/fmgr_query.py index f123b8436e..d87be8b474 100644 --- a/plugins/modules/network/fortimanager/fmgr_query.py +++ b/plugins/modules/network/fortimanager/fmgr_query.py @@ -140,12 +140,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG def fmgr_get_custom(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_script.py b/plugins/modules/network/fortimanager/fmgr_script.py index 6beef12a4d..0a23480715 100644 --- a/plugins/modules/network/fortimanager/fmgr_script.py +++ b/plugins/modules/network/fortimanager/fmgr_script.py @@ -119,12 +119,12 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG def set_script(fmgr, paramgram): diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_appctrl.py b/plugins/modules/network/fortimanager/fmgr_secprof_appctrl.py index 918bff2490..7a3d567477 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_appctrl.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_appctrl.py @@ -348,13 +348,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### # START METHODS diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_av.py b/plugins/modules/network/fortimanager/fmgr_secprof_av.py index 017429b947..ba8ea37051 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_av.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_av.py @@ -977,13 +977,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### # START METHODS diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_dns.py b/plugins/modules/network/fortimanager/fmgr_secprof_dns.py index 356c08d712..62732df202 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_dns.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_dns.py @@ -208,14 +208,14 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_ips.py b/plugins/modules/network/fortimanager/fmgr_secprof_ips.py index e735c7bcb3..525ab8cec3 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_ips.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_ips.py @@ -436,13 +436,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_profile_group.py b/plugins/modules/network/fortimanager/fmgr_secprof_profile_group.py index 3fdbd69238..ac1fb88586 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_profile_group.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_profile_group.py @@ -167,14 +167,14 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_proxy.py b/plugins/modules/network/fortimanager/fmgr_secprof_proxy.py index 8e92d7092b..7765ce0581 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_proxy.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_proxy.py @@ -209,13 +209,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_spam.py b/plugins/modules/network/fortimanager/fmgr_secprof_spam.py index 2e15abf203..ebc374ce0d 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_spam.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_spam.py @@ -417,13 +417,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### # START METHODS diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_ssl_ssh.py b/plugins/modules/network/fortimanager/fmgr_secprof_ssl_ssh.py index 67d8aee12c..e5c71c480d 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_ssl_ssh.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_ssl_ssh.py @@ -696,14 +696,14 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### # START METHODS diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_voip.py b/plugins/modules/network/fortimanager/fmgr_secprof_voip.py index 8959684e1c..f35ebc8c1e 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_voip.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_voip.py @@ -888,13 +888,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_waf.py b/plugins/modules/network/fortimanager/fmgr_secprof_waf.py index 7ec95bade9..275176959f 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_waf.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_waf.py @@ -1051,14 +1051,14 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_wanopt.py b/plugins/modules/network/fortimanager/fmgr_secprof_wanopt.py index 03ee0580ba..0b03e06a6c 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_wanopt.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_wanopt.py @@ -490,13 +490,13 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict ############### diff --git a/plugins/modules/network/fortimanager/fmgr_secprof_web.py b/plugins/modules/network/fortimanager/fmgr_secprof_web.py index f06f1266cb..7a3da4ff17 100644 --- a/plugins/modules/network/fortimanager/fmgr_secprof_web.py +++ b/plugins/modules/network/fortimanager/fmgr_secprof_web.py @@ -783,14 +783,14 @@ api_result: from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.connection import Connection -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.fortimanager import FortiManagerHandler -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGBaseException -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRCommon -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FMGRMethods -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import prepare_dict -from ansible_collections.fortinet.fortios.plugins.module_utils.network.fortimanager.common import scrub_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.fortimanager import FortiManagerHandler +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGBaseException +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRCommon +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FMGRMethods +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import DEFAULT_RESULT_OBJ +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import FAIL_SOCKET_MSG +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import prepare_dict +from ansible_collections.fortinet.fortios.plugins.module_utils.fortimanager.common import scrub_dict def fmgr_webfilter_profile_modify(fmgr, paramgram): diff --git a/plugins/modules/network/icx/icx_command.py b/plugins/modules/network/icx/icx_command.py index b63f8842d6..871991743f 100644 --- a/plugins/modules/network/icx/icx_command.py +++ b/plugins/modules/network/icx/icx_command.py @@ -11,7 +11,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'supported_by': 'community'} -DOCUMENTATION = ''' +DOCUMENTATION = """ --- module: icx_command author: "Ruckus Wireless (@Commscope)" @@ -34,7 +34,7 @@ options: device requires answering a prompt, checkall and newline if multiple prompts, it is possible to pass a dict containing I(command), I(answer), I(prompt), I(check_all) - and I(newline).Common answers are 'y' or "\r" (carriage return, + and I(newline).Common answers are 'y' or "\\r" (carriage return, must be double quotes). See examples. type: list required: true @@ -74,7 +74,7 @@ options: trying the command again. type: int default: 1 -''' +""" EXAMPLES = """ tasks: diff --git a/plugins/modules/network/voss/voss_command.py b/plugins/modules/network/voss/voss_command.py index 9c27a5c98e..551fabb1b0 100644 --- a/plugins/modules/network/voss/voss_command.py +++ b/plugins/modules/network/voss/voss_command.py @@ -25,7 +25,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'supported_by': 'community'} -DOCUMENTATION = ''' +DOCUMENTATION = """ --- module: voss_command author: "Lindsay Hill (@LindsayHill)" @@ -48,7 +48,7 @@ options: until the condition is satisfied or the number of retries has expired. If a command sent to the device requires answering a prompt, it is possible to pass a dict containing I(command), - I(answer) and I(prompt). Common answers are 'y' or "\r" + I(answer) and I(prompt). Common answers are 'y' or "\\r" (carriage return, must be double quotes). See examples. required: true wait_for: @@ -82,7 +82,7 @@ options: conditions, the interval indicates how long to wait before trying the command again. default: 1 -''' +""" EXAMPLES = r""" tasks: diff --git a/plugins/modules/remote_management/intersight/intersight_info.py b/plugins/modules/remote_management/intersight/intersight_info.py index 0ffeb9b906..d0fc35718f 100644 --- a/plugins/modules/remote_management/intersight/intersight_info.py +++ b/plugins/modules/remote_management/intersight/intersight_info.py @@ -72,7 +72,7 @@ intersight_servers: sample: 5978bea36ad4b000018d63dc ''' -from ansible_collections.cisco.intersight.plugins.module_utils.remote_management.intersight import IntersightModule, intersight_argument_spec +from ansible_collections.cisco.intersight.plugins.module_utils.intersight import IntersightModule, intersight_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/storage/netapp/na_cdot_aggregate.py b/plugins/modules/storage/netapp/na_cdot_aggregate.py index 6e3d9d1f72..b2cf0b3f02 100644 --- a/plugins/modules/storage/netapp/na_cdot_aggregate.py +++ b/plugins/modules/storage/netapp/na_cdot_aggregate.py @@ -18,7 +18,7 @@ module: na_cdot_aggregate short_description: Manage NetApp cDOT aggregates. extends_documentation_fragment: -- netapp.ontap.netapp.ontap +- netapp.ontap.netapp.na_ontap author: Sumit Kumar (@timuster) diff --git a/plugins/modules/storage/netapp/na_cdot_license.py b/plugins/modules/storage/netapp/na_cdot_license.py index 9b844ba381..c4b58e288c 100644 --- a/plugins/modules/storage/netapp/na_cdot_license.py +++ b/plugins/modules/storage/netapp/na_cdot_license.py @@ -18,7 +18,7 @@ module: na_cdot_license short_description: Manage NetApp cDOT protocol and feature licenses extends_documentation_fragment: -- netapp.ontap.netapp.ontap +- netapp.ontap.netapp.na_ontap author: Sumit Kumar (@timuster) diff --git a/plugins/modules/storage/netapp/na_cdot_lun.py b/plugins/modules/storage/netapp/na_cdot_lun.py index 8fcd1c8d40..7da3c81f6b 100644 --- a/plugins/modules/storage/netapp/na_cdot_lun.py +++ b/plugins/modules/storage/netapp/na_cdot_lun.py @@ -18,7 +18,7 @@ module: na_cdot_lun short_description: Manage NetApp cDOT luns extends_documentation_fragment: -- netapp.ontap.netapp.ontap +- netapp.ontap.netapp.na_ontap author: Sumit Kumar (@timuster) diff --git a/plugins/modules/storage/netapp/na_cdot_qtree.py b/plugins/modules/storage/netapp/na_cdot_qtree.py index ff3b4a1109..99f73c9824 100644 --- a/plugins/modules/storage/netapp/na_cdot_qtree.py +++ b/plugins/modules/storage/netapp/na_cdot_qtree.py @@ -18,7 +18,7 @@ module: na_cdot_qtree short_description: Manage qtrees extends_documentation_fragment: -- netapp.ontap.netapp.ontap +- netapp.ontap.netapp.na_ontap author: Sumit Kumar (@timuster) diff --git a/plugins/modules/storage/netapp/na_cdot_svm.py b/plugins/modules/storage/netapp/na_cdot_svm.py index 16aa0e56ff..e7a41e6583 100644 --- a/plugins/modules/storage/netapp/na_cdot_svm.py +++ b/plugins/modules/storage/netapp/na_cdot_svm.py @@ -18,7 +18,7 @@ module: na_cdot_svm short_description: Manage NetApp cDOT svm extends_documentation_fragment: -- netapp.ontap.netapp.ontap +- netapp.ontap.netapp.na_ontap author: Sumit Kumar (@timuster) diff --git a/plugins/modules/storage/netapp/na_cdot_user.py b/plugins/modules/storage/netapp/na_cdot_user.py index 5a1062cd0e..4012a2ffab 100644 --- a/plugins/modules/storage/netapp/na_cdot_user.py +++ b/plugins/modules/storage/netapp/na_cdot_user.py @@ -18,7 +18,7 @@ module: na_cdot_user short_description: useradmin configuration and management extends_documentation_fragment: -- netapp.ontap.netapp.ontap +- netapp.ontap.netapp.na_ontap author: Sumit Kumar (@timuster) diff --git a/plugins/modules/storage/netapp/na_cdot_user_role.py b/plugins/modules/storage/netapp/na_cdot_user_role.py index 9531f6f353..e04d02bc29 100644 --- a/plugins/modules/storage/netapp/na_cdot_user_role.py +++ b/plugins/modules/storage/netapp/na_cdot_user_role.py @@ -18,7 +18,7 @@ module: na_cdot_user_role short_description: useradmin configuration and management extends_documentation_fragment: -- netapp.ontap.netapp.ontap +- netapp.ontap.netapp.na_ontap author: Sumit Kumar (@timuster) diff --git a/plugins/modules/storage/netapp/na_cdot_volume.py b/plugins/modules/storage/netapp/na_cdot_volume.py index a66c9071a5..45a4392179 100644 --- a/plugins/modules/storage/netapp/na_cdot_volume.py +++ b/plugins/modules/storage/netapp/na_cdot_volume.py @@ -18,7 +18,7 @@ module: na_cdot_volume short_description: Manage NetApp cDOT volumes extends_documentation_fragment: -- netapp.ontap.netapp.ontap +- netapp.ontap.netapp.na_ontap author: Sumit Kumar (@timuster) diff --git a/tests/unit/modules/system/interfaces_file/interfaces_file/test_interfaces_file.py b/tests/unit/modules/system/interfaces_file/interfaces_file/test_interfaces_file.py index 3f81e6b3d9..02104dfd96 100644 --- a/tests/unit/modules/system/interfaces_file/interfaces_file/test_interfaces_file.py +++ b/tests/unit/modules/system/interfaces_file/interfaces_file/test_interfaces_file.py @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . +__metaclass__ = type + from ansible_collections.ansible.posix.tests.unit.compat import unittest from ansible_collections.community.general.plugins.modules import interfaces_file from shutil import copyfile, move @@ -156,7 +158,7 @@ class TestInterfacesFileModule(unittest.TestCase): fail_json_iterations = [] for i, options in enumerate(options_list): try: - _, lines = interfaces_file.setInterfaceOption(module, lines, options['iface'], options['option'], options['value'], options['state']) + dummy, lines = interfaces_file.setInterfaceOption(module, lines, options['iface'], options['option'], options['value'], options['state']) except AnsibleFailJson as e: fail_json_iterations.append("[%d] fail_json message: %s\noptions:\n%s" % (i, str(e), json.dumps(options, sort_keys=True, indent=4, separators=(',', ': ')))) @@ -188,8 +190,8 @@ class TestInterfacesFileModule(unittest.TestCase): fail_json_iterations = [] options['state'] = state try: - _, lines = interfaces_file.setInterfaceOption(module, lines, - options['iface'], options['option'], options['value'], options['state']) + dummy, lines = interfaces_file.setInterfaceOption(module, lines, + options['iface'], options['option'], options['value'], options['state']) except AnsibleFailJson as e: fail_json_iterations.append("fail_json message: %s\noptions:\n%s" % (str(e), json.dumps(options, sort_keys=True, indent=4, separators=(',', ': ')))) @@ -312,8 +314,8 @@ class TestInterfacesFileModule(unittest.TestCase): options = options_list[0] fail_json_iterations = [] try: - _, lines = interfaces_file.setInterfaceOption(module, lines, options['iface'], options['option'], - options['value'], options['state'], options['address_family']) + dummy, lines = interfaces_file.setInterfaceOption(module, lines, options['iface'], options['option'], + options['value'], options['state'], options['address_family']) except AnsibleFailJson as e: fail_json_iterations.append("fail_json message: %s\noptions:\n%s" % (str(e), json.dumps(options, sort_keys=True, indent=4, separators=(',', ': ')))) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index efe930af4b..3686e79470 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -42,18 +42,22 @@ cd "${TEST_DIR}" ansible-galaxy -vvv collection install ansible.posix ansible-galaxy -vvv collection install community.crypto ansible-galaxy -vvv collection install ansible.netcommon +ansible-galaxy -vvv collection install ovirt.ovirt_collection # unit tests ansible-galaxy -vvv collection install community.kubernetes ansible-galaxy -vvv collection install netbox.netbox ansible-galaxy -vvv collection install netapp.ontap +ansible-galaxy -vvv collection install cisco.mso ansible-galaxy -vvv collection install cisco.meraki +ansible-galaxy -vvv collection install cisco.intersight ansible-galaxy -vvv collection install fortinet.fortios ansible-galaxy -vvv collection install junipernetworks.junos ansible-galaxy -vvv collection install cisco.aci ansible-galaxy -vvv collection install google.cloud ansible-galaxy -vvv collection install community.kubernetes ansible-galaxy -vvv collection install f5networks.f5_modules +ansible-galaxy -vvv collection install check_point.mgmt # Needed until https://github.com/ansible/ansible/issues/68415 is fixed: chmod -R a+rX "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections"