Skip to content

Commit b169344

Browse files
committed
1060: Move Error yaml to VPD
This commit is to move yaml/com/ibm/VPD.errors.yaml into yaml/com/ibm/VPD directory Test: Tested the patch on Rainier system. Reached successfully standby - runtime - standby Change-Id: I4e04a865164f7e1a4548ffd7a80b4f035a31573d Signed-off-by: Alpana Kumari <alpankum@in.ibm.com>
1 parent 1e36361 commit b169344

File tree

4 files changed

+61
-20
lines changed

4 files changed

+61
-20
lines changed

gen/com/ibm/VPD/Parser/meson.build

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Generated file; do not modify.
2+
generated_sources += custom_target(
3+
'com/ibm/VPD/Parser__cpp'.underscorify(),
4+
input: [ '../../../../../yaml/com/ibm/VPD/Parser.errors.yaml', ],
5+
output: [ 'error.cpp', 'error.hpp', ],
6+
depend_files: sdbusplusplus_depfiles,
7+
command: [
8+
sdbuspp_gen_meson_prog, '--command', 'cpp',
9+
'--output', meson.current_build_dir(),
10+
'--tool', sdbusplusplus_prog,
11+
'--directory', meson.current_source_dir() / '../../../../../yaml',
12+
'com/ibm/VPD/Parser',
13+
],
14+
)
15+

gen/com/ibm/VPD/meson.build

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
# Generated file; do not modify.
2-
generated_sources += custom_target(
3-
'com/ibm/VPD__cpp'.underscorify(),
4-
input: [ '../../../../yaml/com/ibm/VPD.errors.yaml', ],
5-
output: [ 'error.cpp', 'error.hpp', ],
2+
subdir('Manager')
3+
generated_others += custom_target(
4+
'com/ibm/VPD/Manager__markdown'.underscorify(),
5+
input: [ '../../../../yaml/com/ibm/VPD/Manager.interface.yaml', ],
6+
output: [ 'Manager.md' ],
67
depend_files: sdbusplusplus_depfiles,
78
command: [
8-
sdbuspp_gen_meson_prog, '--command', 'cpp',
9+
sdbuspp_gen_meson_prog, '--command', 'markdown',
910
'--output', meson.current_build_dir(),
1011
'--tool', sdbusplusplus_prog,
1112
'--directory', meson.current_source_dir() / '../../../../yaml',
12-
'com/ibm/VPD',
13+
'com/ibm/VPD/Manager',
1314
],
1415
)
1516

16-
subdir('Manager')
17+
subdir('Parser')
1718
generated_others += custom_target(
18-
'com/ibm/VPD/Manager__markdown'.underscorify(),
19-
input: [ '../../../../yaml/com/ibm/VPD/Manager.interface.yaml', ],
20-
output: [ 'Manager.md' ],
19+
'com/ibm/VPD/Parser__markdown'.underscorify(),
20+
input: [ '../../../../yaml/com/ibm/VPD/Parser.errors.yaml', ],
21+
output: [ 'Parser.md' ],
2122
depend_files: sdbusplusplus_depfiles,
2223
command: [
2324
sdbuspp_gen_meson_prog, '--command', 'markdown',
2425
'--output', meson.current_build_dir(),
2526
'--tool', sdbusplusplus_prog,
2627
'--directory', meson.current_source_dir() / '../../../../yaml',
27-
'com/ibm/VPD/Manager',
28+
'com/ibm/VPD/Parser',
2829
],
2930
)
3031

yaml/com/ibm/VPD/Manager.interface.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ methods:
2323
Value to be updated for the keyword.
2424
errors:
2525
- xyz.openbmc_project.Common.Error.InvalidArgument
26-
- com.ibm.VPD.Error.PathNotFound
27-
- com.ibm.VPD.Error.RecordNotFound
28-
- com.ibm.VPD.Error.KeywordNotFound
26+
- com.ibm.VPD.Parser.Error.PathNotFound
27+
- com.ibm.VPD.Parser.Error.RecordNotFound
28+
- com.ibm.VPD.Parser.Error.KeywordNotFound
2929

3030
- name: GetFRUsByUnexpandedLocationCode
3131
description: >
@@ -49,8 +49,8 @@ methods:
4949
code.
5050
errors:
5151
- xyz.openbmc_project.Common.Error.InvalidArgument
52-
- com.ibm.VPD.Error.LocationNotFound
53-
- com.ibm.VPD.Error.NodeNotFound
52+
- com.ibm.VPD.Parser.Error.LocationNotFound
53+
- com.ibm.VPD.Parser.Error.NodeNotFound
5454

5555
- name: GetFRUsByExpandedLocationCode
5656
description: >
@@ -69,8 +69,8 @@ methods:
6969
code.
7070
errors:
7171
- xyz.openbmc_project.Common.Error.InvalidArgument
72-
- com.ibm.VPD.Error.LocationNotFound
73-
- com.ibm.VPD.Error.NodeNotFound
72+
- com.ibm.VPD.Parser.Error.LocationNotFound
73+
- com.ibm.VPD.Parser.Error.NodeNotFound
7474

7575
- name: GetExpandedLocationCode
7676
description: >
@@ -94,8 +94,8 @@ methods:
9494
Location code in expanded format.
9595
errors:
9696
- xyz.openbmc_project.Common.Error.InvalidArgument
97-
- com.ibm.VPD.Error.LocationNotFound
98-
- com.ibm.VPD.Error.NodeNotFound
97+
- com.ibm.VPD.Parser.Error.LocationNotFound
98+
- com.ibm.VPD.Parser.Error.NodeNotFound
9999

100100
- name: PerformVPDRecollection
101101
description: >

yaml/com/ibm/VPD/Parser.errors.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
- name: LocationNotFound
2+
description: Location is not found.
3+
- name: NodeNotFound
4+
description: Node number is not found.
5+
- name: PathNotFound
6+
description: Inventory path is not found.
7+
- name: RecordNotFound
8+
description: Record not found.
9+
- name: KeywordNotFound
10+
description: Keyword is not found.
11+
- name: BlankSystemVPD
12+
description:
13+
System VPD is blank on both hardware and cache. On IBM systems, certain
14+
VPD data must be available for the system to boot. This error is used to
15+
indicate that no valid data was found by the BMC.
16+
- name: InvalidEepromPath
17+
description: EEPROM path is invalid. Parser failed to access the path.
18+
- name: InvalidVPD
19+
description: VPD file is not valid. Mandatory records are missing in VPD file.
20+
- name: EccCheckFailed
21+
desciption: Invalid VPD data. Ecc check for the data failed.
22+
- name: InvalidJson
23+
description: Invalid Json file.
24+
- name: DbusFailure
25+
description: DBus error occurred.

0 commit comments

Comments
 (0)