Fix(eos_designs): Add redistribute connected under BGP for VRF defaul…

…t if no underlay (#4522)
aristanetworks · Sep 30, 2024 · f055823 · f055823
1 parent 0b5d9d7
commit f055823
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/...ista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg b/...ista/avd/molecule/eos_designs_unit_tests/intended/configs/bgp-from-network-services-1.cfg
@@ -108,6 +108,7 @@ router bgp 65001
    neighbor 10.10.1.2 peer group MYPEERGROUP
    neighbor 10.10.20.1 peer group MLAG-IPv4-UNDERLAY-PEER
    neighbor 10.10.20.1 description bgp-from-network-services-2_Vlan3099
+   redistribute connected
    !
    address-family ipv4
       neighbor MLAG-IPv4-UNDERLAY-PEER activate

diff --git a/...lecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml b/...lecule/eos_designs_unit_tests/intended/structured_configs/bgp-from-network-services-1.yml
@@ -24,6 +24,8 @@ router_bgp:
     maximum_routes: 12000
     send_community: all
     route_map_in: RM-MLAG-PEER-IN
+  redistribute_routes:
+  - source_protocol: connected
   neighbors:
   - ip_address: 10.10.20.1
     peer_group: MLAG-IPv4-UNDERLAY-PEER

diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py
@@ -176,20 +176,26 @@ def _router_bgp_vrfs(self: AvdStructuredConfigNetworkServices) -> dict:
                     if (bgp_vrf_redistribute_static := vrf.get("redistribute_static")) is True or (
                         vrf["static_routes"] and bgp_vrf_redistribute_static is not False
                     ):
-                        bgp_vrf.setdefault("redistribute_routes", []).append({"source_protocol": "static"})
+                        bgp_vrf["redistribute_routes"].append({"source_protocol": "static"})
 
-                elif bgp_vrf:
-                    # VRF default with RD/RT and eos_cli/struct_cfg which should go under the vrf default context.
-                    # Any peers added later will be put directly under router_bgp
-                    append_if_not_duplicate(
-                        list_of_dicts=router_bgp["vrfs"],
-                        primary_key="name",
-                        new_dict={"name": vrf_name, **bgp_vrf},
-                        context="BGP VRFs defined under network services",
-                        context_keys=["name"],
-                    )
-                    # Resetting bgp_vrf so we only add global keys if there are any neighbors for VRF default
-                    bgp_vrf = {}
+                else:
+                    # VRF default
+                    if bgp_vrf:
+                        # RD/RT and/or eos_cli/struct_cfg which should go under the vrf default context.
+                        # Any peers added later will be put directly under router_bgp
+                        append_if_not_duplicate(
+                            list_of_dicts=router_bgp["vrfs"],
+                            primary_key="name",
+                            new_dict={"name": vrf_name, **bgp_vrf},
+                            context="BGP VRFs defined under network services",
+                            context_keys=["name"],
+                        )
+                        # Resetting bgp_vrf so we only add global keys if there are any neighbors for VRF default
+                        bgp_vrf = {}
+
+                    if self.shared_utils.underlay_routing_protocol == "none":
+                        # We need to add redistribute connected for the default VRF when underlay_routing_protocol is "none"
+                        bgp_vrf["redistribute_routes"] = [{"source_protocol": "connected"}]
 
                 # MLAG IBGP Peering VLANs per VRF
                 # Will only be configured for VRF default if underlay_routing_protocol == "none".