From 129e4405f4841d1334d69d9e9d864ed9980976dd Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Date: Mon, 14 Oct 2024 00:26:20 -0700 Subject: [PATCH 1/5] rearrange the commands --- .../documentation/devices/static-routes.md | 4 ++-- .../documentation/devices/system.md | 4 ++-- .../intended/configs/static-routes.cfg | 4 ++-- .../intended/configs/system.cfg | 4 ++-- .../j2templates/eos/static-routes.j2 | 8 +++++++- .../j2templates/eos/system.j2 | 20 +++++++++++++++++-- .../j2templates/eos/traffic-policies.j2 | 8 ++++---- 7 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md index af3d485e50c..993f53b249d 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md @@ -58,10 +58,10 @@ interface Management1 ! ip route 1.1.1.0/24 Vlan101 10.1.1.1 ip route 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ -ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1 -ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ ip route vrf APP 10.3.4.0/24 1.2.3.4 ip route vrf APP 10.3.5.0/24 Null0 +ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1 +ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ ip route vrf customer01 10.3.6.0/24 Ethernet40 11.2.1.1 track bfd 100 tag 1000 name Track-BFD metric 300 ip route vrf customer01 10.3.7.0/24 Ethernet41 100 tag 1000 name No-Track-BFD metric 300 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md index feca39283ba..b09a9142548 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md @@ -66,13 +66,13 @@ interface Management1 system control-plane tcp mss ceiling ipv4 1344 ipv6 1366 ip access-group acl4_1 in + ip access-group acl4_3 vrf default in ip access-group acl4_2 vrf red in ip access-group acl4_2 vrf red_1 in - ip access-group acl4_3 vrf default in ipv6 access-group acl6_1 in + ipv6 access-group acl6_3 vrf default in ipv6 access-group acl6_2 vrf blue in ipv6 access-group acl6_2 vrf blue_1 in - ipv6 access-group acl6_3 vrf default in ``` ## System L1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg index 9d81dc6164a..3d7a7c00537 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg @@ -6,9 +6,9 @@ interface Management1 ! ip route 1.1.1.0/24 Vlan101 10.1.1.1 ip route 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ -ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1 -ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ ip route vrf APP 10.3.4.0/24 1.2.3.4 ip route vrf APP 10.3.5.0/24 Null0 +ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1 +ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ ip route vrf customer01 10.3.6.0/24 Ethernet40 11.2.1.1 track bfd 100 tag 1000 name Track-BFD metric 300 ip route vrf customer01 10.3.7.0/24 Ethernet41 100 tag 1000 name No-Track-BFD metric 300 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg index 871af45d159..d246010a90b 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg @@ -11,10 +11,10 @@ interface Management1 system control-plane tcp mss ceiling ipv4 1344 ipv6 1366 ip access-group acl4_1 in + ip access-group acl4_3 vrf default in ip access-group acl4_2 vrf red in ip access-group acl4_2 vrf red_1 in - ip access-group acl4_3 vrf default in ipv6 access-group acl6_1 in + ipv6 access-group acl6_3 vrf default in ipv6 access-group acl6_2 vrf blue in ipv6 access-group acl6_2 vrf blue_1 in - ipv6 access-group acl6_3 vrf default in 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 e5b392c64a3..f608d16878c 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 @@ -6,7 +6,13 @@ {# eos - static routes #} {% if static_routes is arista.avd.defined %} ! -{% for static_route in static_routes %} +{% 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 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 %} +{% endif %} +{% for static_route in sorted_static_routes | arista.avd.default([]) %} {% set static_route_cli = "ip route" %} {% if static_route.vrf is arista.avd.defined and static_route.vrf != 'default' %} {% set static_route_cli = static_route_cli ~ " vrf " ~ static_route.vrf %} 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 bcdd11a9044..fb22c5e0e48 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 @@ -19,7 +19,15 @@ system control-plane {{ cp_mss_cli }} {% endif %} {# control_plane access_groups ipv4 #} -{% for acl_set in system.control_plane.ipv4_access_groups | arista.avd.natural_sort %} +{% 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 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([]) %} {% set cp_ipv4_access_grp = "ip access-group " ~ acl_set.acl_name %} {% if acl_set.vrf is arista.avd.defined %} {% set cp_ipv4_access_grp = cp_ipv4_access_grp ~ " vrf " ~ acl_set.vrf %} @@ -28,7 +36,15 @@ system control-plane {{ cp_ipv4_access_grp }} {% endfor %} {# control_plane access_groups ipv6 #} -{% for acl_set in system.control_plane.ipv6_access_groups | arista.avd.natural_sort %} +{% 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 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([]) %} {% set cp_ipv6_access_grp = "ipv6 access-group " ~ acl_set.acl_name %} {% if acl_set.vrf is arista.avd.defined %} {% set cp_ipv6_access_grp = cp_ipv6_access_grp ~ " vrf " ~ acl_set.vrf %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 index 534c8f93237..06a621ed96a 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 @@ -132,16 +132,16 @@ traffic-policies {% endif %} {% endfor %} {% endif %} -{# -- TTL MANAGEMENT -- #} -{% if match.ttl is arista.avd.defined %} - ttl {{ match.ttl }} -{% endif %} {# -- FRAGMENT MANAGEMENT -- #} {% if match.fragment.offset is arista.avd.defined %} fragment offset {{ match.fragment.offset }} {% elif match.fragment is defined %} fragment {% endif %} +{# -- TTL MANAGEMENT -- #} +{% if match.ttl is arista.avd.defined %} + ttl {{ match.ttl }} +{% endif %} {# -- ACTIONS SECTION -- #} {% if match.actions.count is arista.avd.defined or match.actions.traffic_class is arista.avd.defined or match.actions.dscp is arista.avd.defined or match.actions.drop is arista.avd.defined(true) %} ! From 50c30dd28d7f21b5d4551dfe1e4bb18ce3a8634b Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Date: Mon, 14 Oct 2024 01:59:29 -0700 Subject: [PATCH 2/5] run all molecule --- .../documentation/devices/LEAF1A.md | 2 +- .../documentation/devices/LEAF1B.md | 2 +- .../documentation/devices/LEAF2A.md | 2 +- .../documentation/devices/LEAF3A.md | 2 +- .../documentation/devices/LEAF3B.md | 2 +- .../documentation/devices/LEAF3C.md | 2 +- .../documentation/devices/LEAF3D.md | 2 +- .../documentation/devices/LEAF3E.md | 2 +- .../campus-fabric/intended/configs/LEAF1A.cfg | 2 +- .../campus-fabric/intended/configs/LEAF1B.cfg | 2 +- .../campus-fabric/intended/configs/LEAF2A.cfg | 2 +- .../campus-fabric/intended/configs/LEAF3A.cfg | 2 +- .../campus-fabric/intended/configs/LEAF3B.cfg | 2 +- .../campus-fabric/intended/configs/LEAF3C.cfg | 2 +- .../campus-fabric/intended/configs/LEAF3D.cfg | 2 +- .../campus-fabric/intended/configs/LEAF3E.cfg | 2 +- .../documentation/devices/DC1-SVC3A.md | 1 + .../intended/configs/DC1-SVC3A.cfg | 1 + .../cvp-empty-filter/cv_server_configlets.yml | 2 +- .../cvp/cv_server_configlets.yml | 2 +- .../documentation/devices/BGP-LEAF1.md | 2 +- .../documentation/devices/BGP-LEAF2.md | 2 +- .../documentation/devices/BGP-SPINE2.md | 2 +- .../documentation/devices/ISIS-LEAF1.md | 2 +- .../documentation/devices/ISIS-SPINE1.md | 2 +- .../documentation/devices/L2ONLY-LEAF1.md | 2 +- .../documentation/devices/L2ONLY-LEAF2.md | 2 +- .../documentation/devices/OSPF-LEAF1.md | 2 +- .../documentation/devices/OSPF-LEAF2.md | 2 +- .../documentation/devices/OSPF-SPINE2.md | 2 +- .../intended/configs/BGP-LEAF1.cfg | 2 +- .../intended/configs/BGP-LEAF2.cfg | 2 +- .../intended/configs/BGP-SPINE2.cfg | 2 +- .../intended/configs/ISIS-LEAF1.cfg | 2 +- .../intended/configs/ISIS-SPINE1.cfg | 2 +- .../intended/configs/L2ONLY-LEAF1.cfg | 2 +- .../intended/configs/L2ONLY-LEAF2.cfg | 2 +- .../intended/configs/OSPF-LEAF1.cfg | 2 +- .../intended/configs/OSPF-LEAF2.cfg | 2 +- .../intended/configs/OSPF-SPINE2.cfg | 2 +- .../documentation/devices/SITE2-LER1.md | 2 +- .../intended/configs/SITE2-LER1.cfg | 2 +- .../devices/DC1-POD1-L2LEAF1A.md | 2 +- .../devices/DC1-POD1-L2LEAF2A.md | 2 +- .../devices/DC1-POD1-L2LEAF2B.md | 2 +- .../devices/DC2-POD1-L2LEAF1A.md | 2 +- .../devices/DC2-POD1-L2LEAF2A.md | 2 +- .../intended/configs/DC1-POD1-L2LEAF1A.cfg | 2 +- .../intended/configs/DC1-POD1-L2LEAF2A.cfg | 2 +- .../intended/configs/DC1-POD1-L2LEAF2B.cfg | 2 +- .../intended/configs/DC2-POD1-L2LEAF1A.cfg | 2 +- .../intended/configs/DC2-POD1-L2LEAF2A.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/MH-LEAF2A.cfg | 2 +- .../intended/configs/SVI_PROFILE_NODE_1.cfg | 2 +- .../intended/configs/SVI_PROFILE_NODE_2.cfg | 2 +- .../intended/configs/cv-pathfinder-edge.cfg | 6 ++--- .../configs/evpn_services_l2_only_false.cfg | 2 +- .../configs/flow-tracking-tests-l2-leaf1.cfg | 2 +- .../configs/flow-tracking-tests-l2-leaf2.cfg | 2 +- .../intended/configs/sflow-tests-l2-leaf1.cfg | 2 +- .../intended/configs/sflow-tests-l2-leaf2.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 | 4 ++-- .../documentation/devices/DC1-BL1B.md | 4 ++-- .../documentation/devices/DC1-SVC3A.md | 2 +- .../documentation/devices/DC1-SVC3B.md | 2 +- .../intended/configs/DC1-BL1A.cfg | 4 ++-- .../intended/configs/DC1-BL1B.cfg | 4 ++-- .../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 +- 86 files changed, 120 insertions(+), 118 deletions(-) diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md index 51e25775162..c51b6f3709b 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md @@ -1481,8 +1481,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md index f53463de078..d7716c83455 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md @@ -1481,8 +1481,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md index d11cd5041d2..093de3e9117 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md @@ -6847,8 +6847,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md index c12c8f77d01..977d97b6119 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md @@ -2588,8 +2588,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md index 0bf9ec18635..b7300a3df5f 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md @@ -2588,8 +2588,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md index c2e9b878a7a..a5fd429f6ab 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md @@ -2477,8 +2477,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md index b95b119f01f..249689e2cc3 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md @@ -2477,8 +2477,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md index 7a5ee120e49..7ab0aa8a133 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md +++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md @@ -2477,8 +2477,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg index 8e0522989a2..a67c9e8d893 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg @@ -1063,8 +1063,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ! ntp local-interface vrf MGMT Management0 ntp server vrf MGMT pool.ntp.org diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg index 01b5c956126..af1c4a39c0b 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg @@ -1063,8 +1063,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ! ntp local-interface vrf MGMT Management0 ntp server vrf MGMT pool.ntp.org diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg index 73ace9f104c..f041fe48a40 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg @@ -6070,8 +6070,8 @@ interface Vlan10 ip address 10.10.10.8/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ! ntp local-interface vrf MGMT Management0 ntp server vrf MGMT pool.ntp.org diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg index 0633ee8f2ea..990c08a14b5 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg @@ -2067,8 +2067,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ! ntp local-interface vrf MGMT Management0 ntp server vrf MGMT pool.ntp.org diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg index 32689b04ce0..bf56ae12afe 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg @@ -2067,8 +2067,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ! ntp local-interface vrf MGMT Management0 ntp server vrf MGMT pool.ntp.org diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg index 5c839f91b8d..ef60e00950a 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg @@ -1990,8 +1990,8 @@ interface Vlan10 ip address 10.10.10.11/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ! ntp local-interface vrf MGMT Management0 ntp server vrf MGMT pool.ntp.org diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg index 9024a9ea570..f833a80e76c 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg @@ -1990,8 +1990,8 @@ interface Vlan10 ip address 10.10.10.12/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ! ntp local-interface vrf MGMT Management0 ntp server vrf MGMT pool.ntp.org diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg index 7e5caeef5ff..fdd44a162d5 100644 --- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg +++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg @@ -1990,8 +1990,8 @@ interface Vlan10 ip address 10.10.10.13/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ip route 0.0.0.0/0 10.10.10.1 +ip route vrf MGMT 0.0.0.0/0 172.16.100.1 ! ntp local-interface vrf MGMT Management0 ntp server vrf MGMT pool.ntp.org diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md index e7d8c6984e5..9bda09b73b7 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md @@ -508,6 +508,7 @@ interface Port-Channel10 switchport trunk allowed vlan 110-111,210-211 switchport mode trunk switchport + ! evpn ethernet-segment identifier 0000:0000:0303:0202:0101 route-target import 03:03:02:02:01:01 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg index 68c20619bbb..6c8bea64a4f 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg @@ -162,6 +162,7 @@ interface Port-Channel10 switchport trunk allowed vlan 110-111,210-211 switchport mode trunk switchport + ! evpn ethernet-segment identifier 0000:0000:0303:0202:0101 route-target import 03:03:02:02:01:01 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml index 17e4750d28d..d312fb2a048 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml @@ -1087,7 +1087,7 @@ cvp_configlets: trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n \ switchport mode trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n \ description SERVER_server03_ESI\n no shutdown\n switchport trunk allowed - vlan 110-111,210-211\n switchport mode trunk\n switchport\n evpn ethernet-segment\n + vlan 110-111,210-211\n switchport mode trunk\n switchport\n !\n evpn ethernet-segment\n \ identifier 0000:0000:0303:0202:0101\n route-target import 03:03:02:02:01:01\n \ lacp system-id 0303.0202.0101\n!\ninterface Ethernet1\n description P2P_DC1-SPINE1_Ethernet4\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.25/31\n!\ninterface diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml index 17e4750d28d..d312fb2a048 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml @@ -1087,7 +1087,7 @@ cvp_configlets: trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n \ switchport mode trunk\n switchport\n mlag 7\n!\ninterface Port-Channel10\n \ description SERVER_server03_ESI\n no shutdown\n switchport trunk allowed - vlan 110-111,210-211\n switchport mode trunk\n switchport\n evpn ethernet-segment\n + vlan 110-111,210-211\n switchport mode trunk\n switchport\n !\n evpn ethernet-segment\n \ identifier 0000:0000:0303:0202:0101\n route-target import 03:03:02:02:01:01\n \ lacp system-id 0303.0202.0101\n!\ninterface Ethernet1\n description P2P_DC1-SPINE1_Ethernet4\n \ no shutdown\n mtu 1500\n no switchport\n ip address 172.31.255.25/31\n!\ninterface diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md index 85b829c0e18..e279c99141c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md @@ -282,8 +282,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md index 87b6baa8c75..09d0e437278 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md @@ -237,8 +237,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md index 4aeba46201e..8bc78b22806 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md @@ -412,8 +412,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 10.0.0.0/8 10.1.100.100 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ### Router BGP diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md index 08b4973821f..5f5461b42f0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md @@ -243,8 +243,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md index 9b3e5e99271..cdb63d9d104 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md @@ -312,8 +312,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 10.1.0.0/16 10.1.100.100 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ### Router ISIS diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md index e26e2892ebb..0f1571047cb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md @@ -237,8 +237,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md index c7e4935f4a4..e91a2d91424 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md @@ -237,8 +237,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md index f7e5db54d62..a913699e31e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md @@ -237,8 +237,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md index f86d912da44..01961c0a16a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md @@ -237,8 +237,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md index 9195ffed613..cb15ba7ec5d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md @@ -382,8 +382,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 10.0.0.0/8 10.1.100.100 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ``` ### Router OSPF diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg index e543e302972..25b9587221f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg @@ -95,7 +95,7 @@ interface Vlan4092 ip address 172.23.254.4/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg index 6aac8b8e64f..721b8bfb584 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg @@ -63,7 +63,7 @@ interface Vlan4092 ip address 172.23.254.5/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg index 1c452d7aada..17de0c20f9d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg @@ -143,8 +143,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 10.0.0.0/8 10.1.100.100 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! route-map RM-MLAG-PEER-IN permit 10 description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg index c0fcdef3c98..980aaf6e476 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg @@ -50,7 +50,7 @@ interface Vlan4092 ip address 172.23.254.4/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg index 99e81a75881..eedf3b43bde 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg @@ -75,8 +75,8 @@ ip virtual-router mac-address 00:1c:73:00:00:9a ip routing no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 10.1.0.0/16 10.1.100.100 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! router isis EVPN_UNDERLAY net 49.0001.1921.6825.5001.00 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF1.cfg index 54240708d92..52584d6f5af 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF1.cfg @@ -63,7 +63,7 @@ interface Vlan4092 ip address 172.23.254.4/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF2.cfg index d0ac472b116..21780de5845 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF2.cfg @@ -63,7 +63,7 @@ interface Vlan4092 ip address 172.23.254.5/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF1.cfg index 11409fa16a9..b87f525da01 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF1.cfg @@ -63,7 +63,7 @@ interface Vlan4092 ip address 172.23.254.4/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF2.cfg index d7b901c5c92..d37a3005226 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF2.cfg @@ -63,7 +63,7 @@ interface Vlan4092 ip address 172.23.254.5/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 0.0.0.0/0 172.23.254.1 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg index 0d3424a36eb..4f1a241cdfa 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg @@ -124,8 +124,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ip route 10.0.0.0/8 10.1.100.100 +ip route vrf MGMT 0.0.0.0/0 172.31.0.1 ! router ospf 100 router-id 192.168.255.2 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 1df2d657f25..45604569713 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 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 +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ``` ### 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 82e2cf4df66..8fe6082b66c 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 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 +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ! mpls ip ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF1A.md index 85bee7cf3ba..482a7db3ec4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF1A.md @@ -270,8 +270,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.110.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md index e9e9855ab1a..bd216143a77 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md @@ -382,8 +382,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.110.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md index e4d6411a026..47a2a9619db 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md @@ -410,8 +410,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.110.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF1A.md index b7ba833f92c..9f08e6c814a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF1A.md @@ -298,8 +298,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.210.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md index c52f87bc13f..33858fe36f0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md @@ -298,8 +298,8 @@ no ip routing vrf MGMT ```eos ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.210.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ``` ## Multicast diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF1A.cfg index d9c71447bd6..b21d4efe99c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF1A.cfg @@ -48,8 +48,8 @@ interface Vlan4085 ip address 172.21.110.4/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.110.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ! interface Loopback1111 description Loopback created from raw_eos_cli under platform_settings vEOS-LAB diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg index 0e5a6ef7c6d..1bba2933c28 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg @@ -121,8 +121,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.110.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ! interface Loopback1002 description Loopback created from raw_eos_cli under l2leaf node-group RACK2_MLAG diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg index b04cba58c27..e46c78ed78b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg @@ -127,8 +127,8 @@ mlag configuration reload-delay mlag 300 reload-delay non-mlag 330 ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.110.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ! interface Loopback1003 description Loopback created from raw_eos_cli under l2leaf node DC1-POD1-L2LEAF2B diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF1A.cfg index c0602828b2e..cd1263d9f92 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF1A.cfg @@ -54,8 +54,8 @@ interface Vlan4092 ip address 172.21.210.4/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.210.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ! interface Loopback1011 description Loopback created from raw_eos_cli under l2leaf defaults in DC2 POD1 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg index b19d0c16683..fad7b09c1ce 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg @@ -54,8 +54,8 @@ interface Vlan4092 ip address 172.21.210.5/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ip route 0.0.0.0/0 172.21.210.1 +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 ! interface Loopback1011 description Loopback created from raw_eos_cli under l2leaf defaults in DC2 POD1 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 8c2082f45d3..4a8db3617c7 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 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 +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/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 e159b95669e..0d931df3fd2 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 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 +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/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 f5f5aa5a392..44b711801dd 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 2cc47494930..0101440d97a 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 7ff1a8051cb..4ffdffebc85 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/MH-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg index 97221c63fc5..22781b52b5b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg @@ -139,8 +139,8 @@ ip prefix-list PL-STATIC-VRF-DEFAULT ip prefix-list PL-SVI-VRF-DEFAULT seq 10 permit 10.2.10.0/24 ! -ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ip route 10.0.0.0/8 10.2.10.100 +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/SVI_PROFILE_NODE_1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/SVI_PROFILE_NODE_1.cfg index 2be05008aa5..5765585d91b 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 dc690d217b7..a157f50ec03 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/cv-pathfinder-edge.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg index 50f5f578fb7..52331356039 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg @@ -530,12 +530,12 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY ip prefix-list PL-STATIC-VRF-DEFAULT seq 10 permit 66.66.66.0/24 ! -ip route 172.16.0.0/16 172.16.5.4 -ip route 172.16.0.0/16 172.16.5.9 -ip route 66.66.66.0/24 172.17.0.0 ip route 10.37.121.1/32 172.20.20.21 name IE-ZSCALER-PRI ip route 10.39.77.1/32 172.20.20.21 name IE-ZSCALER-SEC ip route 10.50.9.1/32 172.20.20.21 name IE-ZSCALER-TER +ip route 172.16.0.0/16 172.16.5.4 +ip route 172.16.0.0/16 172.16.5.9 +ip route 66.66.66.0/24 172.17.0.0 ! ip nat pool PORT-ONLY-POOL port-only port range 1500 65535 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 79b9d4c8fb7..0279bf6aa87 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 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 +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/flow-tracking-tests-l2-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg index b4d91ad0b75..c72e68c60c4 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg @@ -67,7 +67,7 @@ interface Vlan4092 ip address 10.254.254.4/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 192.168.0.1 ip route 0.0.0.0/0 10.254.254.1 +ip route vrf MGMT 0.0.0.0/0 192.168.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg index 9d77c801727..360d3a2930e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg @@ -67,7 +67,7 @@ interface Vlan4092 ip address 10.254.254.5/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 192.168.0.1 ip route 0.0.0.0/0 10.254.254.1 +ip route vrf MGMT 0.0.0.0/0 192.168.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg index 754634fcf86..b5c51b22df9 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg @@ -64,7 +64,7 @@ interface Vlan4092 ip address 10.254.254.4/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 192.168.0.1 ip route 0.0.0.0/0 10.254.254.1 +ip route vrf MGMT 0.0.0.0/0 192.168.0.1 ! end diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg index c1ec1ed822d..82db2c4fb18 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg @@ -64,7 +64,7 @@ interface Vlan4092 ip address 10.254.254.5/24 no ip routing vrf MGMT ! -ip route vrf MGMT 0.0.0.0/0 192.168.0.1 ip route 0.0.0.0/0 10.254.254.1 +ip route vrf MGMT 0.0.0.0/0 192.168.0.1 ! end 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 ac2757c1f3e..bfe61edd1d0 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,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, +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, 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,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, +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, 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,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, +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, 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,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, +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, 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,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, +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, 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,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, +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, 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 9771aa2b650..b33ac542b2e 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 | 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 | - | +| 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 | - | | 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 | 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 | - | +| 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 | - | | 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 | 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 | - | +| 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 | - | | 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 | 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 | - | +| 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 | - | | 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 | 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 | - | +| 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 | - | | 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 | 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 | - | +| 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 | - | | 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 d1dba04ba71..becef3f3f83 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": "VerifyLoggingSourceIntf", + "test": "VerifyLoggingSourceInt", "categories": [ "logging" ], @@ -723,7 +723,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the appropriate timestamp." + "description": "Verifies if logs are generated with the riate 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 3926523a408..019c31a740b 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": "VerifyLoggingSourceIntf", + "test": "VerifyLoggingSourceInt", "categories": [ "logging" ], @@ -723,7 +723,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the appropriate timestamp." + "description": "Verifies if logs are generated with the riate 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 7c02f57a938..f9486f0c8f9 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": "VerifyLoggingSourceIntf", + "test": "VerifyLoggingSourceInt", "categories": [ "logging" ], @@ -768,7 +768,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the appropriate timestamp." + "description": "Verifies if logs are generated with the riate 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 98b88310350..01b873e4a37 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": "VerifyLoggingSourceIntf", + "test": "VerifyLoggingSourceInt", "categories": [ "logging" ], @@ -732,7 +732,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the appropriate timestamp." + "description": "Verifies if logs are generated with the riate 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 b97382a47b2..a48ccefad68 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": "VerifyLoggingSourceIntf", + "test": "VerifyLoggingSourceInt", "categories": [ "logging" ], @@ -786,7 +786,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the appropriate timestamp." + "description": "Verifies if logs are generated with the riate 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 19aab640552..7527b7d8739 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": "VerifyLoggingSourceIntf", + "test": "VerifyLoggingSourceInt", "categories": [ "logging" ], @@ -696,7 +696,7 @@ "categories": [ "logging" ], - "description": "Verifies if logs are generated with the appropriate timestamp." + "description": "Verifies if logs are generated with the riate 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 7a4da0d6bb4..0ce512d248e 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 10.3.4.0/24 1.2.3.4 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 da9243d53ae..035b45f089f 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 10.3.4.0/24 1.2.3.4 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 8646825fda0..0e1585c9632 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 MGMT 0.0.0.0/0 192.168.200.5 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-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md index 8a1e542a63c..880ac241ca8 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 MGMT 0.0.0.0/0 192.168.200.5 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/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg index 9127e91173a..fcbdd5797aa 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 10.3.4.0/24 1.2.3.4 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 62642f6331f..79c9027d348 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 10.3.4.0/24 1.2.3.4 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 dbac2d92dea..117bc86c296 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 MGMT 0.0.0.0/0 192.168.200.5 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 ! 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 cf134e95907..28182a14396 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 MGMT 0.0.0.0/0 192.168.200.5 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 ! 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 781e837cd50..cb288d0e82b 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 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 +ip route vrf MGMT 0.0.0.0/0 192.168.200.5 ``` ### 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 1f378dc4a85..e3d98b1a85c 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 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 +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_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 dbde08d61e5..3e971b7cc0a 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 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 +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/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 34a4051dd9a..8742a32cb8d 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 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 +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 From 35e7bc026d77ce3feb2596e39f1ff4ad0569a667 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Date: Mon, 14 Oct 2024 02:27:47 -0700 Subject: [PATCH 3/5] 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([]) %} From 56d53e3d316a517107f6129406f739f2ba4559c1 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Date: Thu, 17 Oct 2024 02:20:15 -0700 Subject: [PATCH 4/5] added sorting on traffic-policies protocol --- .../documentation/devices/traffic-policies.md | 11 ++++++----- .../intended/configs/traffic-policies.cfg | 11 ++++++----- .../j2templates/eos/traffic-policies.j2 | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md index 7ebb284c230..4fbedf09afa 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md @@ -173,9 +173,9 @@ traffic-policies ! match BLUE-C1-POLICY-02 ipv4 source prefix field-set DEMO-01 DEMO-02 + protocol icmp protocol tcp flags established protocol tcp destination port field-set SERVICE-DEMO - protocol icmp ! actions count DEMO-TRAFFIC @@ -194,9 +194,9 @@ traffic-policies match BLUE-C1-POLICY-04 ipv4 source prefix field-set DEMO-02 destination prefix field-set DEMO-01 + protocol icmp protocol tcp flags established protocol tcp source port 22 destination port 80 - protocol icmp ! actions set traffic class 5 @@ -211,6 +211,7 @@ traffic-policies set traffic class 5 ! match BLUE-C1-POLICY-06 ipv4 + protocol icmp protocol neighbors bgp ! match BLUE-C1-POLICY-07 ipv4 @@ -218,8 +219,8 @@ traffic-policies ! match BLUE-C1-POLICY-08 ipv4 destination prefix 10.0.0.0/8 192.168.0.0/16 - protocol udp destination port 1,10-20 protocol tcp source port field-set SERVICE-DEMO-SRC destination port field-set SERVICE-DEMO-DST + protocol udp destination port 1,10-20 ! match ipv4-all-default ipv4 actions @@ -232,16 +233,16 @@ traffic-policies ! match BLUE-C2-POLICY-01 ipv4 source prefix 10.0.0.0/8 192.168.0.0/16 - protocol tcp source port 1,10-20 protocol icmp + protocol tcp source port 1,10-20 ! actions set traffic class 5 ! match BLUE-C2-POLICY-02 ipv4 source prefix field-set DEMO-01 DEMO-02 - protocol tcp source port field-set SERVICE-DEMO protocol icmp + protocol tcp source port field-set SERVICE-DEMO ! actions count DEMO-TRAFFIC diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/traffic-policies.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/traffic-policies.cfg index fe2c0c135b6..4bf3c4d341c 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/traffic-policies.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/traffic-policies.cfg @@ -43,9 +43,9 @@ traffic-policies ! match BLUE-C1-POLICY-02 ipv4 source prefix field-set DEMO-01 DEMO-02 + protocol icmp protocol tcp flags established protocol tcp destination port field-set SERVICE-DEMO - protocol icmp ! actions count DEMO-TRAFFIC @@ -64,9 +64,9 @@ traffic-policies match BLUE-C1-POLICY-04 ipv4 source prefix field-set DEMO-02 destination prefix field-set DEMO-01 + protocol icmp protocol tcp flags established protocol tcp source port 22 destination port 80 - protocol icmp ! actions set traffic class 5 @@ -81,6 +81,7 @@ traffic-policies set traffic class 5 ! match BLUE-C1-POLICY-06 ipv4 + protocol icmp protocol neighbors bgp ! match BLUE-C1-POLICY-07 ipv4 @@ -88,8 +89,8 @@ traffic-policies ! match BLUE-C1-POLICY-08 ipv4 destination prefix 10.0.0.0/8 192.168.0.0/16 - protocol udp destination port 1,10-20 protocol tcp source port field-set SERVICE-DEMO-SRC destination port field-set SERVICE-DEMO-DST + protocol udp destination port 1,10-20 ! match ipv4-all-default ipv4 actions @@ -102,16 +103,16 @@ traffic-policies ! match BLUE-C2-POLICY-01 ipv4 source prefix 10.0.0.0/8 192.168.0.0/16 - protocol tcp source port 1,10-20 protocol icmp + protocol tcp source port 1,10-20 ! actions set traffic class 5 ! match BLUE-C2-POLICY-02 ipv4 source prefix field-set DEMO-01 DEMO-02 - protocol tcp source port field-set SERVICE-DEMO protocol icmp + protocol tcp source port field-set SERVICE-DEMO ! actions count DEMO-TRAFFIC diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 index 06a621ed96a..23b5187cd3e 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 @@ -77,7 +77,7 @@ traffic-policies {# -- PROTOCOL MANAGEMENT -- #} {% if match.protocols is arista.avd.defined %} {% set bgp_flag = True %} -{% for protocol in match.protocols %} +{% for protocol in match.protocols | arista.avd.natural_sort('protocol') %} {% if protocol.protocol | lower in ['neighbors', 'bgp'] and bgp_flag %} {% if protocol.protocol | lower == 'neighbors' %} {% set protocol_neighbors_cli = 'protocol neighbors bgp' %} From b1fab8ca6368f1176f2f0b46e55ce64a127db6c7 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Date: Thu, 17 Oct 2024 02:55:55 -0700 Subject: [PATCH 5/5] removed sorting on protocol --- .../documentation/devices/traffic-policies.md | 11 +++++------ .../intended/configs/traffic-policies.cfg | 11 +++++------ .../j2templates/eos/traffic-policies.j2 | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md index 4fbedf09afa..7ebb284c230 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/traffic-policies.md @@ -173,9 +173,9 @@ traffic-policies ! match BLUE-C1-POLICY-02 ipv4 source prefix field-set DEMO-01 DEMO-02 - protocol icmp protocol tcp flags established protocol tcp destination port field-set SERVICE-DEMO + protocol icmp ! actions count DEMO-TRAFFIC @@ -194,9 +194,9 @@ traffic-policies match BLUE-C1-POLICY-04 ipv4 source prefix field-set DEMO-02 destination prefix field-set DEMO-01 - protocol icmp protocol tcp flags established protocol tcp source port 22 destination port 80 + protocol icmp ! actions set traffic class 5 @@ -211,7 +211,6 @@ traffic-policies set traffic class 5 ! match BLUE-C1-POLICY-06 ipv4 - protocol icmp protocol neighbors bgp ! match BLUE-C1-POLICY-07 ipv4 @@ -219,8 +218,8 @@ traffic-policies ! match BLUE-C1-POLICY-08 ipv4 destination prefix 10.0.0.0/8 192.168.0.0/16 - protocol tcp source port field-set SERVICE-DEMO-SRC destination port field-set SERVICE-DEMO-DST protocol udp destination port 1,10-20 + protocol tcp source port field-set SERVICE-DEMO-SRC destination port field-set SERVICE-DEMO-DST ! match ipv4-all-default ipv4 actions @@ -233,16 +232,16 @@ traffic-policies ! match BLUE-C2-POLICY-01 ipv4 source prefix 10.0.0.0/8 192.168.0.0/16 - protocol icmp protocol tcp source port 1,10-20 + protocol icmp ! actions set traffic class 5 ! match BLUE-C2-POLICY-02 ipv4 source prefix field-set DEMO-01 DEMO-02 - protocol icmp protocol tcp source port field-set SERVICE-DEMO + protocol icmp ! actions count DEMO-TRAFFIC diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/traffic-policies.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/traffic-policies.cfg index 4bf3c4d341c..fe2c0c135b6 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/traffic-policies.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/traffic-policies.cfg @@ -43,9 +43,9 @@ traffic-policies ! match BLUE-C1-POLICY-02 ipv4 source prefix field-set DEMO-01 DEMO-02 - protocol icmp protocol tcp flags established protocol tcp destination port field-set SERVICE-DEMO + protocol icmp ! actions count DEMO-TRAFFIC @@ -64,9 +64,9 @@ traffic-policies match BLUE-C1-POLICY-04 ipv4 source prefix field-set DEMO-02 destination prefix field-set DEMO-01 - protocol icmp protocol tcp flags established protocol tcp source port 22 destination port 80 + protocol icmp ! actions set traffic class 5 @@ -81,7 +81,6 @@ traffic-policies set traffic class 5 ! match BLUE-C1-POLICY-06 ipv4 - protocol icmp protocol neighbors bgp ! match BLUE-C1-POLICY-07 ipv4 @@ -89,8 +88,8 @@ traffic-policies ! match BLUE-C1-POLICY-08 ipv4 destination prefix 10.0.0.0/8 192.168.0.0/16 - protocol tcp source port field-set SERVICE-DEMO-SRC destination port field-set SERVICE-DEMO-DST protocol udp destination port 1,10-20 + protocol tcp source port field-set SERVICE-DEMO-SRC destination port field-set SERVICE-DEMO-DST ! match ipv4-all-default ipv4 actions @@ -103,16 +102,16 @@ traffic-policies ! match BLUE-C2-POLICY-01 ipv4 source prefix 10.0.0.0/8 192.168.0.0/16 - protocol icmp protocol tcp source port 1,10-20 + protocol icmp ! actions set traffic class 5 ! match BLUE-C2-POLICY-02 ipv4 source prefix field-set DEMO-01 DEMO-02 - protocol icmp protocol tcp source port field-set SERVICE-DEMO + protocol icmp ! actions count DEMO-TRAFFIC diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 index 23b5187cd3e..06a621ed96a 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 @@ -77,7 +77,7 @@ traffic-policies {# -- PROTOCOL MANAGEMENT -- #} {% if match.protocols is arista.avd.defined %} {% set bgp_flag = True %} -{% for protocol in match.protocols | arista.avd.natural_sort('protocol') %} +{% for protocol in match.protocols %} {% if protocol.protocol | lower in ['neighbors', 'bgp'] and bgp_flag %} {% if protocol.protocol | lower == 'neighbors' %} {% set protocol_neighbors_cli = 'protocol neighbors bgp' %}