From 232ca913bda6ed39f43ca9945ca38cdef105b1d3 Mon Sep 17 00:00:00 2001 From: Guillaume Mulocher Date: Thu, 19 Oct 2023 06:38:01 +0200 Subject: [PATCH] Fix(eos_cli_config_gen): Wrong CLI template for some options (#3263) --- .../documentation/devices/ip-security.md | 8 ++++---- .../eos_cli_config_gen/intended/configs/ip-security.cfg | 8 ++++---- .../roles/eos_cli_config_gen/templates/eos/ip-security.j2 | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-security.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-security.md index 5d7c2459a33..b895782ff90 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-security.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-security.md @@ -67,21 +67,21 @@ interface Management1 ip security ! ike policy IKE-1 - local_id 192.168.100.1 + local-id 192.168.100.1 ! ike policy IKE-2 ! sa policy SA-1 esp encryption aes128 - pfs_dh_group 14 + pfs dh-group 14 ! sa policy SA-2 esp encryption aes128 - pfs_dh_group 14 + pfs dh-group 14 ! sa policy SA-3 esp encryption null - pfs_dh_group 17 + pfs dh-group 17 ! profile Profile-1 ike-policy IKE-1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-security.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-security.cfg index 679546cdc7e..68ee2b76db1 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-security.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-security.cfg @@ -10,21 +10,21 @@ no aaa root ip security ! ike policy IKE-1 - local_id 192.168.100.1 + local-id 192.168.100.1 ! ike policy IKE-2 ! sa policy SA-1 esp encryption aes128 - pfs_dh_group 14 + pfs dh-group 14 ! sa policy SA-2 esp encryption aes128 - pfs_dh_group 14 + pfs dh-group 14 ! sa policy SA-3 esp encryption null - pfs_dh_group 17 + pfs dh-group 17 ! profile Profile-1 ike-policy IKE-1 diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/ip-security.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/ip-security.j2 index c3b1f210d5a..fe27a581d16 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/ip-security.j2 +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/ip-security.j2 @@ -11,7 +11,7 @@ ip security ! ike policy {{ ike_policy.name }} {% if ike_policy.local_id is arista.avd.defined %} - local_id {{ ike_policy.local_id }} + local-id {{ ike_policy.local_id }} {% endif %} {% endfor %} {% for sa_policy in ip_security.sa_policies | arista.avd.default([]) %} @@ -24,7 +24,7 @@ ip security esp encryption {{ sa_policy.esp.encryption }} {% endif %} {% if sa_policy.pfs_dh_group is arista.avd.defined %} - pfs_dh_group {{ sa_policy.pfs_dh_group }} + pfs dh-group {{ sa_policy.pfs_dh_group }} {% endif %} {% endfor %} {% for profile in ip_security.profiles | arista.avd.default([]) %}