Reverting the change for redistribute to ospf.

aristanetworks · Jul 26, 2024 · d8650dc · d8650dc
1 parent b4aba9a
commit d8650dc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/...ions/arista/avd/roles/eos_designs/docs/tables/network-services-vrfs-settings.md b/...ions/arista/avd/roles/eos_designs/docs/tables/network-services-vrfs-settings.md
diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml
@@ -6592,11 +6592,12 @@ $defs:
               redistribute_static:
                 type: bool
                 description: Non-selectively enabling or disabling redistribute static
-                  inside the VRF.
+                  to BGP inside the VRF.
               redistribute_connected:
                 type: bool
                 default: true
-                description: Enabled/disable redistribution of connected routes.
+                description: Non-selectively enabling or disabling redistribution
+                  of connected routes to BGP.
               bgp_peers:
                 documentation_options:
                   table: network-services-vrfs-bgp-settings

diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_network_services.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/defs_network_services.schema.yml
@@ -896,11 +896,11 @@ $defs:
                         type: str
               redistribute_static:
                 type: bool
-                description: Non-selectively enabling or disabling redistribute static inside the VRF.
+                description: Non-selectively enabling or disabling redistribute static to BGP inside the VRF.
               redistribute_connected:
                 type: bool
                 default: true
-                description: Enabled/disable redistribution of connected routes.
+                description: Non-selectively enabling or disabling redistribution of connected routes to BGP.
               bgp_peers:
                 documentation_options:
                   table: network-services-vrfs-bgp-settings

diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/router_ospf.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/router_ospf.py
@@ -76,7 +76,7 @@ def router_ospf(self: AvdStructuredConfigNetworkServices) -> dict | None:
                     if (route_map := get(vrf, "ospf.redistribute_bgp.route_map")) is not None:
                         process_redistribute["bgp"]["route_map"] = route_map
 
-                if get(vrf, "redistribute_connected", get(vrf, "ospf.redistribute_connected.enabled", default=False)) is True:
+                if get(vrf, "ospf.redistribute_connected.enabled", default=False) is True:
                     process_redistribute["connected"] = {}
                     if (route_map := get(vrf, "ospf.redistribute_connected.route_map")) is not None:
                         process_redistribute["connected"]["route_map"] = route_map