Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix(eos_validate_state): Fix the VerifyLLDPNeighbors test to skip in case validate_state is set to False #4679

Merged
merged 7 commits into from
Nov 6, 2024
Merged

Fix(eos_validate_state): Fix the VerifyLLDPNeighbors test to skip in case validate_state is set to False #4679

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9dc515
added logic to skip the VerifyLLDPNeighbors test for validate_state f…
MaheshGSLAB Nov 4, 2024
4647c78
Merge branch 'devel' into issue-4675-bug
gmuloc Nov 4, 2024
f73dc3d
updated the documentation
MaheshGSLAB Nov 5, 2024
6580d92
updated doc
MaheshGSLAB Nov 5, 2024
10b63f3
Merge branch 'devel' into issue-4675-bug
MaheshGSLAB Nov 5, 2024
c2904c2
updated the description for eos_cli_config_gen
MaheshGSLAB Nov 6, 2024
57d5251
Merge branch 'devel' into issue-4675-bug
ClausHolbechArista Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...sta/avd/molecule/eos_validate_state/intended/structured_configs/dc2-leaf3a.arista.com.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ ethernet_interfaces:
channel_group:
id: 3
mode: active
validate_state: false
- name: Ethernet4
peer: dc2-leaf3b.arista.com
peer_interface: Ethernet4
Expand Down
13 changes: 0 additions & 13 deletions .../avd/molecule/eos_validate_state/intended/test_catalogs/dc2-leaf3a.arista.com-catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ anta.tests.configuration:
- VerifyZeroTouch: null
- VerifyRunningConfigDiffs: null
anta.tests.connectivity:
- VerifyLLDPNeighbors:
neighbors:
- neighbor_device: dc2-leaf3b.arista.com
neighbor_port: Ethernet3
port: Ethernet3
result_overwrite:
custom_field: 'Local: Ethernet3 - Remote: dc2-leaf3b.arista.com Ethernet3'
- VerifyLLDPNeighbors:
neighbors:
- neighbor_device: dc2-leaf3b.arista.com
Expand Down Expand Up @@ -309,12 +302,6 @@ anta.tests.hardware:
- ok
- VerifyAdverseDrops: null
anta.tests.interfaces:
- VerifyInterfacesStatus:
interfaces:
- name: Ethernet3
status: up
result_overwrite:
custom_field: Interface Ethernet3 - MLAG_dc2-leaf3b.arista.com_Ethernet3 = 'up'
- VerifyInterfacesStatus:
interfaces:
- name: Ethernet4
Expand Down
3 changes: 3 additions & 0 deletions ...ions/arista/avd/molecule/eos_validate_state/inventory/host_vars/dc2-leaf3a.arista.com.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ custom_structured_configuration_ethernet_interfaces:
peer: dc2-leaf2b
peer_interface: Ethernet2
shutdown: false
# Test to skip the VerifyLLDPNeighbors testcase
- name: Ethernet3
validate_state: false

custom_structured_configuration_port_channel_interfaces:
- name: Port-Channel11
Expand Down
1,010 changes: 504 additions & 506 deletions ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv
View file
Open in desktop

Large diffs are not rendered by default.

1,018 changes: 508 additions & 510 deletions ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions ...a/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,6 @@
"description": "Verifies that the provided LLDP neighbors are connected properly.",
"custom_field": "Local: Ethernet2 - Remote: dc2-spine2 Ethernet5"
},
{
"name": "dc2-leaf3a.arista.com",
"test": "VerifyLLDPNeighbors",
"categories": [
"connectivity"
],
"description": "Verifies that the provided LLDP neighbors are connected properly.",
"custom_field": "Local: Ethernet3 - Remote: dc2-leaf3b.arista.com Ethernet3"
},
{
"name": "dc2-leaf3a.arista.com",
"test": "VerifyLLDPNeighbors",
Expand Down Expand Up @@ -527,15 +518,6 @@
"description": "Verifies the status of the provided interfaces.",
"custom_field": "Interface Ethernet2 - P2P_dc2-spine2_Ethernet5 = 'up'"
},
{
"name": "dc2-leaf3a.arista.com",
"test": "VerifyInterfacesStatus",
"categories": [
"interfaces"
],
"description": "Verifies the status of the provided interfaces.",
"custom_field": "Interface Ethernet3 - MLAG_dc2-leaf3b.arista.com_Ethernet3 = 'up'"
},
{
"name": "dc2-leaf3a.arista.com",
"test": "VerifyInterfacesStatus",
Expand Down
4 changes: 4 additions & 0 deletions ...llections/arista/avd/roles/eos_validate_state/python_modules/tests/avdtestconnectivity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ def test_definition(self) -> dict | None:
required_keys = ["name", "peer", "peer_interface"]

for idx, interface in enumerate(ethernet_interfaces):
if interface.get("validate_state", True) is False:
LOGGER.info("Interface '%s' variable 'validate_state' is set to False. %s is skipped.", interface["name"], self.__class__.__name__)
continue

if self.is_subinterface(interface):
LOGGER.info("Interface '%s' is a subinterface. %s is skipped.", interface["name"], self.__class__.__name__)
continue
Expand Down
Loading