Federated fabric initial overlay management

plugins/action/common/prepare_plugins/prep_001_list_defaults.py

@@ -102,26 +102,28 @@ def prepare(self):
 
         # Check vxlan.topology.switches[index].freeforms list elements
         list_index = 0
-        for switch in self.model_data['vxlan']['topology']['switches']:
-            dm_check = data_model_key_check(switch, ['freeforms'])
-            if 'freeforms' in dm_check['keys_not_found'] or \
-               'freeforms' in dm_check['keys_no_data']:
-                self.model_data['vxlan']['topology']['switches'][list_index]['freeforms'] = []
+        if self.model_data['vxlan'].get('topology', None) is not None:
+            for switch in self.model_data['vxlan']['topology']['switches']:
+                dm_check = data_model_key_check(switch, ['freeforms'])
+                if 'freeforms' in dm_check['keys_not_found'] or \
+                'freeforms' in dm_check['keys_no_data']:
+                    self.model_data['vxlan']['topology']['switches'][list_index]['freeforms'] = []
 
-            list_index += 1
+                list_index += 1
 
         # --------------------------------------------------------------------
         # Fabric Topology Switches Interfaces List Defaults
         # --------------------------------------------------------------------
 
         # Check vxlan.topology.switches[index].interfaces list elements
         list_index = 0
-        for switch in self.model_data['vxlan']['topology']['switches']:
-            dm_check = data_model_key_check(switch, ['interfaces'])
-            if 'interfaces' in dm_check['keys_not_found'] or 'interfaces' in dm_check['keys_no_data']:
-                self.model_data['vxlan']['topology']['switches'][list_index]['interfaces'] = []
+        if self.model_data['vxlan'].get('topology', None) is not None:
+            for switch in self.model_data['vxlan']['topology']['switches']:
+                dm_check = data_model_key_check(switch, ['interfaces'])
+                if 'interfaces' in dm_check['keys_not_found'] or 'interfaces' in dm_check['keys_no_data']:
+                    self.model_data['vxlan']['topology']['switches'][list_index]['interfaces'] = []
 
-            list_index += 1
+                list_index += 1
 
         # --------------------------------------------------------------------
         # Fabric Overlay List Defaults

plugins/action/common/prepare_plugins/prep_103_topology_switches.py

@@ -28,28 +28,29 @@ def __init__(self, **kwargs):
     def prepare(self):
         model_data = self.kwargs['results']['model_extended']
         #  Loop over all the roles in vxlan.topology.switches.role
-        model_data['vxlan']['topology']['spine'] = {}
-        model_data['vxlan']['topology']['leaf'] = {}
-        model_data['vxlan']['topology']['border'] = {}
-        model_data['vxlan']['topology']['border_spine'] = {}
-        model_data['vxlan']['topology']['border_gateway'] = {}
-        model_data['vxlan']['topology']['border_gateway_spine'] = {}
-        model_data['vxlan']['topology']['super_spine'] = {}
-        model_data['vxlan']['topology']['border_super_spine'] = {}
-        model_data['vxlan']['topology']['border_gateway_super_spine'] = {}
-        model_data['vxlan']['topology']['tor'] = {}
-        sm_switches = model_data['vxlan']['topology']['switches']
-        for switch in sm_switches:
-            # Build list of switch IP's based on role keyed by switch name
-            name = switch.get('name')
-            role = switch.get('role')
-            model_data['vxlan']['topology'][role][name] = {}
-            v4_key = 'management_ipv4_address'
-            v6_key = 'management_ipv6_address'
-            v4ip = switch.get('management').get(v4_key)
-            v6ip = switch.get('management').get(v6_key)
-            model_data['vxlan']['topology'][role][name][v4_key] = v4ip
-            model_data['vxlan']['topology'][role][name][v6_key] = v6ip
+        if model_data['vxlan'].get('topology', None) is not None:
+            model_data['vxlan']['topology']['spine'] = {}
+            model_data['vxlan']['topology']['leaf'] = {}
+            model_data['vxlan']['topology']['border'] = {}
+            model_data['vxlan']['topology']['border_spine'] = {}
+            model_data['vxlan']['topology']['border_gateway'] = {}
+            model_data['vxlan']['topology']['border_gateway_spine'] = {}
+            model_data['vxlan']['topology']['super_spine'] = {}
+            model_data['vxlan']['topology']['border_super_spine'] = {}
+            model_data['vxlan']['topology']['border_gateway_super_spine'] = {}
+            model_data['vxlan']['topology']['tor'] = {}
+            sm_switches = model_data['vxlan']['topology']['switches']
+            for switch in sm_switches:
+                # Build list of switch IP's based on role keyed by switch name
+                name = switch.get('name')
+                role = switch.get('role')
+                model_data['vxlan']['topology'][role][name] = {}
+                v4_key = 'management_ipv4_address'
+                v6_key = 'management_ipv6_address'
+                v4ip = switch.get('management').get(v4_key)
+                v6ip = switch.get('management').get(v6_key)
+                model_data['vxlan']['topology'][role][name][v4_key] = v4ip
+                model_data['vxlan']['topology'][role][name][v6_key] = v6ip
 
         self.kwargs['results']['model_extended'] = model_data
         return self.kwargs['results']

