Merge pull request #204 from vmware/jenkins_sync_30.2.2_ansible_collection

Auto updated assets for ansible collection 30.2.2

Author: mkhachane

.github/workflows/ci.yaml

@@ -17,15 +17,15 @@ jobs:
       HOME: "/home/runner"
     strategy:
       matrix:
-        ansible: [2.9.17, 2.10.5]
+        ansible: [2.15.0]
     steps:
       - name: Check out code
         uses: actions/checkout@v2
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9.19
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.9.19
 
       - name: Get Python and Pip version
         run: echo $(pip --version)
@@ -40,11 +40,11 @@ jobs:
         run: ansible-galaxy collection install *.tar.gz
 
       - name: Run unit tests
-        run: ansible-test units --docker -v --color --truncate 0 --python 3.8
+        run: ansible-test units --docker -v --color --truncate 0 --python 3.9
         working-directory: ${{ env.HOME }}/.ansible/collections/ansible_collections/vmware/alb
 
       - name: Run ansible sanity tests
-        run: ansible-test sanity --docker -v --color --truncate 0 --python 3.8
+        run: ansible-test sanity --docker -v --color --truncate 0 --python 3.9
         working-directory: ${{ env.HOME }}/.ansible/collections/ansible_collections/vmware/alb
 
       # Always install galaxy-importer after the unit tests are finished as it is overriding the existing

README.md

@@ -152,7 +152,7 @@ Parameters
                   - Allowed in enterprise edition with any value, enterprise with cloud services edition.
                 </div>
                                 <div style="font-size: small">
-                  - Default value when not specified in API or module is interpreted by Avi Controller as False.
+                  - Default value when not specified in API or module is interpreted by Avi Controller as True.
                 </div>
                                             </td>
         </tr>

docs/avi_controllerproperties.rst

@@ -5,25 +5,11 @@
 
 __metaclass__ = type
 
-from ansible_collections.vmware.alb.plugins.module_utils.avi_api import ApiSession, \
-    sessionDict, APIError, AviCredentials
-import os
-import sys
-import copy
-import json
+from ansible_collections.vmware.alb.plugins.module_utils.avi_api import ApiSession, APIError
 import logging
 import time
-
-if sys.version_info < (3, 5):
-    from urlparse import urlparse
-else:
-    from urllib.parse import urlparse
-
-from datetime import datetime, timedelta
 from requests import ConnectionError
-from requests import Response
 from requests.exceptions import ChunkedEncodingError
-from requests.sessions import Session
 from ssl import SSLError
 
 logger = logging.getLogger(__name__)

plugins/module_utils/csp_avi_api.py

@@ -101,9 +101,7 @@
     HAS_LIB = False
 
 try:
-    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
-        avi_common_argument_spec, ansible_return, avi_obj_cmp,
-        cleanup_absent_fields)
+    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import avi_common_argument_spec
     from ansible_collections.vmware.alb.plugins.module_utils.avi_api import (
         ApiSession, AviCredentials)
     HAS_REQUESTS = True

plugins/modules/avi_api_fileservice.py

@@ -59,7 +59,6 @@
     type: dict
 '''
 
-import json
 import os
 from ansible.module_utils.basic import AnsibleModule
 
@@ -70,19 +69,15 @@
     HAS_LIB = False
 
 try:
-    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
-        avi_common_argument_spec, ansible_return, avi_obj_cmp,
-        cleanup_absent_fields)
+    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import avi_common_argument_spec
     from ansible_collections.vmware.alb.plugins.module_utils.avi_api import (
         ApiSession, AviCredentials)
     HAS_REQUESTS = True
 except ImportError:
     HAS_REQUESTS = False
 try:
     from avi.sdk.avi_api import ApiSession, AviCredentials
-    from avi.sdk.utils.ansible_utils import (
-        avi_obj_cmp, cleanup_absent_fields, avi_common_argument_spec,
-        ansible_return)
+    from avi.sdk.utils.ansible_utils import avi_common_argument_spec
     HAS_AVI = True
 except ImportError:
     HAS_AVI = False

plugins/modules/avi_api_image.py

@@ -48,9 +48,7 @@
 from ansible.module_utils.basic import AnsibleModule
 
 try:
-    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
-        avi_common_argument_spec, ansible_return, avi_obj_cmp,
-        cleanup_absent_fields)
+    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import avi_common_argument_spec
     from ansible_collections.vmware.alb.plugins.module_utils.avi_api import (
         ApiSession, AviCredentials)
     HAS_REQUESTS = True

plugins/modules/avi_api_version.py

@@ -74,13 +74,9 @@
 import time
 from ansible.module_utils.basic import AnsibleModule
 try:
-    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
-        avi_common_argument_spec, ansible_return, avi_obj_cmp,
-        cleanup_absent_fields)
+    from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import avi_common_argument_spec
     from ansible_collections.vmware.alb.plugins.module_utils.avi_api import (
         ApiSession, AviCredentials)
-
-    from pkg_resources import parse_version
     import subprocess
     import requests
     HAS_REQUESTS = True

plugins/modules/avi_bootstrap_controller.py

@@ -52,7 +52,7 @@
             - Enable to use event manager as source of eventsdisable to use log manager as source of events.
             - Field introduced in 30.2.1.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-            - Default value when not specified in API or module is interpreted by Avi Controller as False.
+            - Default value when not specified in API or module is interpreted by Avi Controller as True.
         type: bool
     allow_admin_network_updates:
         description:

plugins/modules/avi_controllerproperties.py

@@ -107,8 +107,6 @@
     type: dict
 '''
 
