From dbdd4b2da0488ce730996647366ce0e863d9658d Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Date: Mon, 14 Oct 2024 02:27:47 -0700 Subject: [PATCH] fix the sorting issue --- .../documentation/devices/SITE2-LER1.md | 2 +- .../intended/configs/SITE2-LER1.cfg | 2 +- .../intended/configs/DC1-BL1A.cfg | 2 +- .../intended/configs/DC1-BL1B.cfg | 2 +- .../intended/configs/DC1-LEAF1A.cfg | 2 +- .../intended/configs/DC1-LEAF2A.cfg | 2 +- .../intended/configs/DC1-LEAF2B.cfg | 2 +- .../intended/configs/SVI_PROFILE_NODE_1.cfg | 2 +- .../intended/configs/SVI_PROFILE_NODE_2.cfg | 2 +- .../configs/evpn_services_l2_only_false.cfg | 2 +- .../reports/FABRIC-state.csv | 24 +++++++++---------- .../reports/FABRIC-state.md | 24 +++++++++---------- .../test_results/dc2-leaf1a-results.json | 4 ++-- .../test_results/dc2-leaf1b-results.json | 4 ++-- .../test_results/dc2-leaf2a-results.json | 4 ++-- .../test_results/dc2-leaf2b-results.json | 4 ++-- .../dc2-leaf3a.arista.com-results.json | 4 ++-- .../dc2-leaf3b.arista.com-results.json | 4 ++-- .../documentation/devices/DC1-BL1A.md | 2 +- .../documentation/devices/DC1-BL1B.md | 2 +- .../documentation/devices/DC1-SVC3A.md | 2 +- .../documentation/devices/DC1-SVC3B.md | 2 +- .../intended/configs/DC1-BL1A.cfg | 2 +- .../intended/configs/DC1-BL1B.cfg | 2 +- .../intended/configs/DC1-SVC3A.cfg | 2 +- .../intended/configs/DC1-SVC3B.cfg | 2 +- .../documentation/devices/DC1-BL1A.md | 2 +- .../documentation/devices/DC1-BL1B.md | 2 +- .../intended/configs/DC1-BL1A.cfg | 2 +- .../intended/configs/DC1-BL1B.cfg | 2 +- .../j2templates/eos/static-routes.j2 | 2 +- .../j2templates/eos/system.j2 | 16 +++++-------- 32 files changed, 65 insertions(+), 69 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LER1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LER1.md index 45604569713..1df2d657f25 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LER1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-LER1.md @@ -580,8 +580,8 @@ ipv6 unicast-routing ```eos ! -ip route vrf TENANT_B_INTRA 123.0.10.0/24 Ethernet6.10 123.1.1.3 name TENANT_B_SITE_5_SUBNET ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf TENANT_B_INTRA 123.0.10.0/24 Ethernet6.10 123.1.1.3 name TENANT_B_SITE_5_SUBNET ``` ### Router OSPF diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LER1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LER1.cfg index 8fe6082b66c..82e2cf4df66 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LER1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/intended/configs/SITE2-LER1.cfg @@ -238,8 +238,8 @@ ip routing vrf TENANT_B_WAN ! ipv6 unicast-routing ! -ip route vrf TENANT_B_INTRA 123.0.10.0/24 Ethernet6.10 123.1.1.3 name TENANT_B_SITE_5_SUBNET ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf TENANT_B_INTRA 123.0.10.0/24 Ethernet6.10 123.1.1.3 name TENANT_B_SITE_5_SUBNET ! mpls ip ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg index 4a8db3617c7..8c2082f45d3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1A.cfg @@ -280,8 +280,8 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY ! mac address-table notification host-flap logging ! -ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ! route-map RM-CONN-2-BGP permit 10 match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg index 0d931df3fd2..e159b95669e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-BL1B.cfg @@ -258,8 +258,8 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.255.0/24 eq 32 seq 20 permit 192.168.254.0/24 eq 32 ! -ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ! route-map RM-CONN-2-BGP permit 10 match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg index 44b711801dd..f5f5aa5a392 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF1A.cfg @@ -274,9 +274,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY ! ipv6 unicast-routing vrf 12345678 ! +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ip route vrf Tenant_A_APP_Zone 10.2.32.0/24 Vlan132 name VARP ip route vrf Tenant_A_APP_Zone 10.3.32.0/24 Vlan132 name VARP -ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ! ntp local-interface vrf MGMT Management1 ntp server vrf MGMT 192.168.200.5 prefer diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg index 0101440d97a..2cc47494930 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2A.cfg @@ -669,10 +669,10 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY ipv6 unicast-routing vrf 12345678 ipv6 unicast-routing vrf Tenant_D_OP_Zone ! +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ip route vrf Tenant_D_OP_Zone 0.0.0.0/0 10.3.11.4 ip route vrf Tenant_D_OP_Zone 1.1.1.0/24 10.3.11.4 track bfd name Track-bfd-network-services ip route vrf Tenant_D_OP_Zone 10.3.11.0/24 Vlan411 name VARP -ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ! ipv6 route vrf Tenant_D_OP_Zone ::/0 2001:db8:311::4 name IPv6-test-2 ipv6 route vrf Tenant_D_OP_Zone 2001:dba::/32 2001:db8:310::1 track bfd name Track-bfd-network-services diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg index 4ffdffebc85..7ff1a8051cb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-LEAF2B.cfg @@ -634,10 +634,10 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY ipv6 unicast-routing vrf 12345678 ipv6 unicast-routing vrf Tenant_D_OP_Zone ! +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ip route vrf Tenant_D_OP_Zone 0.0.0.0/0 10.3.11.4 ip route vrf Tenant_D_OP_Zone 1.1.1.0/24 10.3.11.4 track bfd name Track-bfd-network-services ip route vrf Tenant_D_OP_Zone 10.3.11.0/24 Vlan411 name VARP -ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ! ipv6 route vrf Tenant_D_OP_Zone ::/0 2001:db8:311::4 name IPv6-test-2 ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg index 5765585d91b..2be05008aa5 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg @@ -258,10 +258,10 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.255.0/24 eq 32 seq 20 permit 192.168.254.0/24 eq 32 ! +ip route vrf MGMT 0.0.0.0/0 10.0.0.1 ip route vrf svi_profile_tests_vrf 10.4.10.0/24 Vlan410 name VARP ip route vrf svi_profile_tests_vrf 10.4.11.0/24 Vlan411 name VARP ip route vrf svi_profile_tests_vrf 10.4.12.0/24 Vlan412 name VARP -ip route vrf MGMT 0.0.0.0/0 10.0.0.1 ! route-map RM-CONN-2-BGP permit 10 match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_2.cfg index a157f50ec03..dc690d217b7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_2.cfg @@ -258,10 +258,10 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.255.0/24 eq 32 seq 20 permit 192.168.254.0/24 eq 32 ! +ip route vrf MGMT 0.0.0.0/0 10.0.0.1 ip route vrf svi_profile_tests_vrf 10.4.10.0/24 Vlan410 name VARP ip route vrf svi_profile_tests_vrf 10.4.11.0/24 Vlan411 name VARP ip route vrf svi_profile_tests_vrf 10.4.12.0/24 Vlan412 name VARP -ip route vrf MGMT 0.0.0.0/0 10.0.0.1 ! route-map RM-CONN-2-BGP permit 10 match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg index 0279bf6aa87..79b9d4c8fb7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_false.cfg @@ -461,8 +461,8 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY ipv6 unicast-routing vrf 12345678 ipv6 unicast-routing vrf Tenant_D_OP_Zone ! -ip route vrf Tenant_D_OP_Zone 10.3.11.0/24 Vlan411 name VARP ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_D_OP_Zone 10.3.11.0/24 Vlan411 name VARP ! ntp local-interface vrf MGMT Management1 ntp server vrf MGMT 192.168.200.5 prefer diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv index bfe61edd1d0..ac2757c1f3e 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.csv @@ -1439,8 +1439,8 @@ id,dut,categories,test,description,inputs,result,messages 1438,dc2-leaf1a,Logging,VerifyLoggingHosts,Verifies logging hosts (syslog servers) for a specified VRF.,,NOT RUN, 1439,dc2-leaf1a,Logging,VerifyLoggingLogsGeneration,Verifies if logs are generated.,,NOT RUN, 1440,dc2-leaf1a,Logging,VerifyLoggingPersistent,Verifies if logging persistent is enabled and logs are saved in flash.,,NOT RUN, -1441,dc2-leaf1a,Logging,VerifyLoggingSourceInt,Verifies logging source-interface for a specified VRF.,,NOT RUN, -1442,dc2-leaf1a,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the riate timestamp.,,NOT RUN, +1441,dc2-leaf1a,Logging,VerifyLoggingSourceIntf,Verifies logging source-interface for a specified VRF.,,NOT RUN, +1442,dc2-leaf1a,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the appropriate timestamp.,,NOT RUN, 1443,dc2-leaf1a,MLAG,VerifyMlagConfigSanity,Verifies there are no MLAG config-sanity inconsistencies.,,NOT RUN, 1444,dc2-leaf1a,MLAG,VerifyMlagDualPrimary,Verifies the MLAG dual-primary detection parameters.,,NOT RUN, 1445,dc2-leaf1a,MLAG,VerifyMlagInterfaces,Verifies there are no inactive or active-partial MLAG ports.,,NOT RUN, @@ -1601,8 +1601,8 @@ id,dut,categories,test,description,inputs,result,messages 1600,dc2-leaf1b,Logging,VerifyLoggingHosts,Verifies logging hosts (syslog servers) for a specified VRF.,,NOT RUN, 1601,dc2-leaf1b,Logging,VerifyLoggingLogsGeneration,Verifies if logs are generated.,,NOT RUN, 1602,dc2-leaf1b,Logging,VerifyLoggingPersistent,Verifies if logging persistent is enabled and logs are saved in flash.,,NOT RUN, -1603,dc2-leaf1b,Logging,VerifyLoggingSourceInt,Verifies logging source-interface for a specified VRF.,,NOT RUN, -1604,dc2-leaf1b,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the riate timestamp.,,NOT RUN, +1603,dc2-leaf1b,Logging,VerifyLoggingSourceIntf,Verifies logging source-interface for a specified VRF.,,NOT RUN, +1604,dc2-leaf1b,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the appropriate timestamp.,,NOT RUN, 1605,dc2-leaf1b,MLAG,VerifyMlagConfigSanity,Verifies there are no MLAG config-sanity inconsistencies.,,NOT RUN, 1606,dc2-leaf1b,MLAG,VerifyMlagDualPrimary,Verifies the MLAG dual-primary detection parameters.,,NOT RUN, 1607,dc2-leaf1b,MLAG,VerifyMlagInterfaces,Verifies there are no inactive or active-partial MLAG ports.,,NOT RUN, @@ -1840,8 +1840,8 @@ id,dut,categories,test,description,inputs,result,messages 1839,dc2-leaf2a,Logging,VerifyLoggingHosts,Verifies logging hosts (syslog servers) for a specified VRF.,,NOT RUN, 1840,dc2-leaf2a,Logging,VerifyLoggingLogsGeneration,Verifies if logs are generated.,,NOT RUN, 1841,dc2-leaf2a,Logging,VerifyLoggingPersistent,Verifies if logging persistent is enabled and logs are saved in flash.,,NOT RUN, -1842,dc2-leaf2a,Logging,VerifyLoggingSourceInt,Verifies logging source-interface for a specified VRF.,,NOT RUN, -1843,dc2-leaf2a,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the riate timestamp.,,NOT RUN, +1842,dc2-leaf2a,Logging,VerifyLoggingSourceIntf,Verifies logging source-interface for a specified VRF.,,NOT RUN, +1843,dc2-leaf2a,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the appropriate timestamp.,,NOT RUN, 1844,dc2-leaf2a,MLAG,VerifyMlagConfigSanity,Verifies there are no MLAG config-sanity inconsistencies.,,NOT RUN, 1845,dc2-leaf2a,MLAG,VerifyMlagDualPrimary,Verifies the MLAG dual-primary detection parameters.,,NOT RUN, 1846,dc2-leaf2a,MLAG,VerifyMlagInterfaces,Verifies there are no inactive or active-partial MLAG ports.,,NOT RUN, @@ -2003,8 +2003,8 @@ id,dut,categories,test,description,inputs,result,messages 2002,dc2-leaf2b,Logging,VerifyLoggingHosts,Verifies logging hosts (syslog servers) for a specified VRF.,,NOT RUN, 2003,dc2-leaf2b,Logging,VerifyLoggingLogsGeneration,Verifies if logs are generated.,,NOT RUN, 2004,dc2-leaf2b,Logging,VerifyLoggingPersistent,Verifies if logging persistent is enabled and logs are saved in flash.,,NOT RUN, -2005,dc2-leaf2b,Logging,VerifyLoggingSourceInt,Verifies logging source-interface for a specified VRF.,,NOT RUN, -2006,dc2-leaf2b,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the riate timestamp.,,NOT RUN, +2005,dc2-leaf2b,Logging,VerifyLoggingSourceIntf,Verifies logging source-interface for a specified VRF.,,NOT RUN, +2006,dc2-leaf2b,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the appropriate timestamp.,,NOT RUN, 2007,dc2-leaf2b,MLAG,VerifyMlagConfigSanity,Verifies there are no MLAG config-sanity inconsistencies.,,NOT RUN, 2008,dc2-leaf2b,MLAG,VerifyMlagDualPrimary,Verifies the MLAG dual-primary detection parameters.,,NOT RUN, 2009,dc2-leaf2b,MLAG,VerifyMlagInterfaces,Verifies there are no inactive or active-partial MLAG ports.,,NOT RUN, @@ -2244,8 +2244,8 @@ id,dut,categories,test,description,inputs,result,messages 2243,dc2-leaf3a.arista.com,Logging,VerifyLoggingHosts,Verifies logging hosts (syslog servers) for a specified VRF.,,NOT RUN, 2244,dc2-leaf3a.arista.com,Logging,VerifyLoggingLogsGeneration,Verifies if logs are generated.,,NOT RUN, 2245,dc2-leaf3a.arista.com,Logging,VerifyLoggingPersistent,Verifies if logging persistent is enabled and logs are saved in flash.,,NOT RUN, -2246,dc2-leaf3a.arista.com,Logging,VerifyLoggingSourceInt,Verifies logging source-interface for a specified VRF.,,NOT RUN, -2247,dc2-leaf3a.arista.com,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the riate timestamp.,,NOT RUN, +2246,dc2-leaf3a.arista.com,Logging,VerifyLoggingSourceIntf,Verifies logging source-interface for a specified VRF.,,NOT RUN, +2247,dc2-leaf3a.arista.com,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the appropriate timestamp.,,NOT RUN, 2248,dc2-leaf3a.arista.com,MLAG,VerifyMlagConfigSanity,Verifies there are no MLAG config-sanity inconsistencies.,,NOT RUN, 2249,dc2-leaf3a.arista.com,MLAG,VerifyMlagDualPrimary,Verifies the MLAG dual-primary detection parameters.,,NOT RUN, 2250,dc2-leaf3a.arista.com,MLAG,VerifyMlagInterfaces,Verifies there are no inactive or active-partial MLAG ports.,,NOT RUN, @@ -2403,8 +2403,8 @@ id,dut,categories,test,description,inputs,result,messages 2402,dc2-leaf3b.arista.com,Logging,VerifyLoggingHosts,Verifies logging hosts (syslog servers) for a specified VRF.,,NOT RUN, 2403,dc2-leaf3b.arista.com,Logging,VerifyLoggingLogsGeneration,Verifies if logs are generated.,,NOT RUN, 2404,dc2-leaf3b.arista.com,Logging,VerifyLoggingPersistent,Verifies if logging persistent is enabled and logs are saved in flash.,,NOT RUN, -2405,dc2-leaf3b.arista.com,Logging,VerifyLoggingSourceInt,Verifies logging source-interface for a specified VRF.,,NOT RUN, -2406,dc2-leaf3b.arista.com,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the riate timestamp.,,NOT RUN, +2405,dc2-leaf3b.arista.com,Logging,VerifyLoggingSourceIntf,Verifies logging source-interface for a specified VRF.,,NOT RUN, +2406,dc2-leaf3b.arista.com,Logging,VerifyLoggingTimestamp,Verifies if logs are generated with the appropriate timestamp.,,NOT RUN, 2407,dc2-leaf3b.arista.com,MLAG,VerifyMlagConfigSanity,Verifies there are no MLAG config-sanity inconsistencies.,,NOT RUN, 2408,dc2-leaf3b.arista.com,MLAG,VerifyMlagDualPrimary,Verifies the MLAG dual-primary detection parameters.,,NOT RUN, 2409,dc2-leaf3b.arista.com,MLAG,VerifyMlagInterfaces,Verifies there are no inactive or active-partial MLAG ports.,,NOT RUN, diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md index b33ac542b2e..9771aa2b650 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/FABRIC-state.md @@ -1522,8 +1522,8 @@ | 1438 | dc2-leaf1a | Logging | VerifyLoggingHosts | Verifies logging hosts (syslog servers) for a specified VRF. | - | NOT RUN | - | | 1439 | dc2-leaf1a | Logging | VerifyLoggingLogsGeneration | Verifies if logs are generated. | - | NOT RUN | - | | 1440 | dc2-leaf1a | Logging | VerifyLoggingPersistent | Verifies if logging persistent is enabled and logs are saved in flash. | - | NOT RUN | - | -| 1441 | dc2-leaf1a | Logging | VerifyLoggingSourceInt | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | -| 1442 | dc2-leaf1a | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the riate timestamp. | - | NOT RUN | - | +| 1441 | dc2-leaf1a | Logging | VerifyLoggingSourceIntf | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | +| 1442 | dc2-leaf1a | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the appropriate timestamp. | - | NOT RUN | - | | 1443 | dc2-leaf1a | MLAG | VerifyMlagConfigSanity | Verifies there are no MLAG config-sanity inconsistencies. | - | NOT RUN | - | | 1444 | dc2-leaf1a | MLAG | VerifyMlagDualPrimary | Verifies the MLAG dual-primary detection parameters. | - | NOT RUN | - | | 1445 | dc2-leaf1a | MLAG | VerifyMlagInterfaces | Verifies there are no inactive or active-partial MLAG ports. | - | NOT RUN | - | @@ -1684,8 +1684,8 @@ | 1600 | dc2-leaf1b | Logging | VerifyLoggingHosts | Verifies logging hosts (syslog servers) for a specified VRF. | - | NOT RUN | - | | 1601 | dc2-leaf1b | Logging | VerifyLoggingLogsGeneration | Verifies if logs are generated. | - | NOT RUN | - | | 1602 | dc2-leaf1b | Logging | VerifyLoggingPersistent | Verifies if logging persistent is enabled and logs are saved in flash. | - | NOT RUN | - | -| 1603 | dc2-leaf1b | Logging | VerifyLoggingSourceInt | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | -| 1604 | dc2-leaf1b | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the riate timestamp. | - | NOT RUN | - | +| 1603 | dc2-leaf1b | Logging | VerifyLoggingSourceIntf | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | +| 1604 | dc2-leaf1b | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the appropriate timestamp. | - | NOT RUN | - | | 1605 | dc2-leaf1b | MLAG | VerifyMlagConfigSanity | Verifies there are no MLAG config-sanity inconsistencies. | - | NOT RUN | - | | 1606 | dc2-leaf1b | MLAG | VerifyMlagDualPrimary | Verifies the MLAG dual-primary detection parameters. | - | NOT RUN | - | | 1607 | dc2-leaf1b | MLAG | VerifyMlagInterfaces | Verifies there are no inactive or active-partial MLAG ports. | - | NOT RUN | - | @@ -1923,8 +1923,8 @@ | 1839 | dc2-leaf2a | Logging | VerifyLoggingHosts | Verifies logging hosts (syslog servers) for a specified VRF. | - | NOT RUN | - | | 1840 | dc2-leaf2a | Logging | VerifyLoggingLogsGeneration | Verifies if logs are generated. | - | NOT RUN | - | | 1841 | dc2-leaf2a | Logging | VerifyLoggingPersistent | Verifies if logging persistent is enabled and logs are saved in flash. | - | NOT RUN | - | -| 1842 | dc2-leaf2a | Logging | VerifyLoggingSourceInt | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | -| 1843 | dc2-leaf2a | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the riate timestamp. | - | NOT RUN | - | +| 1842 | dc2-leaf2a | Logging | VerifyLoggingSourceIntf | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | +| 1843 | dc2-leaf2a | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the appropriate timestamp. | - | NOT RUN | - | | 1844 | dc2-leaf2a | MLAG | VerifyMlagConfigSanity | Verifies there are no MLAG config-sanity inconsistencies. | - | NOT RUN | - | | 1845 | dc2-leaf2a | MLAG | VerifyMlagDualPrimary | Verifies the MLAG dual-primary detection parameters. | - | NOT RUN | - | | 1846 | dc2-leaf2a | MLAG | VerifyMlagInterfaces | Verifies there are no inactive or active-partial MLAG ports. | - | NOT RUN | - | @@ -2086,8 +2086,8 @@ | 2002 | dc2-leaf2b | Logging | VerifyLoggingHosts | Verifies logging hosts (syslog servers) for a specified VRF. | - | NOT RUN | - | | 2003 | dc2-leaf2b | Logging | VerifyLoggingLogsGeneration | Verifies if logs are generated. | - | NOT RUN | - | | 2004 | dc2-leaf2b | Logging | VerifyLoggingPersistent | Verifies if logging persistent is enabled and logs are saved in flash. | - | NOT RUN | - | -| 2005 | dc2-leaf2b | Logging | VerifyLoggingSourceInt | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | -| 2006 | dc2-leaf2b | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the riate timestamp. | - | NOT RUN | - | +| 2005 | dc2-leaf2b | Logging | VerifyLoggingSourceIntf | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | +| 2006 | dc2-leaf2b | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the appropriate timestamp. | - | NOT RUN | - | | 2007 | dc2-leaf2b | MLAG | VerifyMlagConfigSanity | Verifies there are no MLAG config-sanity inconsistencies. | - | NOT RUN | - | | 2008 | dc2-leaf2b | MLAG | VerifyMlagDualPrimary | Verifies the MLAG dual-primary detection parameters. | - | NOT RUN | - | | 2009 | dc2-leaf2b | MLAG | VerifyMlagInterfaces | Verifies there are no inactive or active-partial MLAG ports. | - | NOT RUN | - | @@ -2327,8 +2327,8 @@ | 2243 | dc2-leaf3a.arista.com | Logging | VerifyLoggingHosts | Verifies logging hosts (syslog servers) for a specified VRF. | - | NOT RUN | - | | 2244 | dc2-leaf3a.arista.com | Logging | VerifyLoggingLogsGeneration | Verifies if logs are generated. | - | NOT RUN | - | | 2245 | dc2-leaf3a.arista.com | Logging | VerifyLoggingPersistent | Verifies if logging persistent is enabled and logs are saved in flash. | - | NOT RUN | - | -| 2246 | dc2-leaf3a.arista.com | Logging | VerifyLoggingSourceInt | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | -| 2247 | dc2-leaf3a.arista.com | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the riate timestamp. | - | NOT RUN | - | +| 2246 | dc2-leaf3a.arista.com | Logging | VerifyLoggingSourceIntf | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | +| 2247 | dc2-leaf3a.arista.com | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the appropriate timestamp. | - | NOT RUN | - | | 2248 | dc2-leaf3a.arista.com | MLAG | VerifyMlagConfigSanity | Verifies there are no MLAG config-sanity inconsistencies. | - | NOT RUN | - | | 2249 | dc2-leaf3a.arista.com | MLAG | VerifyMlagDualPrimary | Verifies the MLAG dual-primary detection parameters. | - | NOT RUN | - | | 2250 | dc2-leaf3a.arista.com | MLAG | VerifyMlagInterfaces | Verifies there are no inactive or active-partial MLAG ports. | - | NOT RUN | - | @@ -2486,8 +2486,8 @@ | 2402 | dc2-leaf3b.arista.com | Logging | VerifyLoggingHosts | Verifies logging hosts (syslog servers) for a specified VRF. | - | NOT RUN | - | | 2403 | dc2-leaf3b.arista.com | Logging | VerifyLoggingLogsGeneration | Verifies if logs are generated. | - | NOT RUN | - | | 2404 | dc2-leaf3b.arista.com | Logging | VerifyLoggingPersistent | Verifies if logging persistent is enabled and logs are saved in flash. | - | NOT RUN | - | -| 2405 | dc2-leaf3b.arista.com | Logging | VerifyLoggingSourceInt | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | -| 2406 | dc2-leaf3b.arista.com | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the riate timestamp. | - | NOT RUN | - | +| 2405 | dc2-leaf3b.arista.com | Logging | VerifyLoggingSourceIntf | Verifies logging source-interface for a specified VRF. | - | NOT RUN | - | +| 2406 | dc2-leaf3b.arista.com | Logging | VerifyLoggingTimestamp | Verifies if logs are generated with the appropriate timestamp. | - | NOT RUN | - | | 2407 | dc2-leaf3b.arista.com | MLAG | VerifyMlagConfigSanity | Verifies there are no MLAG config-sanity inconsistencies. | - | NOT RUN | - | | 2408 | dc2-leaf3b.arista.com | MLAG | VerifyMlagDualPrimary | Verifies the MLAG dual-primary detection parameters. | - | NOT RUN | - | | 2409 | dc2-leaf3b.arista.com | MLAG | VerifyMlagInterfaces | Verifies there are no inactive or active-partial MLAG ports. | - | NOT RUN | - | diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1a-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1a-results.json index becef3f3f83..d1dba04ba71 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1a-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1a-results.json @@ -711,7 +711,7 @@ }, { "name": "dc2-leaf1a", - "test": "VerifyLoggingSourceInt", + "test": "VerifyLoggingSourceIntf", "categories": [ "logging" ], @@ -723,7 +723,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the riate timestamp." + "description": "Verifies if logs are generated with the appropriate timestamp." }, { "name": "dc2-leaf1a", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1b-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1b-results.json index 019c31a740b..3926523a408 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1b-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf1b-results.json @@ -711,7 +711,7 @@ }, { "name": "dc2-leaf1b", - "test": "VerifyLoggingSourceInt", + "test": "VerifyLoggingSourceIntf", "categories": [ "logging" ], @@ -723,7 +723,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the riate timestamp." + "description": "Verifies if logs are generated with the appropriate timestamp." }, { "name": "dc2-leaf1b", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2a-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2a-results.json index f9486f0c8f9..7c02f57a938 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2a-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2a-results.json @@ -756,7 +756,7 @@ }, { "name": "dc2-leaf2a", - "test": "VerifyLoggingSourceInt", + "test": "VerifyLoggingSourceIntf", "categories": [ "logging" ], @@ -768,7 +768,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the riate timestamp." + "description": "Verifies if logs are generated with the appropriate timestamp." }, { "name": "dc2-leaf2a", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2b-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2b-results.json index 01b873e4a37..98b88310350 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2b-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf2b-results.json @@ -720,7 +720,7 @@ }, { "name": "dc2-leaf2b", - "test": "VerifyLoggingSourceInt", + "test": "VerifyLoggingSourceIntf", "categories": [ "logging" ], @@ -732,7 +732,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the riate timestamp." + "description": "Verifies if logs are generated with the appropriate timestamp." }, { "name": "dc2-leaf2b", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json index a48ccefad68..b97382a47b2 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3a.arista.com-results.json @@ -774,7 +774,7 @@ }, { "name": "dc2-leaf3a.arista.com", - "test": "VerifyLoggingSourceInt", + "test": "VerifyLoggingSourceIntf", "categories": [ "logging" ], @@ -786,7 +786,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the riate timestamp." + "description": "Verifies if logs are generated with the appropriate timestamp." }, { "name": "dc2-leaf3a.arista.com", diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3b.arista.com-results.json b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3b.arista.com-results.json index 7527b7d8739..19aab640552 100644 --- a/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3b.arista.com-results.json +++ b/ansible_collections/arista/avd/molecule/eos_validate_state/reports/test_results/dc2-leaf3b.arista.com-results.json @@ -684,7 +684,7 @@ }, { "name": "dc2-leaf3b.arista.com", - "test": "VerifyLoggingSourceInt", + "test": "VerifyLoggingSourceIntf", "categories": [ "logging" ], @@ -696,7 +696,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the riate timestamp." + "description": "Verifies if logs are generated with the appropriate timestamp." }, { "name": "dc2-leaf3b.arista.com", diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md index 0ce512d248e..86a8f3cbf90 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md @@ -591,11 +591,11 @@ ip routing vrf Tenant_L3_VRF_Zone ```eos ! +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ip route vrf Tenant_A_WAN_Zone 1.1.1.0/24 Vlan101 10.1.1.1 ip route vrf Tenant_A_WAN_Zone 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 -ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ``` ### Router BGP diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md index 035b45f089f..23949587c2e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md @@ -589,11 +589,11 @@ ip routing vrf Tenant_L3_VRF_Zone ```eos ! +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ip route vrf Tenant_A_WAN_Zone 1.1.1.0/24 Vlan101 10.1.1.1 ip route vrf Tenant_A_WAN_Zone 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 -ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ``` ### Router BGP diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md index 0e1585c9632..8646825fda0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -1244,8 +1244,8 @@ ip routing vrf Tenant_C_WAN_Zone ```eos ! -ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 ``` ### Router BGP diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md index 880ac241ca8..8a1e542a63c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -1244,8 +1244,8 @@ ip routing vrf Tenant_C_WAN_Zone ```eos ! -ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 ``` ### Router BGP diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg index fcbdd5797aa..5a5351b853b 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg @@ -213,11 +213,11 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.255.0/24 eq 32 seq 20 permit 192.168.254.0/24 eq 32 ! +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ip route vrf Tenant_A_WAN_Zone 1.1.1.0/24 Vlan101 10.1.1.1 ip route vrf Tenant_A_WAN_Zone 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 -ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ! route-map RM-CONN-2-BGP permit 10 match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg index 79c9027d348..ff023d7cfb8 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg @@ -212,11 +212,11 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY seq 10 permit 192.168.255.0/24 eq 32 seq 20 permit 192.168.254.0/24 eq 32 ! +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ip route vrf Tenant_A_WAN_Zone 1.1.1.0/24 Vlan101 10.1.1.1 ip route vrf Tenant_A_WAN_Zone 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 -ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ! route-map RM-CONN-2-BGP permit 10 match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg index 117bc86c296..dbac2d92dea 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg @@ -710,8 +710,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 ! ntp local-interface vrf MGMT Management1 ntp server vrf MGMT 192.168.200.5 prefer diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg index 28182a14396..cf134e95907 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg @@ -710,8 +710,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0 ! ntp local-interface vrf MGMT Management1 ntp server vrf MGMT 192.168.200.5 prefer diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1A.md index cb288d0e82b..781e837cd50 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1A.md @@ -544,8 +544,8 @@ ipv6 unicast-routing ```eos ! -ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ``` ### Router General diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1B.md index e3d98b1a85c..1f378dc4a85 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-BL1B.md @@ -545,8 +545,8 @@ ipv6 unicast-routing ```eos ! -ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ``` ### Router BGP diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1A.cfg index 3e971b7cc0a..dbde08d61e5 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1A.cfg @@ -166,8 +166,8 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY ! ipv6 unicast-routing ! -ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ! ntp local-interface vrf MGMT Management1 ntp server vrf MGMT 192.168.200.5 prefer diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1B.cfg index 8742a32cb8d..34a4051dd9a 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/configs/DC1-BL1B.cfg @@ -167,8 +167,8 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY ! ipv6 unicast-routing ! -ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ip route vrf MGMT 0.0.0.0/0 192.168.200.5 +ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4 ! ntp local-interface vrf MGMT Management1 ntp server vrf MGMT 192.168.200.5 prefer diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/static-routes.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/static-routes.j2 index f608d16878c..a0f01d15bb0 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/static-routes.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/static-routes.j2 @@ -7,7 +7,7 @@ {% if static_routes is arista.avd.defined %} ! {% if static_routes is arista.avd.defined %} -{% set with_vrf_non_default = static_routes | selectattr('vrf', 'arista.avd.defined') | rejectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort('vrf') | arista.avd.natural_sort %} +{% set with_vrf_non_default = static_routes | selectattr('vrf', 'arista.avd.defined') | rejectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort | arista.avd.natural_sort('vrf') %} {% set without_vrf = static_routes | rejectattr('vrf', 'arista.avd.defined') | arista.avd.natural_sort %} {% set with_vrf_default = static_routes | selectattr('vrf', 'arista.avd.defined') | selectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort %} {% set sorted_static_routes = without_vrf | list + with_vrf_default | list + with_vrf_non_default | list %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/system.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/system.j2 index fb22c5e0e48..913ebf3c154 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/system.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/system.j2 @@ -20,11 +20,9 @@ system control-plane {% endif %} {# control_plane access_groups ipv4 #} {% if system.control_plane.ipv4_access_groups is arista.avd.defined %} -{% set with_vrf_non_default = system.control_plane.ipv4_access_groups - | selectattr('vrf', 'arista.avd.defined') - | rejectattr('vrf', 'equalto', 'default') %} -{% set without_vrf = system.control_plane.ipv4_access_groups | rejectattr('vrf', 'arista.avd.defined') %} -{% set with_vrf_default = system.control_plane.ipv4_access_groups | selectattr('vrf', 'arista.avd.defined') | selectattr('vrf', 'equalto', 'default') %} +{% set with_vrf_non_default = system.control_plane.ipv4_access_groups | selectattr('vrf', 'arista.avd.defined') | rejectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort | arista.avd.natural_sort('vrf') %} +{% set without_vrf = system.control_plane.ipv4_access_groups | rejectattr('vrf', 'arista.avd.defined') | arista.avd.natural_sort %} +{% set with_vrf_default = system.control_plane.ipv4_access_groups | selectattr('vrf', 'arista.avd.defined') | selectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort %} {% set sorted_ipv4_access_groups = without_vrf | list + with_vrf_default | list + with_vrf_non_default | list %} {% endif %} {% for acl_set in sorted_ipv4_access_groups | arista.avd.default([]) %} @@ -37,11 +35,9 @@ system control-plane {% endfor %} {# control_plane access_groups ipv6 #} {% if system.control_plane.ipv6_access_groups is arista.avd.defined %} -{% set with_vrf_non_default = system.control_plane.ipv6_access_groups - | selectattr('vrf', 'arista.avd.defined') - | rejectattr('vrf', 'equalto', 'default') %} -{% set without_vrf = system.control_plane.ipv6_access_groups | rejectattr('vrf', 'arista.avd.defined') %} -{% set with_vrf_default = system.control_plane.ipv6_access_groups | selectattr('vrf', 'arista.avd.defined') | selectattr('vrf', 'equalto', 'default') %} +{% set with_vrf_non_default = system.control_plane.ipv6_access_groups | selectattr('vrf', 'arista.avd.defined') | rejectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort | arista.avd.natural_sort('vrf') %} +{% set without_vrf = system.control_plane.ipv6_access_groups | rejectattr('vrf', 'arista.avd.defined') | arista.avd.natural_sort %} +{% set with_vrf_default = system.control_plane.ipv6_access_groups | selectattr('vrf', 'arista.avd.defined') | selectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort %} {% set sorted_ipv6_access_groups = without_vrf | list + with_vrf_default | list + with_vrf_non_default | list %} {% endif %} {% for acl_set in sorted_ipv6_access_groups | arista.avd.default([]) %}