Skip to content

Refactor MSD Networks to Use Only Base Module #626

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

Closed
wants to merge 4 commits into from
Closed

Refactor MSD Networks to Use Only Base Module #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ca69f2
updates for using network module for msd-level network mgmt
mtarking Oct 9, 2025
7904c78
Merge branch 'develop' into msd_network_refactor
mtarking Oct 17, 2025
22abf54
Merge branch 'develop' into msd_network_refactor
mikewiebe Oct 17, 2025
d85b8f5
Merge branch 'develop' into msd_network_refactor
mtarking Oct 28, 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
Empty file removed roles/dtc/common/templates/ndfc_networks/msd_fabric/child_fabric/3.1/.gitkeep
View file
Open in desktop
Empty file.
47 changes: 0 additions & 47 deletions ...tc/common/templates/ndfc_networks/msd_fabric/child_fabric/3.1/msd_child_fabric_network.j2
View file
Open in desktop

This file was deleted.

Empty file removed roles/dtc/common/templates/ndfc_networks/msd_fabric/child_fabric/3.2/.gitkeep
View file
Open in desktop
Empty file.
49 changes: 0 additions & 49 deletions ...tc/common/templates/ndfc_networks/msd_fabric/child_fabric/3.2/msd_child_fabric_network.j2
View file
Open in desktop

This file was deleted.

Empty file removed roles/dtc/common/templates/ndfc_networks/msd_fabric/child_fabric/4.1/.gitkeep
View file
Open in desktop
Empty file.
48 changes: 0 additions & 48 deletions ...tc/common/templates/ndfc_networks/msd_fabric/child_fabric/4.1/msd_child_fabric_network.j2
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions roles/dtc/common/templates/ndfc_networks/msd_fabric/child_fabric/msd_child_fabric_network.j2
View file
Open in desktop

This file was deleted.

38 changes: 38 additions & 0 deletions roles/dtc/common/templates/ndfc_networks/msd_fabric/msd_fabric_networks.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,44 @@
mtu_l3intf: {{ net['mtu_l3intf'] | default(defaults.vxlan.overlay.networks.mtu_l3intf) }}
route_target_both: {{ net['route_target_both'] | default(defaults.vxlan.overlay.networks.route_target_both) }}
routing_tag: {{ net['route_tag'] | default(defaults.vxlan.overlay.networks.route_tag) }}
{% if net.child_fabrics is defined and net.child_fabrics %}
{% set child_fabrics = net.child_fabrics %}
child_fabric_config:
{% else %}
{% set child_fabrics = [] %}
{% endif %}
{% for child_fabric in child_fabrics %}
- fabric_name: {{ child_fabric['name'] | default(omit) }}
{% if (MD_Multisite.child_fabrics_data[child_fabric['name']]['attributes']['REPLICATION_MODE'] | lower) == 'multicast' %}
multicast_group_address: {{ child_fabric['multicast_group_address'] | default(omit) }}
{% endif %}
dhcp_loopback_id: {{ child_fabric['dhcp_loopback_id'] | default(omit) }}
{% if child_fabric.dhcp_servers is defined %}
{% if child_fabric.dhcp_servers | length == 1 %}
dhcp_srvr1_ip: {{ child_fabric['dhcp_servers'][0]['ip_address'] }}
dhcp_srvr1_vrf: {{ child_fabric['dhcp_servers'][0]['vrf'] }}
{% elif child_fabric.dhcp_servers | length == 2 %}
dhcp_srvr1_ip: {{ child_fabric['dhcp_servers'][0]['ip_address'] }}
dhcp_srvr1_vrf: {{ child_fabric['dhcp_servers'][0]['vrf'] }}
dhcp_srvr2_ip: {{ child_fabric['dhcp_servers'][1]['ip_address'] }}
dhcp_srvr2_vrf: {{ child_fabric['dhcp_servers'][1]['vrf'] }}
{% elif child_fabric.dhcp_servers | length == 3 %}
dhcp_srvr1_ip: {{ child_fabric['dhcp_servers'][0]['ip_address'] }}
dhcp_srvr1_vrf: {{ child_fabric['dhcp_servers'][0]['vrf'] }}
dhcp_srvr2_ip: {{ child_fabric['dhcp_servers'][1]['ip_address'] }}
dhcp_srvr2_vrf: {{ child_fabric['dhcp_servers'][1]['vrf'] }}
dhcp_srvr3_ip: {{ child_fabric['dhcp_servers'][2]['ip_address'] }}
dhcp_srvr3_vrf: {{ child_fabric['dhcp_servers'][2]['vrf'] }}
{% endif %}
{% endif %}
trm_enable: {{ child_fabric['trm_enable'] | default(omit) }}
{# trmv6_enable: {{ child_fabric['trmv6_enable'] | default(omit) }} #}
l3gw_on_border: {{ child_fabric['l3gw_on_border'] | default(omit) }}
netflow_enable: {{ child_fabric['netflow_enable'] | default(omit) }}
{% if child_fabric['netflow_enable'] is defined and child_fabric['netflow_enable'] | bool %}
vlan_nf_monitor: {{ child_fabric['vlan_netflow_monitor'] | default(omit) }}
{% endif %}
{% endfor %}
{# ------------------------------------------------------ #}
{# Attach Group Section #}
{# ------------------------------------------------------ #}
Expand Down
58 changes: 58 additions & 0 deletions roles/dtc/common/templates/ndfc_networks/msd_fabric/msd_fabric_networks.j2.orig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{# Auto-generated NDFC MSD network_attach_groups_dict config data structure for fabric {{ vxlan.fabric.name }} #}
{% if MD_Extended.vxlan.multisite.overlay.networks is defined and MD_Extended.vxlan.multisite.overlay.networks %}
{% set networks = MD_Extended.vxlan.multisite.overlay.networks %}
{% else %}
{% set networks = [] %}
{% endif %}
{% for net in networks %}
- net_name: {{ net['name'] }}
{# ------------------------------------------------------ #}
{# Properties Section #}
{# ------------------------------------------------------ #}
is_l2only: {{ net['is_l2_only'] | default(defaults.vxlan.overlay.networks.is_l2_only) }}
vrf_name: {{ net['vrf_name'] | default(omit) }}
net_id: {{ net['net_id'] | default(omit) }}
vlan_id: {{ net['vlan_id'] | default(omit) }}
vlan_name: {{ net['vlan_name'] | default(omit) }}
gw_ip_subnet: {{ net['gw_ip_address'] | default(omit) }}
{% if net.secondary_ip_addresses is defined %}
{% if net.secondary_ip_addresses | length == 1 %}
secondary_ip_gw1: {{ net['secondary_ip_addresses'][0]['ip_address'] }}
{% elif net.secondary_ip_addresses | length == 2 %}
secondary_ip_gw1: {{ net['secondary_ip_addresses'][0]['ip_address'] }}
secondary_ip_gw2: {{ net['secondary_ip_addresses'][1]['ip_address'] }}
{% elif net.secondary_ip_addresses | length == 3 %}
secondary_ip_gw1: {{ net['secondary_ip_addresses'][0]['ip_address'] }}
secondary_ip_gw2: {{ net['secondary_ip_addresses'][1]['ip_address'] }}
secondary_ip_gw3: {{ net['secondary_ip_addresses'][2]['ip_address'] }}
{% elif net.secondary_ip_addresses | length == 4 %}
secondary_ip_gw1: {{ net['secondary_ip_addresses'][0]['ip_address'] }}
secondary_ip_gw2: {{ net['secondary_ip_addresses'][1]['ip_address'] }}
secondary_ip_gw3: {{ net['secondary_ip_addresses'][2]['ip_address'] }}
secondary_ip_gw4: {{ net['secondary_ip_addresses'][3]['ip_address'] }}
{% endif %}
{% endif %}
arp_suppress: {{ net['arp_suppress'] | default(defaults.vxlan.overlay.networks.arp_supress) }}
gw_ipv6_subnet: {{ net['gw_ipv6_address'] | default(omit) }}
int_desc: {{ net['int_desc'] | default(defaults.vxlan.overlay.networks.net_description) }}
mtu_l3intf: {{ net['mtu_l3intf'] | default(defaults.vxlan.overlay.networks.mtu_l3intf) }}
route_target_both: {{ net['route_target_both'] | default(defaults.vxlan.overlay.networks.route_target_both) }}
routing_tag: {{ net['route_tag'] | default(defaults.vxlan.overlay.networks.route_tag) }}
{# ------------------------------------------------------ #}
{# Attach Group Section #}
{# ------------------------------------------------------ #}
{# Don't need to attach vrfs if there are no msd_switches #}
{% if net['network_attach_group'] is defined %}
attach:
{% if MD_Multisite.overlay_attach_groups.network_attach_groups_dict is defined and MD_Multisite.overlay_attach_groups.network_attach_groups_dict %}
{% set network_attach_groups_dict = MD_Multisite.overlay_attach_groups.network_attach_groups_dict %}
{% endif %}
{% for attach in network_attach_groups_dict[net['network_attach_group']] %}
- ip_address: {{ attach['mgmt_ip_address'] }}
{% if attach['ports'] is defined %}
ports: {{ attach['ports'] }}
{% endif %}
{% endfor %}
deploy: false
{% endif %}
{% endfor %}
10 changes: 5 additions & 5 deletions roles/dtc/create/tasks/msd/vrfs_networks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@
- MD_Extended.vxlan.multisite.overlay.networks
- change_flags_multisite.changes_detected_networks

- name: Manage Child Fabric Networks in Nexus Dashboard
cisco.nac_dc_vxlan.dtc.manage_child_fabric_networks:
nd_version: "{{ nd_version }}"
msite_data: "{{ MD_Multisite }}"
register: child_fabric_network_results
# - name: Manage Child Fabric Networks in Nexus Dashboard
# cisco.nac_dc_vxlan.dtc.manage_child_fabric_networks:
# nd_version: "{{ nd_version }}"
# msite_data: "{{ MD_Multisite }}"
# register: child_fabric_network_results

- name: Update Child Fabrics VRFs and Networks Changed State
ansible.builtin.set_fact:
Expand Down