Refactor(eos_cli_config_gen): Rearrange the CLI for platform (#4578)

aristanetworks · Oct 10, 2024 · 3bf67f2 · 3bf67f2
1 parent 2d07882
commit 3bf67f2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/...ctions/arista/avd/molecule/eos_cli_config_gen/documentation/devices/platform.md b/...ctions/arista/avd/molecule/eos_cli_config_gen/documentation/devices/platform.md
@@ -99,12 +99,12 @@ interface Management1
 !
 platform trident l3 routing mac-address per-vlan
 platform trident forwarding-table partition 2
+platform sand forwarding mode arad
+platform sand lag mode 512x32
+platform sand lag hardware-only
 platform sand qos map traffic-class 0 to network-qos 0
 platform sand qos map traffic-class 1 to network-qos 7
 platform sand qos map traffic-class 2 to network-qos 15
-platform sand lag hardware-only
-platform sand lag mode 512x32
-platform sand forwarding mode arad
 platform sand multicast replication default ingress
 platform sand mdb profile l3-xxl
 platform sfe data-plane cpu allocation maximum 42

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/platform.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/platform.cfg
@@ -22,12 +22,12 @@ platform trident mmu queue profile unused_profile
 !
 platform trident l3 routing mac-address per-vlan
 platform trident forwarding-table partition 2
+platform sand forwarding mode arad
+platform sand lag mode 512x32
+platform sand lag hardware-only
 platform sand qos map traffic-class 0 to network-qos 0
 platform sand qos map traffic-class 1 to network-qos 7
 platform sand qos map traffic-class 2 to network-qos 15
-platform sand lag hardware-only
-platform sand lag mode 512x32
-platform sand forwarding mode arad
 platform sand multicast replication default ingress
 platform sand mdb profile l3-xxl
 platform sfe data-plane cpu allocation maximum 42

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/platform.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/platform.j2
@@ -15,20 +15,20 @@ platform trident l3 routing mac-address per-vlan
 platform trident forwarding-table partition {{ platform.trident.forwarding_table_partition }}
 {%     endif %}
 {%     if platform.sand is arista.avd.defined %}
-{%         for qos_map in platform.sand.qos_maps | arista.avd.natural_sort('traffic_class') %}
-{%             if qos_map.traffic_class is arista.avd.defined and qos_map.to_network_qos is arista.avd.defined %}
-platform sand qos map traffic-class {{ qos_map.traffic_class }} to network-qos {{ qos_map.to_network_qos }}
-{%             endif %}
-{%         endfor %}
-{%         if platform.sand.lag.hardware_only is arista.avd.defined(true) %}
-platform sand lag hardware-only
+{%         if platform.sand.forwarding_mode is arista.avd.defined %}
+platform sand forwarding mode {{ platform.sand.forwarding_mode }}
 {%         endif %}
 {%         if platform.sand.lag.mode is arista.avd.defined %}
 platform sand lag mode {{ platform.sand.lag.mode }}
 {%         endif %}
-{%         if platform.sand.forwarding_mode is arista.avd.defined %}
-platform sand forwarding mode {{ platform.sand.forwarding_mode }}
+{%         if platform.sand.lag.hardware_only is arista.avd.defined(true) %}
+platform sand lag hardware-only
 {%         endif %}
+{%         for qos_map in platform.sand.qos_maps | arista.avd.natural_sort('traffic_class') %}
+{%             if qos_map.traffic_class is arista.avd.defined and qos_map.to_network_qos is arista.avd.defined %}
+platform sand qos map traffic-class {{ qos_map.traffic_class }} to network-qos {{ qos_map.to_network_qos }}
+{%             endif %}
+{%         endfor %}
 {%         if platform.sand.multicast_replication.default is arista.avd.defined %}
 platform sand multicast replication default {{ platform.sand.multicast_replication.default }}
 {%         endif %}