plugins/action/common/prepare_plugins/prep_104_fabric_overlay_services.py

@@ -27,7 +27,10 @@ def __init__(self, **kwargs):
 
     def prepare(self):
         model_data = self.kwargs['results']['model_extended']
-        switches = model_data['vxlan']['topology']['switches']
+        if model_data['vxlan'].get('topology', None) is not None:
+            switches = model_data['vxlan']['topology']['switches']
+        else:
+            switches = []
 
         # Rebuild sm_data['vxlan']['overlay_services']['vrf_attach_groups'] into
         # a structure that is easier to use.

plugins/action/common/prepare_plugins/prep_105_topology_interfaces.py

@@ -34,53 +34,54 @@ def __init__(self, **kwargs):
     def prepare(self):
         model_data = self.kwargs['results']['model_extended']
 
-        model_data['vxlan']['topology']['interfaces'] = {}
-        model_data['vxlan']['topology']['interfaces']['modes'] = {}
+        if model_data['vxlan'].get('topology', None) is not None:
+            model_data['vxlan']['topology']['interfaces'] = {}
+            model_data['vxlan']['topology']['interfaces']['modes'] = {}
 
-        # loop through interface modes and initialize with interface count 0
-        for mode in self.mode_direct:
-            model_data['vxlan']['topology']['interfaces']['modes'][mode] = {}
-            model_data['vxlan']['topology']['interfaces']['modes'][mode]['count'] = 0
-        for mode in self.mode_indirect:
-            model_data['vxlan']['topology']['interfaces']['modes'][mode] = {}
-            model_data['vxlan']['topology']['interfaces']['modes'][mode]['count'] = 0
+            # loop through interface modes and initialize with interface count 0
+            for mode in self.mode_direct:
+                model_data['vxlan']['topology']['interfaces']['modes'][mode] = {}
+                model_data['vxlan']['topology']['interfaces']['modes'][mode]['count'] = 0
+            for mode in self.mode_indirect:
+                model_data['vxlan']['topology']['interfaces']['modes'][mode] = {}
+                model_data['vxlan']['topology']['interfaces']['modes'][mode]['count'] = 0
 
