Fix(eos_cli_config_gen): Fix the invalid configuration of vpn-route i…

…n export direction for router bgp vrf (#4765)
aristanetworks · Dec 4, 2024 · 4261d70 · 4261d70
1 parent 816defa
commit 4261d70
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md b/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
@@ -8574,7 +8574,7 @@ router bgp 65101
       route-target export evpn 1:30001
       route-target export evpn rcf RT_EXPORT_AF_RCF()
       route-target export vpn-ipv6 1:30011
-      route-target export vpn-ipv6 rcf RT_IMPORT_AF_RCF() vpn-route filter-rcf RT_IMPORT_AF_RCF_FILTER()
+      route-target export vpn-ipv6 rcf RT_IMPORT_AF_RCF() vrf-route filter-rcf RT_IMPORT_AF_RCF_FILTER()
       route-target export vpn-ipv6 route-map RT_IMPORT_AF_RM
       redistribute connected
       redistribute ospf match external include leaked

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
@@ -5393,7 +5393,7 @@ router bgp 65101
       route-target export evpn 1:30001
       route-target export evpn rcf RT_EXPORT_AF_RCF()
       route-target export vpn-ipv6 1:30011
-      route-target export vpn-ipv6 rcf RT_IMPORT_AF_RCF() vpn-route filter-rcf RT_IMPORT_AF_RCF_FILTER()
+      route-target export vpn-ipv6 rcf RT_IMPORT_AF_RCF() vrf-route filter-rcf RT_IMPORT_AF_RCF_FILTER()
       route-target export vpn-ipv6 route-map RT_IMPORT_AF_RM
       redistribute connected
       redistribute ospf match external include leaked

diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/router-bgp.yml b/...llections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/router-bgp.yml
@@ -1982,7 +1982,7 @@ router_bgp:
               - "1:30011"
             rcf: RT_IMPORT_AF_RCF()
             route_map: RT_IMPORT_AF_RM
-            vpn_route_filter_rcf: RT_IMPORT_AF_RCF_FILTER()
+            vrf_route_filter_rcf: RT_IMPORT_AF_RCF_FILTER()
       redistribute:
         ospf:
           match_external:

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
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
@@ -2677,8 +2677,8 @@ router bgp {{ router_bgp.as }}
 {%                 endfor %}
 {%                 if address_family.address_family in ['evpn', 'vpn-ipv4', 'vpn-ipv6'] %}
 {%                     if address_family.rcf is arista.avd.defined %}
-{%                         if address_family.vpn_route_filter_rcf is arista.avd.defined and address_family.address_family in ['vpn-ipv4', 'vpn-ipv6'] %}
-      route-target export {{ address_family.address_family }} rcf {{ address_family.rcf }} vpn-route filter-rcf {{ address_family.vpn_route_filter_rcf }}
+{%                         if address_family.vrf_route_filter_rcf is arista.avd.defined and address_family.address_family in ['vpn-ipv4', 'vpn-ipv6'] %}
+      route-target export {{ address_family.address_family }} rcf {{ address_family.rcf }} vrf-route filter-rcf {{ address_family.vrf_route_filter_rcf }}
 {%                         else %}
       route-target export {{ address_family.address_family }} rcf {{ address_family.rcf }}
 {%                         endif %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py b/python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py
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
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
@@ -3762,10 +3762,10 @@ keys:
                           RCF function name with parenthesis.
                           Example: MyFunction(myarg).
                           Only applicable if `address_family` is one of `evpn`, `vpn-ipv4` or `vpn-ipv6`.
-                      vpn_route_filter_rcf:
+                      vrf_route_filter_rcf:
                         type: str
                         description: |-
-                          RCF function name with parenthesis for filtering VPN routes. Also requires `rcf` to be set.
+                          RCF function name with parenthesis for filtering VRF routes. Also requires `rcf` to be set.
                           Example: MyFunction(myarg).
                           Only applicable if `address_family` is one of `vpn-ipv4` or `vpn-ipv6`.
             router_id: