From c5b307b88cf78f4ebcad4eaad0538611f9ccffef Mon Sep 17 00:00:00 2001
From: Sugetha Kalyanaraman <sugethakch@arista.com>
Date: Wed, 6 Dec 2023 13:23:43 -0800
Subject: [PATCH] Fix: Update Readme with correct ansible-core version (#687)

Co-authored-by: Carl Buchmann <carl.buchmann@arista.com>
---
 ansible_collections/arista/cvp/README.md      |  4 +-
 .../cvp/docs/installation/requirements.md     |  2 +-
 .../cvp/roles/configlets_sync/meta/main.yml   | 11 +---
 .../roles/dhcp_configuration/meta/main.yml    | 11 +---
 .../arista/cvp/tests/config.yml               |  4 ++
 .../arista/cvp/tests/sanity/ignore-2.14.txt   | 66 -------------------
 .../arista/cvp/tests/sanity/ignore-2.15.txt   | 66 -------------------
 .../arista/cvp/tests/sanity/ignore-2.16.txt   | 66 -------------------
 8 files changed, 9 insertions(+), 221 deletions(-)
 create mode 100644 ansible_collections/arista/cvp/tests/config.yml

diff --git a/ansible_collections/arista/cvp/README.md b/ansible_collections/arista/cvp/README.md
index 3ffa32a80..f7ee50496 100644
--- a/ansible_collections/arista/cvp/README.md
+++ b/ansible_collections/arista/cvp/README.md
@@ -37,7 +37,7 @@ Current active branch:
 
 ### Python
 
-- Python `>=3.8`
+- Python `>=3.9`
 
 Please check the minimum version supported by your ansible installation on the [ansible website](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#control-node-requirements).
 
@@ -45,7 +45,7 @@ Please check the minimum version supported by your ansible installation on the [
 
 **Ansible version:**
 
-- ansible >= `2.9.0`
+- ansible-core>=2.14.0,<2.17.0
 
 **3rd party Python libraries:**
 
diff --git a/ansible_collections/arista/cvp/docs/installation/requirements.md b/ansible_collections/arista/cvp/docs/installation/requirements.md
index 2f5b0b616..29ce10b6e 100644
--- a/ansible_collections/arista/cvp/docs/installation/requirements.md
+++ b/ansible_collections/arista/cvp/docs/installation/requirements.md
@@ -30,7 +30,7 @@
 
 ## Supported Ansible Versions
 
-- ansible-core from **2.12.6** to **2.15.0** excluding **2.13.0**
+- ansible-core from **2.14.0** to **2.16.x**
 
 ## Additional Python Libraries required
 
diff --git a/ansible_collections/arista/cvp/roles/configlets_sync/meta/main.yml b/ansible_collections/arista/cvp/roles/configlets_sync/meta/main.yml
index 7c026351f..ded170d13 100644
--- a/ansible_collections/arista/cvp/roles/configlets_sync/meta/main.yml
+++ b/ansible_collections/arista/cvp/roles/configlets_sync/meta/main.yml
@@ -1,12 +1,3 @@
 galaxy_info:
-  author: Arista Ansible Team <ansible@arista.com>
   description: Role to synchronize configlets across multiple CloudVision servers
-  issue_tracker_url: https://github.com/aristanetworks/ansible-cvp/issues
-  company: Arista Networks
-  license: Apache-2.0
-  min_ansible_version: 2.9
-  galaxy_tags: ['arista', 'network', 'networking', 'eos', 'avd', 'cloudvision', 'cvp']
-  platforms:
-    - name: EL
-      versions: [7, 8]
-  dependencies: []
+  standalone: false
diff --git a/ansible_collections/arista/cvp/roles/dhcp_configuration/meta/main.yml b/ansible_collections/arista/cvp/roles/dhcp_configuration/meta/main.yml
index 77cc59714..0f79f0736 100644
--- a/ansible_collections/arista/cvp/roles/dhcp_configuration/meta/main.yml
+++ b/ansible_collections/arista/cvp/roles/dhcp_configuration/meta/main.yml
@@ -1,12 +1,3 @@
 galaxy_info:
-  author: Arista Ansible Team <ansible@arista.com>
   description: Role to configure DHCP service to act as ZTP server
-  issue_tracker_url: https://github.com/aristanetworks/ansible-cvp/issues
-  company: Arista Networks
-  license: Apache-2.0
-  min_ansible_version: 2.9
-  galaxy_tags: ['arista', 'network', 'networking', 'eos', 'avd', 'cloudvision', 'cvp']
-  platforms:
-    - name: EL
-      versions: [7, 8]
-  dependencies: []
+  standalone: false
diff --git a/ansible_collections/arista/cvp/tests/config.yml b/ansible_collections/arista/cvp/tests/config.yml
new file mode 100644
index 000000000..8819f3850
--- /dev/null
+++ b/ansible_collections/arista/cvp/tests/config.yml
@@ -0,0 +1,4 @@
+---
+# Sample ansible-test configuration file for collections: https://github.com/ansible/ansible/blob/devel/test/lib/ansible_test/config/config.yml
+modules:
+  python_requires: ">=3.9"
diff --git a/ansible_collections/arista/cvp/tests/sanity/ignore-2.14.txt b/ansible_collections/arista/cvp/tests/sanity/ignore-2.14.txt
index a7df66ed8..d908e6847 100644
--- a/ansible_collections/arista/cvp/tests/sanity/ignore-2.14.txt
+++ b/ansible_collections/arista/cvp/tests/sanity/ignore-2.14.txt
@@ -12,69 +12,3 @@ plugins/modules/cv_tag_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_validate_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_task_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_task.py validate-modules:missing-gplv3-license
-plugins/module_utils/change_tools.py compile-2.7!skip
-plugins/module_utils/change_tools.py import-2.7!skip
-plugins/module_utils/configlet_tools.py compile-2.7!skip
-plugins/module_utils/configlet_tools.py import-2.7!skip
-plugins/module_utils/device_tools.py compile-2.7!skip
-plugins/module_utils/device_tools.py import-2.7!skip
-plugins/module_utils/container_tools.py compile-2.7!skip
-plugins/module_utils/container_tools.py import-2.7!skip
-plugins/module_utils/facts_tools.py compile-2.7!skip
-plugins/module_utils/facts_tools.py import-2.7!skip
-plugins/module_utils/generic_tools.py compile-2.7!skip
-plugins/module_utils/generic_tools.py import-2.7!skip
-plugins/module_utils/image_tools.py compile-2.7!skip
-plugins/module_utils/image_tools.py import-2.7!skip
-plugins/module_utils/resources/api/fields.py compile-2.7!skip
-plugins/module_utils/resources/api/fields.py import-2.7!skip
-plugins/module_utils/resources/exceptions.py compile-2.7!skip
-plugins/module_utils/resources/exceptions.py import-2.7!skip
-plugins/module_utils/resources/modules/fields.py compile-2.7!skip
-plugins/module_utils/resources/modules/fields.py import-2.7!skip
-plugins/module_utils/response.py compile-2.7!skip
-plugins/module_utils/response.py import-2.7!skip
-plugins/module_utils/tag_tools.py compile-2.7!skip
-plugins/module_utils/tag_tools.py import-2.7!skip
-plugins/module_utils/task_tools.py compile-2.7!skip
-plugins/module_utils/task_tools.py import-2.7!skip
-plugins/module_utils/tools_schema.py compile-2.7!skip
-plugins/module_utils/tools_schema.py import-2.7!skip
-plugins/modules/cv_configlet_v3.py compile-2.7!skip
-plugins/modules/cv_configlet_v3.py import-2.7!skip
-plugins/modules/cv_container_v3.py compile-2.7!skip
-plugins/modules/cv_container_v3.py import-2.7!skip
-plugins/modules/cv_device.py compile-2.7!skip
-plugins/modules/cv_device.py import-2.7!skip
-plugins/modules/cv_device_v3.py compile-2.7!skip
-plugins/modules/cv_device_v3.py import-2.7!skip
-plugins/modules/cv_facts_v3.py compile-2.7!skip
-plugins/modules/cv_facts_v3.py import-2.7!skip
-plugins/modules/cv_tag_v3.py compile-2.7!skip
-plugins/modules/cv_tag_v3.py import-2.7!skip
-plugins/modules/cv_task_v3.py compile-2.7!skip
-plugins/modules/cv_task_v3.py import-2.7!skip
-plugins/module_utils/device_tools.py compile-3.5!skip
-plugins/module_utils/device_tools.py import-3.5!skip
-plugins/module_utils/container_tools.py compile-3.5!skip
-plugins/module_utils/container_tools.py import-3.5!skip
-plugins/module_utils/resources/api/fields.py compile-3.5!skip
-plugins/module_utils/resources/api/fields.py import-3.5!skip
-plugins/module_utils/resources/exceptions.py compile-3.5!skip
-plugins/module_utils/resources/exceptions.py import-3.5!skip
-plugins/module_utils/resources/modules/fields.py compile-3.5!skip
-plugins/module_utils/resources/modules/fields.py import-3.5!skip
-plugins/module_utils/response.py compile-3.5!skip
-plugins/module_utils/response.py import-3.5!skip
-plugins/module_utils/tag_tools.py compile-3.5!skip
-plugins/module_utils/tag_tools.py import-3.5!skip
-plugins/module_utils/task_tools.py compile-3.5!skip
-plugins/module_utils/task_tools.py import-3.5!skip
-plugins/modules/cv_configlet_v3.py compile-3.5!skip
-plugins/modules/cv_configlet_v3.py import-3.5!skip
-plugins/modules/cv_container_v3.py compile-3.5!skip
-plugins/modules/cv_container_v3.py import-3.5!skip
-plugins/modules/cv_tag_v3.py compile-3.5!skip
-plugins/modules/cv_tag_v3.py import-3.5!skip
-plugins/modules/cv_task_v3.py compile-3.5!skip
-plugins/modules/cv_task_v3.py import-3.5!skip
diff --git a/ansible_collections/arista/cvp/tests/sanity/ignore-2.15.txt b/ansible_collections/arista/cvp/tests/sanity/ignore-2.15.txt
index a7df66ed8..d908e6847 100644
--- a/ansible_collections/arista/cvp/tests/sanity/ignore-2.15.txt
+++ b/ansible_collections/arista/cvp/tests/sanity/ignore-2.15.txt
@@ -12,69 +12,3 @@ plugins/modules/cv_tag_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_validate_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_task_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_task.py validate-modules:missing-gplv3-license
-plugins/module_utils/change_tools.py compile-2.7!skip
-plugins/module_utils/change_tools.py import-2.7!skip
-plugins/module_utils/configlet_tools.py compile-2.7!skip
-plugins/module_utils/configlet_tools.py import-2.7!skip
-plugins/module_utils/device_tools.py compile-2.7!skip
-plugins/module_utils/device_tools.py import-2.7!skip
-plugins/module_utils/container_tools.py compile-2.7!skip
-plugins/module_utils/container_tools.py import-2.7!skip
-plugins/module_utils/facts_tools.py compile-2.7!skip
-plugins/module_utils/facts_tools.py import-2.7!skip
-plugins/module_utils/generic_tools.py compile-2.7!skip
-plugins/module_utils/generic_tools.py import-2.7!skip
-plugins/module_utils/image_tools.py compile-2.7!skip
-plugins/module_utils/image_tools.py import-2.7!skip
-plugins/module_utils/resources/api/fields.py compile-2.7!skip
-plugins/module_utils/resources/api/fields.py import-2.7!skip
-plugins/module_utils/resources/exceptions.py compile-2.7!skip
-plugins/module_utils/resources/exceptions.py import-2.7!skip
-plugins/module_utils/resources/modules/fields.py compile-2.7!skip
-plugins/module_utils/resources/modules/fields.py import-2.7!skip
-plugins/module_utils/response.py compile-2.7!skip
-plugins/module_utils/response.py import-2.7!skip
-plugins/module_utils/tag_tools.py compile-2.7!skip
-plugins/module_utils/tag_tools.py import-2.7!skip
-plugins/module_utils/task_tools.py compile-2.7!skip
-plugins/module_utils/task_tools.py import-2.7!skip
-plugins/module_utils/tools_schema.py compile-2.7!skip
-plugins/module_utils/tools_schema.py import-2.7!skip
-plugins/modules/cv_configlet_v3.py compile-2.7!skip
-plugins/modules/cv_configlet_v3.py import-2.7!skip
-plugins/modules/cv_container_v3.py compile-2.7!skip
-plugins/modules/cv_container_v3.py import-2.7!skip
-plugins/modules/cv_device.py compile-2.7!skip
-plugins/modules/cv_device.py import-2.7!skip
-plugins/modules/cv_device_v3.py compile-2.7!skip
-plugins/modules/cv_device_v3.py import-2.7!skip
-plugins/modules/cv_facts_v3.py compile-2.7!skip
-plugins/modules/cv_facts_v3.py import-2.7!skip
-plugins/modules/cv_tag_v3.py compile-2.7!skip
-plugins/modules/cv_tag_v3.py import-2.7!skip
-plugins/modules/cv_task_v3.py compile-2.7!skip
-plugins/modules/cv_task_v3.py import-2.7!skip
-plugins/module_utils/device_tools.py compile-3.5!skip
-plugins/module_utils/device_tools.py import-3.5!skip
-plugins/module_utils/container_tools.py compile-3.5!skip
-plugins/module_utils/container_tools.py import-3.5!skip
-plugins/module_utils/resources/api/fields.py compile-3.5!skip
-plugins/module_utils/resources/api/fields.py import-3.5!skip
-plugins/module_utils/resources/exceptions.py compile-3.5!skip
-plugins/module_utils/resources/exceptions.py import-3.5!skip
-plugins/module_utils/resources/modules/fields.py compile-3.5!skip
-plugins/module_utils/resources/modules/fields.py import-3.5!skip
-plugins/module_utils/response.py compile-3.5!skip
-plugins/module_utils/response.py import-3.5!skip
-plugins/module_utils/tag_tools.py compile-3.5!skip
-plugins/module_utils/tag_tools.py import-3.5!skip
-plugins/module_utils/task_tools.py compile-3.5!skip
-plugins/module_utils/task_tools.py import-3.5!skip
-plugins/modules/cv_configlet_v3.py compile-3.5!skip
-plugins/modules/cv_configlet_v3.py import-3.5!skip
-plugins/modules/cv_container_v3.py compile-3.5!skip
-plugins/modules/cv_container_v3.py import-3.5!skip
-plugins/modules/cv_tag_v3.py compile-3.5!skip
-plugins/modules/cv_tag_v3.py import-3.5!skip
-plugins/modules/cv_task_v3.py compile-3.5!skip
-plugins/modules/cv_task_v3.py import-3.5!skip
diff --git a/ansible_collections/arista/cvp/tests/sanity/ignore-2.16.txt b/ansible_collections/arista/cvp/tests/sanity/ignore-2.16.txt
index a7df66ed8..d908e6847 100644
--- a/ansible_collections/arista/cvp/tests/sanity/ignore-2.16.txt
+++ b/ansible_collections/arista/cvp/tests/sanity/ignore-2.16.txt
@@ -12,69 +12,3 @@ plugins/modules/cv_tag_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_validate_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_task_v3.py validate-modules:missing-gplv3-license
 plugins/modules/cv_task.py validate-modules:missing-gplv3-license
-plugins/module_utils/change_tools.py compile-2.7!skip
-plugins/module_utils/change_tools.py import-2.7!skip
-plugins/module_utils/configlet_tools.py compile-2.7!skip
-plugins/module_utils/configlet_tools.py import-2.7!skip
-plugins/module_utils/device_tools.py compile-2.7!skip
-plugins/module_utils/device_tools.py import-2.7!skip
-plugins/module_utils/container_tools.py compile-2.7!skip
-plugins/module_utils/container_tools.py import-2.7!skip
-plugins/module_utils/facts_tools.py compile-2.7!skip
-plugins/module_utils/facts_tools.py import-2.7!skip
-plugins/module_utils/generic_tools.py compile-2.7!skip
-plugins/module_utils/generic_tools.py import-2.7!skip
-plugins/module_utils/image_tools.py compile-2.7!skip
-plugins/module_utils/image_tools.py import-2.7!skip
-plugins/module_utils/resources/api/fields.py compile-2.7!skip
-plugins/module_utils/resources/api/fields.py import-2.7!skip
-plugins/module_utils/resources/exceptions.py compile-2.7!skip
-plugins/module_utils/resources/exceptions.py import-2.7!skip
-plugins/module_utils/resources/modules/fields.py compile-2.7!skip
-plugins/module_utils/resources/modules/fields.py import-2.7!skip
-plugins/module_utils/response.py compile-2.7!skip
-plugins/module_utils/response.py import-2.7!skip
-plugins/module_utils/tag_tools.py compile-2.7!skip
-plugins/module_utils/tag_tools.py import-2.7!skip
-plugins/module_utils/task_tools.py compile-2.7!skip
-plugins/module_utils/task_tools.py import-2.7!skip
-plugins/module_utils/tools_schema.py compile-2.7!skip
-plugins/module_utils/tools_schema.py import-2.7!skip
-plugins/modules/cv_configlet_v3.py compile-2.7!skip
-plugins/modules/cv_configlet_v3.py import-2.7!skip
-plugins/modules/cv_container_v3.py compile-2.7!skip
-plugins/modules/cv_container_v3.py import-2.7!skip
-plugins/modules/cv_device.py compile-2.7!skip
-plugins/modules/cv_device.py import-2.7!skip
-plugins/modules/cv_device_v3.py compile-2.7!skip
-plugins/modules/cv_device_v3.py import-2.7!skip
-plugins/modules/cv_facts_v3.py compile-2.7!skip
-plugins/modules/cv_facts_v3.py import-2.7!skip
-plugins/modules/cv_tag_v3.py compile-2.7!skip
-plugins/modules/cv_tag_v3.py import-2.7!skip
-plugins/modules/cv_task_v3.py compile-2.7!skip
-plugins/modules/cv_task_v3.py import-2.7!skip
-plugins/module_utils/device_tools.py compile-3.5!skip
-plugins/module_utils/device_tools.py import-3.5!skip
-plugins/module_utils/container_tools.py compile-3.5!skip
-plugins/module_utils/container_tools.py import-3.5!skip
-plugins/module_utils/resources/api/fields.py compile-3.5!skip
-plugins/module_utils/resources/api/fields.py import-3.5!skip
-plugins/module_utils/resources/exceptions.py compile-3.5!skip
-plugins/module_utils/resources/exceptions.py import-3.5!skip
-plugins/module_utils/resources/modules/fields.py compile-3.5!skip
-plugins/module_utils/resources/modules/fields.py import-3.5!skip
-plugins/module_utils/response.py compile-3.5!skip
-plugins/module_utils/response.py import-3.5!skip
-plugins/module_utils/tag_tools.py compile-3.5!skip
-plugins/module_utils/tag_tools.py import-3.5!skip
-plugins/module_utils/task_tools.py compile-3.5!skip
-plugins/module_utils/task_tools.py import-3.5!skip
-plugins/modules/cv_configlet_v3.py compile-3.5!skip
-plugins/modules/cv_configlet_v3.py import-3.5!skip
-plugins/modules/cv_container_v3.py compile-3.5!skip
-plugins/modules/cv_container_v3.py import-3.5!skip
-plugins/modules/cv_tag_v3.py compile-3.5!skip
-plugins/modules/cv_tag_v3.py import-3.5!skip
-plugins/modules/cv_task_v3.py compile-3.5!skip
-plugins/modules/cv_task_v3.py import-3.5!skip