From c3fb4c837b473a8480c1512df6a8d5c8bab7eda1 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Wed, 8 Feb 2017 10:32:13 -0600 Subject: [PATCH] Fix module validation errors for avi_api_session (#21154) --- .../modules/network/avi/avi_api_session.py | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/ansible/modules/network/avi/avi_api_session.py b/lib/ansible/modules/network/avi/avi_api_session.py index 9106cd3938..043c542158 100644 --- a/lib/ansible/modules/network/avi/avi_api_session.py +++ b/lib/ansible/modules/network/avi/avi_api_session.py @@ -23,19 +23,6 @@ # """ -import json -import time -from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.avi import avi_common_argument_spec, ansible_return -from copy import deepcopy - -HAS_AVI = True -try: - from avi.sdk.avi_api import ApiSession - from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields -except ImportError: - HAS_AVI = False - ANSIBLE_METADATA = {'status': ['preview'], 'supported_by': 'community', 'version': '1.0'} DOCUMENTATION = ''' @@ -63,7 +50,7 @@ options: - Query parameters passed to the HTTP API. path: description: - - Path for Avi API resource. For example, C(path: virtualservice) will translate to C(api/virtualserivce). + - 'Path for Avi API resource. For example, C(path: virtualservice) will translate to C(api/virtualserivce).' timeout: description: - Timeout (in seconds) for Avi API calls. @@ -126,6 +113,20 @@ obj: type: dict ''' +import json +import time +from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.avi import avi_common_argument_spec, ansible_return +from copy import deepcopy + +HAS_AVI = True +try: + from avi.sdk.avi_api import ApiSession + from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields +except ImportError: + HAS_AVI = False + + def main(): argument_specs = dict( http_method=dict(required=True,