Reverting the change for redistribute to ospf.

aristanetworks · Jul 26, 2024 · f0b1eb7 · f0b1eb7
1 parent ab78ce3
commit f0b1eb7
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
@@ -57,8 +57,8 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;interface</samp>](## "<network_services_keys.name>.[].vrfs.[].ipv6_static_routes.[].interface") | String |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nodes</samp>](## "<network_services_keys.name>.[].vrfs.[].ipv6_static_routes.[].nodes") | List, items: String |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&lt;str&gt;</samp>](## "<network_services_keys.name>.[].vrfs.[].ipv6_static_routes.[].nodes.[]") | String |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;redistribute_static</samp>](## "<network_services_keys.name>.[].vrfs.[].redistribute_static") | Boolean |  |  |  | Non-selectively enabling or disabling redistribute static inside the VRF. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;redistribute_connected</samp>](## "<network_services_keys.name>.[].vrfs.[].redistribute_connected") | Boolean |  | `True` |  | Enabled/disable redistribution of connected routes. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;redistribute_static</samp>](## "<network_services_keys.name>.[].vrfs.[].redistribute_static") | Boolean |  |  |  | Non-selectively enabling or disabling redistribute static to BGP inside the VRF. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;redistribute_connected</samp>](## "<network_services_keys.name>.[].vrfs.[].redistribute_connected") | Boolean |  | `True` |  | Non-selectively enabling or disabling redistribution of connected routes to BGP. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bgp</samp>](## "<network_services_keys.name>.[].vrfs.[].bgp") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;raw_eos_cli</samp>](## "<network_services_keys.name>.[].vrfs.[].bgp.raw_eos_cli") | String |  |  |  | EOS CLI rendered directly on the Router BGP, VRF definition in the final EOS configuration.<br> |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;structured_config</samp>](## "<network_services_keys.name>.[].vrfs.[].bgp.structured_config") | Dictionary |  |  |  | Custom structured config added under router_bgp.vrfs.[name=<vrf>] for eos_cli_config_gen. |
@@ -239,10 +239,10 @@
                 nodes:
                   - <str>
 
-            # Non-selectively enabling or disabling redistribute static inside the VRF.
+            # Non-selectively enabling or disabling redistribute static to BGP inside the VRF.
             redistribute_static: <bool>
 
-            # Enabled/disable redistribution of connected routes.
+            # Non-selectively enabling or disabling redistribution of connected routes to BGP.
             redistribute_connected: <bool; default=True>
             bgp:
 

diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml
@@ -6562,11 +6562,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