fixing CI negative test

aristanetworks · Feb 19, 2025 · bfb05ee · bfb05ee
1 parent 606d57e
commit bfb05ee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/...ecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interface-l3-edge.yml b/...ecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interface-l3-edge.yml
@@ -16,14 +16,19 @@ l3_edge:
       interfaces: [ethernet1, ethernet1]
       id: 1
       profile: profile1
+      as: [65000, 65002]
+      ip: [192.168.0.2/31, 192.168.0.3/31]
 
     - nodes: [duplicate-interface-l3-edge, peer2]
       # duplicate interface for duplicate-interface-l3-edge
       interfaces: [ethernet1, ethernet2]
       id: 2
       profile: profile2
+      as: [65000, 65002]
+      ip: [192.168.0.2/31, 192.168.0.3/31]
 
 expected_error_message: >-
-  Found duplicate objects with conflicting data while generating configuration for Ethernet Interfaces defined under l3_edge p2p_link.
-  {'name': 'ethernet1', 'peer': 'peer2', 'peer_interface': 'ethernet2', 'description': 'P2P_peer2_ethernet2'} conflicts with
-  {'name': 'ethernet1', 'peer': 'peer1', 'peer_interface': 'ethernet1', 'description': 'P2P_peer1_ethernet1'}.
+  Found duplicate objects with conflicting data while generating configuration for Neighbors. {'ip_address': '192.168.0.3',
+  'peer_group': 'IPv4-UNDERLAY-PEERS', 'remote_as': '65002', 'local_as': '65000', 'peer': 'peer2', 'description': 'peer2'}
+  conflicts with {'ip_address': '192.168.0.3', 'peer_group': 'IPv4-UNDERLAY-PEERS', 'remote_as': '65002',
+  'local_as': '65000', 'peer': 'peer1', 'description': 'peer1'}.
diff --git a/...unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces-with-port-channel.yml b/...unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces-with-port-channel.yml
@@ -33,6 +33,7 @@ core_interfaces:
       interfaces: [ Ethernet1, Ethernet2 ]
       profile: isis_bb_profile
       ip: ["unnumbered loopback0", "unnumbered loopback0"]
+      as: [65000, 65002]
 
     # core Port-Channel
     - nodes: [ duplicate-interfaces-core-interfaces-with-port-channel, core-2-ospf-ldp ]
@@ -46,6 +47,8 @@ core_interfaces:
           - node: core-2-ospf-ldp
             interfaces: [ Ethernet12]
       profile: isis_bb_profile
+      as: [65000, 65002]
+      ip: [192.168.0.2/31, 192.168.0.3/31]
 
 expected_error_message: >-
   Found duplicate objects with conflicting data while generating configuration for Ethernet Interfaces defined under

diff --git a/..._designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces.yml b/..._designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-core-interfaces.yml
@@ -29,13 +29,18 @@ core_interfaces:
       id: 1
       interfaces: [ Ethernet1, Ethernet2 ]
       profile: isis_bb_profile
+      as: [65000, 65002]
+      ip: [192.168.0.2/31, 192.168.0.3/31]
 
     # Link w/o bb profile
     - nodes: [ duplicate-interfaces-core-interfaces, peer2]
       id: 2
       interfaces: [ Ethernet1, Ethernet3 ]
+      as: [65000, 65002]
+      ip: [192.168.0.2/31, 192.168.0.3/31]
 
 expected_error_message: >-
-  Found duplicate objects with conflicting data while generating configuration for Ethernet Interfaces defined under core_interfaces p2p_link.
-  {'name': 'Ethernet1', 'peer': 'peer2', 'peer_interface': 'Ethernet3', 'description': 'P2P_peer2_Ethernet3', 'mtu': 9214} conflicts with
-  {'name': 'Ethernet1', 'peer': 'peer1', 'peer_interface': 'Ethernet2', 'description': 'P2P_peer1_Ethernet2', 'mtu': 1500}.
+  Found duplicate objects with conflicting data while generating configuration for Neighbors. {'ip_address': '192.168.0.3',
+  'peer_group': 'IPv4-UNDERLAY-PEERS', 'remote_as': '65002', 'local_as': '65000', 'peer': 'peer2', 'description': 'peer2'}
+  conflicts with {'ip_address': '192.168.0.3', 'peer_group': 'IPv4-UNDERLAY-PEERS', 'remote_as': '65002', 'local_as': '65000',
+  'peer': 'peer1', 'description': 'peer1'}.
diff --git a/..._negative_unit_tests/inventory/host_vars/failure-p2p-links-ptp-profile-does-not-exist.yml b/..._negative_unit_tests/inventory/host_vars/failure-p2p-links-ptp-profile-does-not-exist.yml
@@ -24,6 +24,7 @@ l3_edge:
       ptp:
         enabled: true
         profile: PROFILE DOES NOT EXIST
+      as: [65000, 65002]
 
 expected_error_message: >-
   PTP Profile 'PROFILE DOES NOT EXIST' referenced under l3_edge.p2p_links does not exist in `ptp_profiles`.