-        for switch in model_data.get('vxlan').get('topology').get('switches'):
-            # loop through interfaces
-            for interface in switch.get('interfaces'):
-                # loop through interface modes direct and count
-                for interface_mode in self.mode_direct:
-                    # if interface mode is a direct match, then increment the count for that mode
-                    if interface_mode == interface.get('mode'):
-                        model_data['vxlan']['topology']['interfaces']['modes'][interface_mode]['count'] += 1
-                        model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
-                # loop through interface modes indirect along with additional validation and count
-                if interface.get('mode') == 'access':
-                    # if interface name starts with 'po' and has vpc_id, then it is a vpc access interface
-                    if interface.get('name').lower().startswith('po') and interface.get('vpc_id'):
-                        model_data['vxlan']['topology']['interfaces']['modes']['access_vpc']['count'] += 1
-                        model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
-                    # if interface name starts with 'po', then it is a port-channel access interface
-                    elif interface.get('name').lower().startswith('po'):
-                        model_data['vxlan']['topology']['interfaces']['modes']['access_po']['count'] += 1
-                        model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
-                    # else it is a regular access interface
-                    else:
-                        model_data['vxlan']['topology']['interfaces']['modes']['access']['count'] += 1
-                        model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
-                if interface.get('mode') == 'trunk':
-                    # if interface name starts with 'po' and has vpc_id, then it is a vpc trunk interface
-                    if interface.get('name').lower().startswith('po') and interface.get('vpc_id'):
-                        model_data['vxlan']['topology']['interfaces']['modes']['trunk_vpc']['count'] += 1
-                        model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
-                    # if interface name starts with 'po', then it is a port-channel trunk interface
-                    elif interface.get('name').lower().startswith('po'):
-                        model_data['vxlan']['topology']['interfaces']['modes']['trunk_po']['count'] += 1
-                        model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
-                    # else it is a regular trunk interface
-                    else:
-                        model_data['vxlan']['topology']['interfaces']['modes']['trunk']['count'] += 1
-                        model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
+            for switch in model_data.get('vxlan').get('topology').get('switches'):
+                # loop through interfaces
+                for interface in switch.get('interfaces'):
+                    # loop through interface modes direct and count
+                    for interface_mode in self.mode_direct:
+                        # if interface mode is a direct match, then increment the count for that mode
+                        if interface_mode == interface.get('mode'):
+                            model_data['vxlan']['topology']['interfaces']['modes'][interface_mode]['count'] += 1
+                            model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
+                    # loop through interface modes indirect along with additional validation and count
+                    if interface.get('mode') == 'access':
+                        # if interface name starts with 'po' and has vpc_id, then it is a vpc access interface
+                        if interface.get('name').lower().startswith('po') and interface.get('vpc_id'):
+                            model_data['vxlan']['topology']['interfaces']['modes']['access_vpc']['count'] += 1
+                            model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
+                        # if interface name starts with 'po', then it is a port-channel access interface
+                        elif interface.get('name').lower().startswith('po'):
+                            model_data['vxlan']['topology']['interfaces']['modes']['access_po']['count'] += 1
+                            model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
+                        # else it is a regular access interface
+                        else:
+                            model_data['vxlan']['topology']['interfaces']['modes']['access']['count'] += 1
+                            model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
+                    if interface.get('mode') == 'trunk':
+                        # if interface name starts with 'po' and has vpc_id, then it is a vpc trunk interface
+                        if interface.get('name').lower().startswith('po') and interface.get('vpc_id'):
+                            model_data['vxlan']['topology']['interfaces']['modes']['trunk_vpc']['count'] += 1
+                            model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
+                        # if interface name starts with 'po', then it is a port-channel trunk interface
+                        elif interface.get('name').lower().startswith('po'):
+                            model_data['vxlan']['topology']['interfaces']['modes']['trunk_po']['count'] += 1
+                            model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
+                        # else it is a regular trunk interface
+                        else:
+                            model_data['vxlan']['topology']['interfaces']['modes']['trunk']['count'] += 1
+                            model_data['vxlan']['topology']['interfaces']['modes']['all']['count'] += 1
 
         self.kwargs['results']['model_extended'] = model_data
         return self.kwargs['results']

plugins/action/common/prepare_plugins/prep_107_policy.py

@@ -30,14 +30,15 @@ def prepare(self):
 
         # Ensure that vrf_lite's switches are mapping to their respective
         # management IP address from topology switches
-        topology_switches = model_data['vxlan']['topology']['switches']
-        for switch in model_data['vxlan']['policy']['switches']:
-            if any(sw['name'] == switch['name'] for sw in topology_switches):
-                found_switch = next((item for item in topology_switches if item["name"] == switch['name']))
-                if found_switch.get('management').get('management_ipv4_address'):
-                    switch['name'] = found_switch['management']['management_ipv4_address']
-                elif found_switch.get('management').get('management_ipv6_address'):
-                    switch['name'] = found_switch['management']['management_ipv6_address']
+        if model_data['vxlan'].get('topology', None) is not None:
+            topology_switches = model_data['vxlan']['topology']['switches']
+            for switch in model_data['vxlan']['policy']['switches']:
+                if any(sw['name'] == switch['name'] for sw in topology_switches):
+                    found_switch = next((item for item in topology_switches if item["name"] == switch['name']))
+                    if found_switch.get('management').get('management_ipv4_address'):
+                        switch['name'] = found_switch['management']['management_ipv4_address']
+                    elif found_switch.get('management').get('management_ipv6_address'):
+                        switch['name'] = found_switch['management']['management_ipv6_address']
 
         self.kwargs['results']['model_extended'] = model_data
         return self.kwargs['results']

