Skip to content

Commit ea028e6

Browse files
authored
[msft-202405][yang-model] support reserving mem in high region for crashkernel (#1851)
Why I did it Cherry-pick sonic-net/sonic-buildimage#24441 in msft-202405. Work item tracking Microsoft ADO (number only):
1 parent 40c0bab commit ea028e6

File tree

3 files changed

+59
-2
lines changed

3 files changed

+59
-2
lines changed

src/sonic-yang-models/tests/yang_model_tests/tests/kdump.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,26 @@
1111
"KDUMP_WITH_VALID_VALUES_4": {
1212
"desc": "Configuring the kdump with valid values."
1313
},
14+
"KDUMP_WITH_VALID_MEM_HIGH": {
15+
"desc": "Configuring the kdump with valid values and high suffix."
16+
},
17+
"KDUMP_WITH_VALID_MEM_HIGH_2": {
18+
"desc": "Configuring the kdump with valid values and high suffix."
19+
},
1420
"KDUMP_WITH_INVALID_NUM_DUMPS": {
1521
"desc": "Configuring kdump config with a invalid number of allowed kdumps.",
1622
"eStr": ["pattern", "does not satisfy"]
1723
},
1824
"KDUMP_WITH_INVALID_MEMORY": {
1925
"desc": "Configuring kdump config with invalid memory config.",
2026
"eStr": ["pattern", "does not satisfy"]
27+
},
28+
"KDUMP_WITH_INVALID_MEM_HIGH": {
29+
"desc": "Configuring kdump config with invalid value.",
30+
"eStr": ["Pattern", "does not satisfy"]
31+
},
32+
"KDUMP_WITH_INVALID_MEM_HIGH_2": {
33+
"desc": "Configuring kdump config with invalid suffix.",
34+
"eStr": ["Pattern", "does not satisfy"]
2135
}
2236
}

src/sonic-yang-models/tests/yang_model_tests/tests_config/kdump.json

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,28 @@
4343
}
4444
}
4545
},
46-
46+
"KDUMP_WITH_VALID_MEM_HIGH": {
47+
"sonic-kdump:sonic-kdump": {
48+
"sonic-kdump:KDUMP": {
49+
"config": {
50+
"enabled": "true",
51+
"num_dumps": "3",
52+
"memory": "1G,high",
53+
}
54+
}
55+
}
56+
},
57+
"KDUMP_WITH_VALID_MEM_HIGH_2": {
58+
"sonic-kdump:sonic-kdump": {
59+
"sonic-kdump:KDUMP": {
60+
"config": {
61+
"enabled": "true",
62+
"num_dumps": "3",
63+
"memory": "512M,high",
64+
}
65+
}
66+
}
67+
},
4768
"KDUMP_WITH_INVALID_NUM_DUMPS": {
4869
"sonic-kdump:sonic-kdump": {
4970
"sonic-kdump:KDUMP": {
@@ -65,5 +86,27 @@
6586
}
6687
}
6788
}
89+
},
90+
"KDUMP_WITH_INVALID_MEM_HIGH": {
91+
"sonic-kdump:sonic-kdump": {
92+
"sonic-kdump:KDUMP": {
93+
"config": {
94+
"enabled": "true",
95+
"num_dumps": "3",
96+
"memory": "100,high",
97+
}
98+
}
99+
}
100+
},
101+
"KDUMP_WITH_INVALID_MEM_HIGH_2": {
102+
"sonic-kdump:sonic-kdump": {
103+
"sonic-kdump:KDUMP": {
104+
"config": {
105+
"enabled": "true",
106+
"num_dumps": "3",
107+
"memory": "1G,highx",
108+
}
109+
}
110+
}
68111
}
69112
}

src/sonic-yang-models/yang-models/sonic-kdump.yang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module sonic-kdump {
3333

3434
leaf memory {
3535
type string {
36-
pattern "(((([0-9]+[MG]?)?(-([0-9]+[MG])?):)?[0-9]+[MG],?)+)";
36+
pattern "((((([0-9]+[MG]?)?(-([0-9]+[MG])?):)?[0-9]+[MG],?)+)|([0-9]+[MG],high))";
3737
}
3838
description
3939
"Memory reserved for loading the crash handler kernel. The amount

0 commit comments

Comments
 (0)