[sonic-breakout_cfg.yang]: Remove pattern from sonic-breakout_cfg.yang. (#6801)

Praveen Chaudhary · judyjoseph · commit d627587377af · 2021-11-05T18:52:30.000-07:00
Changes:
-- Remove pattern from sonic-breakout_cfg.yang, it is redundant.
-- test changes.

Signed-off-by: Praveen Chaudhary &lt;pchaudhary@linkedin.com&gt;
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/breakout.json b/src/sonic-yang-models/tests/yang_model_tests/tests/breakout.json
@@ -1,12 +1,5 @@
 {
-    "BREAKOUT_CFG_CORRECT_MODES": {
-	"desc": "BREAKOUT_CFG correct breakout modes"
-    },
-    "BREAKOUT_CFG_INCORRECT_MODES": {
-	"desc": "BREAKOUT_CFG wrong breakout modes",
-	"eStr": ["pattern", "does not satisfy"]
-    },
     "CRM_BRK_CFG_FLEX_TABLE": {
-	"desc": "CRM BREAKOUT CFG FLEX COUNTER TABLE."
+        "desc": "CRM BREAKOUT CFG FLEX COUNTER TABLE."
     }
 }
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/breakout.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/breakout.json
@@ -1,60 +1,4 @@
 {
-    "BREAKOUT_CFG_CORRECT_MODES": {
-        "sonic-breakout_cfg:sonic-breakout_cfg": {
-            "sonic-breakout_cfg:BREAKOUT_CFG": {
-                "BREAKOUT_CFG_LIST": [
-                    {
-                        "brkout_mode": "1x200G[100G,50G,40G,25G,10G,1G]",
-                        "port": "Ethernet0"
-                    },
-                    {
-                        "brkout_mode": "2x100G[50G,40G,25G,10G,1G]",
-                        "port": "Ethernet8"
-                    },
-                    {
-                        "brkout_mode": "4x50G[40G,25G,10G,1G]",
-                        "port": "Ethernet4"
-                    },
-                    {
-                        "brkout_mode": "1x25G[10G]",
-                        "port": "Ethernet12"
-                    },
-                    {
-                        "brkout_mode": "1x100G[50G,40G,25G,10G]",
-                        "port": "Ethernet16"
-                    },
-                    {
-                        "brkout_mode": "2x50G[40G,25G,10G]",
-                        "port": "Ethernet20"
-                    },
-                    {
-                        "brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
-                        "port": "Ethernet24"
-                    }
-                ]
-            }
-        }
-    },
-    "BREAKOUT_CFG_INCORRECT_MODES": {
-        "sonic-breakout_cfg:sonic-breakout_cfg": {
-            "sonic-breakout_cfg:BREAKOUT_CFG": {
-                "BREAKOUT_CFG_LIST": [
-                    {
-                        "brkout_mode": "1x500G[100G,50G,40G,25G,10G,1G]",
-                        "port": "Ethernet0"
-                    },
-                    {
-                        "brkout_mode": "2x300G[50G,40G,25G,1G]",
-                        "port": "Ethernet8"
-                    },
-                    {
-                        "brkout_mode": "5x50G[40G,25G]",
-                        "port": "Ethernet4"
-                    }
-                ]
-            }
-        }
-    },
     "CRM_BRK_CFG_FLEX_TABLE": {
         "sonic-breakout_cfg:sonic-breakout_cfg": {
             "sonic-breakout_cfg:BREAKOUT_CFG": {
diff --git a/src/sonic-yang-models/yang-models/sonic-breakout_cfg.yang b/src/sonic-yang-models/yang-models/sonic-breakout_cfg.yang
@@ -26,6 +26,7 @@ module sonic-breakout_cfg {
 
                 key "port";
 
+
                 /*
                  * This is leaf instead of a leafref towards port, because this
                  * table will contains Parent ports and their current breakout-mode,
@@ -40,14 +41,9 @@ module sonic-breakout_cfg {
                 }
 
                 leaf brkout_mode {
+                    description "break_mode for port, it is verifed using platform.json";
                     type string {
                         length 1..64;
-                        /*
-                         * Below allowed patterns are based on most used Platforms,
-                         * Add any other breakout-mode to allow Dynamic Port
-                         * Breakout to that breakout-mode.
-                         */
-                        pattern '1x100G\[40G\]|2x50G|4x25G\[10G\]|2x25G\(2\)\+1x50G\(2\)|1x50G\(2\)\+2x25G\(2\)|1x400G|2x200G|4x100G|8x50G|1x200G\[100G,50G,40G,25G,10G,1G\]|2x100G\[50G,40G,25G,10G,1G\]|4x50G\[40G,25G,10G,1G\]|1x25G\[10G\]|1x100G\[50G,40G,25G,10G\]|2x50G\[40G,25G,10G\]|4x25G\[10G\]|1x25G\[10G,1G\]|1x100G\[50G,40G,25G,10G,1G\]|2x50G\[40G,25G,10G,1G\]|4x25G\[10G,1G\]|1x400G\[200G,100G,50G,40G,25G,10G,1G\]|2x200G\[100G,50G,40G,25G,10G,1G\]|4x100G\[50G,40G,25G,10G,1G\]';
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,5 @@`
`1`	`1`	`{`
`2`		`- "BREAKOUT_CFG_CORRECT_MODES": {`
`3`		`- "desc": "BREAKOUT_CFG correct breakout modes"`
`4`		`- },`
`5`		`- "BREAKOUT_CFG_INCORRECT_MODES": {`
`6`		`- "desc": "BREAKOUT_CFG wrong breakout modes",`
`7`		`- "eStr": ["pattern", "does not satisfy"]`
`8`		`- },`
`9`	`2`	`"CRM_BRK_CFG_FLEX_TABLE": {`
`10`		`- "desc": "CRM BREAKOUT CFG FLEX COUNTER TABLE."`
	`3`	`+ "desc": "CRM BREAKOUT CFG FLEX COUNTER TABLE."`
`11`	`4`	`}`
`12`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ module sonic-breakout_cfg {`
`26`	`26`
`27`	`27`	`key "port";`
`28`	`28`
	`29`	`+`
`29`	`30`	`/*`
`30`	`31`	`* This is leaf instead of a leafref towards port, because this`
`31`	`32`	`* table will contains Parent ports and their current breakout-mode,`
`@@ -40,14 +41,9 @@ module sonic-breakout_cfg {`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`leaf brkout_mode {`
	`44`	`+ description "break_mode for port, it is verifed using platform.json";`
`43`	`45`	`type string {`
`44`	`46`	`length 1..64;`
`45`		`- /*`
`46`		`- * Below allowed patterns are based on most used Platforms,`
`47`		`- * Add any other breakout-mode to allow Dynamic Port`
`48`		`- * Breakout to that breakout-mode.`
`49`		`- */`
`50`		`- pattern '1x100G\[40G\]\|2x50G\|4x25G\[10G\]\|2x25G\(2\)\+1x50G\(2\)\|1x50G\(2\)\+2x25G\(2\)\|1x400G\|2x200G\|4x100G\|8x50G\|1x200G\[100G,50G,40G,25G,10G,1G\]\|2x100G\[50G,40G,25G,10G,1G\]\|4x50G\[40G,25G,10G,1G\]\|1x25G\[10G\]\|1x100G\[50G,40G,25G,10G\]\|2x50G\[40G,25G,10G\]\|4x25G\[10G\]\|1x25G\[10G,1G\]\|1x100G\[50G,40G,25G,10G,1G\]\|2x50G\[40G,25G,10G,1G\]\|4x25G\[10G,1G\]\|1x400G\[200G,100G,50G,40G,25G,10G,1G\]\|2x200G\[100G,50G,40G,25G,10G,1G\]\|4x100G\[50G,40G,25G,10G,1G\]';`
`51`	`47`	`}`
`52`	`48`	`}`
`53`	`49`	`}`