diff options
| author | Chaitanya Deshpande <15983253+chaitanyaavi@users.noreply.github.com> | 2019-03-06 22:39:49 +0530 |
|---|---|---|
| committer | Nathaniel Case <this.is@nathanielca.se> | 2019-03-06 12:09:49 -0500 |
| commit | 662dd2c1de6506833274bd064a6ecdf720e4fa2c (patch) | |
| tree | 298b478267e1ade62b972ee41b267abb2a9d081b | |
| parent | 77565554c823d2d6b681acc11a598405cd0e8981 (diff) | |
| download | ansible-662dd2c1de6506833274bd064a6ecdf720e4fa2c.tar.gz | |
Avi: Fixed import issues (#52661)
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/ansible/modules/network/avi/avi_api_session.py b/lib/ansible/modules/network/avi/avi_api_session.py index e6783bcc7c..3cf5bc4e59 100644 --- a/lib/ansible/modules/network/avi/avi_api_session.py +++ b/lib/ansible/modules/network/avi/avi_api_session.py @@ -115,8 +115,8 @@ from copy import deepcopy try: from ansible.module_utils.network.avi.avi import ( - avi_common_argument_spec, ansible_return, AviCredentials, HAS_AVI) - from avi.sdk.avi_api import ApiSession + avi_common_argument_spec, ansible_return, HAS_AVI) + from avi.sdk.avi_api import ApiSession, AviCredentials from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields except ImportError: diff --git a/lib/ansible/modules/network/avi/avi_api_version.py b/lib/ansible/modules/network/avi/avi_api_version.py index 16df11ce5a..00d8e9c01b 100644 --- a/lib/ansible/modules/network/avi/avi_api_version.py +++ b/lib/ansible/modules/network/avi/avi_api_version.py @@ -55,8 +55,8 @@ from ansible.module_utils.basic import AnsibleModule try: from ansible.module_utils.network.avi.avi import ( - avi_common_argument_spec, HAS_AVI, AviCredentials) - from avi.sdk.avi_api import ApiSession + avi_common_argument_spec, HAS_AVI) + from avi.sdk.avi_api import ApiSession, AviCredentials except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py b/lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py index 917cf2adcb..c304eb7bcc 100644 --- a/lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py +++ b/lib/ansible/modules/network/avi/avi_gslbservice_patch_member.py @@ -114,10 +114,10 @@ HAS_AVI = True try: from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI) - from avi.sdk.avi_api import ApiSession + from avi.sdk.avi_api import ApiSession, AviCredentials from avi.sdk.utils.ansible_utils import ( avi_obj_cmp, cleanup_absent_fields, ansible_return, - AviCheckModeResponse, AviCredentials) + AviCheckModeResponse) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_useraccount.py b/lib/ansible/modules/network/avi/avi_useraccount.py index 08ed87c75d..600f07d7fa 100644 --- a/lib/ansible/modules/network/avi/avi_useraccount.py +++ b/lib/ansible/modules/network/avi/avi_useraccount.py @@ -78,8 +78,8 @@ from copy import deepcopy try: from ansible.module_utils.network.avi.avi import ( - avi_common_argument_spec, ansible_return, AviCredentials, HAS_AVI) - from avi.sdk.avi_api import ApiSession + avi_common_argument_spec, ansible_return, HAS_AVI) + from avi.sdk.avi_api import ApiSession, AviCredentials from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields except ImportError: |