Skip to content

Fix for 644, 645 and 647 #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Fix for 644, 645 and 647 #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b84b8c
Fix for #645
juarocha Oct 21, 2025
1feece8
Fix for 644
juarocha Oct 21, 2025
0e4f5b0
Fix for 647
juarocha Oct 21, 2025
e0ed505
Merge branch 'netascode:develop' into vrf-lite-ospf-fix-644-645
juarocha Oct 27, 2025
cb3745e
Merge branch 'netascode:develop' into vrf-lite-ospf-fix-644-645
juarocha Nov 13, 2025
3ab6230
Merge branch 'netascode:develop' into vrf-lite-ospf-fix-644-645
juarocha Nov 19, 2025
1ca8ab0
Fixing indentation and removing extra lines
juarocha Nov 20, 2025
5947501
Merge branch 'netascode:develop' into vrf-lite-ospf-fix-644-645
juarocha Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ebgp.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
{% if switch_redist.source == 'static' and switch_redist.route_map_ipv4 %}
redistribute static route-map {{ switch_redist.route_map_ipv4 }}
{% endif %}
{% if switch_redist.source == 'ospf' and switch_redist.route_map_ipv4 %}
{% if switch_redist.source == 'ospf' and switch_redist.route_map_ipv4 and switch_redist.protocol_tag %}
redistribute ospf {{ switch_redist.protocol_tag }} route-map {{ switch_redist.route_map_ipv4 }}
{% endif %}
{% endfor %}
Expand Down Expand Up @@ -200,6 +200,5 @@ router bgp {{ data_model_extended.vxlan.global[simplified_fabric_type].bgp_asn }
router bgp {{ data_model_extended.vxlan.global[simplified_fabric_type].bgp_asn }}
{# Other VRFs #}
vrf {{ item.vrf }}

{{- vrf_lite_ebgp_vrf_config(item, switch_item, defaults) | indent(2) -}}
{% endif %}
27 changes: 13 additions & 14 deletions roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ospf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,24 @@ area {{ area.id | ipaddr('address') }} nssa
{%- set nssa_options_flags_enabled = true -%}
{% endif %}
{% if nssa_options.no_redistribution is true %}
{% set _= nssa_options_flags.append("no-redistribution") -%}
{%- set _= nssa_options_flags.append("no-redistribution") -%}
{%- set nssa_options_flags_enabled = true -%}
{% endif %}
{% if nssa_options.default_information_originate is true %}
{% set _= nssa_options_flags.append("default-information-originate") %}
{%- set _= nssa_options_flags.append("default-information-originate") -%}
{% if area.nssa.route_map %}
{% set _= nssa_options_flags.append("route-map") %}
{% set _= nssa_options_flags.append(area.nssa.route_map) %}
{% set nssa_options_flags_enabled = true %}
{%- set _= nssa_options_flags.append("route-map") -%}
{%- set _= nssa_options_flags.append(area.nssa.route_map) -%}
{%- set nssa_options_flags_enabled = true -%}
{% endif %}
{% endif %}
{% if nssa_options.translate_always is true %}
{% set _= nssa_options_translate.append("always") %}
{% set nssa_options_translate_enabled = true %}
{%- set _= nssa_options_translate.append("always") -%}
{%- set nssa_options_translate_enabled = true -%}
{% endif %}
{% if nssa_options.translate_supress_fa is true %}
{% set _= nssa_options_translate.append("supress-fa") %}
{% set nssa_options_translate_enabled = true %}
{%- set _= nssa_options_translate.append("supress-fa") -%}
{%- set nssa_options_translate_enabled = true -%}
{% endif %}
{% if nssa_options.translate_never is true %}
{% set _= nssa_options_translate.append("never") %}
Expand Down Expand Up @@ -85,7 +85,6 @@ default-information originate
{% endif %}
{% endif %}
{% endmacro %}

feature ospf
{% set redistribute = {} %}
{% set feature = {} %}
Expand All @@ -112,7 +111,7 @@ router ospf {{ item.ospf['process'] }}
{% endif %}
{% if item.ospf.areas is defined and item.ospf.areas %}
{% for area in item.ospf.areas %}
{{- render_ospf_area(area, defaults) -}}
{{ render_ospf_area(area, defaults) | trim | indent(2) }}
{% endfor %}
{% endif %}
{% if (item.ospf.distance and item.ospf.distance != 110) or (item.ospf.distance is not defined and defaults.vxlan.overlay_extensions.vrf_lites.ospf.distance != 110) %}
Expand Down Expand Up @@ -142,9 +141,9 @@ router ospf {{ item.ospf['process'] }}
router-id {{ switch_item['router_id'] }}
{% endif %}
{% if item.ospf.areas %}
{% for area in item.ospf.areas %}
{{- render_ospf_area(area, defaults) -}}
{% endfor %}
{% for area in item.ospf.areas %}
{{ render_ospf_area(area, defaults) | trim | indent(4) }}
{% endfor %}
{% endif %}
{% if (item.ospf.distance and item.ospf.distance != 110) or (item.ospf.distance is not defined and defaults.vxlan.overlay_extensions.vrf_lites.ospf.distance != 110) %}
distance {{ item.ospf.distance }}
Expand Down
2 changes: 1 addition & 1 deletion roles/validate/files/rules/ibgp_vxlan/502_policy_vrf_lite_cross_reference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def check_global_ospf_area(cls, policy):
"""
Check OSPF if backbone area is standard
"""
if policy.get("ospf") and not policy["ospf"].get("areas"):
if policy.get("ospf") and policy["ospf"].get("areas"):
for area in policy["ospf"]["areas"]:
if "id" in area and area.get("area_type"):
# Check if AREA 0 is not standard
Expand Down