Fixing rootguard timeout issue for mst

Author: wajahatrazi

MSTP.md

@@ -19,7 +19,7 @@
     'EXP_TO_FC_MAP_LIST',
     'CABLE_LENGTH_LIST',
     'MPLS_TC_TO_TC_MAP_LIST',
-    'TC_TO_DSCP_MAP_LIST'
+    'TC_TO_DSCP_MAP_LIST',
 ]
 
 # Workaround for those fields who is defined as leaf-list in YANG model but have string value in config DB.

SONiC_PVST_HLD.md

@@ -2365,6 +2365,7 @@
 
         "STP": {
             "GLOBAL": {
+                "global-stp-mode": "GLOBAL",
                 "mode": "pvst",
                 "rootguard_timeout": "30",
                 "forward_delay": "15",
@@ -2438,6 +2439,7 @@
 
         "STP_MST": {
             "GLOBAL": {
+                "global-stp-mode": "GLOBAL",
                 "name": "region1",
                 "revision": "0",
                 "max_hops": "20",

src/sonic-yang-mgmt/sonic_yang_ext.py

@@ -263,12 +263,10 @@ def test_run_tests(self):
             for test in self.tests:
                 test = test.strip()
                 if test in self.ExceptionTests:
-                    ret = ret + self.runExceptionTest(test);
+                    ret = ret + self.runExceptionTest(test)
                 elif test in self.SpecialTests:
-                    ret = ret + self.runSpecialTest(test);
+                    ret = ret + self.runSpecialTest(test)
                 else:
-                    #log.error("Unexpected Test: {}".format(test))
-                    #ret = ret + 1
                     raise Exception("Unexpected Test")
         except Exception as e:
             ret = FAIL * len(self.tests)

src/sonic-yang-models/tests/files/sample_config_db.json

@@ -22,23 +22,19 @@
                 "GLOBAL": [
                     {
                         "global-stp-mode": "GLOBAL",
-                        "mode": "mst",
-                        "forward_delay": 15,
-                        "hello_time": 2,
-                        "max_age": 20,
-                        "priority": 32768
+                        "mode": "mst"
                     }
                 ]
             },
             "sonic-spanning-tree:STP_MST": {
-                "MST_GLOBAL": [
+                "GLOBAL": [
                     {
                         "global-stp-mode": "GLOBAL",
                         "name": "region1",
                         "revision": 0,
                         "max_hops": 20,
-                        "hello_time": 2,
                         "max_age": 20,
+                        "hello_time": 2,
                         "forward_delay": 15
                     }
                 ]

src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py

@@ -151,10 +151,7 @@ module sonic-spanning-tree {
                     }
                     units "seconds";
                     default 30;
-                    must "../mode != 'mst'" {
-                        error-message "Root guard timeout is not allowed in MST mode.";
-                        error-app-tag stp-invalid;
-                    }
+                    when "../mode = 'pvst'";  // Only apply the default when mode is pvst
                     description
                         "Time before re-enabling a port in root-guard mode.";
                 }
@@ -320,7 +317,7 @@ module sonic-spanning-tree {
             description
                 "MST specific configuration container, maps to STP_MST_TABLE";
 
-            list MST_GLOBAL {
+            list GLOBAL {
                 description
                     "List of MST global configurations";
                 max-elements 1;
@@ -375,30 +372,30 @@ module sonic-spanning-tree {
                         "MST Max hops";
                 }
 
-                leaf hello_time {
+                leaf max_age {
                     type uint8 {
-                        range "1..10";
+                        range "6..40";
                     }
-                    default 2;
+                    default 20;
                     must "../../../STP/GLOBAL[global-stp-mode='GLOBAL']/mode='mst'" {
                         error-message "Configuration allowed in MST mode";
                         error-app-tag stp-invalid;
                     }
                     description
-                        "MST hello time in seconds";
+                        "MST max age in seconds";
                 }
 
-                leaf max_age {
+                leaf hello_time {
                     type uint8 {
-                        range "6..40";
+                        range "1..10";
                     }
-                    default 20;
+                    default 2;
                     must "../../../STP/GLOBAL[global-stp-mode='GLOBAL']/mode='mst'" {
                         error-message "Configuration allowed in MST mode";
                         error-app-tag stp-invalid;
                     }
                     description
-                        "MST max age in seconds";
+                        "MST hello time in seconds";
                 }
 
                 leaf forward_delay {