Add lossy scheduler for queue 7 (sonic-net#12596)

* Add lossy scheduler for queue 7
bingwang-ms · Nov 4, 2022 · b06d3e7 · b06d3e7
1 parent 8f80dc3
commit b06d3e7
Show file tree

Hide file tree

Showing 5 changed files with 463 additions and 0 deletions.
diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2
@@ -231,6 +231,7 @@
         "global": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]"
         }{% if PORT_ACTIVE %},{% endif %}
+
 {% endif %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}": {
@@ -330,6 +331,12 @@
         "{{ port }}|5": {
             "scheduler": "[SCHEDULER|scheduler.0]"
         },
+{# DSCP 48 is mapped to QUEUE 7 in macro generate_dscp_to_tc_map #}
+{% if (generate_dscp_to_tc_map is defined) and tunnel_qos_remap_enable %}
+        "{{ port }}|7": {
+            "scheduler": "scheduler.0"
+        },
+{% endif %}
 {% endfor %}
 {% for port in PORT_ACTIVE %}
         "{{ port }}|6": {

diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
@@ -1050,99 +1050,195 @@
         "Ethernet0|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet0|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet4|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet4|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet8|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet8|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet12|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet12|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet16|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet16|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet20|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet20|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet24|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet24|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet28|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet28|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet32|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet32|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet36|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet36|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet40|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet40|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet44|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet44|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet48|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet48|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet52|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet52|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet56|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet56|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet60|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet60|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet64|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet64|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet68|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet68|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet72|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet72|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet76|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet76|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet80|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet80|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet84|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet84|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet88|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet88|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet92|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet92|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet96|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet96|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet100|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet100|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet104|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet104|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet108|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet108|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet112|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet112|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet116|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet116|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet120|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet120|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet124|5": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },
+        "Ethernet124|7": {
+            "scheduler": "scheduler.0"
+        },
         "Ethernet0|6": {
             "scheduler"   : "[SCHEDULER|scheduler.0]"
         },