From dc9eaa53fb1e3a10c733c4ad381379f963cd773a Mon Sep 17 00:00:00 2001
From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com>
Date: Fri, 9 Sep 2022 00:18:26 +0800
Subject: [PATCH] Map TC6 to Queue 1 for regular traffic (#11904)

Why I did it
This PR is to update TC_TO_QUEUE_MAP|AZURE for SKU Arista-7050CX3-32S-D48C8 and Arista-7260CX3 T0.

The change is only to align the TC_TO_QUEUE_MAP for regular traffic and bounced traffic. It has no impact on business because we have no traffic being mapped to TC2 or TC6.

How I did it
Update TC_TO_QUEUE_MAP|AZURE , and test cases as well.

How to verify it
Verified by running test case test_j2files.py

/sonic/src/sonic-config-engine$ python3 setup.py test -s tests/test_j2files.py
running test
......
----------------------------------------------------------------------
Ran 29 tests in 25.390s

OK
---
 .../Arista-7050CX3-32S-D48C8/qos.json.j2                        | 2 +-
 device/common/profiles/th2/7260/BALANCED/qos.json.j2            | 2 +-
 device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2        | 2 +-
 .../tests/sample_output/py3/qos-arista7050cx3-dualtor.json      | 2 +-
 .../tests/sample_output/py3/qos-arista7260-dualtor.json         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
index 6719911b29..040da33dd7 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
@@ -170,7 +170,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },
diff --git a/device/common/profiles/th2/7260/BALANCED/qos.json.j2 b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
index 68daa8ee92..750d0fb0ea 100644
--- a/device/common/profiles/th2/7260/BALANCED/qos.json.j2
+++ b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
@@ -322,7 +322,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
index faf682d3c1..771b8305f8 100644
--- a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
+++ b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
@@ -321,7 +321,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },
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
index 8e1d376f19..00bf9a9a43 100644
--- 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
@@ -19,7 +19,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
index cdb6e8fe84..4d16791f92 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -19,7 +19,7 @@
             "3": "3",
             "4": "4",
             "5": "5",
-            "6": "6",
+            "6": "1",
             "7": "7",
             "8": "1"
         },