diff --git a/anta/tests/security.py b/anta/tests/security.py index f40f16468..33805c4f8 100644 --- a/anta/tests/security.py +++ b/anta/tests/security.py @@ -727,7 +727,6 @@ class VerifySpecificIPSecConn(AntaTest): ``` """ - description = "Verifies the IPv4 security connections." categories: ClassVar[list[str]] = ["security"] commands: ClassVar[list[AntaCommand | AntaTemplate]] = [AntaTemplate(template="show ip security connection vrf {vrf} path peer {peer}", revision=2)] @@ -737,6 +736,7 @@ class Input(AntaTest.Input): ip_security_connections: list[IPSecPeer] """List of IP4v security peers.""" IPSecPeers: ClassVar[type[IPSecPeers]] = IPSecPeers + """To maintain backward compatibility.""" def render(self, template: AntaTemplate) -> list[AntaCommand]: """Render the template for each input IP Sec connection.""" @@ -764,7 +764,9 @@ def test(self) -> None: if state != "Established": source = conn_data.get("saddr") destination = conn_data.get("daddr") - self.result.is_failure(f"{input_peer} Source: {source} Destination: {destination} - Connection down; Expected: Established Actual: {state}") + self.result.is_failure( + f"{input_peer} Source: {source} Destination: {destination} - Connection down - Expected: Established, Actual: {state}" + ) continue # Create a dictionary of existing connections for faster lookup @@ -779,9 +781,8 @@ def test(self) -> None: if (source_input, destination_input, vrf) in existing_connections: existing_state = existing_connections[(source_input, destination_input, vrf)] if existing_state != "Established": - self.result.is_failure( - f"{input_peer} Source: {source_input} Destination: {destination_input} - Connection down; Expected: Established Actual: {existing_state}" - ) + failure = f"Expected: Established, Actual: {existing_state}" + self.result.is_failure(f"{input_peer} Source: {source_input} Destination: {destination_input} - Connection down - {failure}") else: self.result.is_failure(f"{input_peer} Source: {source_input} Destination: {destination_input} - Connection not found.") diff --git a/tests/units/anta_tests/test_security.py b/tests/units/anta_tests/test_security.py index 2e9b92302..472eb7e18 100644 --- a/tests/units/anta_tests/test_security.py +++ b/tests/units/anta_tests/test_security.py @@ -1127,10 +1127,10 @@ "expected": { "result": "failure", "messages": [ - "Peer: 10.255.0.1 VRF: default Source: 172.18.3.2 Destination: 172.18.2.2 - Connection down; Expected: Established Actual: Idle", - "Peer: 10.255.0.1 VRF: default Source: 100.64.2.2 Destination: 100.64.1.2 - Connection down; Expected: Established Actual: Idle", - "Peer: 10.255.0.2 VRF: MGMT Source: 100.64.2.2 Destination: 100.64.1.2 - Connection down; Expected: Established Actual: Idle", - "Peer: 10.255.0.2 VRF: MGMT Source: 172.18.2.2 Destination: 172.18.1.2 - Connection down; Expected: Established Actual: Idle", + "Peer: 10.255.0.1 VRF: default Source: 172.18.3.2 Destination: 172.18.2.2 - Connection down - Expected: Established, Actual: Idle", + "Peer: 10.255.0.1 VRF: default Source: 100.64.2.2 Destination: 100.64.1.2 - Connection down - Expected: Established, Actual: Idle", + "Peer: 10.255.0.2 VRF: MGMT Source: 100.64.2.2 Destination: 100.64.1.2 - Connection down - Expected: Established, Actual: Idle", + "Peer: 10.255.0.2 VRF: MGMT Source: 172.18.2.2 Destination: 172.18.1.2 - Connection down - Expected: Established, Actual: Idle", ], }, }, @@ -1190,8 +1190,8 @@ "expected": { "result": "failure", "messages": [ - "Peer: 10.255.0.1 VRF: default Source: 172.18.3.2 Destination: 172.18.2.2 - Connection down; Expected: Established Actual: Idle", - "Peer: 10.255.0.1 VRF: default Source: 100.64.3.2 Destination: 100.64.2.2 - Connection down; Expected: Established Actual: Idle", + "Peer: 10.255.0.1 VRF: default Source: 172.18.3.2 Destination: 172.18.2.2 - Connection down - Expected: Established, Actual: Idle", + "Peer: 10.255.0.1 VRF: default Source: 100.64.3.2 Destination: 100.64.2.2 - Connection down - Expected: Established, Actual: Idle", "Peer: 10.255.0.2 VRF: default Source: 100.64.4.2 Destination: 100.64.1.2 - Connection not found.", "Peer: 10.255.0.2 VRF: default Source: 172.18.4.2 Destination: 172.18.1.2 - Connection not found.", ],