Support TC value above 7 in yang model (sonic-net#11630)

bingwang-ms · web-flow · commit dd5101e81785 · 2022-08-09T09:34:13.000+08:00
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
@@ -13,6 +13,10 @@
                             {
                                 "dscp":"2",
                                 "tc":"2"
+                            },
+                            {
+                                "dscp":"8",
+                                "tc":"8"
                             }
                         ]
                     },
@@ -26,6 +30,10 @@
                             {
                                 "dscp":"2",
                                 "tc":"2"
+                            },
+                            {
+                                "dscp":"8",
+                                "tc":"8"
                             }
                         ]
                     }
@@ -65,7 +73,7 @@
                         "DSCP_TO_TC_MAP": [
                             {
                                 "dscp": "1",
-                                "tc": "8"
+                                "tc": "16"
                             },
                             {
                                 "dscp":"2",
@@ -92,6 +100,10 @@
                             {
                                 "dot1p":"2",
                                 "tc":"2"
+                            },
+                            {
+                                "dot1p":"3",
+                                "tc":"8"
                             }
                         ]
                     },
@@ -105,6 +117,10 @@
                             {
                                 "dot1p":"2",
                                 "tc":"2"
+                            },
+                            {
+                                "dot1p":"3",
+                                "tc":"8"
                             }
                         ]
                     }
@@ -144,7 +160,7 @@
                         "DOT1P_TO_TC_MAP": [
                             {
                                 "dot1p": "1",
-                                "tc": "8"
+                                "tc": "16"
                             },
                             {
                                 "dot1p":"2",
@@ -171,6 +187,10 @@
                             {
                                 "tc":"2",
                                 "qindex":"2"
+                            },
+                            {
+                                "tc":"8",
+                                "qindex":"3"
                             }
                         ]
                     },
@@ -184,6 +204,10 @@
                             {
                                 "tc":"2",
                                 "qindex":"2"
+                            },
+                            {
+                                "tc":"8",
+                                "qindex":"3"
                             }
                         ]
                     }
@@ -250,6 +274,10 @@
                             {
                                 "tc":"2",
                                 "pg":"2"
+                            },
+                            {
+                                "tc":"8",
+                                "pg":"3"
                             }
                         ]
                     },
@@ -263,6 +291,10 @@
                             {
                                 "tc":"2",
                                 "pg":"2"
+                            },
+                            {
+                                "tc":"8",
+                                "pg":"3"
                             }
                         ]
                     }
@@ -487,6 +519,10 @@
                             {
                                 "dscp":"2",
                                 "tc":"2"
+                            },
+                            {
+                                "dscp":"8",
+                                "tc":"8"
                             }
                         ]
                     }
@@ -507,6 +543,10 @@
                             {
                                 "dot1p":"2",
                                 "tc":"2"
+                            },
+                            {
+                                "dot1p":"3",
+                                "tc":"8"
                             }
                         ]
                     }
@@ -527,6 +567,10 @@
                             {
                                 "tc":"2",
                                 "qindex":"2"
+                            },
+                            {
+                                "tc":"8",
+                                "qindex":"3"
                             }
                         ]
                     }
@@ -546,6 +590,10 @@
                             {
                                 "tc":"2",
                                 "pg":"2"
+                            },
+                            {
+                                "tc":"8",
+                                "pg":"3"
                             }
                         ]
                     }
@@ -643,6 +691,10 @@
                             {
                                 "dscp":"2",
                                 "tc":"2"
+                            },
+                            {
+                                "dscp":"8",
+                                "tc":"8"
                             }
                         ]
                     }
diff --git a/src/sonic-yang-models/yang-models/sonic-dot1p-tc-map.yang b/src/sonic-yang-models/yang-models/sonic-dot1p-tc-map.yang
@@ -6,6 +6,10 @@ module sonic-dot1p-tc-map {
 
     prefix dot1ptm;
 
+    import sonic-types {
+        prefix stypes;
+    }
+
     organization
         "SONiC";
 
@@ -54,12 +58,7 @@ module sonic-dot1p-tc-map {
                     }
 
                     leaf tc {
-                        type string {
-                            pattern "[0-7]?"{
-                                error-message "Invalid Traffic Class";
-                                error-app-tag tc-invalid;
-                            }
-                        }
+                        type stypes:tc_type;
                     }
                 }
             }
diff --git a/src/sonic-yang-models/yang-models/sonic-dscp-tc-map.yang b/src/sonic-yang-models/yang-models/sonic-dscp-tc-map.yang
@@ -6,6 +6,10 @@ module sonic-dscp-tc-map {
 
     prefix dtm;
 
+    import sonic-types {
+        prefix stypes;
+    }
+
     organization
         "SONiC";
 
@@ -54,12 +58,7 @@ module sonic-dscp-tc-map {
                     }
 
                     leaf tc {
-                        type string {
-                            pattern "[0-7]?" {
-                                error-message "Invalid Traffic Class";
-                                error-app-tag tc-invalid;
-                            }
-                        }
+                        type stypes:tc_type;
                     }
                 }
             }
diff --git a/src/sonic-yang-models/yang-models/sonic-tc-priority-group-map.yang b/src/sonic-yang-models/yang-models/sonic-tc-priority-group-map.yang
@@ -6,6 +6,10 @@ module sonic-tc-priority-group-map {
 
     prefix tpgm;
 
+    import sonic-types {
+        prefix stypes;
+    }
+
     organization
         "SONiC";
 
@@ -45,12 +49,7 @@ module sonic-tc-priority-group-map {
                     key "tc";
 
                     leaf tc {
-                        type string {
-                            pattern "[0-7]?" {
-                                error-message "Invalid Traffic Class";
-                                error-app-tag tc-invalid;
-                            }
-                        }
+                        type stypes:tc_type;
                     }
 
                     leaf pg {
diff --git a/src/sonic-yang-models/yang-models/sonic-tc-queue-map.yang b/src/sonic-yang-models/yang-models/sonic-tc-queue-map.yang
@@ -6,6 +6,10 @@ module sonic-tc-queue-map {
 
     prefix tqm;
 
+    import sonic-types {
+        prefix stypes;
+    }
+
     organization
         "SONiC";
 
@@ -45,12 +49,7 @@ module sonic-tc-queue-map {
                     key "tc";
 
                     leaf tc {
-                        type string {
-                            pattern "[0-7]?" {
-                                error-message "Invalid Traffic Class";
-                                error-app-tag tc-invalid;
-                            }
-                        }
+                        type stypes:tc_type;
                     }
 
                     leaf qindex {
diff --git a/src/sonic-yang-models/yang-templates/sonic-types.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-types.yang.j2
@@ -270,6 +270,15 @@ module sonic-types {
             "VXLAN Network Identifier";
     }
 
+    typedef tc_type {
+        type uint8 {
+            range "0..15" {
+                error-message "Invalid Traffic Class";
+                error-app-tag tc-invalid;
+            }
+        }
+    }
+
     {% if yang_model_type == "cvl" %}
     /* Required for CVL */
     container operation {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@`
`13`	`13`	`{`
`14`	`14`	`"dscp":"2",`
`15`	`15`	`"tc":"2"`
	`16`	`+ },`
	`17`	`+ {`
	`18`	`+ "dscp":"8",`
	`19`	`+ "tc":"8"`
`16`	`20`	`}`
`17`	`21`	`]`
`18`	`22`	`},`
`@@ -26,6 +30,10 @@`
`26`	`30`	`{`
`27`	`31`	`"dscp":"2",`
`28`	`32`	`"tc":"2"`
	`33`	`+ },`
	`34`	`+ {`
	`35`	`+ "dscp":"8",`
	`36`	`+ "tc":"8"`
`29`	`37`	`}`
`30`	`38`	`]`
`31`	`39`	`}`
`@@ -65,7 +73,7 @@`
`65`	`73`	`"DSCP_TO_TC_MAP": [`
`66`	`74`	`{`
`67`	`75`	`"dscp": "1",`
`68`		`- "tc": "8"`
	`76`	`+ "tc": "16"`
`69`	`77`	`},`
`70`	`78`	`{`
`71`	`79`	`"dscp":"2",`
`@@ -92,6 +100,10 @@`
`92`	`100`	`{`
`93`	`101`	`"dot1p":"2",`
`94`	`102`	`"tc":"2"`
	`103`	`+ },`
	`104`	`+ {`
	`105`	`+ "dot1p":"3",`
	`106`	`+ "tc":"8"`
`95`	`107`	`}`
`96`	`108`	`]`
`97`	`109`	`},`
`@@ -105,6 +117,10 @@`
`105`	`117`	`{`
`106`	`118`	`"dot1p":"2",`
`107`	`119`	`"tc":"2"`
	`120`	`+ },`
	`121`	`+ {`
	`122`	`+ "dot1p":"3",`
	`123`	`+ "tc":"8"`
`108`	`124`	`}`
`109`	`125`	`]`
`110`	`126`	`}`
`@@ -144,7 +160,7 @@`
`144`	`160`	`"DOT1P_TO_TC_MAP": [`
`145`	`161`	`{`
`146`	`162`	`"dot1p": "1",`
`147`		`- "tc": "8"`
	`163`	`+ "tc": "16"`
`148`	`164`	`},`
`149`	`165`	`{`
`150`	`166`	`"dot1p":"2",`
`@@ -171,6 +187,10 @@`
`171`	`187`	`{`
`172`	`188`	`"tc":"2",`
`173`	`189`	`"qindex":"2"`
	`190`	`+ },`
	`191`	`+ {`
	`192`	`+ "tc":"8",`
	`193`	`+ "qindex":"3"`
`174`	`194`	`}`
`175`	`195`	`]`
`176`	`196`	`},`
`@@ -184,6 +204,10 @@`
`184`	`204`	`{`
`185`	`205`	`"tc":"2",`
`186`	`206`	`"qindex":"2"`
	`207`	`+ },`
	`208`	`+ {`
	`209`	`+ "tc":"8",`
	`210`	`+ "qindex":"3"`
`187`	`211`	`}`
`188`	`212`	`]`
`189`	`213`	`}`
`@@ -250,6 +274,10 @@`
`250`	`274`	`{`
`251`	`275`	`"tc":"2",`
`252`	`276`	`"pg":"2"`
	`277`	`+ },`
	`278`	`+ {`
	`279`	`+ "tc":"8",`
	`280`	`+ "pg":"3"`
`253`	`281`	`}`
`254`	`282`	`]`
`255`	`283`	`},`
`@@ -263,6 +291,10 @@`
`263`	`291`	`{`
`264`	`292`	`"tc":"2",`
`265`	`293`	`"pg":"2"`
	`294`	`+ },`
	`295`	`+ {`
	`296`	`+ "tc":"8",`
	`297`	`+ "pg":"3"`
`266`	`298`	`}`
`267`	`299`	`]`
`268`	`300`	`}`
`@@ -487,6 +519,10 @@`
`487`	`519`	`{`
`488`	`520`	`"dscp":"2",`
`489`	`521`	`"tc":"2"`
	`522`	`+ },`
	`523`	`+ {`
	`524`	`+ "dscp":"8",`
	`525`	`+ "tc":"8"`
`490`	`526`	`}`
`491`	`527`	`]`
`492`	`528`	`}`
`@@ -507,6 +543,10 @@`
`507`	`543`	`{`
`508`	`544`	`"dot1p":"2",`
`509`	`545`	`"tc":"2"`
	`546`	`+ },`
	`547`	`+ {`
	`548`	`+ "dot1p":"3",`
	`549`	`+ "tc":"8"`
`510`	`550`	`}`
`511`	`551`	`]`
`512`	`552`	`}`
`@@ -527,6 +567,10 @@`
`527`	`567`	`{`
`528`	`568`	`"tc":"2",`
`529`	`569`	`"qindex":"2"`
	`570`	`+ },`
	`571`	`+ {`
	`572`	`+ "tc":"8",`
	`573`	`+ "qindex":"3"`
`530`	`574`	`}`
`531`	`575`	`]`
`532`	`576`	`}`
`@@ -546,6 +590,10 @@`
`546`	`590`	`{`
`547`	`591`	`"tc":"2",`
`548`	`592`	`"pg":"2"`
	`593`	`+ },`
	`594`	`+ {`
	`595`	`+ "tc":"8",`
	`596`	`+ "pg":"3"`
`549`	`597`	`}`
`550`	`598`	`]`
`551`	`599`	`}`
`@@ -643,6 +691,10 @@`
`643`	`691`	`{`
`644`	`692`	`"dscp":"2",`
`645`	`693`	`"tc":"2"`
	`694`	`+ },`
	`695`	`+ {`
	`696`	`+ "dscp":"8",`
	`697`	`+ "tc":"8"`
`646`	`698`	`}`
`647`	`699`	`]`
`648`	`700`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@ module sonic-dot1p-tc-map {`
`6`	`6`
`7`	`7`	`prefix dot1ptm;`
`8`	`8`
	`9`	`+ import sonic-types {`
	`10`	`+ prefix stypes;`
	`11`	`+ }`
	`12`	`+`
