Skip to content

Add dhcp servers list #621

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

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Add dhcp servers list #621

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ea7187f
Expand dhcp_servers to 16
Sep 26, 2025
6452c1f
Merge branch 'develop' into add_dhcp_servers_list
Sep 26, 2025
c1961f2
Fix issue 492 - Add dhcp_servers list
Oct 1, 2025
49ceaaa
Merge branch 'develop' into add_dhcp_servers_list
Oct 1, 2025
e574d0f
Merge branch 'develop' into add_dhcp_servers_list
Nov 5, 2025
496e73b
Remove dependency on dhcp_srvrX_ip and dhcp_srvrX_vrf
Nov 11, 2025
ed1155e
Merge branch 'develop' into add_dhcp_servers_list
Nov 11, 2025
db5528f
Normalized jinja template logic for dhcp_servers definition
Nov 14, 2025
7469920
Merge branch 'develop' into add_dhcp_servers_list
Nov 14, 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
1 change: 1 addition & 0 deletions plugins/action/dtc/manage_child_fabric_networks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
# Currently supported Network template config keys and their mapping to data model keys
NETWORK_TEMPLATE_CONFIG_MAP = {
'loopbackId': {'dm_key': 'dhcp_loopback_id', 'default': ''},
'dhcpServers': {'dm_key': 'dhcp_servers', 'default': ''},
'ENABLE_NETFLOW': {'dm_key': 'netflow_enable', 'default': False},
'VLAN_NETFLOW_MONITOR': {'dm_key': 'vlan_netflow_monitor', 'default': ''},
'trmEnabled': {'dm_key': 'trm_enable', 'default': False},
Expand Down
11 changes: 10 additions & 1 deletion roles/dtc/common/templates/ndfc_networks/dc_vxlan_fabric/dc_vxlan_fabric_networks.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,23 @@
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 %}
Copy link
Collaborator

@mtarking mtarking Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to remove all these in favor of just the dhcp server list?

cc @mikewiebe

{% if net.dhcp_servers | length > 0 %}
dhcp_servers:
{% for dhcp_server in net.dhcp_servers[:16] %}
- srvr_ip: {{ dhcp_server['ip_address'] }}
{% if dhcp_server['vrf'] is defined %}
srvr_vrf: {{ dhcp_server['vrf'] }}
{% endif %}
{% endfor %}
{% endif %}
{% endif %}
gw_ipv6_subnet: {{ net['gw_ipv6_address'] | default(omit) }}
int_desc: {{ net['int_desc'] | default(defaults.vxlan.overlay.networks.net_description) }}
Expand Down
14 changes: 14 additions & 0 deletions ...tc/common/templates/ndfc_networks/msd_fabric/child_fabric/3.1/msd_child_fabric_network.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
{# 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'] -%}
Copy link
Collaborator

@mtarking mtarking Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dm should always be defined, no?

Copy link
Collaborator

@mtarking mtarking Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

{%- 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 '' -%}
Copy link
Collaborator

@mtarking mtarking Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

{
"fabric": "{{ fabric_name }}",
"networkName": "{{ network_name }}",
Expand Down Expand Up @@ -30,6 +43,7 @@
"vrfDhcp2": dm['dhcp_servers'][1]['vrf'] if dm['dhcp_servers'][1]['ip_address'] is defined else "",
"dhcpServerAddr3": dm['dhcp_servers'][2]['ip_address'] if dm['dhcp_servers'][2]['ip_address'] is defined else ndfc.dhcpServerAddr3,
"vrfDhcp3": dm['dhcp_servers'][2]['vrf'] if dm['dhcp_servers'][2]['vrf'] is defined else "",
"dhcpServers": dhcpServers,
"ENABLE_NETFLOW": dm.netflow_enable if dm.netflow_enable is defined else ndfc.ENABLE_NETFLOW,
"SVI_NETFLOW_MONITOR": ndfc.SVI_NETFLOW_MONITOR,
"VLAN_NETFLOW_MONITOR": dm.vlan_netflow_monitor if (dm.netflow_enable is defined and dm.netflow_enable) else ndfc.VLAN_NETFLOW_MONITOR,
Expand Down
14 changes: 14 additions & 0 deletions ...tc/common/templates/ndfc_networks/msd_fabric/child_fabric/3.2/msd_child_fabric_network.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
{# 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'] -%}
{%- 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 '' -%}
{
"fabric": "{{ fabric_name }}",
"networkName": "{{ network_name }}",
Expand Down Expand Up @@ -30,6 +43,7 @@
"vrfDhcp2": dm['dhcp_servers'][1]['vrf'] if dm['dhcp_servers'][1]['ip_address'] is defined else "",
"dhcpServerAddr3": dm['dhcp_servers'][2]['ip_address'] if dm['dhcp_servers'][2]['ip_address'] is defined else ndfc.dhcpServerAddr3,
"vrfDhcp3": dm['dhcp_servers'][2]['vrf'] if dm['dhcp_servers'][2]['vrf'] is defined else "",
"dhcpServers": dhcpServers,
"ENABLE_NETFLOW": dm.netflow_enable if dm.netflow_enable is defined else ndfc.ENABLE_NETFLOW,
"SVI_NETFLOW_MONITOR": ndfc.SVI_NETFLOW_MONITOR,
"VLAN_NETFLOW_MONITOR": dm.vlan_netflow_monitor if (dm.netflow_enable is defined and dm.netflow_enable) else ndfc.VLAN_NETFLOW_MONITOR,
Expand Down
14 changes: 14 additions & 0 deletions ...tc/common/templates/ndfc_networks/msd_fabric/child_fabric/4.1/msd_child_fabric_network.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
{# 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'] -%}
{%- 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 '' -%}
{
"fabric": "{{ fabric_name }}",
"networkName": "{{ network_name }}",
Expand Down Expand Up @@ -30,6 +43,7 @@
"vrfDhcp2": dm['dhcp_servers'][1]['vrf'] if dm['dhcp_servers'][1]['ip_address'] is defined else "",
"dhcpServerAddr3": dm['dhcp_servers'][2]['ip_address'] if dm['dhcp_servers'][2]['ip_address'] is defined else ndfc.dhcpServerAddr3,
"vrfDhcp3": dm['dhcp_servers'][2]['vrf'] if dm['dhcp_servers'][2]['vrf'] is defined else "",
"dhcpServers": dhcpServers,
"ENABLE_NETFLOW": dm.netflow_enable if dm.netflow_enable is defined else ndfc.ENABLE_NETFLOW,
"SVI_NETFLOW_MONITOR": ndfc.SVI_NETFLOW_MONITOR,
"VLAN_NETFLOW_MONITOR": dm.vlan_netflow_monitor if (dm.netflow_enable is defined and dm.netflow_enable) else ndfc.VLAN_NETFLOW_MONITOR,
Expand Down