mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-02 14:40:19 -07:00
Updated Avi Modules with new features and documentation update. (#34206)
* Updated Avi Modules with following 1. Support to perform patch operation using the modules. The data update method is selected using avi_api_update_method=patch and patch operation is determined by avi_api_patch_op. The patch data is the normal params that are provided in the modules 2. Support for avi_credentials as single authentication dictionary for all API calls. This is preferred way as opposed to previously all credentials details would pollute the individual Ansible tasks. It also allows the module development to be enhanced without breaking compatibility for new authentication schemes like SAML etc. 3. Support for sharing api_context between the module invocations. This is a workaround to not do multiple logins to Avi Controller and be able to re-use single login across multiple REST API calls. 4. Documentation update for new parameters and existing ones with Units data. * Fixed the pylint and pep8 errors caused due to pycharm editor auto formatting
This commit is contained in:
parent
9b4a1ed475
commit
9e2ff3e4d5
57 changed files with 1522 additions and 238 deletions
|
@ -39,7 +39,7 @@ HAS_AVI = True
|
|||
try:
|
||||
import avi.sdk
|
||||
sdk_version = getattr(avi.sdk, '__version__', None)
|
||||
if ((sdk_version is None) or (sdk_version and (LooseVersion(sdk_version) < LooseVersion('17.1')))):
|
||||
if ((sdk_version is None) or (sdk_version and (LooseVersion(sdk_version) < LooseVersion('17.2.4')))):
|
||||
# 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
|
||||
|
@ -58,25 +58,33 @@ def avi_common_argument_spec():
|
|||
password=dict(default=os.environ.get('AVI_PASSWORD', ''), no_log=True),
|
||||
tenant=dict(default='admin'),
|
||||
tenant_uuid=dict(default=''),
|
||||
api_version=dict(default='16.4'))
|
||||
api_version=dict(default='16.4.4'),
|
||||
avi_credentials=dict(default=None, no_log=True, type='dict'),
|
||||
api_context=dict(type='dict'))
|
||||
|
||||
|
||||
def ansible_return(module, rsp, changed, req=None, existing_obj=None):
|
||||
def ansible_return(module, rsp, changed, req=None, existing_obj=None,
|
||||
api_context=None):
|
||||
"""
|
||||
Helper function to return the right ansible return based on the error code and
|
||||
changed status.
|
||||
:param module: AnsibleModule
|
||||
:param rsp: ApiResponse object returned from ApiSession.
|
||||
:param changed: Whether something changed in this module.
|
||||
:param req: Dict data for Avi API call.
|
||||
:param existing_obj: Dict representing current HTTP resource in Avi Controller.
|
||||
:param rsp: ApiResponse from avi_api
|
||||
:param changed: boolean
|
||||
:param req: Actual req dictionary used in Avi API
|
||||
:param existing_obj: Existing Avi resource. Used for allowing caller to do
|
||||
diff if desired.
|
||||
:param api_context: Avi API context information like CSRF token, session_id
|
||||
used. This can be passed to the next API call to avoid re-login.
|
||||
|
||||
Returns: specific ansible module exit function
|
||||
"""
|
||||
if rsp.status_code > 299:
|
||||
return module.fail_json(msg='Error %d Msg %s req: %s' % (
|
||||
rsp.status_code, rsp.text, req))
|
||||
return module.fail_json(msg='Error %d Msg %s req: %s api_context:%s ' % (
|
||||
rsp.status_code, rsp.text, req, api_context))
|
||||
if changed and existing_obj:
|
||||
return module.exit_json(
|
||||
changed=changed, obj=rsp.json(), old_obj=existing_obj)
|
||||
return module.exit_json(changed=changed, obj=rsp.json())
|
||||
changed=changed, obj=rsp.json(), old_obj=existing_obj,
|
||||
api_context=api_context)
|
||||
return module.exit_json(changed=changed, obj=rsp.json(),
|
||||
api_context=api_context)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue