Feat(eos_cli_config_gen): support for mlag peer-link requests disable…

…d under dhcp_relay (#3262) Co-authored-by: gmuloc <[email protected]>
aristanetworks · Oct 19, 2023 · 0611952 · 0611952
1 parent ae7c25e
commit 0611952
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 3 deletions.
diff --git a/...ions/arista/avd/molecule/eos_cli_config_gen/documentation/devices/dhcp-relay.md b/...ions/arista/avd/molecule/eos_cli_config_gen/documentation/devices/dhcp-relay.md
@@ -41,6 +41,7 @@ interface Management1
 ### DHCP Relay Summary
 
 - DHCP Relay is disabled for tunnelled requests
+- DHCP Relay is disabled for MLAG peer-link requests
 
 | DHCP Relay Servers |
 | ------------------ |
@@ -55,4 +56,5 @@ dhcp relay
    server dhcp-relay-server1
    server dhcp-relay-server2
    tunnel requests disabled
+   mlag peer-link requests disabled
 ```
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dhcp-relay.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dhcp-relay.cfg
@@ -4,6 +4,7 @@ dhcp relay
    server dhcp-relay-server1
    server dhcp-relay-server2
    tunnel requests disabled
+   mlag peer-link requests disabled
 !
 transceiver qsfp default-mode 4x10G
 !

diff --git a/...ble_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dhcp-relay.yml b/...ble_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dhcp-relay.yml
@@ -3,3 +3,4 @@ dhcp_relay:
     - dhcp-relay-server2
     - dhcp-relay-server1
   tunnel_requests_disabled: true
+  mlag_peerlink_requests_disabled: true
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dhcp-relay.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dhcp-relay.md
@@ -11,6 +11,7 @@
     | [<samp>&nbsp;&nbsp;servers</samp>](## "dhcp_relay.servers") | List, items: String |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;- &lt;str&gt;</samp>](## "dhcp_relay.servers.[].&lt;str&gt;") | String |  |  |  | Server IP or Hostname |
     | [<samp>&nbsp;&nbsp;tunnel_requests_disabled</samp>](## "dhcp_relay.tunnel_requests_disabled") | Boolean |  |  |  |  |
+    | [<samp>&nbsp;&nbsp;mlag_peerlink_requests_disabled</samp>](## "dhcp_relay.mlag_peerlink_requests_disabled") | Boolean |  |  |  |  |
 
 === "YAML"
 
@@ -19,4 +20,5 @@
       servers:
         - <str>
       tunnel_requests_disabled: <bool>
+      mlag_peerlink_requests_disabled: <bool>
     ```
diff --git a/...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json b/...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
@@ -1442,6 +1442,10 @@
         "tunnel_requests_disabled": {
           "type": "boolean",
           "title": "Tunnel Requests Disabled"
+        },
+        "mlag_peerlink_requests_disabled": {
+          "type": "boolean",
+          "title": "MLAG Peerlink Requests Disabled"
         }
       },
       "additionalProperties": false,

diff --git a/...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
@@ -1012,6 +1012,8 @@ keys:
           description: Server IP or Hostname
       tunnel_requests_disabled:
         type: bool
+      mlag_peerlink_requests_disabled:
+        type: bool
   dns_domain:
     type: str
     description: Domain Name

diff --git a/...ctions/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_relay.schema.yml b/...ctions/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_relay.schema.yml
@@ -16,3 +16,5 @@ keys:
           description: Server IP or Hostname
       tunnel_requests_disabled:
         type: bool
+      mlag_peerlink_requests_disabled:
+        type: bool
diff --git a/...ble_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/dhcp-relay.j2 b/...ble_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/dhcp-relay.j2
@@ -12,10 +12,15 @@
 {%     if dhcp_relay.tunnel_requests_disabled is arista.avd.defined(true) %}
 
 - DHCP Relay is disabled for tunnelled requests
-{%     elif dhcp_relay.tunnel_requests_disabled is arista.avd.defined(false) %}
+{%     else %}
 
 - DHCP Relay is enabled for tunnelled requests
 {%     endif %}
+{%     if dhcp_relay.mlag_peerlink_requests_disabled is arista.avd.defined(true) %}
+- DHCP Relay is disabled for MLAG peer-link requests
+{%     else %}
+- DHCP Relay is enabled for MLAG peer-link requests
+{%     endif %}
 {%     if dhcp_relay.servers is arista.avd.defined %}
 
 | DHCP Relay Servers |

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/dhcp-relay.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/dhcp-relay.j2
@@ -12,7 +12,8 @@ dhcp relay
 {%     endfor %}
 {%     if dhcp_relay.tunnel_requests_disabled is arista.avd.defined(true) %}
    tunnel requests disabled
-{%     elif dhcp_relay.tunnel_requests_disabled is arista.avd.defined(false) %}
-   no tunnel requests disabled
+{%     endif %}
+{%     if dhcp_relay.mlag_peerlink_requests_disabled is arista.avd.defined(true) %}
+   mlag peer-link requests disabled
 {%     endif %}
 {% endif %}