Merge branch 'netascode:develop' into update_defaults_bgp_password_enable

Author: ccoueffe

CHANGELOG.rst

@@ -8,6 +8,92 @@ This project adheres to `Semantic Versioning <http://semver.org/>`_.
 
 .. contents:: ``Release Versions``
 
+`0.8.1`_
+=====================
+
+**Release Date:** ``2026-07-15``
+
+Added
+-----
+
+* Added support for ND 4.2.1
+* Added BGP ASN auto allocation support
+* Added greenfield cleanup option
+* Added bootstrap cross-reference validation rules
+
+Modified
+--------
+
+* With release 0.8.1, the ptp.vlan_id key has been removed from the data model for vxlan.global.ebgp, vxlan.global.external, and vxlan.multisite.isn as the PTP VLAN ID is not supported for these fabric types.
+* With release 0.8.1, NaC VXLAN supports the following eBGP fabric scenarios with Nexus Dashboard 4.2 or later releases (See https://netascode.cisco.com for more info):
+    •	Multi-AS Mode with ASN Auto Allocation
+    •	Multi-AS Mode with Allow Same ASN On Leafs
+    •	Same-Tier-AS Mode
+
+Fixed
+-----
+
+* https://github.com/netascode/ansible-dc-vxlan/issues/688
+* https://github.com/netascode/ansible-dc-vxlan/issues/727
+* https://github.com/netascode/ansible-dc-vxlan/issues/749
+* https://github.com/netascode/ansible-dc-vxlan/issues/758
+* https://github.com/netascode/ansible-dc-vxlan/issues/799
+* https://github.com/netascode/ansible-dc-vxlan/issues/810
+* https://github.com/netascode/ansible-dc-vxlan/issues/813
+* https://github.com/netascode/ansible-dc-vxlan/issues/814
+* https://github.com/netascode/ansible-dc-vxlan/issues/822
+* https://github.com/netascode/ansible-dc-vxlan/issues/825
+* https://github.com/netascode/ansible-dc-vxlan/issues/829
+* https://github.com/netascode/ansible-dc-vxlan/issues/834
+
+`0.8.0`_
+=====================
+
+**Release Date:** ``2026-05-31``
+
+Added
+-----
+* This release delivers the DTC Pythonic Consolidation
+  * This is a major architectural refactor of the Direct-to-Controller (DTC) roles that replaces per-fabric YAML task files with a unified, data-driven pipeline powered by Python action plugins and externalized YAML registries.
+* ``cr_manage_vrfs_networks`` split into independent ``cr_manage_vrfs`` and ``cr_manage_networks`` tags
+* Added ``role_create`` and ``role_remove`` top-level role tags
+* Added ``cr_manage_links`` and ``cr_manage_tor_pairing`` to iBGP and eBGP VXLAN tag sets
+* General performance improvements
+
+Fixed
+-----
+
+* https://github.com/netascode/ansible-dc-vxlan/issues/767
+* https://github.com/netascode/ansible-dc-vxlan/issues/783
+* https://github.com/netascode/ansible-dc-vxlan/issues/786
+
+* Template Fixes
+  
+  * ndfc_bgw_anycast_vip.j2, ndfc_underlay_ip_address.j2, ndfc_vpc_domain_id_resource.j2
+
+    * Switched from bare ``vxlan.*`` references to fully-qualified ``data_model_extended.vxlan.*``
+
+  * ndfc_fabric_links.j2
+
+    * Added ``peer1_ipv4_addr`` / ``peer2_ipv4_addr`` support for numbered fabric links
+
+  * ndfc_policy.j2
+
+    * Added guard for empty switches list to prevent empty policy render
+
+  * dc_vxlan_fabric_attach_vrfs_loopbacks.j2, msd_fabric_attach_vrfs_loopbacks.j2, mcfg_fabric_attach_vrfs_loopbacks.j2
+
+    * Widened loopback attach condition to include ``loopback_ipv4``, ``loopback_ipv6``, and ``freeform_config``
+
+  * ndfc_underlay_ip_address.j2
+
+    * Added anycast RP resource allocation for multicast replication mode
+
+  * mcfg_fabric_attach_vrfs_loopbacks.j2
+
+    * Fixed ``vlan_id`` type (quoted string for NDFC API)
+
+
 `0.7.2`_
 =====================
 
@@ -520,6 +606,8 @@ The following roles have been added to the collection:
 
 This version of the collection includes support for an IPv4 Underlay only.  Support for IPv6 Underlay will be available in the next release.
 
+.. _0.8.1: https://github.com/netascode/ansible-dc-vxlan/compare/0.8.0...0.8.1
+.. _0.8.0: https://github.com/netascode/ansible-dc-vxlan/compare/0.7.2...0.8.0
 .. _0.7.2: https://github.com/netascode/ansible-dc-vxlan/compare/0.7.1...0.7.2
 .. _0.7.1: https://github.com/netascode/ansible-dc-vxlan/compare/0.7.0...0.7.1
 .. _0.7.0: https://github.com/netascode/ansible-dc-vxlan/compare/0.6.0...0.7.0

README.md

@@ -50,12 +50,14 @@ Inside the [example repository](https://github.com/netascode/ansible-dc-vxlan-ex
 
 ```yaml
 # Control Parameters for 'Remove' role tasks in VXLAN EVPN fabric
+edge_connections_delete_mode: false
 interface_delete_mode: false
 inventory_delete_mode: false
 link_fabric_delete_mode: false
 link_vpc_delete_mode: false
 network_delete_mode: false
 policy_delete_mode: false
+tor_pairing_delete_mode: false
 vpc_delete_mode: false
 vrf_delete_mode: false
 
@@ -83,16 +85,19 @@ The following control variables are available in this collection.
 | Variable | Description | Default Value |
 | -------- | ------- | ------- |
 | `force_run_all` | Force all roles in the collection to run | `false` |
+| `edge_connections_delete_mode` | Remove edge_connections state as part of the remove role | `false` |
 | `interface_delete_mode` | Remove interface state as part of the remove role | `false` |
 | `inventory_delete_mode` | Remove inventory state as part of the remove role | `false` |
+| `link_fabric_delete_mode` | Remove fabric link state as part of the remove role | `false` |
 | `link_vpc_delete_mode` | Remove vpc link state as part of the remove role | `false` |
 | `multisite_child_fabric_delete_mode` | Remove child fabric from MSD fabric as part of the remove role | `false` |
 | `multisite_network_delete_mode` | Remove network state as part of the remove role for multisite (MSD) fabrics | `false` |
 | `multisite_vrf_delete_mode` | Remove vrf state as part of the remove role for multisite (MSD) fabrics | `false` |
 | `network_delete_mode` | Remove network state as part of the remove role | `false` |
 | `policy_delete_mode` | Remove policy state as part of the remove role | `false` |
-| `vrf_delete_mode` | Remove vrf state as part of the remove role | `false` |
+| `tor_pairing_delete_mode` | Remove tor pairing state as part of the remove role | `false` |
 | `vpc_delete_mode` | Remove vpc pair state as part of the remove role | `false` |
+| `vrf_delete_mode` | Remove vrf state as part of the remove role | `false` |
 
 These variables are described in more detail in different sections of this document.
 
@@ -462,7 +467,7 @@ We welcome community contributions to this collection. If you find problems, ple
 
 MIT License
 
-Copyright (c) 2024-2025 Cisco and/or its affiliates.
+Copyright (c) 2024-2026 Cisco and/or its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: cisco
 name: nac_dc_vxlan
-version: 0.7.2-dev
+version: 0.8.1-dev
 readme: README.md
 authors:
   - Charly Coueffe <ccoueffe>
@@ -32,5 +32,5 @@ tags: [cisco, dc, nd, ndfc, nxos, networking, vxlan, evpn, nac, sac]
 
 dependencies:
   "ansible.netcommon": ">=4.1.0"
-  "cisco.dcnm": ">=3.11.1"
+  "cisco.dcnm": ">=3.12.1"
   "community.general": ">=8.5.0"

plugins/action/common/change_flag_manager.py

@@ -103,6 +103,7 @@ def initialize_flags(self):
                 'changes_detected_vpc_peering': False,
                 'changes_detected_vpc_domain_id_resource': False,
                 'changes_detected_vrfs': False,
+                'changes_detected_underlay_ip_address': False,
                 'changes_detected_any': False
             }
         if self.fabric_type == "ISN":

plugins/action/common/get_credentials.py

@@ -207,4 +207,7 @@ def run(self, tmp=None, task_vars=None):
                     display.vvv(f"Using group_vars discovery credentials from model data for device {device_ip}")
 
         results['updated_inv_list'] = updated_inv_list
+        # Convention: post-hooks that produce module-ready data set 'module_data'
+        # so build_resource_data can pass it directly to downstream NDFC modules.
+        results['module_data'] = updated_inv_list
         return results

plugins/action/common/nac_dc_validate.py

@@ -89,10 +89,12 @@ def run(self, tmp=None, task_vars=None):
             schema = DEFAULT_SCHEMA
 
         rules_list = []
+        data_model_loaded = None
         if rules and task_vars['role_path'] in rules:
             # Load in-memory data model using iac-validate
             # Perform the load in this if block to avoid loading the data model multiple times when custom enhanced rules are provided
             results['data'] = load_yaml_files([mdata])
+            data_model_loaded = results['data']
 
             # Introduce common directory to the rules list by default once vrf and network rules are updated
             parent_keys = ['vxlan', 'fabric']
@@ -156,11 +158,17 @@ def run(self, tmp=None, task_vars=None):
             # Else block to pickup custom enhanced rules provided by the user
             rules_list.append(f'{rules}')
 
+        syntax_validated = False
         for rules_item in rules_list:
             validator = nac_validate.validator.Validator(schema, rules_item)
-            if schema:
+            if schema and not syntax_validated and validator.schema is not None:
                 validator.validate_syntax([mdata])
+                syntax_validated = True
             if rules_item:
+                if data_model_loaded is None:
+                    data_model_loaded = load_yaml_files([mdata])
+                    results['data'] = data_model_loaded
+                validator.data = data_model_loaded
                 validator.validate_semantics([mdata])
 
             msg = ""

plugins/action/common/prepare_plugins/prep_105_fabric_overlay.py

@@ -19,14 +19,25 @@
 #
 # SPDX-License-Identifier: MIT
 
-from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.helper_functions import restructure_leaf_tor_data
+from ansible_collections.cisco.nac_dc_vxlan.plugins.plugin_utils.helper_functions import (
+    restructure_leaf_tor_data,
+    resolve_switch_by_identifier,
+)
 
 
 class PreparePlugin:
     def __init__(self, **kwargs):
         self.kwargs = kwargs
         self.keys = []
 
+    def _resolve_mgmt_ip(self, identifier, topology_switches):
+        found = resolve_switch_by_identifier(identifier, topology_switches)
+        mgmt = found.get('management') or {}
+        return (
+            mgmt.get('management_ipv4_address')
+            or mgmt.get('management_ipv6_address')
+        )
+
     def prepare(self):
         data_model = self.kwargs['results']['model_extended']
 
@@ -48,14 +59,8 @@ def prepare(self):
                 vrf_grp_name_list.append(grp['name'])
                 for switch in grp['switches']:
                     data_model['vxlan']['overlay']['vrf_attach_groups_dict'][grp['name']].append(switch)
-                # If the switch is in the switch list and a hostname is used, replace the hostname with the management IP
                 for switch in data_model['vxlan']['overlay']['vrf_attach_groups_dict'][grp['name']]:
-                    if any(sw['name'] == switch['hostname'] for sw in switches):
-                        found_switch = next((item for item in switches if item["name"] == switch['hostname']))
-                        if found_switch.get('management').get('management_ipv4_address'):
-                            switch['mgmt_ip_address'] = found_switch['management']['management_ipv4_address']
-                        elif found_switch.get('management').get('management_ipv6_address'):
-                            switch['mgmt_ip_address'] = found_switch['management']['management_ipv6_address']
+                    switch['mgmt_ip_address'] = self._resolve_mgmt_ip(switch['hostname'], switches)
 
             # Remove vrf_attach_group from vrf if the group_name is not defined
             for vrf in data_model['vxlan']['overlay']['vrfs']:
@@ -78,31 +83,31 @@ def prepare(self):
 
                 for switch in grp['switches']:
                     data_model['vxlan']['overlay']['network_attach_groups_dict'][grp['name']].append(switch)
-                # If the switch is in the switch list and a hostname is used, replace the hostname with the management IP
                 for switch in data_model['vxlan']['overlay']['network_attach_groups_dict'][grp['name']]:
-                    if any(sw['name'] == switch['hostname'] for sw in switches):
-                        found_switch = next((item for item in switches if item["name"] == switch['hostname']))
-                        if found_switch.get('management').get('management_ipv4_address'):
-                            switch['mgmt_ip_address'] = found_switch['management']['management_ipv4_address']
-                        elif found_switch.get('management').get('management_ipv6_address'):
-                            switch['mgmt_ip_address'] = found_switch['management']['management_ipv6_address']
-
-                    # Process nested TOR entries and resolve their management IPs
+                    switch['mgmt_ip_address'] = self._resolve_mgmt_ip(switch['hostname'], switches)
+
                     if 'tors' in switch and switch['tors']:
                         for tor in switch['tors']:
-                            tor_hostname = tor.get('hostname')
-                            if tor_hostname and any(sw['name'] == tor_hostname for sw in switches):
-                                found_tor = next((item for item in switches if item["name"] == tor_hostname))
-                                if found_tor.get('management').get('management_ipv4_address'):
-                                    tor['mgmt_ip_address'] = found_tor['management']['management_ipv4_address']
-                                elif found_tor.get('management').get('management_ipv6_address'):
-                                    tor['mgmt_ip_address'] = found_tor['management']['management_ipv6_address']
+                            tor_id = tor.get('hostname')
+                            if not tor_id:
+                                continue
+                            tor['mgmt_ip_address'] = self._resolve_mgmt_ip(tor_id, switches)
 
             # Remove network_attach_group from net if the group_name is not defined
             for net in data_model['vxlan']['overlay']['networks']:
                 if 'network_attach_group' in net:
                     if net.get('network_attach_group') not in net_grp_name_list:
                         del net['network_attach_group']
 
+            for net in data_model['vxlan']['overlay']['networks']:
+                overrides = net.get('switch_attach_overrides')
+                if not overrides:
+                    continue
+                for override in overrides:
+                    override_id = override.get('hostname')
+                    if not override_id:
+                        continue
+                    override['mgmt_ip_address'] = self._resolve_mgmt_ip(override_id, switches)
+
         self.kwargs['results']['model_extended'] = data_model
         return self.kwargs['results']

plugins/action/common/read_run_map.py

@@ -40,9 +40,11 @@ def run(self, tmp=None, task_vars=None):
         results['diff_run'] = True
         results['validate_only_run'] = False
 
+        fabric_name = self._task.args.get('fabric_name')
         data_model = self._task.args.get('data_model')
         play_tags = self._task.args.get('play_tags')
-        fabric_name = data_model['vxlan']['fabric']['name']
+        if fabric_name is None:
+            fabric_name = data_model['vxlan']['fabric']['name']
 
         if 'dtc' in task_vars['role_path']:
             common_role_path = os.path.dirname(task_vars['role_path'])

plugins/action/common/run_map.py

@@ -41,10 +41,12 @@ def run(self, tmp=None, task_vars=None):
         results = super(ActionModule, self).run(tmp, task_vars)
         results['failed'] = False
 
+        fabric_name = self._task.args.get('fabric_name')
         data_model = self._task.args.get('data_model')
         stage = self._task.args['stage']
 
-        fabric_name = data_model['vxlan']['fabric']['name']
+        if fabric_name is None:
+            fabric_name = data_model['vxlan']['fabric']['name']
 
         if 'dtc' in task_vars['role_path']:
             common_role_path = os.path.dirname(task_vars['role_path'])