Refactor: Address PR comments

aristanetworks · Feb 21, 2024 · 9fd8ca9 · 9fd8ca9
1 parent 4258475
commit 9fd8ca9
Show file tree

Hide file tree

Showing 27 changed files with 3,700 additions and 262 deletions.
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/converge.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/converge.yml
@@ -182,48 +182,6 @@
               - ansible_failed_result is defined
               - ansible_failed_result.msg == expected_error_message
 
-- name: Converge Negative tests for 'eos_designs_facts'
-  hosts: fabric_wan_role_cv_pathinder_role_1
-  connection: local
-  tasks:
-    - name: Run failure scenario Test
-      block:
-        - name: Trigger Error
-          ansible.builtin.import_role:
-            name: arista.avd.eos_designs
-      rescue:
-        - name: Error message
-          run_once: true
-          ansible.builtin.debug:
-            var: ansible_failed_result.msg
-        - name: Assert eos_designs failed with the expected error message
-          run_once: true
-          ansible.builtin.assert:
-            that:
-              - ansible_failed_result is defined
-              - ansible_failed_result.msg == expected_error_message
-
-- name: Converge Negative tests for 'eos_designs_facts'
-  hosts: fabric_wan_role_cv_pathinder_role_2
-  connection: local
-  tasks:
-    - name: Run failure scenario Test
-      block:
-        - name: Trigger Error
-          ansible.builtin.import_role:
-            name: arista.avd.eos_designs
-      rescue:
-        - name: Error message
-          run_once: true
-          ansible.builtin.debug:
-            var: ansible_failed_result.msg
-        - name: Assert eos_designs failed with the expected error message
-          run_once: true
-          ansible.builtin.assert:
-            that:
-              - ansible_failed_result is defined
-              - ansible_failed_result.msg == expected_error_message
-
 - name: Converge Negative tests for 'eos_designs_structured_config'
   hosts: EOS_DESIGNS_FAILURES
   gather_facts: false

diff --git a/...designs_negative_unit_tests/inventory/host_vars/invalid-wan-role-cv-pathfinder-role-1.yml b/...designs_negative_unit_tests/inventory/host_vars/invalid-wan-role-cv-pathfinder-role-1.yml
@@ -1,6 +1,4 @@
 ---
-fabric_name: fabric_wan_role_cv_pathinder_role_1
-
 wan_mode: cv-pathfinder
 type: wan_edge
 

diff --git a/...designs_negative_unit_tests/inventory/host_vars/invalid-wan-role-cv-pathfinder-role-2.yml b/...designs_negative_unit_tests/inventory/host_vars/invalid-wan-role-cv-pathfinder-role-2.yml
@@ -1,6 +1,4 @@
 ---
-fabric_name: fabric_wan_role_cv_pathinder_role_2
-
 wan_mode: cv-pathfinder
 type: wan_rr
 

diff --git a/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/hosts.yml
@@ -51,12 +51,6 @@ all:
         fabric_p2p_vrfs:
           hosts:
             invalid-uplink-type-p2p-vrfs-underlay-router-false:
-        fabric_wan_role_cv_pathinder_role_1:
-          hosts:
-            invalid-wan-role-cv-pathfinder-role-1:
-        fabric_wan_role_cv_pathinder_role_2:
-          hosts:
-            invalid-wan-role-cv-pathfinder-role-2:
     EOS_DESIGNS_FAILURES: # Add cases that fail during 'eos_designs_structured_config' phase
       hosts:
         failure-port-channel:
@@ -93,6 +87,8 @@ all:
         failure-duplicate-evpn-vlan-bundle-name:
         ntp-settings-server-vrf-missing-mgmt-ip:
         ntp-settings-server-vrf-missing-inband-mgmt-interface:
+        invalid-wan-role-cv-pathfinder-role-1:
+        invalid-wan-role-cv-pathfinder-role-2:
         source-interfaces-domain-lookup-duplicate-vrf:
         source-interfaces-domain-lookup-missing-inband-mgmt-interface:
         source-interfaces-domain-lookup-missing-mgmt-ip: