Merge pull request #231 from vmware/jenkins_sync_31.1.2_ansible_collection

Auto updated assets for ansible collection 31.1.2

Author: chandanapatnala

CHANGELOG.rst

@@ -1 +1,13 @@
 
+===========================
+vmware.alb Release Notes
+===========================
+
+
+v31.1.2
+======
+
+- AV-128581 - Added the installation of bs4 as a requirement to fix failure of auto… by @chandanapatnala in #160
+- Auto updated assets for ansible collection eng by @sagarpsalvi in [#178](https://github.com/vmware/ansible-collection-alb/pull/178)
+- Auto updated assets for ansible collection eng by @sagarpsalvi in [#195](https://github.com/vmware/ansible-collection-alb/pull/195)
+- AV-232916 Fixes ansible module doc by @Rohan-sss1 in [#222](https://github.com/vmware/ansible-collection-alb/pull/222)

README.md

@@ -7,7 +7,7 @@
 <!--start requires_ansible-->
 ## Ansible version compatibility
 
-This collection has been tested against following Ansible versions: **>=2.9.10**.
+This collection has been tested against following Ansible versions: **>=2.15.0**.
 
 <!--end requires_ansible-->
 
@@ -17,11 +17,6 @@ This collection has been tested against following Ansible versions: **>=2.9.10**
 
 ## Installation and Usage
 
-Ansible must be installed
-```
-pip install ansible
-```
-
 Install ALB collection using `ansible-galaxy` CLI:
 ```
 ansible-galaxy collection install vmware.alb
@@ -285,5 +280,21 @@ avi_config:
           # please use vars_files parameter as shown in previous example
 ```
 
+## Support
+
+As Red Hat Ansible Certified Content, this collection is entitled to support through the Ansible Automation Platform (AAP) using the Create issue button on the top right corner.
+If a support case cannot be opened with Red Hat and the collection has been obtained either from Galaxy or GitHub, there may community help available on the [Ansible Forum](https://forum.ansible.com/).
+
+## Release Notes
+
+For release notes, see [CHANGELOG.rst](https://github.com/vmware/ansible-collection-alb/blob//CHANGELOG.rst).
+
+## Licensing
+
+GNU General Public License v2.0 or later.
+
+See [LICENSE](https://github.com/vmware/ansible-collection-alb/blob/31.1.2/LICENSE) to see the full text.
+
+
 **Notes**
 Please use Python >= 3.8 if you are using avi_serviceenginegroup module as it has more than 255 arguments

meta/runtime.yml

@@ -1,2 +1,2 @@
 ---
-requires_ansible: '>=2.9.10'
+requires_ansible: '>=2.15.0'

plugins/lookup/avi.py

@@ -6,8 +6,9 @@
 __metaclass__ = type
 
 DOCUMENTATION = '''
-lookup: avi
-author: Sandeep Bandi <[email protected]>
+name: avi
+author:
+  - Sandeep Bandi (@sabandi)
 short_description: Look up ``Avi`` objects.
 description:
     - Given an object_type, fetch all the objects of that type or fetch

plugins/module_utils/avi_api.py

@@ -17,6 +17,7 @@
     from urllib.parse import urlparse
 
 from datetime import datetime, timedelta
+import requests
 from requests import ConnectionError
 from requests import Response
 from requests.exceptions import ChunkedEncodingError
@@ -647,6 +648,10 @@ def _api(self, api_name, path, tenant, tenant_uuid, data=None,
         err = None
         api_hdrs = self._get_api_headers(tenant, tenant_uuid, timeout, headers,
                                          api_version)
+        certificate = self.avi_credentials.ssl_cert
+        key = self.avi_credentials.ssl_key
+        if certificate and key:
+            kwargs['cert'] = (certificate, key)
         if 'X-CSRFToken' in api_hdrs:
             cookies = {
                 'csrftoken': api_hdrs['X-CSRFToken'],

plugins/modules/avi_csrfpolicy.py

@@ -103,7 +103,7 @@
             - Even after that, tokens will be accepted until twice this amount of time has passed.
             - Note, however, that other timeouts from the underlying session layer also affect how long a given token can be used.
             - A token will be invalidated (rotated or deleted) after one of 'token_validity_time_min' (this value), 'session_establishment_timeout',
-            - session_idle_timeout, session_maximum_timeout is reached, whichever occurs first.
+              'session_idle_timeout', 'session_maximum_timeout' is reached, whichever occurs first.
             - Allowed values are 10-1440.
             - Special values are 0- unlimited.
             - Field introduced in 30.2.1.

plugins/modules/avi_deploy_controller.py

@@ -7,7 +7,7 @@
 DOCUMENTATION = '''
 ---
 module: avi_deploy_controller
-author: chaitanyaavi (@chaitanyaavi) <chaitanya.deshpande@avinetworks.com>
+author: Rohan-sss1 (@Rohan-sss1) <rohan.suryavanshi@broadcom.com>
 
 short_description: Module is to deploy vm on vcenter
 description:

plugins/modules/avi_pingaccessagent.py

@@ -66,7 +66,6 @@
             - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
             - edition.
         type: list
-        elements: str
     name:
         description:
             - Name of the pingaccess agent.

plugins/modules/avi_upgradeprofile.py

@@ -0,0 +1,154 @@
+#!/usr/bin/python
+# module_check: supported
+
+# Copyright 2021 VMware, Inc.  All rights reserved. VMware Confidential
+# SPDX-License-Identifier: Apache License 2.0
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
+
+DOCUMENTATION = '''
+---
+module: avi_upgradeprofile
+author: Gaurav Rastogi (@grastogi23) <[email protected]>
+short_description: Module for setup of UpgradeProfile Avi RESTful Object
+description:
+    - This module is used to configure UpgradeProfile object
+    - more examples at U(https://github.com/avinetworks/devops)
+options:
+    state:
+        description:
+            - The state that should be applied on the entity.
+        default: present
+        choices: ["absent", "present"]
+        type: str
+    avi_api_update_method:
+        description:
+            - Default method for object update is HTTP PUT.
+            - Setting to patch will override that behavior to use HTTP PATCH.
+        default: put
+        choices: ["put", "patch"]
+        type: str
+    avi_api_patch_op:
+        description:
+            - Patch operation to use when using avi_api_update_method as patch.
+        choices: ["add", "replace", "delete", "remove"]
+        type: str
+    avi_patch_path:
+        description:
+            - Patch path to use when using avi_api_update_method as patch.
+        type: str
+    avi_patch_value:
+        description:
+            - Patch value to use when using avi_api_update_method as patch.
+        type: str
+    controller:
+        description:
+            - List of controller upgrade related configurable parameters.
+            - Field introduced in 31.1.1.
+            - Allowed with any value in enterprise, enterprise with cloud services edition.
+        type: dict
+    dry_run:
+        description:
+            - List of dryrun related configurable parameters.
+            - Field introduced in 31.1.1.
+            - Allowed with any value in enterprise, enterprise with cloud services edition.
+        type: dict
+    image:
+        description:
+            - List of image related configurable parameters.
+            - Field introduced in 31.1.1.
+            - Allowed with any value in enterprise, enterprise with cloud services edition.
+        type: dict
+    pre_checks:
+        description:
+            - List of upgrade pre-checks related configurable parameters.
+            - Field introduced in 31.1.1.
+            - Allowed with any value in enterprise, enterprise with cloud services edition.
+        type: dict
+    service_engine:
+        description:
+            - List of service engine upgrade related configurable parameters.
+            - Field introduced in 31.1.1.
+            - Allowed with any value in enterprise, enterprise with cloud services edition.
+        type: dict
+    url:
+        description:
+            - Avi controller URL of the object.
+        type: str
+    uuid:
+        description:
+            - Uuid identifier for the upgradeprofile object.
+            - Field introduced in 31.1.1.
+            - Allowed with any value in enterprise, enterprise with cloud services edition.
+        type: str
+extends_documentation_fragment:
+    - vmware.alb.avi
+'''
+
+EXAMPLES = """
+- hosts: all
+  vars:
+    avi_credentials:
+      username: "admin"
+      password: "something"
+      controller: "192.168.15.18"
+      api_version: "21.1.1"
+
+- name: Example to create UpgradeProfile object
+  vmware.alb.avi_upgradeprofile:
+    avi_credentials: "{{ avi_credentials }}"
+    state: present
+    name: sample_upgradeprofile
+"""
+
+RETURN = '''
+obj:
+    description: UpgradeProfile (api/upgradeprofile) object
+    returned: success, changed
+    type: dict
+'''
+
+from ansible.module_utils.basic import AnsibleModule
+try:
+    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
+        avi_common_argument_spec, avi_ansible_api)
+    HAS_REQUESTS = True
+except ImportError:
+    HAS_REQUESTS = False
+
+
+def main():
+    argument_specs = dict(
+        state=dict(default='present',
+                   choices=['absent', 'present']),
+        avi_api_update_method=dict(default='put',
+                                   choices=['put', 'patch']),
+        avi_api_patch_op=dict(choices=['add', 'replace', 'delete', 'remove']),
+        avi_patch_path=dict(type='str',),
+        avi_patch_value=dict(type='str',),
+        controller=dict(type='dict',),
+        dry_run=dict(type='dict',),
+        image=dict(type='dict',),
+        pre_checks=dict(type='dict',),
+        service_engine=dict(type='dict',),
+        url=dict(type='str',),
+        uuid=dict(type='str',),
+    )
+    argument_specs.update(avi_common_argument_spec())
+    module = AnsibleModule(
+        argument_spec=argument_specs, supports_check_mode=True)
+    if not HAS_REQUESTS:
+        return module.fail_json(msg=(
+            'Python requests package is not installed. '
+            'For installation instructions, visit https://pypi.org/project/requests.'))
+    return avi_ansible_api(module, 'upgradeprofile',
+                           set())
+
+
+if __name__ == '__main__':
+    main()

plugins/modules/deploy_se.py

@@ -479,7 +479,7 @@ def main():
             se_vmw_mgmt_mask=dict(required=False, type='str'),
             se_vmw_default_gw=dict(required=False, type='str'),
             se_vmw_sysadmin_public_key=dict(required=False, type='str'),
-            se_auth_token=dict(required=True, type='str'),
+            se_auth_token=dict(required=True, type='str', no_log=True),
             se_cluster_uuid=dict(required=True, type='str'),
             se_leader_ctl_ip=dict(required=True, type='str'),
             se_vmw_number_of_cpus=dict(required=False, type='int'),