Refactor(eos_cli_config_gen): Fixing Cli order for policy_maps.qos (aristanetworks#6283)

Co-authored-by: Shivani-gslab <[email protected]>
Co-authored-by: Guillaume Mulocher <[email protected]>

Author: 3 people

ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/documentation/devices/host1.md

@@ -13817,7 +13817,7 @@ class-map type pbr match-any aaa
 
 | Class Name | COS | DSCP | Traffic Class | Drop Precedence | Police Rate (Burst) -> Action |
 | ---------- | --- | ---- | ------------- | --------------- | ----------------------------- |
-| CM_REPLICATION_LD | - | af11 | 2 | 1 | 10 kbps (260 kbytes) -> drop-precedence<br> 30 kbps(270 kbytes) -> drop |
+| CM_REPLICATION_LD | 2 | af11 | 2 | 1 | 10 kbps (260 kbytes) -> drop-precedence<br> 30 kbps(270 kbytes) -> drop |
 | CM_REPLICATION_LD_2 | - | af11 | 2 | - | - |
 
 ##### PM_REPLICATION_LD2
@@ -13848,6 +13848,7 @@ class-map type pbr match-any aaa
 !
 policy-map type quality-of-service PM_REPLICATION_LD
    class CM_REPLICATION_LD
+      set cos 2
       set dscp af11
       set traffic-class 2
       set drop-precedence 1
@@ -13859,14 +13860,14 @@ policy-map type quality-of-service PM_REPLICATION_LD
 !
 policy-map type quality-of-service PM_REPLICATION_LD2
    class CM_REPLICATION_LD
-      set dscp af11
       set cos 4
+      set dscp af11
       police rate 30 kbps burst-size 280 bytes action set dscp af11 rate 1 mbps burst-size 270 bytes
 !
 policy-map type quality-of-service PM_REPLICATION_LD3
    class CM_REPLICATION_LD
-      set dscp af11
       set cos 6
+      set dscp af11
       police rate 10000 bps burst-size 260 kbytes
 !
 policy-map type quality-of-service pmap_test1

ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/intended/configs/host1.cfg

@@ -5428,6 +5428,7 @@ policy-map type copp copp-system-policy
 !
 policy-map type quality-of-service PM_REPLICATION_LD
    class CM_REPLICATION_LD
+      set cos 2
       set dscp af11
       set traffic-class 2
       set drop-precedence 1
@@ -5439,14 +5440,14 @@ policy-map type quality-of-service PM_REPLICATION_LD
 !
 policy-map type quality-of-service PM_REPLICATION_LD2
    class CM_REPLICATION_LD
-      set dscp af11
       set cos 4
+      set dscp af11
       police rate 30 kbps burst-size 280 bytes action set dscp af11 rate 1 mbps burst-size 270 bytes
 !
 policy-map type quality-of-service PM_REPLICATION_LD3
    class CM_REPLICATION_LD
-      set dscp af11
       set cos 6
+      set dscp af11
       police rate 10000 bps burst-size 260 kbytes
 !
 policy-map type quality-of-service pmap_test1

ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host1/policy-maps.yml

@@ -25,6 +25,7 @@ policy_maps:
             dscp: af11
             traffic_class: 2
             drop_precedence: 1
+            cos: 2
           police:
             rate: 10
             rate_unit: kbps

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/policy-maps-qos.j2

@@ -12,12 +12,18 @@ policy-map type quality-of-service {{ policy_map.name }}
    !
 {%         endif %}
    class {{ class.name }}
-{%         for set in class.set | arista.avd.default([]) %}
-{%             set cli_set = set | replace('_','-') | lower %}
-{%             if cli_set in ['cos', 'dscp', 'traffic-class', 'drop-precedence'] %}
-      set {{ cli_set }} {{ class.set[set] }}
-{%             endif %}
-{%         endfor %}
+{%         if class.set.cos is arista.avd.defined %}
+      set cos {{ class.set.cos }}
+{%         endif %}
+{%         if class.set.dscp is arista.avd.defined %}
+      set dscp {{ class.set.dscp }}
+{%         endif %}
+{%         if class.set.traffic_class is arista.avd.defined %}
+      set traffic-class {{ class.set.traffic_class }}
+{%         endif %}
+{%         if class.set.drop_precedence is arista.avd.defined %}
+      set drop-precedence {{ class.set.drop_precedence }}
+{%         endif %}
 {%         if class.police is arista.avd.defined %}
 {%             set police_cli = "police rate " %}
 {%             if class.police.rate is arista.avd.defined and class.police.rate_burst_size is arista.avd.defined %}