roles/common_global/vars/main.yml

@@ -20,7 +20,6 @@
 # SPDX-License-Identifier: MIT
 
 ---
-
 nac_tags:
   # All Create and Remove Tags
   all:
@@ -30,6 +29,7 @@ nac_tags:
     - cr_manage_interfaces
     - cr_manage_vrfs_networks
     - cr_manage_policy
+    - cr_manage_links
     # -------------------------
     - rr_manage_interfaces
     - rr_manage_networks
@@ -50,6 +50,7 @@ nac_tags:
     - cr_manage_interfaces
     - cr_manage_vrfs_networks
     - cr_manage_policy
+    - cr_manage_links
   create_fabric:
     - cr_manage_fabric
   create_switches:
@@ -62,6 +63,8 @@ nac_tags:
     - cr_manage_vrfs_networks
   create_policy:
     - cr_manage_policy
+  create_links:
+    - cr_manage_links
   # All Remove Tags
   remove:
     - rr_manage_interfaces
@@ -82,5 +85,3 @@ nac_tags:
     - rr_manage_links
   remove_switches:
     - rr_manage_switches
-
-

roles/dtc/common/tasks/ndfc_fabric_links.yml

@@ -0,0 +1,82 @@
+# Copyright (c) 2024 Cisco Systems, Inc. and 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 in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# SPDX-License-Identifier: MIT
+
+---
+- name: Initialize changes_detected Var
+  ansible.builtin.set_fact:
+    changes_detected_fabric_links: false
+  delegate_to: localhost
+
+- name: Set file_name Var
+  ansible.builtin.set_fact:
+    file_name: "{{ MD.vxlan.global.name }}_ndfc_fabric_links.yml"
+  delegate_to: localhost
+
+- name: Stat Previous File If It Exists
+  ansible.builtin.stat:
+    path: "{{ role_path }}/files/{{ file_name }}"
+  register: data_file_previous
+  delegate_to: localhost
+
+- name: Backup Previous Data File If It Exists
+  ansible.builtin.copy:
+    src: "{{ role_path }}/files/{{ file_name }}"
+    dest: "{{ role_path }}/files/{{ file_name }}.old"
+  when: data_file_previous.stat.exists
+
+- name: Delete Previous Data File If It Exists
+  ansible.builtin.file:
+    state: absent
+    path: "{{ role_path }}/files/{{ file_name }}"
+  delegate_to: localhost
+  when: data_file_previous.stat.exists
+
+- name: Build Fabric Links
+  ansible.builtin.template:
+    src: ndfc_fabric_links.j2
+    dest: "{{ role_path }}/files/{{ file_name }}"
+  delegate_to: localhost
+
+- name: Set fabric_links Var default
+  ansible.builtin.set_fact:
+    fabric_links: []
+  delegate_to: localhost
+
+- name: Set fabric_links Var
+  ansible.builtin.set_fact:
+    fabric_links: "{{ lookup('file', file_name) | from_yaml }}"
+  when: MD_Extended.vxlan.topology.fabric_links | length > 0
+  delegate_to: localhost
+
+- name: Diff Previous and Current Data Files
+  cisco.nac_dc_vxlan.dtc.diff_model_changes:
+    file_name_previous: "{{ role_path }}/files/{{ file_name }}.old"
+    file_name_current: "{{ role_path }}/files/{{ file_name }}"
+  register: file_diff_result
+  delegate_to: localhost
+
+- name: Set File Change Flag Based on File Diff Result
+  ansible.builtin.set_fact:
+    changes_detected_fabric_links: true
+  delegate_to: localhost
+  when:
+    - file_diff_result.file_data_changed
+    - check_roles['save_previous']