Feat(eos_cli_config_gen): Add support for configuring for a Port-Chan…

…nel interface
aristanetworks · Jan 17, 2025 · 79f4cca · 79f4cca
1 parent 609668a
commit 79f4cca
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 0 deletions.
diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md b/...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
@@ -5494,6 +5494,7 @@ interface Port-Channel112
    switchport
    ip address dhcp
    dhcp client accept default-route
+   dhcp server ipv4
    port-channel lacp fallback individual
    port-channel lacp fallback timeout 5
 !

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
@@ -2059,6 +2059,7 @@ interface Port-Channel112
    switchport
    ip address dhcp
    dhcp client accept default-route
+   dhcp server ipv4
    port-channel lacp fallback individual
    port-channel lacp fallback timeout 5
 !

diff --git a/...sta/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/port-channel-interfaces.yml b/...sta/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/port-channel-interfaces.yml
@@ -721,6 +721,7 @@ port_channel_interfaces:
     lacp_fallback_mode: individual
     ip_address: dhcp
     dhcp_client_accept_default_route: true
+    dhcp_server_ipv4: true
 
   - name: Port-Channel113
     description: interface_with_mpls_enabled
@@ -729,6 +730,7 @@ port_channel_interfaces:
     ip_address: 172.31.128.9/31
     # This won't be rendered because IP address is not DHCP
     dhcp_client_accept_default_route: true
+    dhcp_server_ipv4: false
     mpls:
       ip: true
       ldp:

diff --git a/...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md b/...ions/arista/avd/roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2
@@ -356,6 +356,9 @@ interface {{ port_channel_interface.name }}
    bfd per-link
 {%         endif %}
 {%     endif %}
+{%     if port_channel_interface.dhcp_server_ipv4 is arista.avd.defined(true) %}
+   dhcp server ipv4
+{%     endif %}
 {%     if port_channel_interface.ip_igmp_host_proxy.enabled is arista.avd.defined(true) %}
 {%         set host_proxy_cli =  "ip igmp host-proxy" %}
    {{ host_proxy_cli }}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py b/python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
diff --git a/...-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/port_channel_interfaces.schema.yml b/...-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/port_channel_interfaces.schema.yml
@@ -814,6 +814,9 @@ keys:
         dhcp_client_accept_default_route:
           type: bool
           description: Install default-route obtained via DHCP.
+        dhcp_server_ipv4:
+          type: bool
+          description: Enable IPv4 DHCP server.
         ip_verify_unicast_source_reachable_via:
           type: str
           valid_values: