From 359bec3b2eed78e105c6eb215a979e7a773bc325 Mon Sep 17 00:00:00 2001
From: Carl Baillargeon <carl.baillargeon@arista.com>
Date: Thu, 8 Feb 2024 09:47:25 -0500
Subject: [PATCH] Update msg

---
 .../eos_validate_state_utils/ansible_eos_device.py          | 6 +++++-
 .../avd/roles/eos_validate_state/tasks/anta_tests.yml       | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ansible_collections/arista/avd/plugins/plugin_utils/eos_validate_state_utils/ansible_eos_device.py b/ansible_collections/arista/avd/plugins/plugin_utils/eos_validate_state_utils/ansible_eos_device.py
index 882a1e38b67..3e73b4e968b 100644
--- a/ansible_collections/arista/avd/plugins/plugin_utils/eos_validate_state_utils/ansible_eos_device.py
+++ b/ansible_collections/arista/avd/plugins/plugin_utils/eos_validate_state_utils/ansible_eos_device.py
@@ -30,7 +30,11 @@
 except TypeError as e:
     # Known bug with Python 3.9.7 and Pydantic `conint`, impacting ANTA. Issue: https://github.com/arista-netdevops-community/anta/issues/557
     if "Interval() takes no arguments" in str(e):
-        msg = "Encountered a known bug with Pydantic and Python 3.9.7. Please consider upgrading Python or using a different environment."
+        msg = (
+            "The ANTA testing framework, used in the AVD eos_validate_state role, has encountered a compatibility issue with Python 3.9.x. "
+            "Please try a different Python version. For assistance or to report your Python version, please refer to the AVD/ANTA GitHub repositories:\n"
+            "https://github.com/aristanetworks/avd/\nhttps://github.com/arista-netdevops-community/anta"
+        )
         raise AristaAvdError(msg) from e
     else:
         # If the TypeError is not related to the known bug, raise it to avoid silencing other issues
diff --git a/ansible_collections/arista/avd/roles/eos_validate_state/tasks/anta_tests.yml b/ansible_collections/arista/avd/roles/eos_validate_state/tasks/anta_tests.yml
index 2f3160a84c7..3986bc7d757 100644
--- a/ansible_collections/arista/avd/roles/eos_validate_state/tasks/anta_tests.yml
+++ b/ansible_collections/arista/avd/roles/eos_validate_state/tasks/anta_tests.yml
@@ -16,7 +16,6 @@
     # cprofile_file: "anta-{{inventory_hostname}}.prof"
   register: anta_results
   check_mode: false
-  when: use_anta | bool
   tags: always
 
 #######################################
@@ -36,7 +35,6 @@
   run_once: true
   check_mode: false
   when:
-    - use_anta | bool
     - validation_report_csv | bool or validation_report_md | bool
   tags:
     - always