ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix imports and installing dependencies in CI, part 1 (#41)

Browse source 
* 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).
This commit is contained in:
Felix Fontein 2020-03-24 23:14:53 +01:00 committed by GitHub
parent 927d91f35f
commit 25394eeafb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
95 changed files with 349 additions and 343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
galaxy.yml
View file

@ -11,7 +11,7 @@ tags: null
#dependencies: #dependencies:
# netapp.ontap: '>=0.1.0' # netapp.ontap: '>=0.1.0'
# community.kubernetes: '>=0.1.0' # community.kubernetes: '>=0.1.0'
# ovirt.ovirt: '>=0.1.0' # ovirt.ovirt_collection: '>=0.1.0'
# ansible.netcommon: '>=0.1.0' # ansible.netcommon: '>=0.1.0'
# cisco.mso: '>=0.1.0' # cisco.mso: '>=0.1.0'
# ansible.posix: '>=0.1.0' # ansible.posix: '>=0.1.0'

4
plugins/module_utils/kubevirt.py
View file

@ -9,8 +9,8 @@ from distutils.version import Version
from ansible.module_utils.common import dict_transformations from ansible.module_utils.common import dict_transformations
from ansible.module_utils.common._collections_compat import Sequence 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.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.raw import KubernetesRawModule
import copy import copy
import re import re

4
plugins/module_utils/network/f5/iworkflow.py
View file

@ -20,8 +20,8 @@ try:
from library.module_utils.network.f5.common import F5BaseClient from library.module_utils.network.f5.common import F5BaseClient
from library.module_utils.network.f5.common import F5ModuleError from library.module_utils.network.f5.common import F5ModuleError
except ImportError: 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
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
class F5Client(F5BaseClient): class F5Client(F5BaseClient):

2
plugins/module_utils/network/f5/urls.py
View file

@ -12,7 +12,7 @@ import re
try: try:
from library.module_utils.network.f5.common import F5ModuleError from library.module_utils.network.f5.common import F5ModuleError
except ImportError: 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_BYTE = re.compile(b'^\\S[^\\r\\n]*$|^$')
_CLEAN_HEADER_REGEX_STR = re.compile(r'^\S[^\r\n]*$|^$') _CLEAN_HEADER_REGEX_STR = re.compile(r'^\S[^\r\n]*$|^$')

4
plugins/modules/cloud/kubevirt/kubevirt_cdi_upload.py
View file

@ -83,8 +83,8 @@ import traceback
from collections import defaultdict 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.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.raw import KubernetesRawModule
# 3rd party imports # 3rd party imports
try: try:

2
plugins/modules/cloud/kubevirt/kubevirt_preset.py
View file

