[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 2024…

…12 (sonic-net#602) ```<br>* 9394071be - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-buildimage into 202412 (2025-02-11) [Sonic Automation] * b59b6be - (head/202411) [YANG] Add missing field in port qos map (sonic-net#21691) (2025-02-11) [mssonicbld] * 645a40f - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#21663) (2025-02-08) [mssonicbld] * 00fe4fa - [submodule] Update submodule sonic-host-services to the latest HEAD automatically (sonic-net#21659) (2025-02-08) [mssonicbld] * 4588316 - [submodule] Update submodule sonic-swss-common to the latest HEAD automatically (sonic-net#21665) (2025-02-08) [mssonicbld]<br>```
saiarcot895 · Feb 11, 2025 · e1693bc · e1693bc
1 parent 5f1210b
commit e1693bc
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 7 deletions.
diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -2330,6 +2330,7 @@
            "Ethernet0": {
                "dot1p_to_tc_map" : "Dot1p_to_tc_map1",
                "dscp_to_tc_map": "Dscp_to_tc_map1",
+               "tc_to_dscp_map": "tc_to_dscp_map1",
                "tc_to_queue_map": "tc_to_q_map1",
                "tc_to_pg_map": "tc_to_pg_map1",
                "pfc_to_queue_map": "pfc_prio_to_q_map1",
@@ -2341,12 +2342,13 @@
             "Ethernet4": {
               "dot1p_to_tc_map" : "Dot1p_to_tc_map2",
               "dscp_to_tc_map": "Dscp_to_tc_map2",
-	          "tc_to_queue_map": "tc_to_q_map2",
-	          "tc_to_pg_map": "tc_to_pg_map2",
-	          "pfc_to_queue_map": "pfc_prio_to_q_map2",
-	          "pfc_to_pg_map"   : "pfc_prio_to_pg_map2",
-	          "pfc_enable"      : "3,4",
-	          "pfcwd_sw_enable" : "3,4"
+              "tc_to_dscp_map": "tc_to_dscp_map2",
+              "tc_to_queue_map": "tc_to_q_map2",
+              "tc_to_pg_map": "tc_to_pg_map2",
+              "pfc_to_queue_map": "pfc_prio_to_q_map2",
+              "pfc_to_pg_map"   : "pfc_prio_to_pg_map2",
+              "pfc_enable"      : "3,4",
+              "pfcwd_sw_enable" : "3,4"
             }
         },
 

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/qosmaps.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/qosmaps.json
@@ -530,6 +530,30 @@
             }
         },
 
+        "sonic-tc-dscp-map:sonic-tc-dscp-map": {
+            "sonic-tc-dscp-map:TC_TO_DSCP_MAP": {
+                "TC_TO_DSCP_MAP_LIST": [
+                    {
+                        "name": "map1",
+                        "TC_TO_DSCP_MAP": [
+                            {
+                                "tc": "1",
+                                "dscp": "1"
+                            },
+                            {
+                                "tc":"2",
+                                "dscp":"2"
+                            },
+                            {
+                                "tc": "8",
+                                "dscp": "8"
+                            }
+                        ]
+                    }
+                ]
+            }
+        },
+
         "sonic-dot1p-tc-map:sonic-dot1p-tc-map": {
             "sonic-dot1p-tc-map:DOT1P_TO_TC_MAP": {
                 "DOT1P_TO_TC_MAP_LIST": [
@@ -681,11 +705,11 @@
                     {
                         "ifname": "Ethernet0",
                         "dscp_to_tc_map": "map1",
+                        "tc_to_dscp_map": "map1",
                         "tc_to_pg_map": "map1",
                         "tc_to_queue_map": "map1",
                         "pfc_to_queue_map": "map1",
                         "pfc_to_pg_map": "map1",
-                        "dscp_to_tc_map": "map1",
                         "dot1p_to_tc_map": "map1",
                         "pfc_enable": "2,3,4,6",
                         "pfcwd_sw_enable" : "2,3,4,6",

diff --git a/src/sonic-yang-models/yang-models/sonic-port-qos-map.yang b/src/sonic-yang-models/yang-models/sonic-port-qos-map.yang
@@ -38,6 +38,11 @@ module sonic-port-qos-map {
         prefix sch;
     }
 
+    import sonic-tc-dscp-map {
+        prefix tdm;
+    }
+
+
     organization
         "SONiC";
 
@@ -116,6 +121,13 @@ module sonic-port-qos-map {
                     }
                 }
 
+                leaf tc_to_dscp_map {
+                    type leafref {
+                        path "/tdm:sonic-tc-dscp-map/tdm:TC_TO_DSCP_MAP/tdm:TC_TO_DSCP_MAP_LIST/tdm:name";
+                    }
+                }
+
+
                 leaf dot1p_to_tc_map {
                     type leafref {
                         path "/dot1ptm:sonic-dot1p-tc-map/dot1ptm:DOT1P_TO_TC_MAP/dot1ptm:DOT1P_TO_TC_MAP_LIST/dot1ptm:name";