Skip to content

Commit d79e878

Browse files
committed
add backwards compatability for 3.1.1
1 parent bcad0a4 commit d79e878

4 files changed

Lines changed: 16 additions & 3 deletions

File tree

roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
{% endif %}
1818
{% endif %}
1919
SNMP_SERVER_HOST_TRAP: {{ vxlan.ebgp_global.snmp_server_host_trap | default(defaults.vxlan.ebgp_global.snmp_server_host_trap) }}
20-
{% if not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool) %}
20+
{% if ( (ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=')) and
21+
(not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool)) ) %}
2122
FEATURE_PTP: {{ vxlan.ebgp_global.ptp.enable | default(defaults.vxlan.ebgp_global.ptp.enable) }}
2223
{% if vxlan.ebgp_global.ptp.enable is defined and vxlan.ebgp_global.ptp.enable | ansible.builtin.bool %}
2324
PTP_DOMAIN_ID: {{ vxlan.ebgp_global.ptp.domain_id | default(defaults.vxlan.ebgp_global.ptp.domain_id) }}

roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/evpn/ebgp_vxlan_fabric_evpn.j2

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@
1414
{% endif %}
1515
{% endif %}
1616
{% endif %}
17+
18+
{% if ( ((ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.1', '<=')) and
19+
(not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool))) or
20+
(ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=')) ) %}
1721
{% if (vxlan.underlay.general.replication_mode | default(defaults.vxlan.underlay.general.replication_mode) | title) == 'Multicast' %}
1822
RP_LB_ID: {{ vxlan.underlay.multicast.underlay_rp_loopback_id | default(defaults.vxlan.underlay.multicast.underlay_rp_loopback_id) }}
1923
RP_COUNT: {{ vxlan.underlay.multicast.rendezvous_points | default(defaults.vxlan.underlay.multicast.rendezvous_points) }}
2024
RP_MODE: {{ vxlan.underlay.multicast.rp_mode | default(defaults.vxlan.underlay.multicast.rp_mode) }}
2125
ENABLE_TRM: {{ vxlan.underlay.multicast.ipv4.trm_enable | default(defaults.vxlan.underlay.multicast.ipv4.trm_enable) | title }}
26+
{% if (ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=')) %}
2227
ENABLE_TRMv6: {{ vxlan.underlay.multicast.ipv6.trmv6_enable | default(defaults.vxlan.underlay.multicast.ipv6.trmv6_enable) | title }}
28+
{% endif %}
2329
{% if not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool) %}
2430
{% if not (vxlan.underlay.general.manual_underlay_allocation | default(defaults.vxlan.underlay.general.manual_underlay_allocation) | ansible.builtin.bool) %}
2531
ANYCAST_RP_IP_RANGE: {{ vxlan.underlay.ipv4.underlay_rp_loopback_ip_range | default(defaults.vxlan.underlay.ipv4.underlay_rp_loopback_ip_range) }}
@@ -28,7 +34,8 @@
2834
{% if (vxlan.underlay.multicast.ipv4.trm_enable | default(defaults.vxlan.underlay.multicast.ipv4.trm_enable) | ansible.builtin.bool) %}
2935
L3VNI_MCAST_GROUP: {{ vxlan.underlay.multicast.ipv4.trm_default_group | default(defaults.vxlan.underlay.multicast.ipv4.trm_default_group) }}
3036
{% endif %}
31-
{% if (vxlan.underlay.multicast.ipv6.trmv6_enable | default(defaults.vxlan.underlay.multicast.ipv6.trmv6_enable) | ansible.builtin.bool) %}
37+
{% if ( (ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=')) and
38+
(vxlan.underlay.multicast.ipv6.trmv6_enable | default(defaults.vxlan.underlay.multicast.ipv6.trmv6_enable) | ansible.builtin.bool) ) %}
3239
L3VNI_IPv6_MCAST_GROUP: "{{ vxlan.underlay.multicast.ipv6.trmv6_default_group | default(defaults.vxlan.underlay.multicast.ipv6.trmv6_default_group) }}"
3340
{% endif %}
3441
{% if vxlan.underlay.multicast.rp_mode | default(defaults.vxlan.underlay.multicast.rp_mode) == 'bidir' %}
@@ -46,6 +53,7 @@
4653
IPv6_MULTICAST_GROUP_SUBNET: {{ vxlan.underlay.multicast.ipv6.group_subnet | default(defaults.vxlan.underlay.multicast.ipv6.group_subnet) }}
4754
{% endif %}
4855
{% endif %}
56+
{% endif %}
4957
{% if vxlan.ebgp_global.layer2_vni_range.from is defined %}
5058
{% set l2_vni_start = vxlan.ebgp_global.layer2_vni_range.from %}
5159
{% if vxlan.ebgp_global.layer2_vni_range.to is defined %}

roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/general/ebgp_vxlan_fabric_general.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@
2323
{% endif %}
2424
{# DISABLE_ROUTE_MAP_TAG: #}
2525
{# ROUTE_MAP_TAG: #}
26+
{% if ( (not (ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.1', '<='))) and
27+
( not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool)) ) %}
2628
{# SUBINTERFACE_RANGE: #}
29+
{% endif %}
2730
{# #}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{# Auto-generated NDFC eBGP VXLAN EVPN Security config data structure for fabric {{ vxlan.fabric.name }} #}
2-
{% if not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool) %}
2+
{% if ( (ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.1', '>=')) and
3+
(not (vxlan.underlay.general.enable_ipv6_underlay | default(defaults.vxlan.underlay.general.enable_ipv6_underlay) | ansible.builtin.bool)) ) %}
34
ENABLE_MACSEC: false
45
{% endif %}

0 commit comments

Comments
 (0)