Auto updated assets for ansible collection 22.1.7 (#203)

Rohan Suryawanshi · sagarpsalvi · chandanapatnala · web-flow · commit cc5614ade41a · 2024-08-14T12:40:21.000+05:30
* Updated assets for ansible collection

Signed-off-by: Rohan &lt;ssalvi@vmware.com&gt;

* Fixing ansible sanity test failures and missing commits in 22.1.7

* Fixing ansible sanity test failures

* Fixing ansible sanity test failures

---------

Signed-off-by: Rohan &lt;ssalvi@vmware.com&gt;
Co-authored-by: Rohan &lt;ssalvi@vmware.com&gt;
Co-authored-by: cpatnala &lt;cpatnala@vmware.com&gt;
diff --git a/.github/workflows/ci.yaml b/.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
@@ -62,4 +62,4 @@ jobs:
       #   run: python -m galaxy_importer.main ${GITHUB_WORKSPACE}/vmware-*.tar.gz | tee ${GITHUB_WORKSPACE}/log.txt
 
       # - name: Check errors
-      #   run: if grep -E 'ERROR' ${GITHUB_WORKSPACE}/log.txt; then exit 1; else exit 0; fi
+      #   run: if grep -E 'ERROR' ${GITHUB_WORKSPACE}/log.txt; then exit 1; else exit 0; fi
diff --git a/README.md b/README.md
diff --git a/docs/avi_serviceenginegroup.rst b/docs/avi_serviceenginegroup.rst
@@ -5859,5 +5859,4 @@ Authors
 ~~~~~~~
 - Gaurav Rastogi (grastogi@vmware.com)
 - Sandeep Bandi (sbandi@vmware.com)
-- Amol Shinde (samol@vmware.com)
-
+- Amol Shinde (samol@vmware.com)
diff --git a/docs/avi_serviceenginegroup_advanced.rst b/docs/avi_serviceenginegroup_advanced.rst
@@ -2518,5 +2518,4 @@ Authors
 ~~~~~~~
 - Gaurav Rastogi (grastogi@vmware.com)
 - Sandeep Bandi (sbandi@vmware.com)
-- Amol Shinde (samol@vmware.com)
-
+- Amol Shinde (samol@vmware.com)
diff --git a/galaxy.yml b/galaxy.yml
@@ -18,4 +18,4 @@ tags:
 - load
 - balancer
 - sdk
-version: 22.1.6
+version: 22.1.7
diff --git a/plugins/doc_fragments/avi.py b/plugins/doc_fragments/avi.py
@@ -118,5 +118,6 @@ class ModuleDocFragment(object):
         default: false
 
 notes:
-  - For more information on using Ansible to manage Avi Network devices see U(https://www.ansible.com/ansible-avi-networks).
+  - For more information on using Ansible to manage Avi Network
+    devices see U(https://www.ansible.com/ansible-avi-networks).
 '''
diff --git a/plugins/module_utils/csp_avi_api.py b/plugins/module_utils/csp_avi_api.py
@@ -5,25 +5,12 @@
 
 __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__)
diff --git a/plugins/modules/avi_api_fileservice.py b/plugins/modules/avi_api_fileservice.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
diff --git a/plugins/modules/avi_api_image.py b/plugins/modules/avi_api_image.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
diff --git a/plugins/modules/avi_api_version.py b/plugins/modules/avi_api_version.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
diff --git a/plugins/modules/avi_bootstrap_controller.py b/plugins/modules/avi_bootstrap_controller.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
diff --git a/plugins/modules/avi_gslbservice_patch_member.py b/plugins/modules/avi_gslbservice_patch_member.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
diff --git a/plugins/modules/avi_pulse_registration.py b/plugins/modules/avi_pulse_registration.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
diff --git a/plugins/modules/avi_saml_api_session.py b/plugins/modules/avi_saml_api_session.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
diff --git a/plugins/modules/avi_serviceenginegroup.py b/plugins/modules/avi_serviceenginegroup.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
diff --git a/plugins/modules/avi_update_se_data_vnics.py b/plugins/modules/avi_update_se_data_vnics.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
diff --git a/plugins/modules/avi_user.py b/plugins/modules/avi_user.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
diff --git a/plugins/modules/avi_useraccount.py b/plugins/modules/avi_useraccount.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
diff --git a/plugins/modules/deploy_se.py b/plugins/modules/deploy_se.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
diff --git a/plugins/modules/verify_se.py b/plugins/modules/verify_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
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,3 +1,3 @@
 -r requirements.txt
 mock
-beautifulsoup4==4.9.3
+beautifulsoup4==4.12.2
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
@@ -49,6 +49,15 @@ plugins/modules/avi_serviceenginegroup_advanced.py import-3.8!skip
 plugins/modules/avi_serviceenginegroup_advanced.py validate-modules:missing-gplv3-license
 tests/unit/modules/test_avi_pool.py pylint!skip
 plugins/modules/avi_saml_api_session.py validate-modules:doc-type-does-not-match-spec
+plugins/modules/avi_webhook.py validate-modules:no-log-needed
+plugins/modules/avi_virtualservice.py validate-modules:no-log-needed
+plugins/modules/avi_sslkeyandcertificate.py validate-modules:no-log-needed
+plugins/modules/avi_serviceenginegroup.py validate-modules:no-log-needed
+plugins/modules/avi_pool.py validate-modules:no-log-needed
+plugins/modules/avi_bootstrap_controller.py validate-modules:no-log-needed
+plugins/modules/avi_cloudconnectoruser.py validate-modules:no-log-needed
+plugins/modules/avi_jwtserverprofile.py validate-modules:no-log-needed
+plugins/modules/avi_vsdatascriptset.py validate-modules:no-log-needed
 plugins/modules/avi_bootstrap_controller.py validate-modules:doc-required-mismatch
 plugins/modules/avi_labelgroup.py validate-modules:missing-gplv3-license
 plugins/modules/avi_labelgroup.py import-3.8!skip
@@ -268,6 +277,7 @@ plugins/modules/avi_systemconfiguration.py validate-modules:missing-gplv3-licens
 plugins/modules/avi_systemconfiguration.py import-3.8!skip
 plugins/modules/avi_virtualservice.py validate-modules:missing-gplv3-license
 plugins/modules/avi_virtualservice.py import-3.8!skip
+plugins/lookup/avi.py import-3.8!skip
 plugins/module_utils/avi_api.py import-3.8!skip
 plugins/module_utils/saml_avi_api.py import-3.8!skip
 plugins/module_utils/utils/ansible_utils.py import-3.8!skip
diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt

-Original file line number
+Diff line change
 ~~~~~~~
 - Gaurav Rastogi ([email protected])
 - Sandeep Bandi ([email protected])
 -- Amol Shinde ([email protected])
+-
 +- Amol Shinde ([email protected])