From fb857ffb0f50e8993938dff2bafe98d7720859e6 Mon Sep 17 00:00:00 2001 From: Vibhu-gslab Date: Tue, 30 Jul 2024 15:31:28 +0530 Subject: [PATCH] fixing template --- .../documentation/devices/virtual-source-nat.md | 2 +- .../intended/configs/virtual-source-nat.cfg | 2 +- .../j2templates/eos/virtual-source-nat-vrfs.j2 | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/virtual-source-nat.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/virtual-source-nat.md index 0dc0bf10e35..9fd5a89e101 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/virtual-source-nat.md +++ b/ansible_collections/arista/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/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/virtual-source-nat.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/virtual-source-nat.cfg index ce482e001bd..2bcfa931763 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/virtual-source-nat.cfg +++ b/ansible_collections/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 index 53ff4518449..acd4385147d 100644 --- 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 %}