-import json
-import time
 from ansible.module_utils.basic import AnsibleModule
 from copy import deepcopy
 
@@ -137,11 +135,9 @@ def delete_member(module, check_mode, api, tenant, tenant_uuid,
                   if group['name'] == data['group']['name']]
         if groups:
             changed = any(
-                [(lambda g: g['ip']['addr'] in patched_member_ids)(m)
-                    for m in groups[0].get('members', []) if 'fqdn' not in m])
+                (m['ip']['addr'] in patched_member_ids) for m in groups[0].get('members', []) if 'fqdn' not in m)
             changed = changed or any(
-                [(lambda g: g['fqdn'] in patched_member_fqdns)(m)
-                    for m in groups[0].get('members', []) if 'fqdn' in m])
+                (m['fqdn'] in patched_member_fqdns) for m in groups[0].get('members', []) if 'fqdn' in m)
     if check_mode or not changed:
         return changed, rsp
     # should not come here if not found

plugins/modules/avi_gslbservice_patch_member.py

@@ -184,8 +184,7 @@
 from ansible.module_utils.basic import AnsibleModule
 try:
     from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
-        avi_common_argument_spec, AviCheckModeResponse, ansible_return, avi_obj_cmp,
-        cleanup_absent_fields)
+        avi_common_argument_spec, AviCheckModeResponse, avi_obj_cmp)
     from ansible_collections.vmware.alb.plugins.module_utils.avi_api import (
         ApiSession, AviCredentials)
     HAS_REQUESTS = True

plugins/modules/avi_pulse_registration.py

@@ -96,11 +96,9 @@
 from ansible.module_utils.basic import AnsibleModule
 try:
     from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
-        avi_common_argument_spec, ansible_return, avi_obj_cmp,
-        cleanup_absent_fields)
+        avi_common_argument_spec, ansible_return)
     from ansible_collections.vmware.alb.plugins.module_utils.avi_api import (
         ApiSession, AviCredentials)
-    from pkg_resources import parse_version
     from requests import ConnectionError
     from ssl import SSLError
     from requests.exceptions import ChunkedEncodingError

plugins/modules/avi_saml_api_session.py

@@ -1639,7 +1639,7 @@
 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, ansible_return)
+        avi_common_argument_spec, avi_ansible_api)
     HAS_REQUESTS = True
 except ImportError:
     HAS_REQUESTS = False

plugins/modules/avi_serviceenginegroup.py

@@ -100,8 +100,7 @@
 from ansible.module_utils.basic import AnsibleModule
 try:
     from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
-        avi_common_argument_spec, ansible_return, avi_ansible_api, avi_obj_cmp,
-        cleanup_absent_fields)
+        avi_common_argument_spec, avi_ansible_api)
     from ansible_collections.vmware.alb.plugins.module_utils.avi_api import (
         ApiSession, AviCredentials)
     HAS_REQUESTS = True

plugins/modules/avi_update_se_data_vnics.py

@@ -142,7 +142,7 @@
 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, ansible_return)
+        avi_common_argument_spec, avi_ansible_api)
     HAS_REQUESTS = True
 except ImportError:
     HAS_REQUESTS = False

plugins/modules/avi_user.py

@@ -75,15 +75,11 @@
     type: dict
 '''
 
-import json
-import time
 from ansible.module_utils.basic import AnsibleModule
-from copy import deepcopy
 
 try:
     from ansible_collections.vmware.alb.plugins.module_utils.utils.ansible_utils import (
-        avi_common_argument_spec, ansible_return, avi_obj_cmp,
-        cleanup_absent_fields)
+        avi_common_argument_spec, ansible_return)
     from ansible_collections.vmware.alb.plugins.module_utils.avi_api import (
         ApiSession, AviCredentials)
     HAS_REQUESTS = True

plugins/modules/avi_useraccount.py

@@ -207,15 +207,13 @@
 
 
 import atexit
-import json
 try:
     from urllib import quote
 except ImportError:
     from urllib.parse import quote
 try:
     import requests
     import os
-    import time
     from pyVim.connect import SmartConnectNoSSL, Disconnect
     from pyVmomi import vim, vmodl
     HAS_IMPORT = True

plugins/modules/deploy_se.py

@@ -113,7 +113,6 @@
 '''
 
 
-import json
 import atexit
 try:
     import requests
@@ -127,8 +126,7 @@
 try:
     from pkg_resources import parse_version
     import avi.sdk
-    from avi.sdk.avi_api import (ApiSession, ObjectNotFound, APIError, ApiResponse,
-                                 avi_timedelta, sessionDict)
+    from avi.sdk.avi_api import ApiSession
 
     sdk_version = getattr(avi.sdk, '__version__', None)
     if ((sdk_version is None) or