Updating the data-model schema as suggested

aristanetworks · Jan 17, 2024 · 02e944a · 02e944a
1 parent 423bad8
commit 02e944a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vxlan-interface.yml b/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vxlan-interface.yml
@@ -5,7 +5,8 @@ vxlan_interface:
     description: DC1-LEAF2A_VTEP
     vxlan:
       source_interface: Loopback0
-      multicast_headend_replication: true
+      multicast:
+        headend_replication: true
       controller_client:
         enabled: true
       mlag_source_interface: Loopback1

diff --git a/..._collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vxlan-interface.md b/..._collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vxlan-interface.md
@@ -12,7 +12,8 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;description</samp>](## "vxlan_interface.Vxlan1.description") | String |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;vxlan</samp>](## "vxlan_interface.Vxlan1.vxlan") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;source_interface</samp>](## "vxlan_interface.Vxlan1.vxlan.source_interface") | String |  |  |  | Source Interface Name |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;multicast_headend_replication</samp>](## "vxlan_interface.Vxlan1.vxlan.multicast_headend_replication") | Boolean |  |  |  |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;multicast</samp>](## "vxlan_interface.Vxlan1.vxlan.multicast") | Dictionary |  |  |  |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;headend_replication</samp>](## "vxlan_interface.Vxlan1.vxlan.multicast.headend_replication") | Boolean |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;controller_client</samp>](## "vxlan_interface.Vxlan1.vxlan.controller_client") | Dictionary |  |  |  | Client to CVX Controllers |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;enabled</samp>](## "vxlan_interface.Vxlan1.vxlan.controller_client.enabled") | Boolean |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mlag_source_interface</samp>](## "vxlan_interface.Vxlan1.vxlan.mlag_source_interface") | String |  |  |  |  |
@@ -52,7 +53,8 @@
 
           # Source Interface Name
           source_interface: <str>
-          multicast_headend_replication: <bool>
+          multicast:
+            headend_replication: <bool>
 
           # Client to CVX Controllers
           controller_client:

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
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
diff --git a/...s/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/vxlan_interface.schema.yml b/...s/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/vxlan_interface.schema.yml
@@ -20,8 +20,11 @@ keys:
               source_interface:
                 type: str
                 description: Source Interface Name
-              multicast_headend_replication:
-                type: bool
+              multicast:
+                type: dict
+                keys:
+                  headend_replication:
+                    type: bool
               controller_client:
                 type: dict
                 description: Client to CVX Controllers

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/vxlan-interface.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/vxlan-interface.j2
@@ -76,7 +76,7 @@ interface Vxlan1
 {%     for vrf in vxlan_interface.Vxlan1.vxlan.vrfs | arista.avd.natural_sort('name') if vrf.multicast_group is arista.avd.defined %}
    vxlan vrf {{ vrf.name }} multicast group {{ vrf.multicast_group }}
 {%     endfor %}
-{%     if vxlan_interface.Vxlan1.vxlan.multicast_headend_replication is arista.avd.defined(true) %}
+{%     if vxlan_interface.Vxlan1.vxlan.multicast.headend_replication is arista.avd.defined(true) %}
    vxlan multicast headend-replication
 {%     endif %}
 {%     if  vxlan_interface.Vxlan1.eos_cli is arista.avd.defined %}