@ -92,7 +92,7 @@ import copy
import traceback 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 ( from ansible_collections.community.general.plugins.module_utils.kubevirt import (
virtdict, virtdict,

4
plugins/modules/cloud/kubevirt/kubevirt_pvc.py
View file

@ -254,8 +254,8 @@ import traceback
from collections import defaultdict 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.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.raw import KubernetesRawModule
from ansible_collections.community.general.plugins.module_utils.kubevirt import virtdict, KubeVirtRawModule from ansible_collections.community.general.plugins.module_utils.kubevirt import virtdict, KubeVirtRawModule

2
plugins/modules/cloud/kubevirt/kubevirt_rs.py
View file

@ -111,7 +111,7 @@ import copy
import traceback 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 ( from ansible_collections.community.general.plugins.module_utils.kubevirt import (
virtdict, virtdict,

2
plugins/modules/cloud/kubevirt/kubevirt_template.py
View file

@ -205,7 +205,7 @@ kubevirt_template:
import copy import copy
import traceback 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 ( from ansible_collections.community.general.plugins.module_utils.kubevirt import (
virtdict, virtdict,

2
plugins/modules/cloud/kubevirt/kubevirt_vm.py
View file

@ -249,7 +249,7 @@ kubevirt_vm:
import copy import copy
import traceback 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 ( from ansible_collections.community.general.plugins.module_utils.kubevirt import (
virtdict, virtdict,
KubeVirtRawModule, KubeVirtRawModule,

4
plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py
View file

@ -55,7 +55,7 @@ options:
description: description:
- "Name of the host, which affinity labels should be listed." - "Name of the host, which affinity labels should be listed."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_api_facts.py
View file

@ -32,7 +32,7 @@ notes:
which contains a information about oVirt/RHV API. You need to register the result with which contains a information about oVirt/RHV API. You need to register the result with
the I(register) keyword to use it." the I(register) keyword to use it."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_cluster_facts.py
View file

@ -51,7 +51,7 @@ options:
- "For example to search cluster X from datacenter Y use following pattern: - "For example to search cluster X from datacenter Y use following pattern:
name=X and datacenter=Y" name=X and datacenter=Y"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py
View file

@ -35,7 +35,7 @@ options:
- "Search term which is accepted by oVirt/RHV search backend." - "Search term which is accepted by oVirt/RHV search backend."
- "For example to search datacenter I(X) use following pattern: I(name=X)" - "For example to search datacenter I(X) use following pattern: I(name=X)"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_disk_facts.py
View file

@ -51,7 +51,7 @@ options:
- "For example to search Disk X from storage Y use following pattern: - "For example to search Disk X from storage Y use following pattern:
name=X and storage.name=Y" name=X and storage.name=Y"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_event_facts.py
View file

@ -74,7 +74,7 @@ options:
default: true default: true
type: bool type: bool
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py
View file

@ -54,7 +54,7 @@ options:
description: description:
- "Name of the external provider, can be used as glob expression." - "Name of the external provider, can be used as glob expression."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_group_facts.py
View file

@ -50,7 +50,7 @@ options:
- "Search term which is accepted by oVirt/RHV search backend." - "Search term which is accepted by oVirt/RHV search backend."
- "For example to search group X use following pattern: name=X" - "For example to search group X use following pattern: name=X"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_host_facts.py
View file

@ -47,7 +47,7 @@ options:
type: str type: str
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py
View file

@ -62,7 +62,7 @@ options:
description: description:
- "LUN id." - "LUN id."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_network_facts.py
View file

@ -50,7 +50,7 @@ options:
- "Search term which is accepted by oVirt/RHV search backend." - "Search term which is accepted by oVirt/RHV search backend."
- "For example to search network starting with string vlan1 use: name=vlan1*" - "For example to search network starting with string vlan1 use: name=vlan1*"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_nic_facts.py
View file

@ -53,7 +53,7 @@ options:
description: description:
- "Name of the NIC, can be used as glob expression." - "Name of the NIC, can be used as glob expression."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_permission_facts.py
View file

@ -61,7 +61,7 @@ options:
- "Namespace of the authorization provider, where user/group resides." - "Namespace of the authorization provider, where user/group resides."
required: false required: false
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_link_name, get_link_name,

4
plugins/modules/cloud/ovirt/ovirt_quota_facts.py
View file

@ -53,7 +53,7 @@ options:
description: description:
- "Name of the quota, can be used as glob expression." - "Name of the quota, can be used as glob expression."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py
View file

@ -53,7 +53,7 @@ options:
description: description:
- "Name of the scheduling policy, can be used as glob expression." - "Name of the scheduling policy, can be used as glob expression."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py
View file

@ -41,7 +41,7 @@ options:
description: description:
- "Id of the snapshot we want to retrieve information about." - "Id of the snapshot we want to retrieve information about."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py
View file

@ -51,7 +51,7 @@ options:
- "For example to search storage domain X from datacenter Y use following pattern: - "For example to search storage domain X from datacenter Y use following pattern:
name=X and datacenter=Y" name=X and datacenter=Y"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py
View file

@ -58,7 +58,7 @@ options:
description: description:
- "The storage domain name where the templates should be listed." - "The storage domain name where the templates should be listed."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py
View file

@ -58,7 +58,7 @@ options:
description: description:
- "The storage domain name where the virtual machines should be listed." - "The storage domain name where the virtual machines should be listed."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_tag_facts.py
View file

@ -55,7 +55,7 @@ options:
description: description:
- "Name of the host, which tags should be listed." - "Name of the host, which tags should be listed."
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_template_facts.py
View file

@ -51,7 +51,7 @@ options:
- "For example to search template X from datacenter Y use following pattern: - "For example to search template X from datacenter Y use following pattern:
name=X and datacenter=Y" name=X and datacenter=Y"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_user_facts.py
View file

@ -50,7 +50,7 @@ options:
- "Search term which is accepted by oVirt/RHV search backend." - "Search term which is accepted by oVirt/RHV search backend."
- "For example to search user X use following pattern: name=X" - "For example to search user X use following pattern: name=X"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_vm_facts.py
View file

@ -70,7 +70,7 @@ options:
effect when the virtual machine is restarted. By default the value is set by engine." effect when the virtual machine is restarted. By default the value is set by engine."
type: bool type: bool
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py
View file

@ -50,7 +50,7 @@ options:
- "Search term which is accepted by oVirt/RHV search backend." - "Search term which is accepted by oVirt/RHV search backend."
- "For example to search vmpool X: name=X" - "For example to search vmpool X: name=X"
extends_documentation_fragment: 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.common.removed import removed_module
from ansible.module_utils.basic import AnsibleModule 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, check_sdk,
create_connection, create_connection,
get_dict_of_struct, get_dict_of_struct,

4
plugins/modules/network/aci/aci_interface_policy_fc.py
View file

@ -46,7 +46,7 @@ options:
- The alias for the current object. This relates to the nameAlias field in ACI. - The alias for the current object. This relates to the nameAlias field in ACI.
type: str type: str
extends_documentation_fragment: extends_documentation_fragment:
- cisco.aci.aci - cisco.aci.modules
seealso: seealso:
- name: APIC Management Information Model reference - name: APIC Management Information Model reference
@ -174,7 +174,7 @@ url:
''' '''
from ansible.module_utils.basic import AnsibleModule 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(): def main():

4
plugins/modules/network/aci/aci_interface_policy_l2.py
View file

@ -57,7 +57,7 @@ options:
- The alias for the current object. This relates to the nameAlias field in ACI. - The alias for the current object. This relates to the nameAlias field in ACI.
type: str type: str
extends_documentation_fragment: extends_documentation_fragment:
- cisco.aci.aci - cisco.aci.modules
seealso: seealso:
- name: APIC Management Information Model reference - name: APIC Management Information Model reference
@ -184,7 +184,7 @@ url:
''' '''
from ansible.module_utils.basic import AnsibleModule 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 # Mapping dicts are used to normalize the proposed data to what the APIC expects, which will keep diffs accurate
QINQ_MAPPING = dict( QINQ_MAPPING = dict(

4
plugins/modules/network/aci/aci_interface_policy_lldp.py
View file

@ -50,7 +50,7 @@ options:
- The alias for the current object. This relates to the nameAlias field in ACI. - The alias for the current object. This relates to the nameAlias field in ACI.
type: str type: str
extends_documentation_fragment: extends_documentation_fragment:
- cisco.aci.aci - cisco.aci.modules
seealso: seealso:
- name: APIC Management Information Model reference - name: APIC Management Information Model reference
@ -179,7 +179,7 @@ url:
''' '''
from ansible.module_utils.basic import AnsibleModule 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(): def main():

4
plugins/modules/network/aci/aci_interface_policy_mcp.py
View file

@ -45,7 +45,7 @@ options:
- The alias for the current object. This relates to the nameAlias field in ACI. - The alias for the current object. This relates to the nameAlias field in ACI.
type: str type: str
extends_documentation_fragment: extends_documentation_fragment:
- cisco.aci.aci - cisco.aci.modules
seealso: seealso:
- name: APIC Management Information Model reference - name: APIC Management Information Model reference
@ -173,7 +173,7 @@ url:
''' '''
from ansible.module_utils.basic import AnsibleModule 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(): def main():

4
plugins/modules/network/aci/aci_interface_policy_port_channel.py
View file

@ -94,7 +94,7 @@ options:
- The alias for the current object. This relates to the nameAlias field in ACI. - The alias for the current object. This relates to the nameAlias field in ACI.
type: str type: str
extends_documentation_fragment: extends_documentation_fragment:
- cisco.aci.aci - cisco.aci.modules
seealso: seealso:
- name: APIC Management Information Model reference - name: APIC Management Information Model reference
@ -223,7 +223,7 @@ url:
''' '''
from ansible.module_utils.basic import AnsibleModule 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(): def main():

4
plugins/modules/network/aci/aci_interface_policy_port_security.py
View file

@ -52,7 +52,7 @@ options:
- The alias for the current object. This relates to the nameAlias field in ACI. - The alias for the current object. This relates to the nameAlias field in ACI.
type: str type: str
extends_documentation_fragment: extends_documentation_fragment:
- cisco.aci.aci - cisco.aci.modules
seealso: seealso:
- name: APIC Management Information Model reference - name: APIC Management Information Model reference
@ -181,7 +181,7 @@ url:
''' '''
from ansible.module_utils.basic import AnsibleModule 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(): def main():

4
plugins/modules/network/aci/mso_schema_template_external_epg_contract.py
View file

@ -70,7 +70,7 @@ seealso:
- module: cisco.mso.mso_schema_template_externalepg - module: cisco.mso.mso_schema_template_externalepg
- module: cisco.mso.mso_schema_template_contract_filter - module: cisco.mso.mso_schema_template_contract_filter
extends_documentation_fragment: extends_documentation_fragment:
- cisco.mso.mso - cisco.mso.modules
''' '''
@ -132,7 +132,7 @@ RETURN = r'''
''' '''
from ansible.module_utils.basic import AnsibleModule 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(): def main():

4
plugins/modules/network/aci/mso_schema_template_external_epg_subnet.py
View file

@ -57,7 +57,7 @@ options:
notes: notes:
- Due to restrictions of the MSO REST API concurrent modifications to EPG subnets can be dangerous and corrupt data. - Due to restrictions of the MSO REST API concurrent modifications to EPG subnets can be dangerous and corrupt data.
extends_documentation_fragment: extends_documentation_fragment:
- cisco.mso.mso - cisco.mso.modules
''' '''
@ -115,7 +115,7 @@ RETURN = r'''
''' '''
from ansible.module_utils.basic import AnsibleModule 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(): def main():

2
plugins/modules/network/check_point/checkpoint_access_rule.py
View file

@ -119,7 +119,7 @@ checkpoint_access_rules:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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): def get_access_rule(module, connection):

2
plugins/modules/network/check_point/checkpoint_host.py
View file

@ -93,7 +93,7 @@ checkpoint_hosts:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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): def get_host(module, connection):

2
plugins/modules/network/check_point/cp_publish.py
View file

@ -56,7 +56,7 @@ cp_publish:
""" """
from ansible.module_utils.basic import AnsibleModule 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(): def main():

6
plugins/modules/network/eric_eccli/eric_eccli_command.py
View file

@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
'supported_by': 'community'} 'supported_by': 'community'}
DOCUMENTATION = ''' DOCUMENTATION = """
--- ---
module: eric_eccli_command module: eric_eccli_command
author: Ericsson IPOS OAM team (@itercheng) author: Ericsson IPOS OAM team (@itercheng)
@ -34,7 +34,7 @@ options:
the number of retries has expired. If a command sent to the the number of retries has expired. If a command sent to the
device requires answering a prompt, it is possible to pass device requires answering a prompt, it is possible to pass
a dict containing I(command), I(answer) and I(prompt). 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. double quotes). See examples.
type: list type: list
required: true required: true
@ -80,7 +80,7 @@ notes:
- For more information on using Ansible to manage Ericsson devices see the Ericsson documents. - 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)." - "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). - For more information please see the L(ERIC_ECCLI Platform Options guide,../network/user_guide/platform_eric_eccli.html).
''' """
EXAMPLES = r""" EXAMPLES = r"""
tasks: tasks:

16
plugins/modules/network/f5/bigip_asm_policy.py
View file

@ -248,14 +248,14 @@ try:
from library.module_utils.network.f5.icontrol import tmos_version from library.module_utils.network.f5.icontrol import tmos_version
from library.module_utils.network.f5.icontrol import module_provisioned from library.module_utils.network.f5.icontrol import module_provisioned
except ImportError: 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.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.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.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.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.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.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.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.icontrol import module_provisioned
class Parameters(AnsibleF5Parameters): class Parameters(AnsibleF5Parameters):

20
plugins/modules/network/f5/bigip_device_info.py
View file

@ -7004,16 +7004,16 @@ try:
from library.module_utils.network.f5.icontrol import tmos_version from library.module_utils.network.f5.icontrol import tmos_version
from library.module_utils.network.f5.urls import parseStats from library.module_utils.network.f5.urls import parseStats
except ImportError: 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.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.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.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 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.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.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.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.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.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.icontrol import tmos_version
from ansible_collections.community.general.plugins.module_utils.network.f5.urls import parseStats from ansible_collections.community.general.plugins.module_utils.network.f5.urls import parseStats

14
plugins/modules/network/f5/bigip_device_traffic_group.py
View file

@ -203,13 +203,13 @@ try:
from library.module_utils.network.f5.common import transform_name from library.module_utils.network.f5.common import transform_name
from library.module_utils.network.f5.common import flatten_boolean from library.module_utils.network.f5.common import flatten_boolean
except ImportError: 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.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.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.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 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.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.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.common import flatten_boolean
class Parameters(AnsibleF5Parameters): class Parameters(AnsibleF5Parameters):

4
plugins/modules/network/f5/bigip_facts.py
View file

@ -104,8 +104,8 @@ try:
from library.module_utils.network.f5.common import F5BaseClient from library.module_utils.network.f5.common import F5BaseClient
except ImportError: except ImportError:
from ansible_collections.community.general.plugins.module_utils.network.f5.legacy import bigip_api, bigsuds_found 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.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 F5BaseClient
try: try:
from suds import MethodNotFound, WebFault from suds import MethodNotFound, WebFault

16
plugins/modules/network/f5/bigip_firewall_address_list.py
View file

@ -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
from library.module_utils.network.f5.ipaddress import is_valid_ip_interface from library.module_utils.network.f5.ipaddress import is_valid_ip_interface
except ImportError: 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.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.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.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.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.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.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_address
from ansible_collections.ansible.netcommon.plugins.module_utils.compat.ipaddress import ip_interface 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.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_interface
class Parameters(AnsibleF5Parameters): class Parameters(AnsibleF5Parameters):

14
plugins/modules/network/f5/bigip_firewall_port_list.py
View file

@ -185,13 +185,13 @@ try:
from library.module_utils.network.f5.common import transform_name from library.module_utils.network.f5.common import transform_name
from library.module_utils.network.f5.icontrol import module_provisioned from library.module_utils.network.f5.icontrol import module_provisioned
except ImportError: 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.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.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.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.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.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.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.icontrol import module_provisioned
class Parameters(AnsibleF5Parameters): class Parameters(AnsibleF5Parameters):

8
plugins/modules/network/f5/bigip_gtm_facts.py
View file

@ -194,16 +194,16 @@ except ImportError:
try: try:
from library.module_utils.network.f5.common import F5BaseClient from library.module_utils.network.f5.common import F5BaseClient
except ImportError: 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: try:
from library.module_utils.network.f5.common import F5ModuleError 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 AnsibleF5Parameters
from library.module_utils.network.f5.common import f5_argument_spec from library.module_utils.network.f5.common import f5_argument_spec
except ImportError: 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
from ansible_collections.f5networks.f5_modules.plugins.module_utils.network.f5.common import AnsibleF5Parameters from ansible_collections.f5networks.f5_modules.plugins.module_utils.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 f5_argument_spec
class F5Client(F5BaseClient): class F5Client(F5BaseClient):

12
plugins/modules/network/f5/bigip_lx_package.py
View file

@ -105,12 +105,12 @@ try:
from library.module_utils.network.f5.icontrol import tmos_version from library.module_utils.network.f5.icontrol import tmos_version
from library.module_utils.network.f5.icontrol import upload_file from library.module_utils.network.f5.icontrol import upload_file
except ImportError: 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.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.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.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 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.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.icontrol import upload_file
class Parameters(AnsibleF5Parameters): class Parameters(AnsibleF5Parameters):

16
plugins/modules/network/f5/bigiq_device_info.py
View file

@ -836,14 +836,14 @@ try:
from library.module_utils.network.f5.ipaddress import is_valid_ip from library.module_utils.network.f5.ipaddress import is_valid_ip
from library.module_utils.network.f5.common import transform_name from library.module_utils.network.f5.common import transform_name
except ImportError: 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.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.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.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 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.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.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.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.common import transform_name
def parseStats(entry): def parseStats(entry):

12
plugins/modules/network/fortimanager/fmgr_device.py
View file

@ -119,12 +119,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import FAIL_SOCKET_MSG
def discover_device(fmgr, paramgram): def discover_device(fmgr, paramgram):

12
plugins/modules/network/fortimanager/fmgr_device_config.py
View file

@ -107,12 +107,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import FMGRMethods
def update_device_hostname(fmgr, paramgram): def update_device_hostname(fmgr, paramgram):

12
plugins/modules/network/fortimanager/fmgr_device_group.py
View file

@ -126,12 +126,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import FAIL_SOCKET_MSG
def get_groups(fmgr, paramgram): def get_groups(fmgr, paramgram):

12
plugins/modules/network/fortimanager/fmgr_device_provision_template.py
View file

@ -587,12 +587,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import FAIL_SOCKET_MSG
def get_devprof(fmgr, paramgram): def get_devprof(fmgr, paramgram):

10
plugins/modules/network/fortimanager/fmgr_fwobj_address.py
View file

@ -274,11 +274,11 @@ api_result:
import re import re
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.common import FAIL_SOCKET_MSG
def fmgr_fwobj_ipv4(fmgr, paramgram): def fmgr_fwobj_ipv4(fmgr, paramgram):

14
plugins/modules/network/fortimanager/fmgr_fwobj_ippool.py
View file

@ -285,13 +285,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
############### ###############

14
plugins/modules/network/fortimanager/fmgr_fwobj_ippool6.py
View file

@ -126,13 +126,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
def fmgr_fwobj_ippool6_modify(fmgr, paramgram): def fmgr_fwobj_ippool6_modify(fmgr, paramgram):

12
plugins/modules/network/fortimanager/fmgr_fwobj_service.py
View file

@ -292,12 +292,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import scrub_dict
def fmgr_fwobj_service_custom(fmgr, paramgram): def fmgr_fwobj_service_custom(fmgr, paramgram):

16
plugins/modules/network/fortimanager/fmgr_fwobj_vip.py
View file

@ -1757,14 +1757,14 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.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.common import scrub_dict
def fmgr_firewall_vip_modify(fmgr, paramgram): def fmgr_firewall_vip_modify(fmgr, paramgram):

16
plugins/modules/network/fortimanager/fmgr_fwpol_ipv4.py
View file

@ -970,14 +970,14 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.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.common import scrub_dict
def fmgr_firewall_policy_modify(fmgr, paramgram): def fmgr_firewall_policy_modify(fmgr, paramgram):

12
plugins/modules/network/fortimanager/fmgr_fwpol_package.py
View file

@ -216,12 +216,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import FMGRMethods
def fmgr_fwpol_package(fmgr, paramgram): def fmgr_fwpol_package(fmgr, paramgram):

12
plugins/modules/network/fortimanager/fmgr_ha.py
View file

@ -137,12 +137,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import FAIL_SOCKET_MSG
def fmgr_set_ha_mode(fmgr, paramgram): def fmgr_set_ha_mode(fmgr, paramgram):

2
plugins/modules/network/fortimanager/fmgr_provisioning.py
View file

@ -145,7 +145,7 @@ api_result:
""" """
from ansible.module_utils.basic import AnsibleModule, env_fallback 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 # check for pyFMG lib
try: try:

12
plugins/modules/network/fortimanager/fmgr_query.py
View file

@ -140,12 +140,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import FAIL_SOCKET_MSG
def fmgr_get_custom(fmgr, paramgram): def fmgr_get_custom(fmgr, paramgram):

12
plugins/modules/network/fortimanager/fmgr_script.py
View file

@ -119,12 +119,12 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.common import FAIL_SOCKET_MSG
def set_script(fmgr, paramgram): def set_script(fmgr, paramgram):

14
plugins/modules/network/fortimanager/fmgr_secprof_appctrl.py
View file

@ -348,13 +348,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
############### ###############
# START METHODS # START METHODS

14
plugins/modules/network/fortimanager/fmgr_secprof_av.py
View file

@ -977,13 +977,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
############### ###############
# START METHODS # START METHODS

16
plugins/modules/network/fortimanager/fmgr_secprof_dns.py
View file

@ -208,14 +208,14 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.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.common import scrub_dict
############### ###############

14
plugins/modules/network/fortimanager/fmgr_secprof_ips.py
View file

@ -436,13 +436,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
############### ###############

16
plugins/modules/network/fortimanager/fmgr_secprof_profile_group.py
View file

@ -167,14 +167,14 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.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.common import scrub_dict
############### ###############

14
plugins/modules/network/fortimanager/fmgr_secprof_proxy.py
View file

@ -209,13 +209,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
############### ###############

14
plugins/modules/network/fortimanager/fmgr_secprof_spam.py
View file

@ -417,13 +417,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
############### ###############
# START METHODS # START METHODS

16
plugins/modules/network/fortimanager/fmgr_secprof_ssl_ssh.py
View file

@ -696,14 +696,14 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.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.common import scrub_dict
############### ###############
# START METHODS # START METHODS

14
plugins/modules/network/fortimanager/fmgr_secprof_voip.py
View file

@ -888,13 +888,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
############### ###############

16
plugins/modules/network/fortimanager/fmgr_secprof_waf.py
View file

@ -1051,14 +1051,14 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.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.common import scrub_dict
############### ###############

14
plugins/modules/network/fortimanager/fmgr_secprof_wanopt.py
View file

@ -490,13 +490,13 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.common import scrub_dict
############### ###############

16
plugins/modules/network/fortimanager/fmgr_secprof_web.py
View file

@ -783,14 +783,14 @@ api_result:
from ansible.module_utils.basic import AnsibleModule, env_fallback from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.connection import Connection 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.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.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.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.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.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.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.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.common import scrub_dict
def fmgr_webfilter_profile_modify(fmgr, paramgram): def fmgr_webfilter_profile_modify(fmgr, paramgram):

6
plugins/modules/network/icx/icx_command.py
View file

@ -11,7 +11,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
'supported_by': 'community'} 'supported_by': 'community'}
DOCUMENTATION = ''' DOCUMENTATION = """
--- ---
module: icx_command module: icx_command
author: "Ruckus Wireless (@Commscope)" author: "Ruckus Wireless (@Commscope)"
@ -34,7 +34,7 @@ options:
device requires answering a prompt, checkall and newline if device requires answering a prompt, checkall and newline if
multiple prompts, it is possible to pass multiple prompts, it is possible to pass
a dict containing I(command), I(answer), I(prompt), I(check_all) 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. must be double quotes). See examples.
type: list type: list
required: true required: true
@ -74,7 +74,7 @@ options:
trying the command again. trying the command again.
type: int type: int
default: 1 default: 1
''' """
EXAMPLES = """ EXAMPLES = """
tasks: tasks:

6
plugins/modules/network/voss/voss_command.py
View file

@ -25,7 +25,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
'supported_by': 'community'} 'supported_by': 'community'}
DOCUMENTATION = ''' DOCUMENTATION = """
--- ---
module: voss_command module: voss_command
author: "Lindsay Hill (@LindsayHill)" author: "Lindsay Hill (@LindsayHill)"
@ -48,7 +48,7 @@ options:
until the condition is satisfied or the number of retries has until the condition is satisfied or the number of retries has
expired. If a command sent to the device requires answering a expired. If a command sent to the device requires answering a
prompt, it is possible to pass a dict containing I(command), 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. (carriage return, must be double quotes). See examples.
required: true required: true
wait_for: wait_for:
@ -82,7 +82,7 @@ options:
conditions, the interval indicates how long to wait before conditions, the interval indicates how long to wait before
trying the command again. trying the command again.
default: 1 default: 1
''' """
EXAMPLES = r""" EXAMPLES = r"""
tasks: tasks:

2
plugins/modules/remote_management/intersight/intersight_info.py
View file

@ -72,7 +72,7 @@ intersight_servers:
sample: 5978bea36ad4b000018d63dc 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 from ansible.module_utils.basic import AnsibleModule

2
plugins/modules/storage/netapp/na_cdot_aggregate.py
View file

@ -18,7 +18,7 @@ module: na_cdot_aggregate
short_description: Manage NetApp cDOT aggregates. short_description: Manage NetApp cDOT aggregates.
extends_documentation_fragment: extends_documentation_fragment:
- netapp.ontap.netapp.ontap - netapp.ontap.netapp.na_ontap
author: Sumit Kumar (@timuster) <sumit4@netapp.com> author: Sumit Kumar (@timuster) <sumit4@netapp.com>

2
plugins/modules/storage/netapp/na_cdot_license.py
View file

@ -18,7 +18,7 @@ module: na_cdot_license
short_description: Manage NetApp cDOT protocol and feature licenses short_description: Manage NetApp cDOT protocol and feature licenses
extends_documentation_fragment: extends_documentation_fragment:
- netapp.ontap.netapp.ontap - netapp.ontap.netapp.na_ontap
author: Sumit Kumar (@timuster) <sumit4@netapp.com> author: Sumit Kumar (@timuster) <sumit4@netapp.com>

2
plugins/modules/storage/netapp/na_cdot_lun.py
View file

@ -18,7 +18,7 @@ module: na_cdot_lun
short_description: Manage NetApp cDOT luns short_description: Manage NetApp cDOT luns
extends_documentation_fragment: extends_documentation_fragment:
- netapp.ontap.netapp.ontap - netapp.ontap.netapp.na_ontap
author: Sumit Kumar (@timuster) <sumit4@netapp.com> author: Sumit Kumar (@timuster) <sumit4@netapp.com>

2
plugins/modules/storage/netapp/na_cdot_qtree.py
View file

@ -18,7 +18,7 @@ module: na_cdot_qtree
short_description: Manage qtrees short_description: Manage qtrees
extends_documentation_fragment: extends_documentation_fragment:
- netapp.ontap.netapp.ontap - netapp.ontap.netapp.na_ontap
author: Sumit Kumar (@timuster) <sumit4@netapp.com> author: Sumit Kumar (@timuster) <sumit4@netapp.com>

2
plugins/modules/storage/netapp/na_cdot_svm.py
View file

@ -18,7 +18,7 @@ module: na_cdot_svm
short_description: Manage NetApp cDOT svm short_description: Manage NetApp cDOT svm
extends_documentation_fragment: extends_documentation_fragment:
- netapp.ontap.netapp.ontap - netapp.ontap.netapp.na_ontap
author: Sumit Kumar (@timuster) <sumit4@netapp.com> author: Sumit Kumar (@timuster) <sumit4@netapp.com>

2
plugins/modules/storage/netapp/na_cdot_user.py
View file

@ -18,7 +18,7 @@ module: na_cdot_user
short_description: useradmin configuration and management short_description: useradmin configuration and management
extends_documentation_fragment: extends_documentation_fragment:
- netapp.ontap.netapp.ontap - netapp.ontap.netapp.na_ontap
author: Sumit Kumar (@timuster) <sumit4@netapp.com> author: Sumit Kumar (@timuster) <sumit4@netapp.com>

2
plugins/modules/storage/netapp/na_cdot_user_role.py
View file

@ -18,7 +18,7 @@ module: na_cdot_user_role
short_description: useradmin configuration and management short_description: useradmin configuration and management
extends_documentation_fragment: extends_documentation_fragment:
- netapp.ontap.netapp.ontap - netapp.ontap.netapp.na_ontap
author: Sumit Kumar (@timuster) <sumit4@netapp.com> author: Sumit Kumar (@timuster) <sumit4@netapp.com>

2
plugins/modules/storage/netapp/na_cdot_volume.py
View file

@ -18,7 +18,7 @@ module: na_cdot_volume
short_description: Manage NetApp cDOT volumes short_description: Manage NetApp cDOT volumes
extends_documentation_fragment: extends_documentation_fragment:
- netapp.ontap.netapp.ontap - netapp.ontap.netapp.na_ontap
author: Sumit Kumar (@timuster) <sumit4@netapp.com> author: Sumit Kumar (@timuster) <sumit4@netapp.com>

8
tests/unit/modules/system/interfaces_file/interfaces_file/test_interfaces_file.py
View file

@ -15,6 +15,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
__metaclass__ = type
from ansible_collections.ansible.posix.tests.unit.compat import unittest from ansible_collections.ansible.posix.tests.unit.compat import unittest
from ansible_collections.community.general.plugins.modules import interfaces_file from ansible_collections.community.general.plugins.modules import interfaces_file
from shutil import copyfile, move from shutil import copyfile, move
@ -156,7 +158,7 @@ class TestInterfacesFileModule(unittest.TestCase):
fail_json_iterations = [] fail_json_iterations = []
for i, options in enumerate(options_list): for i, options in enumerate(options_list):
try: 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: except AnsibleFailJson as e:
fail_json_iterations.append("[%d] fail_json message: %s\noptions:\n%s" % fail_json_iterations.append("[%d] fail_json message: %s\noptions:\n%s" %
(i, str(e), json.dumps(options, sort_keys=True, indent=4, separators=(',', ': ')))) (i, str(e), json.dumps(options, sort_keys=True, indent=4, separators=(',', ': '))))
@ -188,7 +190,7 @@ class TestInterfacesFileModule(unittest.TestCase):
fail_json_iterations = [] fail_json_iterations = []
options['state'] = state options['state'] = state
try: try:
_, lines = interfaces_file.setInterfaceOption(module, lines, dummy, lines = interfaces_file.setInterfaceOption(module, lines,
options['iface'], options['option'], options['value'], options['state']) options['iface'], options['option'], options['value'], options['state'])
except AnsibleFailJson as e: except AnsibleFailJson as e:
fail_json_iterations.append("fail_json message: %s\noptions:\n%s" % fail_json_iterations.append("fail_json message: %s\noptions:\n%s" %
@ -312,7 +314,7 @@ class TestInterfacesFileModule(unittest.TestCase):
options = options_list[0] options = options_list[0]
fail_json_iterations = [] fail_json_iterations = []
try: try:
_, lines = interfaces_file.setInterfaceOption(module, lines, options['iface'], options['option'], dummy, lines = interfaces_file.setInterfaceOption(module, lines, options['iface'], options['option'],
options['value'], options['state'], options['address_family']) options['value'], options['state'], options['address_family'])
except AnsibleFailJson as e: except AnsibleFailJson as e:
fail_json_iterations.append("fail_json message: %s\noptions:\n%s" % fail_json_iterations.append("fail_json message: %s\noptions:\n%s" %

4
tests/utils/shippable/shippable.sh
View file

@ -42,18 +42,22 @@ cd "${TEST_DIR}"
ansible-galaxy -vvv collection install ansible.posix ansible-galaxy -vvv collection install ansible.posix
ansible-galaxy -vvv collection install community.crypto ansible-galaxy -vvv collection install community.crypto
ansible-galaxy -vvv collection install ansible.netcommon ansible-galaxy -vvv collection install ansible.netcommon
ansible-galaxy -vvv collection install ovirt.ovirt_collection
# unit tests # unit tests
ansible-galaxy -vvv collection install community.kubernetes ansible-galaxy -vvv collection install community.kubernetes
ansible-galaxy -vvv collection install netbox.netbox ansible-galaxy -vvv collection install netbox.netbox
ansible-galaxy -vvv collection install netapp.ontap 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.meraki
ansible-galaxy -vvv collection install cisco.intersight
ansible-galaxy -vvv collection install fortinet.fortios ansible-galaxy -vvv collection install fortinet.fortios
ansible-galaxy -vvv collection install junipernetworks.junos ansible-galaxy -vvv collection install junipernetworks.junos
ansible-galaxy -vvv collection install cisco.aci ansible-galaxy -vvv collection install cisco.aci
ansible-galaxy -vvv collection install google.cloud ansible-galaxy -vvv collection install google.cloud
ansible-galaxy -vvv collection install community.kubernetes ansible-galaxy -vvv collection install community.kubernetes
ansible-galaxy -vvv collection install f5networks.f5_modules 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: # Needed until https://github.com/ansible/ansible/issues/68415 is fixed:
chmod -R a+rX "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections" chmod -R a+rX "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections"