Add dhcp servers list #621
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 4 commits
September 26, 2025 11:50
Merge develop to add_dhcp_servers_list
Merge latest develop with add_dhcp_servers_list
Collaborator
Author
IMPORTANTThis PR relies on the base module PR#516: The PR expands the capabilities of the base module to add a max of 16 DHCP servers to the VXLAN networks. If PR-516 is not approved, the proposed merges in this branch wont work. |
mikewiebe
approved these changes
Oct 22, 2025
mtarking
requested changes
Nov 10, 2025
Comment on lines
42
to
52
| dhcp_srvr1_vrf: {{ net['dhcp_servers'][0]['vrf'] }} | ||
| dhcp_srvr2_ip: {{ net['dhcp_servers'][1]['ip_address'] }} | ||
| dhcp_srvr2_vrf: {{ net['dhcp_servers'][1]['vrf'] }} | ||
| {% elif net.dhcp_servers | length == 3 %} | ||
| {% elif net.dhcp_servers | length >= 3 %} | ||
| dhcp_srvr1_ip: {{ net['dhcp_servers'][0]['ip_address'] }} | ||
| dhcp_srvr1_vrf: {{ net['dhcp_servers'][0]['vrf'] }} | ||
| dhcp_srvr2_ip: {{ net['dhcp_servers'][1]['ip_address'] }} | ||
| dhcp_srvr2_vrf: {{ net['dhcp_servers'][1]['vrf'] }} | ||
| dhcp_srvr3_ip: {{ net['dhcp_servers'][2]['ip_address'] }} | ||
| dhcp_srvr3_vrf: {{ net['dhcp_servers'][2]['vrf'] }} | ||
| {% endif %} |
Collaborator
There was a problem hiding this comment.
Do we need to remove all these in favor of just the dhcp server list?
cc @mikewiebe
Comment on lines
2
to
14
| {# Build dhcpServers as a JSON dict (or empty string) #} | ||
| {%- set _dhcp_pairs = [] -%} | ||
| {%- if dm is defined and dm['dhcp_servers'] is defined and dm['dhcp_servers'] -%} | ||
| {%- for srvr in dm['dhcp_servers'] -%} | ||
| {%- if srvr['ip_address'] is defined and srvr['ip_address'] -%} | ||
| {%- set _ = _dhcp_pairs.append({ | ||
| "srvrAddr": srvr['ip_address'], "srvrVrf": srvr['vrf'] | ||
| }) -%} | ||
| {%- endif -%} | ||
| {%- endfor -%} | ||
| {%- endif -%} | ||
| {%- set _dhcp_obj = {'dhcpServers': _dhcp_pairs} -%} | ||
| {%- set dhcpServers = _dhcp_obj if (_dhcp_pairs|length > 0) else '' -%} |
Collaborator
There was a problem hiding this comment.
Same applies to 3.2 and 4.1 template but do we want to merge the MSD VRF and Network updates #625 before merging this as it removes all three of these?
cc @mikewiebe
added 2 commits
November 11, 2025 12:16
Merge branch 'develop' inot add_dhcp_servers_list
mtarking
requested changes
Nov 13, 2025
| {# Auto-generated NDFC VXLAN EVPN MSD Child Fabric Network config data structure for fabric {{ fabric_name }} #} | ||
| {# Build dhcpServers as a JSON dict (or empty string) #} | ||
| {%- set _dhcp_pairs = [] -%} | ||
| {%- if dm is defined and dm['dhcp_servers'] is defined and dm['dhcp_servers'] -%} |
Collaborator
There was a problem hiding this comment.
dm should always be defined, no?
| {# Auto-generated NDFC VXLAN EVPN MSD Child Fabric Network config data structure for fabric {{ fabric_name }} #} | ||
| {# Build dhcpServers as a JSON dict (or empty string) #} | ||
| {%- set _dhcp_pairs = [] -%} | ||
| {%- if dm is defined and dm['dhcp_servers'] is defined and dm['dhcp_servers'] -%} |
Collaborator
There was a problem hiding this comment.
dm['dhcp_servers'] is defined and dm['dhcp_servers'] is a different check than in roles/dtc/common/templates/ndfc_networks/dc_vxlan_fabric/dc_vxlan_fabric_networks.j2. Can we normalize?
added 2 commits
November 13, 2025 20:40
Merge branch 'develp' into 'add_dhcp_servers_list'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issue(s)
Fixes #492
Related Collection Role
Related Data Model Element
Proposed Changes
Test Notes
Test was done directly to NDFC controllers. The results were successful for both VXLAN_EVPN and MSD fabrics.
Cisco NDFC Version
Checklist