Skip to content

Commit ecb7625

Browse files
wajahatraziwajahatrazi
committed
Changes
2 parents 0de9d67 + e684942 commit ecb7625

File tree

4 files changed

+148
-349
lines changed

4 files changed

+148
-349
lines changed

‎src/sonic-yang-models/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ def run(self):
288288
'./cvlyang-models/sonic-macsec.yang',
289289
'./cvlyang-models/sonic-bmp.yang',
290290
'./cvlyang-models/sonic-serial-console.yang',
291-
'./yang-models/sonic-stp.yang',
291+
'./cvlyang-models/sonic-stp.yang',
292292
'./cvlyang-models/sonic-bgp-sentinel.yang']),
293293
],
294294
zip_safe=False,

‎src/sonic-yang-models/tests/yang_model_tests/tests/stp.json

+40-130
Original file line numberDiff line numberDiff line change
@@ -1,148 +1,58 @@
11
{
2-
"STP_GLOBAL_CONFIG_TEST": {
3-
"desc": "Configure STP globally with valid mode (mst or pvst)."
4-
},
5-
"STP_GLOBAL_INVALID_PRIORITY": {
6-
"desc": "Configure an invalid priority value in the STP global settings.",
7-
"eStrKey": "InvalidValue",
8-
"eStr": ["priority"]
2+
"STP_GLOBAL_VALID_TEST": {
3+
"desc": "Configure valid global STP settings in PVST mode with default parameters"
94
},
105
"STP_GLOBAL_INVALID_MODE_TEST": {
11-
"desc": "Configure STP globally with an invalid mode.",
12-
"eStrKey": "InvalidSTPMode",
13-
"eStr": ["Invalid STP mode value. Valid values are 'mst' or 'pvst'."]
14-
},
15-
"STP_GLOBAL_CONFIG_NO_MODE_NEG_TEST": {
16-
"desc": "Configure STP globally without specifying a mode.",
17-
"eStrKey": "Mandatory",
18-
"eStr": ["STP mode must be specified."]
19-
},
20-
"STP_GLOBAL_INVALID_ROOTGUARD_TIMEOUT": {
21-
"desc": "Configure an invalid root guard timeout in global STP settings.",
22-
"eStrKey": "InvalidRootguardTimeout",
23-
"eStr": ["Root-guard Timeout must be between 5 and 600 seconds."]
24-
},
25-
"STP_VLAN_VALID_CONFIG_TEST": {
26-
"desc": "Configure PVST VLAN with valid parameters (priority and VLAN ID)."
27-
},
28-
"STP_VLAN_INVALID_VLAN_ID_NEG_TEST": {
29-
"desc": "Configure PVST VLAN with an invalid VLAN ID.",
30-
"eStrKey": "InvalidVlanID",
31-
"eStr": ["VLAN ID must be between 1 and 4095."]
32-
},
33-
"STP_VLAN_INVALID_PRIORITY_NEG_TEST": {
34-
"desc": "Configure PVST VLAN with an invalid bridge priority.",
35-
"eStrKey": "InvalidPriority",
36-
"eStr": ["Bridge priority must be between 0 and 61440."]
37-
},
38-
"STP_VLAN_MISSING_PRIORITY_NEG_TEST": {
39-
"desc": "Configure PVST VLAN without specifying priority.",
40-
"eStrKey": "Mandatory",
41-
"eStr": ["Bridge priority must be specified for PVST VLAN."]
42-
},
43-
"STP_VLAN_DUPLICATE_CONFIG_NEG_TEST": {
44-
"desc": "Configure PVST VLAN with a duplicate VLAN ID.",
45-
"eStrKey": "DuplicateVlanID",
46-
"eStr": ["Duplicate VLAN ID detected."]
47-
},
48-
"STP_INTERFACE_VALID_CONFIG_TEST": {
49-
"desc": "Configure STP parameters on an interface with valid values."
50-
},
51-
"STP_INTERFACE_INVALID_COST_NEG_TEST": {
52-
"desc": "Configure an invalid path cost for an interface.",
53-
"eStrKey": "InvalidPathCost",
54-
"eStr": ["Path cost must be between 1 and 200000000."]
55-
},
56-
"STP_INTERFACE_DUPLICATE_NEG_TEST": {
57-
"desc": "Configure duplicate STP parameters for the same interface.",
58-
"eStrKey": "DuplicateInterfaceConfig",
59-
"eStr": ["Duplicate interface configuration detected."]
60-
},
61-
"STP_INTERFACE_INVALID_PORTFAST_NEG_TEST": {
62-
"desc": "Configure portfast on MST mode interface.",
63-
"eStrKey": "InvalidPortfast",
64-
"eStr": ["Configuration not allowed in MST mode"]
65-
},
66-
"STP_MST_GLOBAL_CONFIG_TEST": {
67-
"desc": "Configure MSTP globally with valid parameters."
68-
},
69-
"STP_MST_REGION_NAME_MISSING_NEG_TEST": {
70-
"desc": "Configure MSTP region without specifying a name.",
71-
"eStrKey": "Mandatory",
72-
"eStr": ["MST region name must be provided."]
73-
},
74-
"STP_MST_REGION_NAME_INVALID_NEG_TEST": {
75-
"desc": "Configure MSTP with an invalid region name.",
6+
"desc": "Configure invalid STP mode value",
767
"eStrKey": "InvalidValue",
77-
"eStr": ["MST region name must be between 1 and 32 characters."]
78-
},
79-
"STP_MST_INSTANCE_VALID_CONFIG_TEST": {
80-
"desc": "Configure MSTP instance with valid instance ID and VLAN mapping."
81-
},
82-
"STP_MST_INSTANCE_DUPLICATE_ID_NEG_TEST": {
83-
"desc": "Configure MSTP instance with a duplicate instance ID.",
84-
"eStrKey": "DuplicateInstanceID",
85-
"eStr": ["Duplicate MSTP instance ID detected."]
86-
},
87-
"STP_MST_INSTANCE_INVALID_VLAN_NEG_TEST": {
88-
"desc": "Configure MSTP instance with an invalid VLAN list.",
89-
"eStrKey": "InvalidVlanList",
90-
"eStr": ["VLAN list contains invalid or out-of-range VLAN IDs."]
91-
},
92-
"STP_MST_INSTANCE_MISSING_VLAN_NEG_TEST": {
93-
"desc": "Configure MSTP instance without associating VLANs.",
94-
"eStrKey": "Mandatory",
95-
"eStr": ["At least one VLAN must be associated with the MSTP instance."]
8+
"eStr": ["Invalid STP mode - must be pvst or mst"]
969
},
97-
"STP_MST_PORT_CONFIG_TEST": {
98-
"desc": "Configure MSTP parameters on a port with valid settings."
99-
},
100-
"STP_MST_PORT_INVALID_PRIORITY_NEG_TEST": {
101-
"desc": "Configure MSTP port with an invalid port priority.",
102-
"eStrKey": "InvalidPortPriority",
103-
"eStr": ["Port priority must be between 0 and 240."]
10+
"STP_GLOBAL_INVALID_PRIORITY_TEST": {
11+
"desc": "Configure invalid bridge priority value",
12+
"eStrKey": "InvalidValue",
13+
"eStr": ["Invalid Bridge Priority value"]
10414
},
105-
"STP_MST_PORT_INVALID_COST_NEG_TEST": {
106-
"desc": "Configure MSTP port with an invalid path cost.",
107-
"eStrKey": "InvalidPathCost",
108-
"eStr": ["Path cost must be between 1 and 20000000."]
15+
"STP_VLAN_VALID_TEST": {
16+
"desc": "Configure valid VLAN STP parameters with priority and timers"
10917
},
110-
"STP_MST_PORT_DUPLICATE_NEG_TEST": {
111-
"desc": "Configure MSTP parameters with duplicate port settings.",
112-
"eStrKey": "DuplicatePortConfig",
113-
"eStr": ["Duplicate MSTP port configuration detected."]
18+
"STP_PORT_VALID_PVST_TEST": {
19+
"desc": "Configure valid port parameters in PVST mode including portfast and guards"
11420
},
115-
"STP_MST_PORT_EDGE_PORT_NEG_TEST": {
116-
"desc": "Configure MSTP port with edge-port enabled in non-MST mode.",
117-
"eStrKey": "InvalidEdgePort",
118-
"eStr": ["Edge-port configuration is only allowed in MST mode."]
21+
"STP_PORT_INVALID_COST_TEST": {
22+
"desc": "Configure invalid path cost value",
23+
"eStrKey": "InvalidValue",
24+
"eStr": ["Invalid Port Path Cost value"]
11925
},
120-
"STP_MST_PORT_LINK_TYPE_TEST": {
121-
"desc": "Configure MSTP port with valid link type (auto, shared, point-to-point)."
26+
"STP_PORT_INVALID_PRIORITY_TEST": {
27+
"desc": "Configure invalid port priority",
28+
"eStrKey": "InvalidValue",
29+
"eStr": ["Invalid Port Priority value"]
12230
},
123-
"STP_MST_PORT_INVALID_LINK_TYPE_NEG_TEST": {
124-
"desc": "Configure MSTP port with an invalid link type.",
125-
"eStrKey": "InvalidLinkType",
126-
"eStr": ["Link type must be 'auto', 'shared', or 'point-to-point'."]
31+
"STP_MST_VALID_CONFIG_TEST": {
32+
"desc": "Configure valid MST mode with region and revision"
12733
},
128-
"STP_MST_PORT_CONFIG_DUPLICATE_EDGE_PORT_NEG_TEST": {
129-
"desc": "Configure MSTP port with duplicate edge-port configuration.",
130-
"eStrKey": "DuplicateEdgePortConfig",
131-
"eStr": ["Duplicate edge-port configuration detected."]
34+
"STP_MST_INVALID_IN_PVST_TEST": {
35+
"desc": "Configure MST parameters while in PVST mode",
36+
"eStrKey": "stp-invalid",
37+
"eStr": ["Configuration allowed only in MST mode"]
13238
},
133-
"STP_PORT_EDGE_PORT_TEST": {
134-
"desc": "Configure edge port settings on an interface."
39+
"STP_MST_INSTANCE_VALID_TEST": {
40+
"desc": "Configure valid MST instance with VLAN mapping"
13541
},
136-
"STP_PORT_LINK_TYPE_TEST": {
137-
"desc": "Configure link type settings on an interface."
42+
"STP_MST_INSTANCE_INVALID_VLAN_TEST": {
43+
"desc": "Configure invalid VLAN mapping for MST instance",
44+
"eStrKey": "InvalidValue",
45+
"eStr": ["Invalid VLAN mapping for MST instance"]
13846
},
139-
"STP_MST_HOLD_COUNT_TEST": {
140-
"desc": "Configure MST hold count with valid settings."
47+
"STP_PORT_ROOTGUARD_MST_TEST": {
48+
"desc": "Configure root guard in MST mode",
49+
"eStrKey": "stp-invalid",
50+
"eStr": ["Configuration not allowed in MST mode"]
14151
},
142-
"STP_MST_HELLO_TIME_TEST": {
143-
"desc": "Configure MST hello time with valid settings."
52+
"STP_PORT_BPDUGUARD_VALID_TEST": {
53+
"desc": "Configure valid BPDU guard settings with port disable"
14454
},
145-
"STP_MST_MAX_HOPS_TEST": {
146-
"desc": "Configure MST max hops with valid settings."
55+
"STP_MST_PORT_VALID_TEST": {
56+
"desc": "Configure valid MST port settings with edge port and link type"
14757
}
14858
}

0 commit comments

Comments
 (0)