`9`	`13`	`organization`
`10`	`14`	`"SONiC";`
`11`	`15`
`@@ -54,12 +58,7 @@ module sonic-dot1p-tc-map {`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`leaf tc {`
`57`		`- type string {`
`58`		`- pattern "[0-7]?"{`
`59`		`- error-message "Invalid Traffic Class";`
`60`		`- error-app-tag tc-invalid;`
`61`		`- }`
`62`		`- }`
	`61`	`+ type stypes:tc_type;`
`63`	`62`	`}`
`64`	`63`	`}`
`65`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@ module sonic-dscp-tc-map {`
`6`	`6`
`7`	`7`	`prefix dtm;`
`8`	`8`
	`9`	`+ import sonic-types {`
	`10`	`+ prefix stypes;`
	`11`	`+ }`
	`12`	`+`
`9`	`13`	`organization`
`10`	`14`	`"SONiC";`
`11`	`15`
`@@ -54,12 +58,7 @@ module sonic-dscp-tc-map {`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`leaf tc {`
`57`		`- type string {`
`58`		`- pattern "[0-7]?" {`
`59`		`- error-message "Invalid Traffic Class";`
`60`		`- error-app-tag tc-invalid;`
`61`		`- }`
`62`		`- }`
	`61`	`+ type stypes:tc_type;`
`63`	`62`	`}`
`64`	`63`	`}`
`65`	`64`	`}`