Address comment, do not sort ACL rules.

aristanetworks · Oct 9, 2024 · 68b5c05 · 68b5c05
1 parent bf8bd89
commit 68b5c05
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/roles.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/roles.j2
@@ -8,7 +8,7 @@
 !
 role {{ role.name }}
 {%     if role.sequence_numbers is arista.avd.defined %}
-{%         for sequence in role.sequence_numbers | arista.avd.natural_sort %}
+{%         for sequence in role.sequence_numbers %}
 {%             if sequence.action is arista.avd.defined and sequence.command is arista.avd.defined %}
 {%                 set sequence_cli = "" %}
 {%                 if sequence.sequence is arista.avd.defined %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-ospf.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-ospf.j2
@@ -120,7 +120,11 @@ router ospf {{ process_id.id }}
 {%         endif %}
 {%     endfor %}
 {%     for network_prefix in process_id.network_prefixes | arista.avd.natural_sort('ipv4_prefix') %}
-   network {{ network_prefix.ipv4_prefix }} area {{ network_prefix.area }}
+{%         set prefix_cli = "network " ~ network_prefix.ipv4_prefix %}
+{%         if network_prefix.area is arista.avd.defined %}
+{%             set prefix_cli = prefix_cli ~ " area " ~ network_prefix.area %}
+{%         endif %}
+   {{ prefix_cli }}
 {%     endfor %}
 {%     if process_id.max_lsa is arista.avd.defined %}
    max-lsa {{ process_id.max_lsa }}