PVST MST YANG model

src/sonic-yang-mgmt/sonic_yang_ext.py

@@ -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.

src/sonic-yang-models/setup.py

@@ -142,6 +142,7 @@
     'sonic-grpcclient.yang',
     'sonic-serial-console.yang',
     'sonic-smart-switch.yang',
+    'sonic-spanning-tree.yang',
     'sonic-srv6.yang',
 ]
 

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

@@ -2403,6 +2403,45 @@
             }
         },
 
+        "STP": {
+            "GLOBAL": {
+                "mode": "pvst",
+                "rootguard_timeout": "30",
+                "forward_delay": "15",
+                "hello_time": "2",
+                "max_age": "20",
+                "priority": "32768"
+            }
+        },
+        "STP_VLAN": {
+            "Vlan100": {
+                "forward_delay": "15",
+                "hello_time": "2",
+                "max_age": "20",
+                "priority": "32768",
+                "enabled": "true",
+                "vlanid": "100"
+            }
+        },
+        "STP_VLAN_PORT": {
+            "Vlan100|Ethernet0": {
+                "path_cost": "200000",
+                "priority": "128"
+            }
+        },
+        "STP_PORT": {
+            "Ethernet0": {
+                "enabled": "true",
+                "root_guard": "false",
+                "bpdu_guard": "false",
+                "bpdu_guard_do_disable": "false",
+                "path_cost": "200",
+                "priority": "128",
+                "portfast": "false",
+                "uplink_fast": "false"
+            }
+        },
+
 
         "MCLAG_DOMAIN": {
             "123": {

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

@@ -264,9 +264,9 @@ 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:
                     raise Exception("Unexpected Test")
         except Exception as e:

src/sonic-yang-models/tests/yang_model_tests/tests/sonic-spanning-tree.json

@@ -0,0 +1,6 @@
+{
+    "PVST_GLOBAL_VALID": {
+        "desc": "Configure valid global PVST settings",
+        "eStr": []
+    }
+}

src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-spanning-tree.json

@@ -0,0 +1,34 @@
+{
+	"PVST_GLOBAL_VALID": {
+		"sonic-spanning-tree:sonic-spanning-tree": {
+			"sonic-spanning-tree:STP": {
+				"STP_LIST": [
+					{
+						"keyleaf": "GLOBAL",
+						"mode": "pvst",
+						"rootguard_timeout": "30",
+						"forward_delay": "15",
+						"hello_time": "2",
+						"max_age": "20",
+						"priority": "32768"
+					}
+				]
+			},
+			"sonic-spanning-tree:STP_PORT": {
+				"STP_PORT_LIST": [
+					{
+						"ifname": "Ethernet0",
+						"enabled": "true",
+						"root_guard": "false",
+						"bpdu_guard": "false",
+						"bpdu_guard_do_disable": "false",
+						"uplink_fast": "false",
+						"portfast": "false",
+						"path_cost": "200",
+						"priority": "128"
+					}
+				]
+			}
+		}
+	}
+}