From bbee6648bba3b39b37b177f0acff34c10e9e57dd Mon Sep 17 00:00:00 2001
From: gmuloc <gmulocher@arista.com>
Date: Fri, 2 Aug 2024 16:20:19 +0200
Subject: [PATCH] Doc: Merge name-server table with ip-name-servers

---
 .../docs/tables/ip-name-servers.md            |  1 +
 .../docs/tables/name-server.md                | 20 -------------------
 .../schema/eos_cli_config_gen.schema.yml      | 15 ++------------
 .../schema_fragments/name_server.schema.yml   | 15 ++------------
 4 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/name-server.md

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ip-name-servers.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ip-name-servers.md
index 9989f3fed86..6c325315140 100644
--- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ip-name-servers.md
+++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ip-name-servers.md
@@ -11,6 +11,7 @@
     | [<samp>&nbsp;&nbsp;-&nbsp;ip_address</samp>](## "ip_name_servers.[].ip_address") | String |  |  |  | IPv4 or IPv6 address for DNS server. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;vrf</samp>](## "ip_name_servers.[].vrf") | String |  |  |  | VRF Name. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;priority</samp>](## "ip_name_servers.[].priority") | Integer |  |  | Min: 0<br>Max: 4 | Priority value (lower is first). |
+    | [<samp>name_server</samp>](## "name_server") <span style="color:red">removed</span> | Dictionary |  |  |  | <span style="color:red">This key was removed. Support was removed in AVD version v5.0.0. Use <samp>ip_name_servers</samp> instead.</span> |
 
 === "YAML"
 
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/name-server.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/name-server.md
deleted file mode 100644
index 9d501bbcac5..00000000000
--- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/name-server.md
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  ~ Copyright (c) 2024 Arista Networks, Inc.
-  ~ Use of this source code is governed by the Apache License 2.0
-  ~ that can be found in the LICENSE file.
-  -->
-=== "Table"
-
-    | Variable | Type | Required | Default | Value Restrictions | Description |
-    | -------- | ---- | -------- | ------- | ------------------ | ----------- |
-    | [<samp>name_server</samp>](## "name_server") <span style="color:red">removed</span> | Dictionary |  |  |  | <span style="color:red">This key was removed. Support was removed in AVD version v5.0.0. Use <samp>ip_name_servers</samp> instead.</span> |
-    | [<samp>&nbsp;&nbsp;source</samp>](## "name_server.source") | Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;vrf</samp>](## "name_server.source.vrf") | String |  |  |  | VRF Name. |
-    | [<samp>&nbsp;&nbsp;nodes</samp>](## "name_server.nodes") | List, items: String |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&lt;str&gt;</samp>](## "name_server.nodes.[]") | String |  |  |  |  |
-
-=== "YAML"
-
-    ```yaml
-
-    ```
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
index af26c7b3607..0d4f9134fec 100644
--- 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
@@ -7967,25 +7967,14 @@ keys:
             type: bool
             description: Enables the MPLS tunneling of TTL exceeded ICMP replies.
   name_server:
+    documentation_options:
+      table: ip-name-servers
     deprecation:
       removed: true
       warning: true
       new_key: ip_name_servers
       remove_in_version: v5.0.0
     type: dict
-    keys:
-      source:
-        type: dict
-        keys:
-          vrf:
-            description: VRF Name.
-            type: str
-            convert_types:
-            - int
-      nodes:
-        type: list
-        items:
-          type: str
   ntp:
     type: dict
     keys:
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/name_server.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/name_server.schema.yml
index 07f41984b28..e11e8342833 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/name_server.schema.yml
+++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/name_server.schema.yml
@@ -7,22 +7,11 @@
 type: dict
 keys:
   name_server:
+    documentation_options:
+      table: ip-name-servers
     deprecation:
       removed: true
       warning: true
       new_key: ip_name_servers
       remove_in_version: v5.0.0
     type: dict
-    keys:
-      source:
-        type: dict
-        keys:
-          vrf:
-            description: VRF Name.
-            type: str
-            convert_types:
-              - int
-      nodes:
-        type: list
-        items:
-          type: str