diff --git a/lib/ansible/module_utils/avi_ansible_utils.py b/lib/ansible/module_utils/avi.py similarity index 95% rename from lib/ansible/module_utils/avi_ansible_utils.py rename to lib/ansible/module_utils/avi.py index 1bbb3e9c007..4957f4e2bea 100644 --- a/lib/ansible/module_utils/avi_ansible_utils.py +++ b/lib/ansible/module_utils/avi.py @@ -29,10 +29,10 @@ # This module initially matched the namespace of network module avi. However, # that causes namespace import error when other modules from avi namespaces -# are imported. In order to avoid the import collisions this was renamed to -# avi_ansible_utils to allow this module to be ceterpiece of all integration -# with external avi modules. +# are imported. Added import of absolute_import to avoid import collisions for +# avi.sdk. +from __future__ import absolute_import import os from pkg_resources import parse_version diff --git a/lib/ansible/modules/network/avi/avi_analyticsprofile.py b/lib/ansible/modules/network/avi/avi_analyticsprofile.py index a65532defd8..fb71b9fee0d 100644 --- a/lib/ansible/modules/network/avi/avi_analyticsprofile.py +++ b/lib/ansible/modules/network/avi/avi_analyticsprofile.py @@ -389,19 +389,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_api_session.py b/lib/ansible/modules/network/avi/avi_api_session.py index 3024c7eacde..8db0e7303aa 100644 --- a/lib/ansible/modules/network/avi/avi_api_session.py +++ b/lib/ansible/modules/network/avi/avi_api_session.py @@ -119,7 +119,7 @@ from ansible.module_utils.basic import AnsibleModule from copy import deepcopy try: - from ansible.module_utils.avi_ansible_utils import ( + from ansible.module_utils.avi import ( avi_common_argument_spec, ansible_return, HAS_AVI) from avi.sdk.avi_api import ApiSession from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields diff --git a/lib/ansible/modules/network/avi/avi_applicationpersistenceprofile.py b/lib/ansible/modules/network/avi/avi_applicationpersistenceprofile.py index e892c45107d..3a960ab70d4 100644 --- a/lib/ansible/modules/network/avi/avi_applicationpersistenceprofile.py +++ b/lib/ansible/modules/network/avi/avi_applicationpersistenceprofile.py @@ -113,19 +113,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_applicationprofile.py b/lib/ansible/modules/network/avi/avi_applicationprofile.py index 9d4d3df8e18..1389c18bee7 100644 --- a/lib/ansible/modules/network/avi/avi_applicationprofile.py +++ b/lib/ansible/modules/network/avi/avi_applicationprofile.py @@ -152,19 +152,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_certificatemanagementprofile.py b/lib/ansible/modules/network/avi/avi_certificatemanagementprofile.py index 449fcf19a19..e8df46633ad 100644 --- a/lib/ansible/modules/network/avi/avi_certificatemanagementprofile.py +++ b/lib/ansible/modules/network/avi/avi_certificatemanagementprofile.py @@ -83,19 +83,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_healthmonitor.py b/lib/ansible/modules/network/avi/avi_healthmonitor.py index 4327be3a585..ff09985b092 100644 --- a/lib/ansible/modules/network/avi/avi_healthmonitor.py +++ b/lib/ansible/modules/network/avi/avi_healthmonitor.py @@ -135,7 +135,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi_ansible_utils import ( + from ansible.module_utils.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_networkprofile.py b/lib/ansible/modules/network/avi/avi_networkprofile.py index 4c40e5bd20d..5edceaa294c 100644 --- a/lib/ansible/modules/network/avi/avi_networkprofile.py +++ b/lib/ansible/modules/network/avi/avi_networkprofile.py @@ -89,19 +89,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_pkiprofile.py b/lib/ansible/modules/network/avi/avi_pkiprofile.py index 3ef3bec0135..7026df886d3 100644 --- a/lib/ansible/modules/network/avi/avi_pkiprofile.py +++ b/lib/ansible/modules/network/avi/avi_pkiprofile.py @@ -99,19 +99,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_pool.py b/lib/ansible/modules/network/avi/avi_pool.py index 2116506f9fe..e38c4451cfd 100644 --- a/lib/ansible/modules/network/avi/avi_pool.py +++ b/lib/ansible/modules/network/avi/avi_pool.py @@ -291,7 +291,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi_ansible_utils import ( + from ansible.module_utils.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_poolgroup.py b/lib/ansible/modules/network/avi/avi_poolgroup.py index 48a5b5aa3c1..855688aa945 100644 --- a/lib/ansible/modules/network/avi/avi_poolgroup.py +++ b/lib/ansible/modules/network/avi/avi_poolgroup.py @@ -112,7 +112,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi_ansible_utils import ( + from ansible.module_utils.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_role.py b/lib/ansible/modules/network/avi/avi_role.py index de561792236..c65e581c79a 100644 --- a/lib/ansible/modules/network/avi/avi_role.py +++ b/lib/ansible/modules/network/avi/avi_role.py @@ -79,19 +79,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py b/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py index 090226c80de..6a311679ec2 100644 --- a/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py +++ b/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py @@ -130,7 +130,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi_ansible_utils import ( + from ansible.module_utils.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_sslprofile.py b/lib/ansible/modules/network/avi/avi_sslprofile.py index dff6db4eda0..1ba01dded5f 100644 --- a/lib/ansible/modules/network/avi/avi_sslprofile.py +++ b/lib/ansible/modules/network/avi/avi_sslprofile.py @@ -150,19 +150,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_systemconfiguration.py b/lib/ansible/modules/network/avi/avi_systemconfiguration.py index d9e88786552..dfde02fc3b2 100644 --- a/lib/ansible/modules/network/avi/avi_systemconfiguration.py +++ b/lib/ansible/modules/network/avi/avi_systemconfiguration.py @@ -106,7 +106,7 @@ extends_documentation_fragment: ''' EXAMPLES = """ -- name: Example Adds/Deletes SystemConfiguration configuration from Avi Controller +- name: Example to create SystemConfiguration object avi_systemconfiguration: controller: 10.10.25.42 username: admin @@ -122,19 +122,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_tenant.py b/lib/ansible/modules/network/avi/avi_tenant.py index 1fa2f7ae51f..d5c9cec36e0 100644 --- a/lib/ansible/modules/network/avi/avi_tenant.py +++ b/lib/ansible/modules/network/avi/avi_tenant.py @@ -91,19 +91,11 @@ obj: type: dict ''' -from pkg_resources import parse_version from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec -HAS_AVI = True try: - import avi.sdk - sdk_version = getattr(avi.sdk, '__version__', None) - if ((sdk_version is None) or (sdk_version and - (parse_version(sdk_version) < parse_version('16.3.5.post1')))): - # It allows the __version__ to be '' as that value is used in development builds - raise ImportError - from avi.sdk.utils.ansible_utils import avi_ansible_api + from ansible.module_utils.avi import ( + avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_virtualservice.py b/lib/ansible/modules/network/avi/avi_virtualservice.py index 94b47da84e9..f013b1a7c4d 100644 --- a/lib/ansible/modules/network/avi/avi_virtualservice.py +++ b/lib/ansible/modules/network/avi/avi_virtualservice.py @@ -355,7 +355,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi_ansible_utils import ( + from ansible.module_utils.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/test/compile/python2.4-skip.txt b/test/compile/python2.4-skip.txt index 7910c729632..753d1ddd7fa 100644 --- a/test/compile/python2.4-skip.txt +++ b/test/compile/python2.4-skip.txt @@ -32,6 +32,7 @@ /lib/ansible/modules/web_infrastructure/ansible_tower/ /lib/ansible/module_utils/a10.py /lib/ansible/module_utils/ansible_tower.py +/lib/ansible/module_utils/avi.py /lib/ansible/module_utils/azure_rm_common.py /lib/ansible/module_utils/cloud.py /lib/ansible/module_utils/docker_common.py