Re-arranging the commands

aristanetworks · Jan 16, 2024 · 423bad8 · 423bad8
1 parent edbef02
commit 423bad8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface.md b/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/vxlan-interface.md
@@ -85,7 +85,6 @@ interface Management1
 interface Vxlan1
    description DC1-LEAF2A_VTEP
    vxlan source-interface Loopback0
-   vxlan multicast headend-replication
    vxlan controller-client
    vxlan virtual-router encapsulation mac-address mlag-system-id
    vxlan udp-port 4789
@@ -105,6 +104,7 @@ interface Vxlan1
    vxlan vlan 110 multicast group 239.9.1.4
    vxlan vlan 112 multicast group 239.9.1.6
    vxlan vrf Tenant_A_OP_Zone multicast group 232.0.0.10
+   vxlan multicast headend-replication
    vxlan encapsulation ipv4
 
 ```
diff --git a/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface.cfg b/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vxlan-interface.cfg
@@ -15,7 +15,6 @@ interface Management1
 interface Vxlan1
    description DC1-LEAF2A_VTEP
    vxlan source-interface Loopback0
-   vxlan multicast headend-replication
    vxlan controller-client
    vxlan virtual-router encapsulation mac-address mlag-system-id
    vxlan udp-port 4789
@@ -35,6 +34,7 @@ interface Vxlan1
    vxlan vlan 110 multicast group 239.9.1.4
    vxlan vlan 112 multicast group 239.9.1.6
    vxlan vrf Tenant_A_OP_Zone multicast group 232.0.0.10
+   vxlan multicast headend-replication
    vxlan encapsulation ipv4
 
 !

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
@@ -14,9 +14,6 @@ interface Vxlan1
 {%     if vxlan_interface.Vxlan1.vxlan.source_interface is arista.avd.defined %}
    vxlan source-interface {{ vxlan_interface.Vxlan1.vxlan.source_interface }}
 {%     endif %}
-{%     if vxlan_interface.Vxlan1.vxlan.multicast_headend_replication is arista.avd.defined(true) %}
-   vxlan multicast headend-replication
-{%     endif %}
 {%     if vxlan_interface.Vxlan1.vxlan.controller_client.enabled is arista.avd.defined(true) %}
    vxlan controller-client
 {%     endif %}
@@ -79,6 +76,9 @@ 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) %}
+   vxlan multicast headend-replication
+{%     endif %}
 {%     if  vxlan_interface.Vxlan1.eos_cli is arista.avd.defined %}
    {{ vxlan_interface.Vxlan1.eos_cli | indent(3, false) }}
 {%     endif %}