fixing template

aristanetworks · Jul 31, 2024 · fb857ff · fb857ff
1 parent a1140fc
commit fb857ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...sta/avd/molecule/eos_cli_config_gen/documentation/devices/virtual-source-nat.md b/...sta/avd/molecule/eos_cli_config_gen/documentation/devices/virtual-source-nat.md
@@ -53,7 +53,7 @@ interface Management1
 !
 ip address virtual source-nat vrf TEST_01 address 1.1.1.1
 ip address virtual source-nat vrf TEST_02 address 1.1.1.2
-ipv6 address virtual source-nat vrf TEST_03 address 2001:db8:85a3::8a2e:370:7334
 ip address virtual source-nat vrf TEST_04 address 1.1.1.3
+ipv6 address virtual source-nat vrf TEST_03 address 2001:db8:85a3::8a2e:370:7334
 ipv6 address virtual source-nat vrf TEST_04 address 2001:db8:85a3::8a2e:370:7335
 ```
diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/intended/configs/virtual-source-nat.cfg b/...ollections/arista/avd/molecule/eos_cli_config_gen/intended/configs/virtual-source-nat.cfg
@@ -14,8 +14,8 @@ interface Management1
 !
 ip address virtual source-nat vrf TEST_01 address 1.1.1.1
 ip address virtual source-nat vrf TEST_02 address 1.1.1.2
-ipv6 address virtual source-nat vrf TEST_03 address 2001:db8:85a3::8a2e:370:7334
 ip address virtual source-nat vrf TEST_04 address 1.1.1.3
+ipv6 address virtual source-nat vrf TEST_03 address 2001:db8:85a3::8a2e:370:7334
 ipv6 address virtual source-nat vrf TEST_04 address 2001:db8:85a3::8a2e:370:7335
 !
 end
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/virtual-source-nat-vrfs.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/virtual-source-nat-vrfs.j2
@@ -6,12 +6,18 @@
 {# eos - virtual source nat vrfs #}
 {% if virtual_source_nat_vrfs is arista.avd.defined %}
 !
+{%     set ipv4_address_list = [] %}
+{%     set ipv6_address_list = [] %}
 {%     for vrf in virtual_source_nat_vrfs | arista.avd.natural_sort('name') %}
 {%         if vrf.ip_address is arista.avd.defined %}
-ip address virtual source-nat vrf {{ vrf.name }} address {{ vrf.ip_address }}
+{%             do ipv4_address_list.append("ip address virtual source-nat vrf " + vrf.name + " address " + vrf.ip_address) %}
 {%         endif %}
 {%         if vrf.ipv6_address is arista.avd.defined %}
-ipv6 address virtual source-nat vrf {{ vrf.name }} address {{ vrf.ipv6_address }}
+{%             do ipv6_address_list.append("ipv6 address virtual source-nat vrf " + vrf.name + " address " + vrf.ipv6_address) %}
 {%         endif %}
 {%     endfor %}
+{%     set ip_addresses = ipv4_address_list + ipv6_address_list %}
+{%     for ip_address in ip_addresses %}
+{{ ip_address }}
+{%     endfor %}
 {% endif %}