Address comments

aristanetworks · Nov 25, 2024 · 8b1eb8d · 8b1eb8d
1 parent 232bdf8
commit 8b1eb8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups-ldap.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups-ldap.j2
@@ -5,13 +5,8 @@
 #}
 {# eos - aaa server groups ldap #}
 {% if aaa_server_groups is arista.avd.defined %}
-{%     set filtered_groups = [] %}
-{%     for aaa_server_group in aaa_server_groups %}
-{%         if aaa_server_group.type is arista.avd.defined %}
-{%             do filtered_groups.append(aaa_server_group) %}
-{%         endif %}
-{%     endfor %}
-{%     for aaa_server_group in filtered_groups | arista.avd.natural_sort('name') | arista.avd.natural_sort("type") %}
+{%     set filtered_groups = aaa_server_groups | selectattr("type") %}
+{%     for aaa_server_group in filtered_groups | arista.avd.natural_sort('name') %}
 {%         if aaa_server_group.type | arista.avd.default == 'ldap' %}
 !
 aaa group server {{ aaa_server_group.type }} {{ aaa_server_group.name }}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups-radius.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups-radius.j2
@@ -5,14 +5,9 @@
 #}
 {# eos - aaa server groups #}
 {% if aaa_server_groups is arista.avd.defined %}
-{%     set filtered_groups = [] %}
-{%     for aaa_server_group in aaa_server_groups %}
-{%         if aaa_server_group.type is arista.avd.defined %}
-{%             do filtered_groups.append(aaa_server_group) %}
-{%         endif %}
-{%     endfor %}
-{%     for aaa_server_group in filtered_groups | arista.avd.natural_sort('name') | arista.avd.natural_sort('type') %}
-{%         if aaa_server_group.type | arista.avd.default("") == 'radius' %}
+{%     set filtered_groups = aaa_server_groups | selectattr("type") %}
+{%     for aaa_server_group in filtered_groups | arista.avd.natural_sort('name') %}
+{%         if aaa_server_group.type | arista.avd.default == 'radius' %}
 !
 aaa group server {{ aaa_server_group.type }} {{ aaa_server_group.name }}
 {%             if aaa_server_group.servers is arista.avd.defined %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups-tacacs-plus.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups-tacacs-plus.j2
@@ -5,13 +5,8 @@
 #}
 {# eos - aaa server groups #}
 {% if aaa_server_groups is arista.avd.defined %}
-{%     set filtered_groups = [] %}
-{%     for aaa_server_group in aaa_server_groups %}
-{%         if aaa_server_group.type is arista.avd.defined %}
-{%             do filtered_groups.append(aaa_server_group) %}
-{%         endif %}
-{%     endfor %}
-{%     for aaa_server_group in filtered_groups | arista.avd.natural_sort('name') | arista.avd.natural_sort("type") %}
+{%     set filtered_groups = aaa_server_groups | selectattr("type") %}
+{%     for aaa_server_group in filtered_groups | arista.avd.natural_sort('name') %}
 {%         if aaa_server_group.type is arista.avd.defined('tacacs+') %}
 !
 aaa group server {{ aaa_server_group.type }} {{ aaa_server_group.name }}