Issue-545 (#557)

* update j2 template

* adjust template

Author: mtarking

plugins/action/dtc/manage_child_fabric_vrfs.py

@@ -29,6 +29,7 @@
 from ansible.template import Templar
 from ansible.errors import AnsibleFileNotFound
 from ansible_collections.cisco.nac_dc_vxlan.plugins.filter.version_compare import version_compare
+from ansible.plugins.filter.core import to_bool
 
 
 import re
@@ -227,6 +228,7 @@ def run(self, tmp=None, task_vars=None):
 
                             # Create a Templar instance
                             templar = Templar(loader=self._loader, variables=vrf_vars)
+                            templar.environment.filters['bool'] = to_bool
 
                             # Render the template with the combined variables
                             rendered_content = templar.template(template_content)

roles/dtc/common/templates/ndfc_vrfs/msd_fabric/child_fabric/3.1/msd_child_fabric_vrf.j2

@@ -28,12 +28,12 @@
       "ENABLE_NETFLOW": dm.enable_netflow if dm.enable_netflow is defined else ndfc.ENABLE_NETFLOW,
       "NETFLOW_MONITOR": dm.netflow_monitor if (dm.enable_netflow is defined and dm.enable_netflow) else ndfc.NETFLOW_MONITOR,
       "trmEnabled": dm.trm_enable if dm.trm_enable is defined else ndfc.trmEnabled,
-      "loopbackNumber": dm.rp_loopback_id if ((dm.no_rp is defined and not dm.no_rp | default(ndfc.isRPAbsent)) or (dm.rp_external is defined and not dm.rp_external | default(ndfc.isRPExternal))) else ndfc.loopbackNumber | default(""),
-      "rpAddress": dm.rp_address if (dm.no_rp is defined and not dm.no_rp) else ndfc.rpAddress | default(""),
+      "loopbackNumber": dm.rp_loopback_id if (dm.rp_loopback_id is defined and ((not dm.no_rp | default(ndfc.isRPAbsent) | bool) or (not dm.rp_external | default(ndfc.isRPExternal) | bool))) else ndfc.loopbackNumber | default(""),
+      "rpAddress": dm.rp_address if (dm.rp_address is defined and (not dm.no_rp | default(ndfc.isRPAbsent) | bool)) else ndfc.rpAddress | default(""),
       "isRPAbsent": dm.no_rp | default(ndfc.isRPAbsent),
       "isRPExternal": dm.rp_external | default(ndfc.isRPExternal),
       "L3VniMcastGroup": dm.underlay_mcast_ip | default(ndfc.L3VniMcastGroup) | default(""),
-      "multicastGroup": dm.overlay_multicast_group | default(ndfc.multicastGroup) if (dm.no_rp is defined and not dm.no_rp | default(ndfc.isRPAbsent)) else ndfc.multicastGroup,
+      "multicastGroup": dm.overlay_multicast_group | default(ndfc.multicastGroup) if (dm.overlay_multicast_group is defined and (not dm.no_rp | default(ndfc.isRPAbsent) | bool)) else ndfc.multicastGroup,
       "disableRtAuto": ndfc.disableRtAuto,
       "routeTargetImport": ndfc.routeTargetImport,
       "routeTargetExport": ndfc.routeTargetExport,

roles/dtc/common/templates/ndfc_vrfs/msd_fabric/child_fabric/3.2/msd_child_fabric_vrf.j2

@@ -30,12 +30,12 @@
       "ENABLE_NETFLOW": dm.enable_netflow if dm.enable_netflow is defined else ndfc.ENABLE_NETFLOW,
       "NETFLOW_MONITOR": dm.netflow_monitor if (dm.enable_netflow is defined and dm.enable_netflow) else ndfc.NETFLOW_MONITOR,
       "trmEnabled": dm.trm_enable if dm.trm_enable is defined else ndfc.trmEnabled,
-      "loopbackNumber": dm.rp_loopback_id if ((dm.no_rp is defined and not dm.no_rp | default(ndfc.isRPAbsent)) or (dm.rp_external is defined and not dm.rp_external | default(ndfc.isRPExternal))) else ndfc.loopbackNumber | default(""),
-      "rpAddress": dm.rp_address if (dm.no_rp is defined and not dm.no_rp) else ndfc.rpAddress | default(""),
+      "loopbackNumber": dm.rp_loopback_id if (dm.rp_loopback_id is defined and ((not dm.no_rp | default(ndfc.isRPAbsent) | bool) or (not dm.rp_external | default(ndfc.isRPExternal) | bool))) else ndfc.loopbackNumber | default(""),
+      "rpAddress": dm.rp_address if (dm.rp_address is defined and (not dm.no_rp | default(ndfc.isRPAbsent) | bool)) else ndfc.rpAddress | default(""),
       "isRPAbsent": dm.no_rp | default(ndfc.isRPAbsent),
       "isRPExternal": dm.rp_external | default(ndfc.isRPExternal),
       "L3VniMcastGroup": dm.underlay_mcast_ip | default(ndfc.L3VniMcastGroup) | default(""),
-      "multicastGroup": dm.overlay_multicast_group | default(ndfc.multicastGroup) if (dm.no_rp is defined and not dm.no_rp | default(ndfc.isRPAbsent)) else ndfc.multicastGroup,
+      "multicastGroup": dm.overlay_multicast_group | default(ndfc.multicastGroup) if (dm.overlay_multicast_group is defined and (not dm.no_rp | default(ndfc.isRPAbsent) | bool)) else ndfc.multicastGroup,
       "trmV6Enabled": ndfc.trmV6Enabled,
       "rpV6Address": ndfc.rpV6Address if ndfc.rpV6Address is defined else "",
       "isV6RPAbsent": ndfc.isV6RPAbsent,