From c67f95e4b6aa0a3e42df9a7f7e9dd30c688f3147 Mon Sep 17 00:00:00 2001 From: Shivani-gslab <145646625+Shivani-gslab@users.noreply.github.com> Date: Mon, 28 Oct 2024 14:39:01 +0530 Subject: [PATCH 1/8] Feat(eos_cli_config_gen): Add support for OSPF graceful restart (#4591) --- .../documentation/devices/router-ospf.md | 4 ++++ .../intended/configs/router-ospf.cfg | 4 ++++ .../inventory/host_vars/router-ospf.yml | 7 +++++++ .../docs/tables/router-ospf.md | 10 ++++++++++ .../j2templates/eos/router-ospf.j2 | 12 ++++++++++++ .../schema/eos_cli_config_gen.schema.yml | 16 ++++++++++++++++ .../schema_fragments/router_ospf.schema.yml | 15 +++++++++++++++ 7 files changed, 68 insertions(+) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-ospf.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-ospf.md index de2fc53ec98..e2bc23b986a 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-ospf.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-ospf.md @@ -251,7 +251,9 @@ router ospf 100 max-lsa 12000 maximum-paths 10 default-information originate + graceful-restart mpls ldp sync default + graceful-restart-helper ! router ospf 101 vrf CUSTOMER01 router-id 1.0.1.1 @@ -265,6 +267,8 @@ router ospf 101 vrf CUSTOMER01 summary-address 20.0.0.0/8 tag 10 summary-address 30.0.0.0/8 attribute-map RM-OSPF_SUMMARY summary-address 40.0.0.0/8 not-advertise + graceful-restart grace-period 10 + no graceful-restart-helper area 5 not-so-stubby lsa type-7 convert type-5 ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-ospf.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-ospf.cfg index d5b255c4eee..78d67f0c70d 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-ospf.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-ospf.cfg @@ -51,7 +51,9 @@ router ospf 100 max-lsa 12000 maximum-paths 10 default-information originate + graceful-restart mpls ldp sync default + graceful-restart-helper ! router ospf 101 vrf CUSTOMER01 router-id 1.0.1.1 @@ -65,6 +67,8 @@ router ospf 101 vrf CUSTOMER01 summary-address 20.0.0.0/8 tag 10 summary-address 30.0.0.0/8 attribute-map RM-OSPF_SUMMARY summary-address 40.0.0.0/8 not-advertise + graceful-restart grace-period 10 + no graceful-restart-helper area 5 not-so-stubby lsa type-7 convert type-5 ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-ospf.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-ospf.yml index 2f149bc63a8..0661455a892 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-ospf.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-ospf.yml @@ -33,6 +33,9 @@ router_ospf: inter_area: 70 distribute_list_in: route_map: RM-OSPF-DIST-IN + graceful_restart: + enabled: true + graceful_restart_helper: true - id: 101 vrf: CUSTOMER01 passive_interface_default: true @@ -60,6 +63,10 @@ router_ospf: initial: 100 min: 200 max: 300 + graceful_restart: + enabled: true + grace_period: 10 + graceful_restart_helper: false eos_cli: | area 5 not-so-stubby lsa type-7 convert type-5 diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-ospf.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-ospf.md index 69eab6194fa..8b42779ea9b 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-ospf.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-ospf.md @@ -83,6 +83,10 @@ | [          on_startup](## "router_ospf.process_ids.[].max_metric.router_lsa.on_startup") | String | | | | "wait-for-bgp" or Integer 5-86400.
Example: "wait-for-bgp" Or "222"
| | [          summary_lsa](## "router_ospf.process_ids.[].max_metric.router_lsa.summary_lsa") | Dictionary | | | | | | [            override_metric](## "router_ospf.process_ids.[].max_metric.router_lsa.summary_lsa.override_metric") | Integer | | | Min: 1
Max: 16777215 | | + | [      graceful_restart](## "router_ospf.process_ids.[].graceful_restart") | Dictionary | | | | | + | [        enabled](## "router_ospf.process_ids.[].graceful_restart.enabled") | Boolean | Required | | | | + | [        grace_period](## "router_ospf.process_ids.[].graceful_restart.grace_period") | Integer | | | Min: 1
Max: 1800 | Specify maximum time in seconds to wait for graceful-restart to complete. | + | [      graceful_restart_helper](## "router_ospf.process_ids.[].graceful_restart_helper") | Boolean | | | | | | [      mpls_ldp_sync_default](## "router_ospf.process_ids.[].mpls_ldp_sync_default") | Boolean | | | | | | [      eos_cli](## "router_ospf.process_ids.[].eos_cli") | String | | | | Multiline EOS CLI rendered directly on the Router OSPF process ID in the final EOS configuration. | @@ -212,6 +216,12 @@ on_startup: summary_lsa: override_metric: + graceful_restart: + enabled: + + # Specify maximum time in seconds to wait for graceful-restart to complete. + grace_period: + graceful_restart_helper: mpls_ldp_sync_default: # Multiline EOS CLI rendered directly on the Router OSPF process ID in the final EOS configuration. diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-ospf.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-ospf.j2 index dfc44f7b848..fc6c9bf132e 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-ospf.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-ospf.j2 @@ -200,9 +200,21 @@ router ospf {{ process_id.id }} summary-address {{ summary_address.prefix }} {% endif %} {% endfor %} +{% if process_id.graceful_restart.enabled is arista.avd.defined(true) %} +{% set graceful_restart_cli = "graceful-restart" %} +{% if process_id.graceful_restart.grace_period is arista.avd.defined %} +{% set graceful_restart_cli = graceful_restart_cli ~ " grace-period " ~ process_id.graceful_restart.grace_period %} +{% endif %} + {{ graceful_restart_cli }} +{% endif %} {% if process_id.mpls_ldp_sync_default is arista.avd.defined(true) %} mpls ldp sync default {% endif %} +{% if process_id.graceful_restart_helper is arista.avd.defined(true) %} + graceful-restart-helper +{% elif process_id.graceful_restart_helper is arista.avd.defined(false) %} + no graceful-restart-helper +{% endif %} {% if process_id.eos_cli is arista.avd.defined %} {{ process_id.eos_cli | indent(3, false) }} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 2a4b8346936..e37451c1077 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -18717,6 +18717,22 @@ keys: - str min: 1 max: 16777215 + graceful_restart: + type: dict + keys: + enabled: + type: bool + required: true + grace_period: + type: int + convert_types: + - str + min: 1 + max: 1800 + description: Specify maximum time in seconds to wait for graceful-restart + to complete. + graceful_restart_helper: + type: bool mpls_ldp_sync_default: type: bool eos_cli: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_ospf.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_ospf.schema.yml index 33631cbd110..56ed608d0d7 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_ospf.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_ospf.schema.yml @@ -301,6 +301,21 @@ keys: - str min: 1 max: 16777215 + graceful_restart: + type: dict + keys: + enabled: + type: bool + required: true + grace_period: + type: int + convert_types: + - str + min: 1 + max: 1800 + description: Specify maximum time in seconds to wait for graceful-restart to complete. + graceful_restart_helper: + type: bool mpls_ldp_sync_default: type: bool eos_cli: From 2b115f775dc9da147a51657a44404e3a001ee166 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar <122076792+MaheshGSLAB@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:18:32 +0530 Subject: [PATCH 2/8] Feat(eos_cli_config_gen): Added dot1x radius av-pair `lldp` and `dhcp` command support (#4618) --- .../intended/configs/dot1x.cfg | 5 ++ .../inventory/host_vars/dot1x.yml | 17 +++++++ .../eos_cli_config_gen/docs/tables/dot1x.md | 44 ++++++++++++++++ .../j2templates/eos/dot1x.j2 | 47 +++++++++++++++-- .../schema/eos_cli_config_gen.schema.yml | 51 +++++++++++++++++++ .../schema/schema_fragments/dot1x.schema.yml | 51 +++++++++++++++++++ 6 files changed, 210 insertions(+), 5 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dot1x.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dot1x.cfg index deb70a6b28c..f821f5f1db9 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dot1x.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dot1x.cfg @@ -25,6 +25,11 @@ dot1x captive-portal url http://portal-nacm08/captiveredirect/ ssl profile Profile1 captive-portal access-list ipv4 ACL captive-portal start limit infinite + radius av-pair lldp system-name auth-only + radius av-pair lldp system-description auth-only + radius av-pair dhcp hostname auth-only + radius av-pair dhcp parameter-request-list auth-only + radius av-pair dhcp vendor-class-id auth-only supplicant logging ! interface Management1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dot1x.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dot1x.yml index 2e0fd5e5da2..72db9385f88 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dot1x.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dot1x.yml @@ -10,6 +10,23 @@ dot1x: radius_av_pair: service_type: true framed_mtu: 1500 + lldp: + system_name: + enabled: true + auth_only: true + system_description: + enabled: true + auth_only: true + dhcp: + hostname: + enabled: true + auth_only: true + parameter_request_list: + enabled: true + auth_only: true + vendor_class_id: + enabled: true + auth_only: true aaa: unresponsive: eap_response: success diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dot1x.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dot1x.md index da9c6cb982a..b9603e12f94 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dot1x.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dot1x.md @@ -21,6 +21,23 @@ | [  radius_av_pair](## "dot1x.radius_av_pair") | Dictionary | | | | | | [    service_type](## "dot1x.radius_av_pair.service_type") | Boolean | | | | | | [    framed_mtu](## "dot1x.radius_av_pair.framed_mtu") | Integer | | | Min: 68
Max: 9236 | | + | [    lldp](## "dot1x.radius_av_pair.lldp") | Dictionary | | | | | + | [      system_name](## "dot1x.radius_av_pair.lldp.system_name") | Dictionary | | | | LLDP system name (LLDP TLV 5) av-pair. | + | [        enabled](## "dot1x.radius_av_pair.lldp.system_name.enabled") | Boolean | Required | | | | + | [        auth_only](## "dot1x.radius_av_pair.lldp.system_name.auth_only") | Boolean | | | | | + | [      system_description](## "dot1x.radius_av_pair.lldp.system_description") | Dictionary | | | | LLDP system description (LLDP TLV 6) av-pair. | + | [        enabled](## "dot1x.radius_av_pair.lldp.system_description.enabled") | Boolean | Required | | | | + | [        auth_only](## "dot1x.radius_av_pair.lldp.system_description.auth_only") | Boolean | | | | | + | [    dhcp](## "dot1x.radius_av_pair.dhcp") | Dictionary | | | | | + | [      hostname](## "dot1x.radius_av_pair.dhcp.hostname") | Dictionary | | | | Hostname (DHCP Option 12). | + | [        enabled](## "dot1x.radius_av_pair.dhcp.hostname.enabled") | Boolean | Required | | | | + | [        auth_only](## "dot1x.radius_av_pair.dhcp.hostname.auth_only") | Boolean | | | | | + | [      parameter_request_list](## "dot1x.radius_av_pair.dhcp.parameter_request_list") | Dictionary | | | | Parameters requested by host (DHCP Option 55). | + | [        enabled](## "dot1x.radius_av_pair.dhcp.parameter_request_list.enabled") | Boolean | Required | | | | + | [        auth_only](## "dot1x.radius_av_pair.dhcp.parameter_request_list.auth_only") | Boolean | | | | | + | [      vendor_class_id](## "dot1x.radius_av_pair.dhcp.vendor_class_id") | Dictionary | | | | Vendor class identifier (DHCP Option 60). | + | [        enabled](## "dot1x.radius_av_pair.dhcp.vendor_class_id.enabled") | Boolean | Required | | | | + | [        auth_only](## "dot1x.radius_av_pair.dhcp.vendor_class_id.auth_only") | Boolean | | | | | | [  aaa](## "dot1x.aaa") | Dictionary | | | | Configure AAA parameters. | | [    unresponsive](## "dot1x.aaa.unresponsive") | Dictionary | | | | Configure AAA timeout options. | | [      eap_response](## "dot1x.aaa.unresponsive.eap_response") | String | | | Valid Values:
- success
- disabled | EAP response to send. | @@ -81,6 +98,33 @@ radius_av_pair: service_type: framed_mtu: + lldp: + + # LLDP system name (LLDP TLV 5) av-pair. + system_name: + enabled: + auth_only: + + # LLDP system description (LLDP TLV 6) av-pair. + system_description: + enabled: + auth_only: + dhcp: + + # Hostname (DHCP Option 12). + hostname: + enabled: + auth_only: + + # Parameters requested by host (DHCP Option 55). + parameter_request_list: + enabled: + auth_only: + + # Vendor class identifier (DHCP Option 60). + vendor_class_id: + enabled: + auth_only: # Configure AAA parameters. aaa: diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/dot1x.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/dot1x.j2 index 0e206c75f8c..fd41b6b1997 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/dot1x.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/dot1x.j2 @@ -75,13 +75,11 @@ dot1x mac based authentication hold period {{ dot1x.mac_based_authentication.hold_period }} seconds {% endif %} {% endif %} -{% if dot1x.radius_av_pair is arista.avd.defined %} -{% if dot1x.radius_av_pair.service_type is arista.avd.defined(true) %} +{% if dot1x.radius_av_pair.service_type is arista.avd.defined(true) %} radius av-pair service-type -{% endif %} -{% if dot1x.radius_av_pair.framed_mtu is arista.avd.defined %} +{% endif %} +{% if dot1x.radius_av_pair.framed_mtu is arista.avd.defined %} radius av-pair framed-mtu {{ dot1x.radius_av_pair.framed_mtu }} -{% endif %} {% endif %} {% if dot1x.radius_av_pair_username_format.delimiter is arista.avd.defined and dot1x.radius_av_pair_username_format.mac_string_case is arista.avd.defined %} mac-based-auth radius av-pair user-name delimiter {{ dot1x.radius_av_pair_username_format.delimiter }} {{ dot1x.radius_av_pair_username_format.mac_string_case }} @@ -108,6 +106,45 @@ dot1x captive-portal start limit infinite {% endif %} {% endif %} +{% if dot1x.radius_av_pair.lldp is arista.avd.defined %} +{% if dot1x.radius_av_pair.lldp.system_name.enabled is arista.avd.defined(true) %} +{% set av_pair_lldp = "radius av-pair lldp system-name" %} +{% if dot1x.radius_av_pair.lldp.system_name.auth_only is arista.avd.defined(true) %} +{% set av_pair_lldp = av_pair_lldp ~ " auth-only" %} +{% endif %} + {{ av_pair_lldp }} +{% endif %} +{% if dot1x.radius_av_pair.lldp.system_description.enabled is arista.avd.defined(true) %} +{% set av_pair_lldp = "radius av-pair lldp system-description" %} +{% if dot1x.radius_av_pair.lldp.system_description.auth_only is arista.avd.defined(true) %} +{% set av_pair_lldp = av_pair_lldp ~ " auth-only" %} +{% endif %} + {{ av_pair_lldp }} +{% endif %} +{% endif %} +{% if dot1x.radius_av_pair.dhcp is arista.avd.defined %} +{% if dot1x.radius_av_pair.dhcp.hostname.enabled is arista.avd.defined(true) %} +{% set av_pair_dhcp = "radius av-pair dhcp hostname" %} +{% if dot1x.radius_av_pair.dhcp.hostname.auth_only is arista.avd.defined(true) %} +{% set av_pair_dhcp = av_pair_dhcp ~ " auth-only" %} +{% endif %} + {{ av_pair_dhcp }} +{% endif %} +{% if dot1x.radius_av_pair.dhcp.parameter_request_list.enabled is arista.avd.defined(true) %} +{% set av_pair_dhcp = "radius av-pair dhcp parameter-request-list" %} +{% if dot1x.radius_av_pair.dhcp.parameter_request_list.auth_only is arista.avd.defined(true) %} +{% set av_pair_dhcp = av_pair_dhcp ~ " auth-only" %} +{% endif %} + {{ av_pair_dhcp }} +{% endif %} +{% if dot1x.radius_av_pair.dhcp.vendor_class_id.enabled is arista.avd.defined(true) %} +{% set av_pair_dhcp = "radius av-pair dhcp vendor-class-id" %} +{% if dot1x.radius_av_pair.dhcp.vendor_class_id.auth_only is arista.avd.defined(true) %} +{% set av_pair_dhcp = av_pair_dhcp ~ " auth-only" %} +{% endif %} + {{ av_pair_dhcp }} +{% endif %} +{% endif %} {% if dot1x.supplicant.logging is arista.avd.defined(true) %} supplicant logging {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index e37451c1077..975852d3880 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -1589,6 +1589,57 @@ keys: max: 9236 convert_types: - str + lldp: + type: dict + keys: + system_name: + description: LLDP system name (LLDP TLV 5) av-pair. + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool + system_description: + description: LLDP system description (LLDP TLV 6) av-pair. + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool + dhcp: + type: dict + keys: + hostname: + description: Hostname (DHCP Option 12). + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool + parameter_request_list: + description: Parameters requested by host (DHCP Option 55). + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool + vendor_class_id: + description: Vendor class identifier (DHCP Option 60). + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool aaa: type: dict description: Configure AAA parameters. diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/dot1x.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/dot1x.schema.yml index a864a30020d..b14301768b3 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/dot1x.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/dot1x.schema.yml @@ -64,6 +64,57 @@ keys: max: 9236 convert_types: - str + lldp: + type: dict + keys: + system_name: + description: LLDP system name (LLDP TLV 5) av-pair. + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool + system_description: + description: LLDP system description (LLDP TLV 6) av-pair. + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool + dhcp: + type: dict + keys: + hostname: + description: Hostname (DHCP Option 12). + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool + parameter_request_list: + description: Parameters requested by host (DHCP Option 55). + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool + vendor_class_id: + description: Vendor class identifier (DHCP Option 60). + type: dict + keys: + enabled: + type: bool + required: true + auth_only: + type: bool aaa: type: dict description: Configure AAA parameters. From e8be90587353972fafc7b8ed452ca5120ad3b2da Mon Sep 17 00:00:00 2001 From: juanjtomasg <66510649+juanjtomasg@users.noreply.github.com> Date: Mon, 28 Oct 2024 14:09:45 +0100 Subject: [PATCH 3/8] Feat(eos_cli_config_gen): Add maximum_paths to router_bgp.vrfs (#4655) --- .../devices/router-bgp-vrf-address-families.md | 1 + .../configs/router-bgp-vrf-address-families.cfg | 1 + .../router-bgp-vrf-address-families.yml | 3 +++ .../eos_cli_config_gen/docs/tables/router-bgp.md | 6 ++++++ .../j2templates/eos/router-bgp.j2 | 7 +++++++ .../schema/eos_cli_config_gen.schema.yml | 16 ++++++++++++++++ .../schema_fragments/router_bgp.schema.yml | 16 ++++++++++++++++ 7 files changed, 50 insertions(+) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-vrf-address-families.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-vrf-address-families.md index 82f82f4a301..7cfe7147fb1 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-vrf-address-families.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-vrf-address-families.md @@ -234,6 +234,7 @@ router bgp 65001 bgp additional-paths send limit 3 ! vrf VRF03 + maximum-paths 10 ecmp 10 redistribute dynamic rcf VRF_RCF_DYNAMIC() ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-vrf-address-families.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-vrf-address-families.cfg index c594f6a66e3..c6f395b3e1e 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-vrf-address-families.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-vrf-address-families.cfg @@ -173,6 +173,7 @@ router bgp 65001 bgp additional-paths send limit 3 ! vrf VRF03 + maximum-paths 10 ecmp 10 redistribute dynamic rcf VRF_RCF_DYNAMIC() ! address-family ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-vrf-address-families.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-vrf-address-families.yml index 785908d358c..93b06619649 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-vrf-address-families.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-vrf-address-families.yml @@ -411,6 +411,9 @@ router_bgp: route_map: RM_VRF_HOST - name: VRF03 + maximum_paths: + paths: 10 + ecmp: 10 address_family_ipv4: bgp: additional_paths: diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md index da99f910a3c..9f43aa3b84c 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md @@ -1067,6 +1067,9 @@ | [      networks](## "router_bgp.vrfs.[].networks") | List, items: Dictionary | | | | | | [        - prefix](## "router_bgp.vrfs.[].networks.[].prefix") | String | Required, Unique | | | IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". | | [          route_map](## "router_bgp.vrfs.[].networks.[].route_map") | String | | | | | + | [      maximum_paths](## "router_bgp.vrfs.[].maximum_paths") | Dictionary | | | | | + | [        paths](## "router_bgp.vrfs.[].maximum_paths.paths") | Integer | Required | | Min: 1
Max: 600 | | + | [        ecmp](## "router_bgp.vrfs.[].maximum_paths.ecmp") | Integer | | | Min: 1
Max: 600 | | | [      updates](## "router_bgp.vrfs.[].updates") | Dictionary | | | | | | [        wait_for_convergence](## "router_bgp.vrfs.[].updates.wait_for_convergence") | Boolean | | | | Disables FIB updates and route advertisement when the BGP instance is initiated until the BGP convergence state is reached.
| | [        wait_install](## "router_bgp.vrfs.[].updates.wait_install") | Boolean | | | | Do not advertise reachability to a prefix until that prefix has been installed in hardware.
This will eliminate any temporary black holes due to a BGP speaker advertising reachability to a prefix that may not yet be installed into the forwarding plane.
| @@ -3786,6 +3789,9 @@ # IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". - prefix: route_map: + maximum_paths: + paths: + ecmp: updates: # Disables FIB updates and route advertisement when the BGP instance is initiated until the BGP convergence state is reached. diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 index d477194a94b..9e47af631a7 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 @@ -2658,6 +2658,13 @@ router bgp {{ router_bgp.as }} {% if vrf.timers is arista.avd.defined %} timers bgp {{ vrf.timers }} {% endif %} +{% if vrf.maximum_paths.paths is arista.avd.defined %} +{% set paths_cli = "maximum-paths " ~ vrf.maximum_paths.paths %} +{% if vrf.maximum_paths.ecmp is arista.avd.defined %} +{% set paths_cli = paths_cli ~ " ecmp " ~ vrf.maximum_paths.ecmp %} +{% endif %} + {{ paths_cli }} +{% endif %} {% if vrf.bgp.additional_paths.install is arista.avd.defined(true) %} bgp additional-paths install {% elif vrf.bgp.additional_paths.install_ecmp_primary is arista.avd.defined(true) %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 975852d3880..0fde1a7c9fa 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -15695,6 +15695,22 @@ keys: description: IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". route_map: type: str + maximum_paths: + type: dict + keys: + paths: + type: int + required: true + convert_types: + - str + min: 1 + max: 600 + ecmp: + type: int + convert_types: + - str + min: 1 + max: 600 updates: type: dict keys: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml index 275fb466252..219ed524284 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml @@ -3705,6 +3705,22 @@ keys: description: IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I". route_map: type: str + maximum_paths: + type: dict + keys: + paths: + type: int + required: true + convert_types: + - str + min: 1 + max: 600 + ecmp: + type: int + convert_types: + - str + min: 1 + max: 600 updates: type: dict keys: From 63b29c82f7aff540b127cd1c52f472d01801b3e6 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar <122076792+MaheshGSLAB@users.noreply.github.com> Date: Mon, 28 Oct 2024 18:49:57 +0530 Subject: [PATCH 4/8] Feat(eos_cli_config_gen): Added support for `neighbor x.x.x.x encapsulation mpls next-hop-self source-intf ` (#4608) --- .../documentation/devices/router-bgp-evpn-mpls.md | 3 ++- .../intended/configs/router-bgp-evpn-mpls.cfg | 1 + .../inventory/host_vars/router-bgp-evpn-mpls.yml | 2 ++ .../roles/eos_cli_config_gen/docs/tables/router-bgp.md | 8 ++++++-- .../_eos_cli_config_gen/j2templates/eos/router-bgp.j2 | 8 ++++++-- .../schema/eos_cli_config_gen.schema.yml | 7 ++++++- .../schema/schema_fragments/router_bgp.schema.yml | 5 ++++- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md index a4b663331bd..37075e00f17 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md @@ -103,7 +103,7 @@ ASN Notation: asplain | Neighbor | Activate | Encapsulation | | -------- | -------- | ------------- | | 192.168.255.3 | True | default | -| 192.168.255.4 | False | default | +| 192.168.255.4 | False | mpls | ##### EVPN Neighbor Default Encapsulation @@ -145,5 +145,6 @@ router bgp 65101 neighbor 192.168.255.3 activate neighbor 192.168.255.4 rcf in Address_Family_EVPN_In() neighbor 192.168.255.4 rcf out Address_Family_EVPN_Out() + neighbor 192.168.255.4 encapsulation mpls next-hop-self source-interface Ethernet1 layer-2 fec in-place update timeout 100 seconds ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-mpls.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-mpls.cfg index 8dc866980e4..fbd0ce41546 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-mpls.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-mpls.cfg @@ -34,4 +34,5 @@ router bgp 65101 neighbor 192.168.255.3 activate neighbor 192.168.255.4 rcf in Address_Family_EVPN_In() neighbor 192.168.255.4 rcf out Address_Family_EVPN_Out() + neighbor 192.168.255.4 encapsulation mpls next-hop-self source-interface Ethernet1 layer-2 fec in-place update timeout 100 seconds diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml index 739bf7afadb..7aa5a5372e4 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml @@ -55,6 +55,8 @@ router_bgp: - ip_address: 192.168.255.4 rcf_in: Address_Family_EVPN_In() rcf_out: Address_Family_EVPN_Out() + encapsulation: mpls + next_hop_self_source_interface: Ethernet1 peer_groups: - name: EVPN-OVERLAY-PEERS activate: true diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md index 9f43aa3b84c..0f3091c59ad 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md @@ -347,7 +347,7 @@ | [    domain_identifier](## "router_bgp.address_family_evpn.domain_identifier") | String | | | | | | [    neighbor_default](## "router_bgp.address_family_evpn.neighbor_default") | Dictionary | | | | | | [      encapsulation](## "router_bgp.address_family_evpn.neighbor_default.encapsulation") | String | | | Valid Values:
- vxlan
- mpls
- path-selection | Transport encapsulation for neighbor. | - | [      next_hop_self_source_interface](## "router_bgp.address_family_evpn.neighbor_default.next_hop_self_source_interface") | String | | | | Source interface name. | + | [      next_hop_self_source_interface](## "router_bgp.address_family_evpn.neighbor_default.next_hop_self_source_interface") | String | | | | Source interface name for MPLS encapsulation. Requires `encapsulation` to be set as `mpls`. | | [      next_hop_self_received_evpn_routes](## "router_bgp.address_family_evpn.neighbor_default.next_hop_self_received_evpn_routes") | Dictionary | | | | | | [        enable](## "router_bgp.address_family_evpn.neighbor_default.next_hop_self_received_evpn_routes.enable") | Boolean | | | | | | [        inter_domain](## "router_bgp.address_family_evpn.neighbor_default.next_hop_self_received_evpn_routes.inter_domain") | Boolean | | | | | @@ -368,6 +368,7 @@ | [          send](## "router_bgp.address_family_evpn.neighbors.[].additional_paths.send") | String | | | Valid Values:
- any
- backup
- ecmp
- limit
- disabled | Select an option to send multiple paths for same prefix through bgp updates.
any: Send any eligible path.
backup: Best path and installed backup path.
ecmp: All paths in best path ECMP group.
limit: Limit to n eligible paths.
disabled: Disable sending any paths. | | [          send_limit](## "router_bgp.address_family_evpn.neighbors.[].additional_paths.send_limit") | Integer | | | Min: 2
Max: 64 | Number of paths to send through bgp updates. For this setting, `send` must be set to `limit` or `ecmp`. | | [        encapsulation](## "router_bgp.address_family_evpn.neighbors.[].encapsulation") | String | | | Valid Values:
- vxlan
- mpls
- path-selection | Transport encapsulation for the neighbor. | + | [        next_hop_self_source_interface](## "router_bgp.address_family_evpn.neighbors.[].next_hop_self_source_interface") | String | | | | Source interface name for MPLS encapsulation. Requires `encapsulation` to be set as `mpls`. | | [    peer_groups](## "router_bgp.address_family_evpn.peer_groups") | List, items: Dictionary | | | | | | [      - name](## "router_bgp.address_family_evpn.peer_groups.[].name") | String | Required, Unique | | | Peer-group name. | | [        activate](## "router_bgp.address_family_evpn.peer_groups.[].activate") | Boolean | | | | | @@ -2239,7 +2240,7 @@ # Transport encapsulation for neighbor. encapsulation: - # Source interface name. + # Source interface name for MPLS encapsulation. Requires `encapsulation` to be set as `mpls`. next_hop_self_source_interface: next_hop_self_received_evpn_routes: enable: @@ -2289,6 +2290,9 @@ # Transport encapsulation for the neighbor. encapsulation: + + # Source interface name for MPLS encapsulation. Requires `encapsulation` to be set as `mpls`. + next_hop_self_source_interface: peer_groups: # Peer-group name. diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 index 9e47af631a7..45dac894796 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 @@ -924,8 +924,12 @@ router bgp {{ router_bgp.as }} neighbor {{ neighbor.ip_address }} additional-paths send {{ neighbor.additional_paths.send }} {% endif %} {% endif %} -{% if neighbor.encapsulation is arista.avd.defined %} - neighbor {{ neighbor.ip_address }} encapsulation {{ neighbor.encapsulation }} +{% if neighbor.encapsulation is arista.avd.defined %} +{% set encapsulation_cli = "neighbor " ~ neighbor.ip_address ~ " encapsulation " ~ neighbor.encapsulation %} +{% if neighbor.encapsulation == "mpls" and neighbor.next_hop_self_source_interface is arista.avd.defined %} +{% set encapsulation_cli = encapsulation_cli ~ " next-hop-self source-interface " ~ neighbor.next_hop_self_source_interface %} +{% endif %} + {{ encapsulation_cli }} {% endif %} {% endfor %} {% if router_bgp.address_family_evpn.domain_identifier is arista.avd.defined %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 0fde1a7c9fa..cfdc879525f 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -13128,7 +13128,8 @@ keys: - path-selection description: Transport encapsulation for neighbor. next_hop_self_source_interface: - description: Source interface name. + description: Source interface name for MPLS encapsulation. Requires + `encapsulation` to be set as `mpls`. type: str next_hop_self_received_evpn_routes: type: dict @@ -13201,6 +13202,10 @@ keys: - mpls - path-selection description: Transport encapsulation for the neighbor. + next_hop_self_source_interface: + type: str + description: Source interface name for MPLS encapsulation. Requires + `encapsulation` to be set as `mpls`. peer_groups: type: list primary_key: name diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml index 219ed524284..c978278ba50 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml @@ -1259,7 +1259,7 @@ keys: - "path-selection" description: Transport encapsulation for neighbor. next_hop_self_source_interface: - description: Source interface name. + description: Source interface name for MPLS encapsulation. Requires `encapsulation` to be set as `mpls`. type: str next_hop_self_received_evpn_routes: type: dict @@ -1329,6 +1329,9 @@ keys: - "mpls" - "path-selection" description: Transport encapsulation for the neighbor. + next_hop_self_source_interface: + type: str + description: Source interface name for MPLS encapsulation. Requires `encapsulation` to be set as `mpls`. peer_groups: type: list primary_key: name From f5fa416199e96fc406a511cc2695afd15601eb68 Mon Sep 17 00:00:00 2001 From: Shivani-gslab <145646625+Shivani-gslab@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:06:21 +0530 Subject: [PATCH 5/8] Feat(eos_cli_config_gen): Add vrf support for vmtracer_sessions (#4601) --- .../documentation/devices/vmtracer-sessions.md | 9 +++++---- .../intended/configs/vmtracer-sessions.cfg | 1 + .../inventory/host_vars/vmtracer-sessions.yml | 1 + .../eos_cli_config_gen/docs/tables/vmtracer-sessions.md | 2 ++ .../j2templates/documentation/vmtracer-sessions.j2 | 8 +++++--- .../j2templates/eos/vmtracer-sessions.j2 | 3 +++ .../schema/eos_cli_config_gen.schema.yml | 2 ++ .../schema/schema_fragments/vmtracer_sessions.schema.yml | 2 ++ 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vmtracer-sessions.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vmtracer-sessions.md index 261d4ea2058..f0d294c0b46 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vmtracer-sessions.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/vmtracer-sessions.md @@ -41,10 +41,10 @@ interface Management1 #### VM Tracer Summary -| Session | URL | Username | Autovlan | Source Interface | -| ------- | --- | -------- | -------- | ---------------- | -| session_1 | https://192.168.0.10 | user1 | disabled | Management1 | -| session_2 | https://192.168.0.10 | user1 | enabled | - | +| Session | URL | Username | Autovlan | VRF | Source Interface | +| ------- | --- | -------- | -------- | --- | ---------------- | +| session_1 | https://192.168.0.10 | user1 | disabled | MGMT | Management1 | +| session_2 | https://192.168.0.10 | user1 | enabled | - | - | #### VM Tracer Device Configuration @@ -55,6 +55,7 @@ vmtracer session session_1 username user1 password 7 encrypted_password autovlan disable + vrf MGMT source-interface Management1 ! vmtracer session session_2 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vmtracer-sessions.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vmtracer-sessions.cfg index 188b436c48a..5c4df7b10c0 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vmtracer-sessions.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vmtracer-sessions.cfg @@ -9,6 +9,7 @@ vmtracer session session_1 username user1 password 7 encrypted_password autovlan disable + vrf MGMT source-interface Management1 ! vmtracer session session_2 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vmtracer-sessions.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vmtracer-sessions.yml index f1112ed6e0b..bfeafee695c 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vmtracer-sessions.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vmtracer-sessions.yml @@ -6,6 +6,7 @@ vmtracer_sessions: username: user1 password: "encrypted_password" autovlan_disable: true + vrf: MGMT source_interface: Management1 - name: session_2 url: "https://192.168.0.10" diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vmtracer-sessions.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vmtracer-sessions.md index 79104a953c8..1af2bad46c0 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vmtracer-sessions.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vmtracer-sessions.md @@ -13,6 +13,7 @@ | [    username](## "vmtracer_sessions.[].username") | String | | | | | | [    password](## "vmtracer_sessions.[].password") | String | | | | Type 7 Password Hash. | | [    autovlan_disable](## "vmtracer_sessions.[].autovlan_disable") | Boolean | | | | | + | [    vrf](## "vmtracer_sessions.[].vrf") | String | | | | | | [    source_interface](## "vmtracer_sessions.[].source_interface") | String | | | | | === "YAML" @@ -28,5 +29,6 @@ # Type 7 Password Hash. password: autovlan_disable: + vrf: source_interface: ``` diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/vmtracer-sessions.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/vmtracer-sessions.j2 index 523c9f41905..254cdc81b99 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/vmtracer-sessions.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/vmtracer-sessions.j2 @@ -10,15 +10,17 @@ #### VM Tracer Summary -| Session | URL | Username | Autovlan | Source Interface | -| ------- | --- | -------- | -------- | ---------------- | +| Session | URL | Username | Autovlan | VRF | Source Interface | +| ------- | --- | -------- | -------- | --- | ---------------- | {% for session in vmtracer_sessions | arista.avd.natural_sort('name') %} {% set url = session.url | arista.avd.default('-') %} +{% set username = session.username | arista.avd.default('-') %} {% if session.autovlan_disable is arista.avd.defined(true) %} {% set autovlan = 'disabled' %} {% endif %} +{% set vrf = session.vrf | arista.avd.default('-') %} {% set source_interface = session.source_interface | arista.avd.default('-') %} -| {{ session.name }} | {{ url }} | {{ session.username | arista.avd.default('-') }} | {{ autovlan | arista.avd.default('enabled') }} | {{ source_interface }} | +| {{ session.name }} | {{ url }} | {{ username }} | {{ autovlan | arista.avd.default('enabled') }} | {{ vrf }} | {{ source_interface }} | {% endfor %} #### VM Tracer Device Configuration diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vmtracer-sessions.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vmtracer-sessions.j2 index 242e6bb7cbb..7e800d25712 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vmtracer-sessions.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vmtracer-sessions.j2 @@ -19,6 +19,9 @@ vmtracer session {{ session.name }} {% if session.autovlan_disable is arista.avd.defined(true) %} autovlan disable {% endif %} +{% if session.vrf is arista.avd.defined %} + vrf {{ session.vrf }} +{% endif %} {% if session.source_interface is arista.avd.defined %} source-interface {{ session.source_interface }} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index cfdc879525f..39fef85733d 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -21550,6 +21550,8 @@ keys: description: Type 7 Password Hash. autovlan_disable: type: bool + vrf: + type: str source_interface: type: str vrfs: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/vmtracer_sessions.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/vmtracer_sessions.schema.yml index 1bb740189f5..055a04822eb 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/vmtracer_sessions.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/vmtracer_sessions.schema.yml @@ -24,5 +24,7 @@ keys: description: Type 7 Password Hash. autovlan_disable: type: bool + vrf: + type: str source_interface: type: str From 183abe7991a2f046a7834ffb4786fd74144d73a7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 22:46:46 +0100 Subject: [PATCH 6/8] CI: pre-commit autoupdate (#4663) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 56754143c47..fa65fbdcc47 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -75,7 +75,7 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.7.0 + rev: v0.7.1 hooks: # Run the linter. - id: ruff From a4783f50d76850f74efe68b6d119939da5314c19 Mon Sep 17 00:00:00 2001 From: laxmikantchintakindi <159624484+laxmikantchintakindi@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:12:39 +0530 Subject: [PATCH 7/8] Feat(eos_cli_config_gen): Add `route_map_in/out` for `router_bgp.address_family_evpn.neighbors[]` (#4625) --- .../documentation/devices/mpls-cloud.md | 6 +-- .../documentation/devices/pf1.md | 8 ++-- .../documentation/devices/pf2.md | 8 ++-- .../documentation/devices/site1-border1.md | 6 +-- .../documentation/devices/site1-border2.md | 6 +-- .../documentation/devices/site1-wan1.md | 12 +++--- .../documentation/devices/site1-wan2.md | 12 +++--- .../documentation/devices/site2-leaf1.md | 6 +-- .../documentation/devices/site2-leaf2.md | 6 +-- .../documentation/devices/site2-wan1.md | 12 +++--- .../documentation/devices/site2-wan2.md | 12 +++--- .../documentation/devices/site3-wan1.md | 6 +-- .../documentation/devices/dc1-leaf1a.md | 6 +-- .../documentation/devices/dc1-leaf1b.md | 6 +-- .../documentation/devices/dc1-leaf2a.md | 8 ++-- .../documentation/devices/dc1-leaf2b.md | 8 ++-- .../documentation/devices/dc1-spine1.md | 6 +-- .../documentation/devices/dc1-spine2.md | 6 +-- .../documentation/devices/dc2-leaf1a.md | 6 +-- .../documentation/devices/dc2-leaf1b.md | 6 +-- .../documentation/devices/dc2-leaf2a.md | 8 ++-- .../documentation/devices/dc2-leaf2b.md | 8 ++-- .../documentation/devices/dc2-spine1.md | 6 +-- .../documentation/devices/dc2-spine2.md | 6 +-- .../documentation/devices/dc1-leaf1a.md | 6 +-- .../documentation/devices/dc1-leaf1b.md | 6 +-- .../documentation/devices/dc1-leaf2a.md | 6 +-- .../documentation/devices/dc1-leaf2b.md | 6 +-- .../documentation/devices/dc1-spine1.md | 6 +-- .../documentation/devices/dc1-spine2.md | 6 +-- .../devices/router-bgp-evpn-mpls.md | 14 +++---- .../router-bgp-evpn-vpn-import-pruning.md | 8 ++-- .../documentation/devices/router-bgp-evpn.md | 40 ++++++++++--------- .../documentation/devices/router-bgp-rtc.md | 8 ++-- .../devices/router-bgp-v4-evpn.md | 10 ++--- .../devices/router-bgp-v4-v6-evpn.md | 8 ++-- .../intended/configs/router-bgp-evpn.cfg | 2 + .../inventory/host_vars/router-bgp-evpn.yml | 2 + .../documentation/devices/SITE1-LER1.md | 6 +-- .../documentation/devices/SITE1-LER2.md | 6 +-- .../documentation/devices/SITE1-RR1.md | 8 ++-- .../documentation/devices/SITE2-LER1.md | 6 +-- .../documentation/devices/SITE2-RR1.md | 8 ++-- .../documentation/devices/DC1-POD1-LEAF1A.md | 6 +-- .../documentation/devices/DC1-POD1-LEAF2B.md | 8 ++-- .../documentation/devices/DC1-POD1-SPINE1.md | 6 +-- .../documentation/devices/DC1-POD2-LEAF1A.md | 6 +-- .../documentation/devices/DC1-POD2-SPINE1.md | 6 +-- .../documentation/devices/DC1-POD2-SPINE2.md | 6 +-- .../documentation/devices/DC1-RS1.md | 6 +-- .../documentation/devices/DC1-RS2.md | 6 +-- .../documentation/devices/DC1.POD1.LEAF2A.md | 8 ++-- .../documentation/devices/DC2-POD1-LEAF1A.md | 6 +-- .../documentation/devices/DC2-POD1-LEAF2A.md | 6 +-- .../documentation/devices/DC2-POD1-SPINE1.md | 6 +-- .../documentation/devices/DC2-RS1.md | 6 +-- .../documentation/devices/DC2-SUPER-SPINE1.md | 6 +-- .../documentation/devices/DC1-BL1A.md | 6 +-- .../documentation/devices/DC1-BL1B.md | 6 +-- .../documentation/devices/DC1-LEAF1A.md | 6 +-- .../documentation/devices/DC1-LEAF2A.md | 6 +-- .../documentation/devices/DC1-LEAF2B.md | 6 +-- .../documentation/devices/DC1-SPINE1.md | 6 +-- .../documentation/devices/DC1-SPINE2.md | 6 +-- .../documentation/devices/DC1-SPINE3.md | 6 +-- .../documentation/devices/DC1-SPINE4.md | 6 +-- .../documentation/devices/DC1-SVC3A.md | 6 +-- .../documentation/devices/DC1-SVC3B.md | 6 +-- .../documentation/devices/DC1-BL1A.md | 6 +-- .../documentation/devices/DC1-BL1B.md | 6 +-- .../documentation/devices/DC1-LEAF1A.md | 6 +-- .../documentation/devices/DC1-LEAF2A.md | 6 +-- .../documentation/devices/DC1-LEAF2B.md | 6 +-- .../documentation/devices/DC1-SPINE1.md | 6 +-- .../documentation/devices/DC1-SPINE4.md | 6 +-- .../documentation/devices/DC1-SVC3A.md | 6 +-- .../documentation/devices/DC1-SVC3B.md | 6 +-- .../documentation/devices/DC1-BL1A.md | 6 +-- .../documentation/devices/DC1-BL1B.md | 6 +-- .../documentation/devices/DC1-LEAF1A.md | 6 +-- .../documentation/devices/DC1-LEAF2A.md | 6 +-- .../documentation/devices/DC1-LEAF2B.md | 6 +-- .../documentation/devices/DC1-SPINE1.md | 6 +-- .../documentation/devices/DC1-SPINE2.md | 6 +-- .../documentation/devices/DC1-SPINE3.md | 6 +-- .../documentation/devices/DC1-SPINE4.md | 6 +-- .../documentation/devices/DC1-SVC3A.md | 6 +-- .../documentation/devices/DC1-SVC3B.md | 6 +-- .../documentation/devices/DC1-BL1A.md | 6 +-- .../documentation/devices/DC1-BL1B.md | 6 +-- .../documentation/devices/DC1-LEAF1A.md | 6 +-- .../documentation/devices/DC1-LEAF2A.md | 6 +-- .../documentation/devices/DC1-LEAF2B.md | 6 +-- .../documentation/devices/DC1-LEAF3A.md | 6 +-- .../documentation/devices/DC1-LEAF3B.md | 6 +-- .../documentation/devices/DC1-LEAF4A.md | 6 +-- .../documentation/devices/DC1-LEAF4B.md | 6 +-- .../documentation/devices/DC1-SPINE1.md | 6 +-- .../documentation/devices/DC1-SPINE2.md | 6 +-- .../documentation/devices/DC1-SPINE3.md | 6 +-- .../documentation/devices/DC1-SPINE4.md | 6 +-- .../documentation/devices/DC1-SPINE5.md | 6 +-- .../documentation/devices/DC1-SPINE6.md | 6 +-- .../documentation/devices/DC1-SVC3A.md | 6 +-- .../documentation/devices/DC1-SVC3B.md | 6 +-- .../docs/tables/router-bgp.md | 8 ++++ .../j2templates/documentation/router-bgp.j2 | 12 +++--- .../j2templates/eos/router-bgp.j2 | 6 +++ .../schema/eos_cli_config_gen.schema.yml | 6 +++ .../schema_fragments/router_bgp.schema.yml | 6 +++ 110 files changed, 394 insertions(+), 362 deletions(-) diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/mpls-cloud.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/mpls-cloud.md index 155d3783c79..a6f5980581e 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/mpls-cloud.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/mpls-cloud.md @@ -410,9 +410,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/pf1.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/pf1.md index 4a5e5e3db40..4e686809846 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/pf1.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/pf1.md @@ -773,10 +773,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| WAN-OVERLAY-PEERS | True | path-selection | -| WAN-RR-OVERLAY-PEERS | True | path-selection | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| WAN-OVERLAY-PEERS | True | - | - | path-selection | +| WAN-RR-OVERLAY-PEERS | True | - | - | path-selection | #### Router BGP IPv4 SR-TE Address Family diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/pf2.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/pf2.md index abe733bac59..43e172a5d2f 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/pf2.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/pf2.md @@ -773,10 +773,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| WAN-OVERLAY-PEERS | True | path-selection | -| WAN-RR-OVERLAY-PEERS | True | path-selection | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| WAN-OVERLAY-PEERS | True | - | - | path-selection | +| WAN-RR-OVERLAY-PEERS | True | - | - | path-selection | #### Router BGP IPv4 SR-TE Address Family diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-border1.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-border1.md index b727de5d531..61d39386e8f 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-border1.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-border1.md @@ -733,9 +733,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-border2.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-border2.md index cf954100aa8..e4f8e4b8cb1 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-border2.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-border2.md @@ -733,9 +733,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-wan1.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-wan1.md index d671473c99d..0bc36d669ba 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-wan1.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-wan1.md @@ -871,15 +871,15 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| WAN-OVERLAY-PEERS | True | path-selection | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| WAN-OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | path-selection | ##### EVPN Neighbors -| Neighbor | Activate | Encapsulation | -| -------- | -------- | ------------- | -| 192.168.42.4 | True | path-selection | +| Neighbor | Activate | Route-map In | Route-map Out | Encapsulation | +| -------- | -------- | ------------ | ------------- | ------------- | +| 192.168.42.4 | True | - | - | path-selection | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-wan2.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-wan2.md index c9824b5c083..0a532c08daf 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-wan2.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site1-wan2.md @@ -872,15 +872,15 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| WAN-OVERLAY-PEERS | True | path-selection | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| WAN-OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | path-selection | ##### EVPN Neighbors -| Neighbor | Activate | Encapsulation | -| -------- | -------- | ------------- | -| 192.168.42.3 | True | path-selection | +| Neighbor | Activate | Route-map In | Route-map Out | Encapsulation | +| -------- | -------- | ------------ | ------------- | ------------- | +| 192.168.42.3 | True | - | - | path-selection | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-leaf1.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-leaf1.md index fa1d3ecde52..c4e1f4bdd05 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-leaf1.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-leaf1.md @@ -699,9 +699,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-leaf2.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-leaf2.md index 4e7226b054c..93ad1178e6c 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-leaf2.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-leaf2.md @@ -699,9 +699,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-wan1.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-wan1.md index 36556862d8b..1684763f3db 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-wan1.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-wan1.md @@ -832,15 +832,15 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| WAN-OVERLAY-PEERS | True | path-selection | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| WAN-OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | path-selection | ##### EVPN Neighbors -| Neighbor | Activate | Encapsulation | -| -------- | -------- | ------------- | -| 192.168.42.8 | True | path-selection | +| Neighbor | Activate | Route-map In | Route-map Out | Encapsulation | +| -------- | -------- | ------------ | ------------- | ------------- | +| 192.168.42.8 | True | - | - | path-selection | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-wan2.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-wan2.md index 221ef271297..f4124ebcebd 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-wan2.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site2-wan2.md @@ -834,15 +834,15 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| WAN-OVERLAY-PEERS | True | path-selection | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| WAN-OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | path-selection | ##### EVPN Neighbors -| Neighbor | Activate | Encapsulation | -| -------- | -------- | ------------- | -| 192.168.42.7 | True | path-selection | +| Neighbor | Activate | Route-map In | Route-map Out | Encapsulation | +| -------- | -------- | ------------ | ------------- | ------------- | +| 192.168.42.7 | True | - | - | path-selection | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site3-wan1.md b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site3-wan1.md index baaca303a2c..12efaa0475d 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site3-wan1.md +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/documentation/devices/site3-wan1.md @@ -794,9 +794,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| WAN-OVERLAY-PEERS | True | path-selection | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| WAN-OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | path-selection | #### Router BGP IPv4 SR-TE Address Family diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md index 2942cc4a88b..250d0ffd1a5 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md @@ -662,9 +662,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md index 72109e88a8e..c261352bf2e 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md @@ -662,9 +662,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md index 81395daaa87..b0d187a0535 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md @@ -683,10 +683,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-CORE | True | default | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-CORE | True | - | - | default | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md index c1b56bc1411..f5990a4408d 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md @@ -683,10 +683,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-CORE | True | default | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-CORE | True | - | - | default | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md index 591bd97b414..23e5d0b6fb2 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md @@ -325,9 +325,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md index 4175888be77..1cd621e9a1a 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md @@ -325,9 +325,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md index b0237c05b43..5401ae4d65a 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md @@ -662,9 +662,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md index 2455f6d8fd0..c5ef371fc36 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md @@ -662,9 +662,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md index 5c1a960a928..df218d1fe08 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md @@ -683,10 +683,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-CORE | True | default | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-CORE | True | - | - | default | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2b.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2b.md index 517984e9b97..2ce61071f80 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2b.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2b.md @@ -683,10 +683,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-CORE | True | default | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-CORE | True | - | - | default | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine1.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine1.md index 92d71eefef7..c76a2b843ed 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine1.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine1.md @@ -325,9 +325,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine2.md b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine2.md index 954e06ff87d..40ce54737c4 100644 --- a/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine2.md +++ b/ansible_collections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-spine2.md @@ -325,9 +325,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md index 200e75822dd..1bd80ac0a76 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md @@ -723,9 +723,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md index 658066307ca..03094a6cb9d 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md @@ -723,9 +723,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md index 933f84881e4..579b5e8a0b7 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md @@ -723,9 +723,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md index 9e971a550a6..76d526b5226 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md @@ -723,9 +723,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine1.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine1.md index 73dddab2782..098d5fabcf8 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine1.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine1.md @@ -386,9 +386,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine2.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine2.md index 7751059469b..9921da95aca 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine2.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-spine2.md @@ -386,9 +386,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md index 37075e00f17..3c0ee579295 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md @@ -94,16 +94,16 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Neighbors -| Neighbor | Activate | Encapsulation | -| -------- | -------- | ------------- | -| 192.168.255.3 | True | default | -| 192.168.255.4 | False | mpls | +| Neighbor | Activate | Route-map In | Route-map Out | Encapsulation | +| -------- | -------- | ------------ | ------------- | ------------- | +| 192.168.255.3 | True | - | - | default | +| 192.168.255.4 | False | - | - | mpls | ##### EVPN Neighbor Default Encapsulation diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-vpn-import-pruning.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-vpn-import-pruning.md index 8eb002b70bd..08a360ae33e 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-vpn-import-pruning.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-vpn-import-pruning.md @@ -94,10 +94,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | -| MLAG-IPv4-UNDERLAY-PEER | False | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | +| MLAG-IPv4-UNDERLAY-PEER | False | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md index 48ecf97b27c..6116cb94039 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md @@ -107,28 +107,28 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| ADDITIONAL-PATH-PG-1 | True | default | -| ADDITIONAL-PATH-PG-2 | True | default | -| ADDITIONAL-PATH-PG-3 | True | default | -| ADDITIONAL-PATH-PG-4 | True | default | -| ADDITIONAL-PATH-PG-5 | True | default | -| ADDITIONAL-PATH-PG-6 | True | default | -| EVPN-OVERLAY-PEERS | True | vxlan | -| MLAG-IPv4-UNDERLAY-PEER | False | default | -| TEST-ENCAPSULATION | True | mpls | -| TEST-ENCAPSULATION-2 | True | path-selection | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| ADDITIONAL-PATH-PG-1 | True | - | - | default | +| ADDITIONAL-PATH-PG-2 | True | - | - | default | +| ADDITIONAL-PATH-PG-3 | True | - | - | default | +| ADDITIONAL-PATH-PG-4 | True | - | - | default | +| ADDITIONAL-PATH-PG-5 | True | - | - | default | +| ADDITIONAL-PATH-PG-6 | True | - | - | default | +| EVPN-OVERLAY-PEERS | True | - | - | vxlan | +| MLAG-IPv4-UNDERLAY-PEER | False | - | - | default | +| TEST-ENCAPSULATION | True | - | - | mpls | +| TEST-ENCAPSULATION-2 | True | - | - | path-selection | ##### EVPN Neighbors -| Neighbor | Activate | Encapsulation | -| -------- | -------- | ------------- | -| 10.100.100.1 | True | default | -| 10.100.100.2 | True | default | -| 10.100.100.3 | True | default | -| 10.100.100.4 | True | path-selection | -| 10.100.100.5 | True | mpls | +| Neighbor | Activate | Route-map In | Route-map Out | Encapsulation | +| -------- | -------- | ------------ | ------------- | ------------- | +| 10.100.100.1 | True | - | - | default | +| 10.100.100.2 | True | - | - | default | +| 10.100.100.3 | True | - | - | default | +| 10.100.100.4 | True | RM1 | RM2 | path-selection | +| 10.100.100.5 | True | - | - | mpls | ##### EVPN Neighbor Default Encapsulation @@ -319,6 +319,8 @@ router bgp 65101 neighbor 10.100.100.3 activate neighbor 10.100.100.3 default-route rcf RCF_DEFAULT_ROUTE() neighbor 10.100.100.4 activate + neighbor 10.100.100.4 route-map RM1 in + neighbor 10.100.100.4 route-map RM2 out neighbor 10.100.100.4 encapsulation path-selection neighbor 10.100.100.5 activate neighbor 10.100.100.5 encapsulation mpls diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-rtc.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-rtc.md index 653c24b2cdf..33c46a44c34 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-rtc.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-rtc.md @@ -104,10 +104,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | -| MLAG-IPv4-UNDERLAY-PEER | False | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | +| MLAG-IPv4-UNDERLAY-PEER | False | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-v4-evpn.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-v4-evpn.md index 0e54d6f53d3..b22bab9211b 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-v4-evpn.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-v4-evpn.md @@ -151,11 +151,11 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | -| IPv4-UNDERLAY-PEERS | False | default | -| MLAG-IPv4-UNDERLAY-PEER | False | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | +| IPv4-UNDERLAY-PEERS | False | - | - | default | +| MLAG-IPv4-UNDERLAY-PEER | False | - | - | default | #### Router BGP VLAN Aware Bundles diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-v4-v6-evpn.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-v4-v6-evpn.md index 937d361ff63..4a91bcb4209 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-v4-v6-evpn.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-v4-v6-evpn.md @@ -123,10 +123,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY | True | default | -| RCF_TEST | False | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY | True | RM-HIDE-AS-PATH | RM-HIDE-AS-PATH | default | +| RCF_TEST | False | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg index 9e91718cc3b..83bac4e7634 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg @@ -142,6 +142,8 @@ router bgp 65101 neighbor 10.100.100.3 activate neighbor 10.100.100.3 default-route rcf RCF_DEFAULT_ROUTE() neighbor 10.100.100.4 activate + neighbor 10.100.100.4 route-map RM1 in + neighbor 10.100.100.4 route-map RM2 out neighbor 10.100.100.4 encapsulation path-selection neighbor 10.100.100.5 activate neighbor 10.100.100.5 encapsulation mpls diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml index aba25568ce9..a44a1b1234b 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml @@ -143,6 +143,8 @@ router_bgp: - ip_address: 10.100.100.4 activate: true encapsulation: path-selection + route_map_in: RM1 + route_map_out: RM2 - ip_address: 10.100.100.5 activate: true encapsulation: mpls diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md index 6b2df49b131..93707bdabd2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md @@ -660,9 +660,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| MPLS-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| MPLS-OVERLAY-PEERS | True | - | - | default | ##### EVPN Neighbor Default Encapsulation diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md index 799f1e7d7d7..8023886adb2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md @@ -628,9 +628,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| MPLS-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| MPLS-OVERLAY-PEERS | True | - | - | default | ##### EVPN Neighbor Default Encapsulation diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md index b454a4b1213..ce63c726cf3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md @@ -406,10 +406,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| MPLS-OVERLAY-PEERS | True | default | -| RR-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| MPLS-OVERLAY-PEERS | True | - | - | default | +| RR-OVERLAY-PEERS | True | - | - | default | ##### EVPN Neighbor Default Encapsulation 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..fc7322f5ffc 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 @@ -728,9 +728,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| MPLS-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| MPLS-OVERLAY-PEERS | True | - | - | default | ##### EVPN Neighbor Default Encapsulation diff --git a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-RR1.md b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-RR1.md index 727b8df7f84..e2823cd95ad 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-RR1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE2-RR1.md @@ -406,10 +406,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| MPLS-OVERLAY-PEERS | True | default | -| RR-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| MPLS-OVERLAY-PEERS | True | - | - | default | +| RR-OVERLAY-PEERS | True | - | - | default | ##### EVPN Neighbor Default Encapsulation diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF1A.md index a3ec1308658..3935f7fe6fa 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF1A.md @@ -434,9 +434,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md index 225f4866aee..5c50fc51df3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-LEAF2B.md @@ -853,10 +853,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-CORE | True | default | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-CORE | True | - | - | default | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE1.md index a123cd06935..4805da0ee51 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-SPINE1.md @@ -368,9 +368,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-LEAF1A.md index b3097362ccd..2f98b71a314 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-LEAF1A.md @@ -588,9 +588,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VLANs diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE1.md index 933bb80c984..975560cc02d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE1.md @@ -356,9 +356,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md index 8987a612418..0bcb11606b7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD2-SPINE2.md @@ -348,9 +348,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS1.md index 3474db0595e..3316e90c66b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS1.md @@ -310,9 +310,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS2.md index 8a6a321247a..ced16a4aeb3 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-RS2.md @@ -336,9 +336,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1.POD1.LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1.POD1.LEAF2A.md index aeddbb8e4da..d9a10a0d2e2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1.POD1.LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1.POD1.LEAF2A.md @@ -828,10 +828,10 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-CORE | True | default | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-CORE | True | - | - | default | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN DCI Gateway Summary diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md index 2a2ded60744..cdbb918e981 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md @@ -529,9 +529,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP VRFs diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md index c09bb1ca6c3..68726dd05de 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md @@ -449,9 +449,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md index 406ca060738..4651378f196 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md @@ -357,9 +357,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS1.md index 7188b9c46a2..7afc7f49448 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-RS1.md @@ -327,9 +327,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md index c55e76066f7..d9f4c11a72b 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-SUPER-SPINE1.md @@ -375,9 +375,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration 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 86a8f3cbf90..a15ebea661e 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 @@ -657,9 +657,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings 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 23949587c2e..dbeefa49470 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 @@ -655,9 +655,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF1A.md index 4789e48af78..4927d1e5a4e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF1A.md @@ -636,9 +636,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2A.md index 3a00a892b2c..8a055117c09 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2A.md @@ -951,9 +951,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2B.md index 456e9ca2d67..736240e510f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-LEAF2B.md @@ -951,9 +951,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE1.md index a501d96a02c..de7d3aecc8f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE1.md @@ -447,9 +447,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE2.md index c846ef7bd58..0b7881ea2c9 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE2.md @@ -447,9 +447,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE3.md index 63dac678627..f32b8eb2099 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE3.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE3.md @@ -447,9 +447,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE4.md index 7413f711e09..8620b4e93ed 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SPINE4.md @@ -447,9 +447,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration 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..fd03d3902e2 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 @@ -1323,9 +1323,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings 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..487a3fc02a8 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 @@ -1323,9 +1323,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md index 3025dcce62d..55abd084c2b 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1A.md @@ -666,9 +666,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md index c4ce017398c..fedcf27cc22 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-BL1B.md @@ -650,9 +650,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF1A.md index 7271d1f2d1d..0b4ad204a09 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF1A.md @@ -500,9 +500,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2A.md index 70cb7591df6..f99537dafb0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2A.md @@ -665,9 +665,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2B.md index 9b728b599f0..f1d38d50cce 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-LEAF2B.md @@ -665,9 +665,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE1.md index fb7c2ceb67a..81b71a1c6e4 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE1.md @@ -509,9 +509,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE4.md index bd77b68bcf7..b13555b37b2 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SPINE4.md @@ -509,9 +509,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3A.md index 0e528e2a199..b3a284bdc41 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3A.md @@ -658,9 +658,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3B.md index 1c0f2752c95..ad82839f097 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_isis_overlay_ibgp/documentation/devices/DC1-SVC3B.md @@ -658,9 +658,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| OVERLAY-PEERS | True | RM-EVPN-SOO-IN | RM-EVPN-SOO-OUT | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1A.md index cd56d592ca4..88303bc5a6e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1A.md @@ -609,9 +609,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1B.md index 73d2b59149e..c8d38f5732e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-BL1B.md @@ -609,9 +609,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF1A.md index 6c2ccd0cbe9..ff193624eb8 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF1A.md @@ -477,9 +477,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md index 27bb8fe62d2..99861dea7be 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md @@ -681,9 +681,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md index 15fa9da18ce..e9e0302bb5e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md @@ -681,9 +681,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE1.md index b95efa2b2f9..b45f4f619ab 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE1.md @@ -471,9 +471,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE2.md index 3160c38bbe7..474200f6137 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE2.md @@ -471,9 +471,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE3.md index 636700110b6..fc370f00825 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE3.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE3.md @@ -471,9 +471,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE4.md index 34e768e48ae..a609bfd8f02 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SPINE4.md @@ -471,9 +471,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md index 96172fea12a..49e91a93658 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -674,9 +674,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md index 8750c69c045..f3085d0a68f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -674,9 +674,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings 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..dcc657e237a 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 @@ -636,9 +636,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings 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..5516e372eee 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 @@ -615,9 +615,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF1A.md index 34f46b2a117..1274d236123 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF1A.md @@ -601,9 +601,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2A.md index bca8eabdef5..d47f81124c4 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2A.md @@ -991,9 +991,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2B.md index f6be423bf5c..7550b7884fb 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF2B.md @@ -991,9 +991,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3A.md index 9e854f10fb5..f37edb27bc6 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3A.md @@ -918,9 +918,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3B.md index 42a9bcda220..6b89019dd3f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF3B.md @@ -918,9 +918,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4A.md index c2e171c15a5..40a32dc881f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4A.md @@ -909,9 +909,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4B.md index 8ec96448a93..a6a52cab09e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-LEAF4B.md @@ -909,9 +909,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE1.md index 8cf0dc5f111..edf02bb7453 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE1.md @@ -432,9 +432,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE2.md index e8c08d06f56..697c23ef697 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE2.md @@ -432,9 +432,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE3.md index 81352089487..4bcc2d81b26 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE3.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE3.md @@ -432,9 +432,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE4.md index 71ba80088b5..26d5a1029b4 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE4.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE4.md @@ -432,9 +432,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE5.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE5.md index 85e18b1c6e2..c8f9798541c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE5.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE5.md @@ -402,9 +402,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE6.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE6.md index 270295c5396..e0a2d74401e 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE6.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SPINE6.md @@ -384,9 +384,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | #### Router BGP Device Configuration diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3A.md index 2c4d84cb971..84d2e04897a 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -1188,9 +1188,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3B.md index 69e2142d312..a007b24b0dc 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -1161,9 +1161,9 @@ ASN Notation: asplain ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | -| EVPN-OVERLAY-PEERS | True | default | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | +| EVPN-OVERLAY-PEERS | True | - | - | default | ##### EVPN Host Flapping Settings diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md index 0f3091c59ad..c24c212e4e3 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md @@ -357,6 +357,8 @@ | [    neighbors](## "router_bgp.address_family_evpn.neighbors") | List, items: Dictionary | | | | | | [      - ip_address](## "router_bgp.address_family_evpn.neighbors.[].ip_address") | String | Required, Unique | | | | | [        activate](## "router_bgp.address_family_evpn.neighbors.[].activate") | Boolean | | | | | + | [        route_map_in](## "router_bgp.address_family_evpn.neighbors.[].route_map_in") | String | | | | Inbound route-map name. | + | [        route_map_out](## "router_bgp.address_family_evpn.neighbors.[].route_map_out") | String | | | | Outbound route-map name. | | [        rcf_in](## "router_bgp.address_family_evpn.neighbors.[].rcf_in") | String | | | | Inbound RCF function name with parenthesis.
Example: MyFunction(myarg). | | [        rcf_out](## "router_bgp.address_family_evpn.neighbors.[].rcf_out") | String | | | | Outbound RCF function name with parenthesis.
Example: MyFunction(myarg). | | [        default_route](## "router_bgp.address_family_evpn.neighbors.[].default_route") | Dictionary | | | | | @@ -2258,6 +2260,12 @@ - ip_address: activate: + # Inbound route-map name. + route_map_in: + + # Outbound route-map name. + route_map_out: + # Inbound RCF function name with parenthesis. # Example: MyFunction(myarg). rcf_in: diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bgp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bgp.j2 index 2e2351b613b..e0d1c532c35 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bgp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bgp.j2 @@ -572,20 +572,20 @@ ASN Notation: {{ router_bgp.as_notation | arista.avd.default('asplain') }} ##### EVPN Peer Groups -| Peer Group | Activate | Encapsulation | -| ---------- | -------- | ------------- | +| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation | +| ---------- | -------- | ------------ | ------------- | ------------- | {% for peer_group in router_bgp.address_family_evpn.peer_groups | arista.avd.natural_sort('name') %} -| {{ peer_group.name }} | {{ peer_group.activate | arista.avd.default(false) }} | {{ peer_group.encapsulation | arista.avd.default("default") }} | +| {{ peer_group.name }} | {{ peer_group.activate | arista.avd.default(false) }} | {{ peer_group.route_map_in | arista.avd.default("-") }} | {{ peer_group.route_map_out | arista.avd.default("-") }} | {{ peer_group.encapsulation | arista.avd.default("default") }} | {% endfor %} {% endif %} {% if router_bgp.address_family_evpn.neighbors is arista.avd.defined %} ##### EVPN Neighbors -| Neighbor | Activate | Encapsulation | -| -------- | -------- | ------------- | +| Neighbor | Activate | Route-map In | Route-map Out | Encapsulation | +| -------- | -------- | ------------ | ------------- | ------------- | {% for neighbor in router_bgp.address_family_evpn.neighbors | arista.avd.natural_sort('ip_address') %} -| {{ neighbor.ip_address }} | {{ neighbor.activate | arista.avd.default(false) }} | {{ neighbor.encapsulation | arista.avd.default("default") }} | +| {{ neighbor.ip_address }} | {{ neighbor.activate | arista.avd.default(false) }} | {{ neighbor.route_map_in | arista.avd.default("-") }} | {{ neighbor.route_map_out | arista.avd.default("-") }} | {{ neighbor.encapsulation | arista.avd.default("default") }} | {% endfor %} {% endif %} {% if router_bgp.address_family_evpn.neighbor_default.encapsulation is arista.avd.defined %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 index 45dac894796..47e135d2831 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 @@ -896,6 +896,12 @@ router bgp {{ router_bgp.as }} {% if neighbor.additional_paths.receive is arista.avd.defined(true) %} neighbor {{ neighbor.ip_address }} additional-paths receive {% endif %} +{% if neighbor.route_map_in is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} route-map {{ neighbor.route_map_in }} in +{% endif %} +{% if neighbor.route_map_out is arista.avd.defined %} + neighbor {{ neighbor.ip_address }} route-map {{ neighbor.route_map_out }} out +{% endif %} {% if neighbor.rcf_in is arista.avd.defined %} neighbor {{ neighbor.ip_address }} rcf in {{ neighbor.rcf_in }} {% endif %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 39fef85733d..940d979aa6c 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -13170,6 +13170,12 @@ keys: type: str activate: type: bool + route_map_in: + type: str + description: Inbound route-map name. + route_map_out: + type: str + description: Outbound route-map name. rcf_in: type: str description: 'Inbound RCF function name with parenthesis. diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml index c978278ba50..77237147b3c 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml @@ -1297,6 +1297,12 @@ keys: type: str activate: type: bool + route_map_in: + type: str + description: Inbound route-map name. + route_map_out: + type: str + description: Outbound route-map name. rcf_in: type: str description: |- From da8a39d692785cba31ba4f2f33c22ee0c5745123 Mon Sep 17 00:00:00 2001 From: Claus Holbech Date: Tue, 29 Oct 2024 10:02:29 +0100 Subject: [PATCH 8/8] Feat(eos_designs): Add support the all dot1x features under adapters/port-profiles/network-ports (#4648) --- .../docs/tables/ethernet-interfaces.md | 4 +- .../docs/tables/connected-endpoints.md | 92 +++++++++++++++++- .../eos_designs/docs/tables/network-ports.md | 92 +++++++++++++++++- .../eos_designs/docs/tables/port-profiles.md | 92 +++++++++++++++++- .../schema/eos_cli_config_gen.schema.yml | 1 + .../ethernet_interfaces.schema.yml | 1 + .../schema/eos_designs.schema.yml | 94 +------------------ .../defs_adapter_config.schema.yml | 94 +------------------ 8 files changed, 277 insertions(+), 193 deletions(-) diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md index 1d4845fede8..7a067277950 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md @@ -266,7 +266,7 @@ | [      - from](## "ethernet_interfaces.[].vlan_translations.[].from") | String | | | | List of vlans as string (only one vlan if direction is "both"). | | [        to](## "ethernet_interfaces.[].vlan_translations.[].to") | Integer | | | | VLAN ID. | | [        direction](## "ethernet_interfaces.[].vlan_translations.[].direction") | String | | `both` | Valid Values:
- in
- out
- both | | - | [    dot1x](## "ethernet_interfaces.[].dot1x") | Dictionary | | | | | + | [    dot1x](## "ethernet_interfaces.[].dot1x") | Dictionary | | | | 802.1x | | [      port_control](## "ethernet_interfaces.[].dot1x.port_control") | String | | | Valid Values:
- auto
- force-authorized
- force-unauthorized | | | [      port_control_force_authorized_phone](## "ethernet_interfaces.[].dot1x.port_control_force_authorized_phone") | Boolean | | | | | | [      reauthentication](## "ethernet_interfaces.[].dot1x.reauthentication") | Boolean | | | | | @@ -1038,6 +1038,8 @@ # VLAN ID. to: direction: + + # 802.1x dot1x: port_control: port_control_force_authorized_phone: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/connected-endpoints.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/connected-endpoints.md index 0f404a257f5..2e122f788f8 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/connected-endpoints.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/connected-endpoints.md @@ -66,16 +66,41 @@ | [            enabled](## ".[].adapters.[].dot1x.mac_based_authentication.enabled") | Boolean | | | | | | [            always](## ".[].adapters.[].dot1x.mac_based_authentication.always") | Boolean | | | | | | [            host_mode_common](## ".[].adapters.[].dot1x.mac_based_authentication.host_mode_common") | Boolean | | | | | + | [          mac_based_access_list](## ".[].adapters.[].dot1x.mac_based_access_list") | Boolean | | | | Operate interface in per-mac access-list mode. | | [          timeout](## ".[].adapters.[].dot1x.timeout") | Dictionary | | | | | | [            idle_host](## ".[].adapters.[].dot1x.timeout.idle_host") | Integer | | | Min: 10
Max: 65535 | | | [            quiet_period](## ".[].adapters.[].dot1x.timeout.quiet_period") | Integer | | | Min: 1
Max: 65535 | | - | [            reauth_period](## ".[].adapters.[].dot1x.timeout.reauth_period") | String | | | | Range 60-4294967295 or "server". | + | [            reauth_period](## ".[].adapters.[].dot1x.timeout.reauth_period") | String | | | | Value can be 60-4294967295 or 'server'. | | [            reauth_timeout_ignore](## ".[].adapters.[].dot1x.timeout.reauth_timeout_ignore") | Boolean | | | | | | [            tx_period](## ".[].adapters.[].dot1x.timeout.tx_period") | Integer | | | Min: 1
Max: 65535 | | | [          reauthorization_request_limit](## ".[].adapters.[].dot1x.reauthorization_request_limit") | Integer | | | Min: 1
Max: 10 | | | [          unauthorized](## ".[].adapters.[].dot1x.unauthorized") | Dictionary | | | | | | [            access_vlan_membership_egress](## ".[].adapters.[].dot1x.unauthorized.access_vlan_membership_egress") | Boolean | | | | | | [            native_vlan_membership_egress](## ".[].adapters.[].dot1x.unauthorized.native_vlan_membership_egress") | Boolean | | | | | + | [          eapol](## ".[].adapters.[].dot1x.eapol") | Dictionary | | | | | + | [            disabled](## ".[].adapters.[].dot1x.eapol.disabled") | Boolean | | | | | + | [            authentication_failure_fallback_mba](## ".[].adapters.[].dot1x.eapol.authentication_failure_fallback_mba") | Dictionary | | | | | + | [              enabled](## ".[].adapters.[].dot1x.eapol.authentication_failure_fallback_mba.enabled") | Boolean | | | | | + | [              timeout](## ".[].adapters.[].dot1x.eapol.authentication_failure_fallback_mba.timeout") | Integer | | | Min: 0
Max: 65535 | | + | [          aaa](## ".[].adapters.[].dot1x.aaa") | Dictionary | | | | | + | [            unresponsive](## ".[].adapters.[].dot1x.aaa.unresponsive") | Dictionary | | | | Configure AAA timeout options. | + | [              eap_response](## ".[].adapters.[].dot1x.aaa.unresponsive.eap_response") | String | | | Valid Values:
- success
- disabled | EAP response to send. EOS default is `success`. | + | [              action](## ".[].adapters.[].dot1x.aaa.unresponsive.action") | Dictionary | | | | Set action for supplicant when AAA times out. | + | [                traffic_allow_access_list](## ".[].adapters.[].dot1x.aaa.unresponsive.action.traffic_allow_access_list") | String | | | | Name of standard access-list to apply when AAA times out. | + | [                apply_cached_results](## ".[].adapters.[].dot1x.aaa.unresponsive.action.apply_cached_results") | Boolean | | | | Use results from a previous AAA response. | + | [                cached_results_timeout](## ".[].adapters.[].dot1x.aaa.unresponsive.action.cached_results_timeout") | Dictionary | | | | | + | [                  time_duration](## ".[].adapters.[].dot1x.aaa.unresponsive.action.cached_results_timeout.time_duration") | Integer | | | Min: 1 | Enable caching for a specific duration -
<1-10000> duration in days
<1-14400000> duration in minutes
<1-240000> duration in hours
<1-864000000> duration in seconds | + | [                  time_duration_unit](## ".[].adapters.[].dot1x.aaa.unresponsive.action.cached_results_timeout.time_duration_unit") | String | Required | | Valid Values:
- days
- hours
- minutes
- seconds | | + | [                apply_alternate](## ".[].adapters.[].dot1x.aaa.unresponsive.action.apply_alternate") | Boolean | | | | Apply alternate action if primary action fails.
eg. aaa unresponsive action apply cached-results else traffic allow | + | [                traffic_allow](## ".[].adapters.[].dot1x.aaa.unresponsive.action.traffic_allow") | Boolean | | | | Set action for supplicant traffic when AAA times out. | + | [                traffic_allow_vlan](## ".[].adapters.[].dot1x.aaa.unresponsive.action.traffic_allow_vlan") | Integer | | | Min: 1
Max: 4094 | | + | [              phone_action](## ".[].adapters.[].dot1x.aaa.unresponsive.phone_action") | Dictionary | | | | Set action for supplicant when AAA times out. | + | [                apply_cached_results](## ".[].adapters.[].dot1x.aaa.unresponsive.phone_action.apply_cached_results") | Boolean | | | | Use results from a previous AAA response. | + | [                cached_results_timeout](## ".[].adapters.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout") | Dictionary | | | | | + | [                  time_duration](## ".[].adapters.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout.time_duration") | Integer | | | Min: 1 | Enable caching for a specific duration -
<1-10000> duration in days
<1-14400000> duration in minutes
<1-240000> duration in hours
<1-864000000> duration in seconds | + | [                  time_duration_unit](## ".[].adapters.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout.time_duration_unit") | String | Required | | Valid Values:
- days
- hours
- minutes
- seconds | | + | [                apply_alternate](## ".[].adapters.[].dot1x.aaa.unresponsive.phone_action.apply_alternate") | Boolean | | | | Apply alternate action if primary action fails.
eg. aaa unresponsive phone action apply cached-results else traffic allow | + | [                traffic_allow](## ".[].adapters.[].dot1x.aaa.unresponsive.phone_action.traffic_allow") | Boolean | | | | Set action for supplicant traffic when AAA times out. | | [        poe](## ".[].adapters.[].poe") | Dictionary | | | | Power Over Ethernet settings applied on port. Only configured if platform supports PoE. | | [          disabled](## ".[].adapters.[].poe.disabled") | Boolean | | `False` | | Disable PoE on a POE capable port. PoE is enabled on all ports that support it by default in EOS. | | [          priority](## ".[].adapters.[].poe.priority") | String | | | Valid Values:
- critical
- high
- medium
- low | Prioritize a port's power in the event that one of the switch's power supplies loses power. | @@ -319,11 +344,14 @@ enabled: always: host_mode_common: + + # Operate interface in per-mac access-list mode. + mac_based_access_list: timeout: idle_host: quiet_period: - # Range 60-4294967295 or "server". + # Value can be 60-4294967295 or 'server'. reauth_period: reauth_timeout_ignore: tx_period: @@ -331,6 +359,66 @@ unauthorized: access_vlan_membership_egress: native_vlan_membership_egress: + eapol: + disabled: + authentication_failure_fallback_mba: + enabled: + timeout: + aaa: + + # Configure AAA timeout options. + unresponsive: + + # EAP response to send. EOS default is `success`. + eap_response: + + # Set action for supplicant when AAA times out. + action: + + # Name of standard access-list to apply when AAA times out. + traffic_allow_access_list: + + # Use results from a previous AAA response. + apply_cached_results: + cached_results_timeout: + + # Enable caching for a specific duration - + # <1-10000> duration in days + # <1-14400000> duration in minutes + # <1-240000> duration in hours + # <1-864000000> duration in seconds + time_duration: =1> + time_duration_unit: + + # Apply alternate action if primary action fails. + # eg. aaa unresponsive action apply cached-results else traffic allow + apply_alternate: + + # Set action for supplicant traffic when AAA times out. + traffic_allow: + traffic_allow_vlan: + + # Set action for supplicant when AAA times out. + phone_action: + + # Use results from a previous AAA response. + apply_cached_results: + cached_results_timeout: + + # Enable caching for a specific duration - + # <1-10000> duration in days + # <1-14400000> duration in minutes + # <1-240000> duration in hours + # <1-864000000> duration in seconds + time_duration: =1> + time_duration_unit: + + # Apply alternate action if primary action fails. + # eg. aaa unresponsive phone action apply cached-results else traffic allow + apply_alternate: + + # Set action for supplicant traffic when AAA times out. + traffic_allow: # Power Over Ethernet settings applied on port. Only configured if platform supports PoE. poe: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/network-ports.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/network-ports.md index e41613d7cc7..55fef548e12 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/network-ports.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/network-ports.md @@ -61,16 +61,41 @@ | [        enabled](## "network_ports.[].dot1x.mac_based_authentication.enabled") | Boolean | | | | | | [        always](## "network_ports.[].dot1x.mac_based_authentication.always") | Boolean | | | | | | [        host_mode_common](## "network_ports.[].dot1x.mac_based_authentication.host_mode_common") | Boolean | | | | | + | [      mac_based_access_list](## "network_ports.[].dot1x.mac_based_access_list") | Boolean | | | | Operate interface in per-mac access-list mode. | | [      timeout](## "network_ports.[].dot1x.timeout") | Dictionary | | | | | | [        idle_host](## "network_ports.[].dot1x.timeout.idle_host") | Integer | | | Min: 10
Max: 65535 | | | [        quiet_period](## "network_ports.[].dot1x.timeout.quiet_period") | Integer | | | Min: 1
Max: 65535 | | - | [        reauth_period](## "network_ports.[].dot1x.timeout.reauth_period") | String | | | | Range 60-4294967295 or "server". | + | [        reauth_period](## "network_ports.[].dot1x.timeout.reauth_period") | String | | | | Value can be 60-4294967295 or 'server'. | | [        reauth_timeout_ignore](## "network_ports.[].dot1x.timeout.reauth_timeout_ignore") | Boolean | | | | | | [        tx_period](## "network_ports.[].dot1x.timeout.tx_period") | Integer | | | Min: 1
Max: 65535 | | | [      reauthorization_request_limit](## "network_ports.[].dot1x.reauthorization_request_limit") | Integer | | | Min: 1
Max: 10 | | | [      unauthorized](## "network_ports.[].dot1x.unauthorized") | Dictionary | | | | | | [        access_vlan_membership_egress](## "network_ports.[].dot1x.unauthorized.access_vlan_membership_egress") | Boolean | | | | | | [        native_vlan_membership_egress](## "network_ports.[].dot1x.unauthorized.native_vlan_membership_egress") | Boolean | | | | | + | [      eapol](## "network_ports.[].dot1x.eapol") | Dictionary | | | | | + | [        disabled](## "network_ports.[].dot1x.eapol.disabled") | Boolean | | | | | + | [        authentication_failure_fallback_mba](## "network_ports.[].dot1x.eapol.authentication_failure_fallback_mba") | Dictionary | | | | | + | [          enabled](## "network_ports.[].dot1x.eapol.authentication_failure_fallback_mba.enabled") | Boolean | | | | | + | [          timeout](## "network_ports.[].dot1x.eapol.authentication_failure_fallback_mba.timeout") | Integer | | | Min: 0
Max: 65535 | | + | [      aaa](## "network_ports.[].dot1x.aaa") | Dictionary | | | | | + | [        unresponsive](## "network_ports.[].dot1x.aaa.unresponsive") | Dictionary | | | | Configure AAA timeout options. | + | [          eap_response](## "network_ports.[].dot1x.aaa.unresponsive.eap_response") | String | | | Valid Values:
- success
- disabled | EAP response to send. EOS default is `success`. | + | [          action](## "network_ports.[].dot1x.aaa.unresponsive.action") | Dictionary | | | | Set action for supplicant when AAA times out. | + | [            traffic_allow_access_list](## "network_ports.[].dot1x.aaa.unresponsive.action.traffic_allow_access_list") | String | | | | Name of standard access-list to apply when AAA times out. | + | [            apply_cached_results](## "network_ports.[].dot1x.aaa.unresponsive.action.apply_cached_results") | Boolean | | | | Use results from a previous AAA response. | + | [            cached_results_timeout](## "network_ports.[].dot1x.aaa.unresponsive.action.cached_results_timeout") | Dictionary | | | | | + | [              time_duration](## "network_ports.[].dot1x.aaa.unresponsive.action.cached_results_timeout.time_duration") | Integer | | | Min: 1 | Enable caching for a specific duration -
<1-10000> duration in days
<1-14400000> duration in minutes
<1-240000> duration in hours
<1-864000000> duration in seconds | + | [              time_duration_unit](## "network_ports.[].dot1x.aaa.unresponsive.action.cached_results_timeout.time_duration_unit") | String | Required | | Valid Values:
- days
- hours
- minutes
- seconds | | + | [            apply_alternate](## "network_ports.[].dot1x.aaa.unresponsive.action.apply_alternate") | Boolean | | | | Apply alternate action if primary action fails.
eg. aaa unresponsive action apply cached-results else traffic allow | + | [            traffic_allow](## "network_ports.[].dot1x.aaa.unresponsive.action.traffic_allow") | Boolean | | | | Set action for supplicant traffic when AAA times out. | + | [            traffic_allow_vlan](## "network_ports.[].dot1x.aaa.unresponsive.action.traffic_allow_vlan") | Integer | | | Min: 1
Max: 4094 | | + | [          phone_action](## "network_ports.[].dot1x.aaa.unresponsive.phone_action") | Dictionary | | | | Set action for supplicant when AAA times out. | + | [            apply_cached_results](## "network_ports.[].dot1x.aaa.unresponsive.phone_action.apply_cached_results") | Boolean | | | | Use results from a previous AAA response. | + | [            cached_results_timeout](## "network_ports.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout") | Dictionary | | | | | + | [              time_duration](## "network_ports.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout.time_duration") | Integer | | | Min: 1 | Enable caching for a specific duration -
<1-10000> duration in days
<1-14400000> duration in minutes
<1-240000> duration in hours
<1-864000000> duration in seconds | + | [              time_duration_unit](## "network_ports.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout.time_duration_unit") | String | Required | | Valid Values:
- days
- hours
- minutes
- seconds | | + | [            apply_alternate](## "network_ports.[].dot1x.aaa.unresponsive.phone_action.apply_alternate") | Boolean | | | | Apply alternate action if primary action fails.
eg. aaa unresponsive phone action apply cached-results else traffic allow | + | [            traffic_allow](## "network_ports.[].dot1x.aaa.unresponsive.phone_action.traffic_allow") | Boolean | | | | Set action for supplicant traffic when AAA times out. | | [    poe](## "network_ports.[].poe") | Dictionary | | | | Power Over Ethernet settings applied on port. Only configured if platform supports PoE. | | [      disabled](## "network_ports.[].poe.disabled") | Boolean | | `False` | | Disable PoE on a POE capable port. PoE is enabled on all ports that support it by default in EOS. | | [      priority](## "network_ports.[].poe.priority") | String | | | Valid Values:
- critical
- high
- medium
- low | Prioritize a port's power in the event that one of the switch's power supplies loses power. | @@ -293,11 +318,14 @@ enabled: always: host_mode_common: + + # Operate interface in per-mac access-list mode. + mac_based_access_list: timeout: idle_host: quiet_period: - # Range 60-4294967295 or "server". + # Value can be 60-4294967295 or 'server'. reauth_period: reauth_timeout_ignore: tx_period: @@ -305,6 +333,66 @@ unauthorized: access_vlan_membership_egress: native_vlan_membership_egress: + eapol: + disabled: + authentication_failure_fallback_mba: + enabled: + timeout: + aaa: + + # Configure AAA timeout options. + unresponsive: + + # EAP response to send. EOS default is `success`. + eap_response: + + # Set action for supplicant when AAA times out. + action: + + # Name of standard access-list to apply when AAA times out. + traffic_allow_access_list: + + # Use results from a previous AAA response. + apply_cached_results: + cached_results_timeout: + + # Enable caching for a specific duration - + # <1-10000> duration in days + # <1-14400000> duration in minutes + # <1-240000> duration in hours + # <1-864000000> duration in seconds + time_duration: =1> + time_duration_unit: + + # Apply alternate action if primary action fails. + # eg. aaa unresponsive action apply cached-results else traffic allow + apply_alternate: + + # Set action for supplicant traffic when AAA times out. + traffic_allow: + traffic_allow_vlan: + + # Set action for supplicant when AAA times out. + phone_action: + + # Use results from a previous AAA response. + apply_cached_results: + cached_results_timeout: + + # Enable caching for a specific duration - + # <1-10000> duration in days + # <1-14400000> duration in minutes + # <1-240000> duration in hours + # <1-864000000> duration in seconds + time_duration: =1> + time_duration_unit: + + # Apply alternate action if primary action fails. + # eg. aaa unresponsive phone action apply cached-results else traffic allow + apply_alternate: + + # Set action for supplicant traffic when AAA times out. + traffic_allow: # Power Over Ethernet settings applied on port. Only configured if platform supports PoE. poe: diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/port-profiles.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/port-profiles.md index 05fa92ee043..8a6b1640b58 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/port-profiles.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/port-profiles.md @@ -57,16 +57,41 @@ | [        enabled](## "port_profiles.[].dot1x.mac_based_authentication.enabled") | Boolean | | | | | | [        always](## "port_profiles.[].dot1x.mac_based_authentication.always") | Boolean | | | | | | [        host_mode_common](## "port_profiles.[].dot1x.mac_based_authentication.host_mode_common") | Boolean | | | | | + | [      mac_based_access_list](## "port_profiles.[].dot1x.mac_based_access_list") | Boolean | | | | Operate interface in per-mac access-list mode. | | [      timeout](## "port_profiles.[].dot1x.timeout") | Dictionary | | | | | | [        idle_host](## "port_profiles.[].dot1x.timeout.idle_host") | Integer | | | Min: 10
Max: 65535 | | | [        quiet_period](## "port_profiles.[].dot1x.timeout.quiet_period") | Integer | | | Min: 1
Max: 65535 | | - | [        reauth_period](## "port_profiles.[].dot1x.timeout.reauth_period") | String | | | | Range 60-4294967295 or "server". | + | [        reauth_period](## "port_profiles.[].dot1x.timeout.reauth_period") | String | | | | Value can be 60-4294967295 or 'server'. | | [        reauth_timeout_ignore](## "port_profiles.[].dot1x.timeout.reauth_timeout_ignore") | Boolean | | | | | | [        tx_period](## "port_profiles.[].dot1x.timeout.tx_period") | Integer | | | Min: 1
Max: 65535 | | | [      reauthorization_request_limit](## "port_profiles.[].dot1x.reauthorization_request_limit") | Integer | | | Min: 1
Max: 10 | | | [      unauthorized](## "port_profiles.[].dot1x.unauthorized") | Dictionary | | | | | | [        access_vlan_membership_egress](## "port_profiles.[].dot1x.unauthorized.access_vlan_membership_egress") | Boolean | | | | | | [        native_vlan_membership_egress](## "port_profiles.[].dot1x.unauthorized.native_vlan_membership_egress") | Boolean | | | | | + | [      eapol](## "port_profiles.[].dot1x.eapol") | Dictionary | | | | | + | [        disabled](## "port_profiles.[].dot1x.eapol.disabled") | Boolean | | | | | + | [        authentication_failure_fallback_mba](## "port_profiles.[].dot1x.eapol.authentication_failure_fallback_mba") | Dictionary | | | | | + | [          enabled](## "port_profiles.[].dot1x.eapol.authentication_failure_fallback_mba.enabled") | Boolean | | | | | + | [          timeout](## "port_profiles.[].dot1x.eapol.authentication_failure_fallback_mba.timeout") | Integer | | | Min: 0
Max: 65535 | | + | [      aaa](## "port_profiles.[].dot1x.aaa") | Dictionary | | | | | + | [        unresponsive](## "port_profiles.[].dot1x.aaa.unresponsive") | Dictionary | | | | Configure AAA timeout options. | + | [          eap_response](## "port_profiles.[].dot1x.aaa.unresponsive.eap_response") | String | | | Valid Values:
- success
- disabled | EAP response to send. EOS default is `success`. | + | [          action](## "port_profiles.[].dot1x.aaa.unresponsive.action") | Dictionary | | | | Set action for supplicant when AAA times out. | + | [            traffic_allow_access_list](## "port_profiles.[].dot1x.aaa.unresponsive.action.traffic_allow_access_list") | String | | | | Name of standard access-list to apply when AAA times out. | + | [            apply_cached_results](## "port_profiles.[].dot1x.aaa.unresponsive.action.apply_cached_results") | Boolean | | | | Use results from a previous AAA response. | + | [            cached_results_timeout](## "port_profiles.[].dot1x.aaa.unresponsive.action.cached_results_timeout") | Dictionary | | | | | + | [              time_duration](## "port_profiles.[].dot1x.aaa.unresponsive.action.cached_results_timeout.time_duration") | Integer | | | Min: 1 | Enable caching for a specific duration -
<1-10000> duration in days
<1-14400000> duration in minutes
<1-240000> duration in hours
<1-864000000> duration in seconds | + | [              time_duration_unit](## "port_profiles.[].dot1x.aaa.unresponsive.action.cached_results_timeout.time_duration_unit") | String | Required | | Valid Values:
- days
- hours
- minutes
- seconds | | + | [            apply_alternate](## "port_profiles.[].dot1x.aaa.unresponsive.action.apply_alternate") | Boolean | | | | Apply alternate action if primary action fails.
eg. aaa unresponsive action apply cached-results else traffic allow | + | [            traffic_allow](## "port_profiles.[].dot1x.aaa.unresponsive.action.traffic_allow") | Boolean | | | | Set action for supplicant traffic when AAA times out. | + | [            traffic_allow_vlan](## "port_profiles.[].dot1x.aaa.unresponsive.action.traffic_allow_vlan") | Integer | | | Min: 1
Max: 4094 | | + | [          phone_action](## "port_profiles.[].dot1x.aaa.unresponsive.phone_action") | Dictionary | | | | Set action for supplicant when AAA times out. | + | [            apply_cached_results](## "port_profiles.[].dot1x.aaa.unresponsive.phone_action.apply_cached_results") | Boolean | | | | Use results from a previous AAA response. | + | [            cached_results_timeout](## "port_profiles.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout") | Dictionary | | | | | + | [              time_duration](## "port_profiles.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout.time_duration") | Integer | | | Min: 1 | Enable caching for a specific duration -
<1-10000> duration in days
<1-14400000> duration in minutes
<1-240000> duration in hours
<1-864000000> duration in seconds | + | [              time_duration_unit](## "port_profiles.[].dot1x.aaa.unresponsive.phone_action.cached_results_timeout.time_duration_unit") | String | Required | | Valid Values:
- days
- hours
- minutes
- seconds | | + | [            apply_alternate](## "port_profiles.[].dot1x.aaa.unresponsive.phone_action.apply_alternate") | Boolean | | | | Apply alternate action if primary action fails.
eg. aaa unresponsive phone action apply cached-results else traffic allow | + | [            traffic_allow](## "port_profiles.[].dot1x.aaa.unresponsive.phone_action.traffic_allow") | Boolean | | | | Set action for supplicant traffic when AAA times out. | | [    poe](## "port_profiles.[].poe") | Dictionary | | | | Power Over Ethernet settings applied on port. Only configured if platform supports PoE. | | [      disabled](## "port_profiles.[].poe.disabled") | Boolean | | `False` | | Disable PoE on a POE capable port. PoE is enabled on all ports that support it by default in EOS. | | [      priority](## "port_profiles.[].poe.priority") | String | | | Valid Values:
- critical
- high
- medium
- low | Prioritize a port's power in the event that one of the switch's power supplies loses power. | @@ -275,11 +300,14 @@ enabled: always: host_mode_common: + + # Operate interface in per-mac access-list mode. + mac_based_access_list: timeout: idle_host: quiet_period: - # Range 60-4294967295 or "server". + # Value can be 60-4294967295 or 'server'. reauth_period: reauth_timeout_ignore: tx_period: @@ -287,6 +315,66 @@ unauthorized: access_vlan_membership_egress: native_vlan_membership_egress: + eapol: + disabled: + authentication_failure_fallback_mba: + enabled: + timeout: + aaa: + + # Configure AAA timeout options. + unresponsive: + + # EAP response to send. EOS default is `success`. + eap_response: + + # Set action for supplicant when AAA times out. + action: + + # Name of standard access-list to apply when AAA times out. + traffic_allow_access_list: + + # Use results from a previous AAA response. + apply_cached_results: + cached_results_timeout: + + # Enable caching for a specific duration - + # <1-10000> duration in days + # <1-14400000> duration in minutes + # <1-240000> duration in hours + # <1-864000000> duration in seconds + time_duration: =1> + time_duration_unit: + + # Apply alternate action if primary action fails. + # eg. aaa unresponsive action apply cached-results else traffic allow + apply_alternate: + + # Set action for supplicant traffic when AAA times out. + traffic_allow: + traffic_allow_vlan: + + # Set action for supplicant when AAA times out. + phone_action: + + # Use results from a previous AAA response. + apply_cached_results: + cached_results_timeout: + + # Enable caching for a specific duration - + # <1-10000> duration in days + # <1-14400000> duration in minutes + # <1-240000> duration in hours + # <1-864000000> duration in seconds + time_duration: =1> + time_duration_unit: + + # Apply alternate action if primary action fails. + # eg. aaa unresponsive phone action apply cached-results else traffic allow + apply_alternate: + + # Set action for supplicant traffic when AAA times out. + traffic_allow: # Power Over Ethernet settings applied on port. Only configured if platform supports PoE. poe: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 940d979aa6c..e0b5760c17b 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -3070,6 +3070,7 @@ keys: default: both dot1x: type: dict + description: 802.1x keys: port_control: type: str diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml index 4d74f1d6c82..6073a23fd50 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml @@ -965,6 +965,7 @@ keys: default: "both" dot1x: type: dict + description: 802.1x keys: port_control: type: str diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml index aebad72bb98..54e7848343d 100644 --- a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml +++ b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml @@ -5247,99 +5247,7 @@ $defs: ' dot1x: type: dict - description: 802.1x - keys: - port_control: - type: str - valid_values: - - auto - - force-authorized - - force-unauthorized - port_control_force_authorized_phone: - type: bool - reauthentication: - type: bool - pae: - type: dict - keys: - mode: - type: str - valid_values: - - authenticator - authentication_failure: - type: dict - keys: - action: - type: str - valid_values: - - allow - - drop - allow_vlan: - type: int - convert_types: - - str - min: 1 - max: 4094 - host_mode: - type: dict - keys: - mode: - type: str - valid_values: - - multi-host - - single-host - multi_host_authenticated: - type: bool - mac_based_authentication: - type: dict - keys: - enabled: - type: bool - always: - type: bool - host_mode_common: - type: bool - timeout: - type: dict - keys: - idle_host: - type: int - convert_types: - - str - min: 10 - max: 65535 - quiet_period: - type: int - convert_types: - - str - min: 1 - max: 65535 - reauth_period: - type: str - convert_types: - - int - description: Range 60-4294967295 or "server". - reauth_timeout_ignore: - type: bool - tx_period: - type: int - convert_types: - - str - min: 1 - max: 65535 - reauthorization_request_limit: - type: int - convert_types: - - str - min: 1 - max: 10 - unauthorized: - type: dict - keys: - access_vlan_membership_egress: - type: bool - native_vlan_membership_egress: - type: bool + $ref: eos_cli_config_gen#/keys/ethernet_interfaces/items/keys/dot1x poe: $ref: eos_cli_config_gen#/keys/ethernet_interfaces/items/keys/poe type: dict diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_adapter_config.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_adapter_config.schema.yml index 7e1283564a5..9eb5ef43d0c 100644 --- a/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_adapter_config.schema.yml +++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_adapter_config.schema.yml @@ -174,99 +174,7 @@ $defs: Optional if default link_tracking settings are configured on the node. dot1x: type: dict - description: 802.1x - keys: - port_control: - type: str - valid_values: - - "auto" - - "force-authorized" - - "force-unauthorized" - port_control_force_authorized_phone: - type: bool - reauthentication: - type: bool - pae: - type: dict - keys: - mode: - type: str - valid_values: - - "authenticator" - authentication_failure: - type: dict - keys: - action: - type: str - valid_values: - - "allow" - - "drop" - allow_vlan: - type: int - convert_types: - - str - min: 1 - max: 4094 - host_mode: - type: dict - keys: - mode: - type: str - valid_values: - - "multi-host" - - "single-host" - multi_host_authenticated: - type: bool - mac_based_authentication: - type: dict - keys: - enabled: - type: bool - always: - type: bool - host_mode_common: - type: bool - timeout: - type: dict - keys: - idle_host: - type: int - convert_types: - - str - min: 10 - max: 65535 - quiet_period: - type: int - convert_types: - - str - min: 1 - max: 65535 - reauth_period: - type: str - convert_types: - - int - description: Range 60-4294967295 or "server". - reauth_timeout_ignore: - type: bool - tx_period: - type: int - convert_types: - - str - min: 1 - max: 65535 - reauthorization_request_limit: - type: int - convert_types: - - str - min: 1 - max: 10 - unauthorized: - type: dict - keys: - access_vlan_membership_egress: - type: bool - native_vlan_membership_egress: - type: bool + $ref: eos_cli_config_gen#/keys/ethernet_interfaces/items/keys/dot1x poe: $ref: eos_cli_config_gen#/keys/ethernet_interfaces/items/keys/poe type: dict