Skip to content

1060: Move Error yaml to VPD directory #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1060
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions gen/com/ibm/VPD/Parser/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Generated file; do not modify.
generated_sources += custom_target(
'com/ibm/VPD/Parser__cpp'.underscorify(),
input: [ '../../../../../yaml/com/ibm/VPD/Parser.errors.yaml', ],
output: [ 'error.cpp', 'error.hpp', ],
depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
'--directory', meson.current_source_dir() / '../../../../../yaml',
'com/ibm/VPD/Parser',
],
)

23 changes: 12 additions & 11 deletions gen/com/ibm/VPD/meson.build
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
# Generated file; do not modify.
generated_sources += custom_target(
'com/ibm/VPD__cpp'.underscorify(),
input: [ '../../../../yaml/com/ibm/VPD.errors.yaml', ],
output: [ 'error.cpp', 'error.hpp', ],
subdir('Manager')
generated_others += custom_target(
'com/ibm/VPD/Manager__markdown'.underscorify(),
input: [ '../../../../yaml/com/ibm/VPD/Manager.interface.yaml', ],
output: [ 'Manager.md' ],
depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
sdbuspp_gen_meson_prog, '--command', 'markdown',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/ibm/VPD',
'com/ibm/VPD/Manager',
],
)

subdir('Manager')
subdir('Parser')
generated_others += custom_target(
'com/ibm/VPD/Manager__markdown'.underscorify(),
input: [ '../../../../yaml/com/ibm/VPD/Manager.interface.yaml', ],
output: [ 'Manager.md' ],
'com/ibm/VPD/Parser__markdown'.underscorify(),
input: [ '../../../../yaml/com/ibm/VPD/Parser.errors.yaml', ],
output: [ 'Parser.md' ],
depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'markdown',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
'--directory', meson.current_source_dir() / '../../../../yaml',
'com/ibm/VPD/Manager',
'com/ibm/VPD/Parser',
],
)

18 changes: 9 additions & 9 deletions yaml/com/ibm/VPD/Manager.interface.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ methods:
Value to be updated for the keyword.
errors:
- xyz.openbmc_project.Common.Error.InvalidArgument
- com.ibm.VPD.Error.PathNotFound
- com.ibm.VPD.Error.RecordNotFound
- com.ibm.VPD.Error.KeywordNotFound
- com.ibm.VPD.Parser.Error.PathNotFound
- com.ibm.VPD.Parser.Error.RecordNotFound
- com.ibm.VPD.Parser.Error.KeywordNotFound

- name: GetFRUsByUnexpandedLocationCode
description: >
Expand All @@ -49,8 +49,8 @@ methods:
code.
errors:
- xyz.openbmc_project.Common.Error.InvalidArgument
- com.ibm.VPD.Error.LocationNotFound
- com.ibm.VPD.Error.NodeNotFound
- com.ibm.VPD.Parser.Error.LocationNotFound
- com.ibm.VPD.Parser.Error.NodeNotFound

- name: GetFRUsByExpandedLocationCode
description: >
Expand All @@ -69,8 +69,8 @@ methods:
code.
errors:
- xyz.openbmc_project.Common.Error.InvalidArgument
- com.ibm.VPD.Error.LocationNotFound
- com.ibm.VPD.Error.NodeNotFound
- com.ibm.VPD.Parser.Error.LocationNotFound
- com.ibm.VPD.Parser.Error.NodeNotFound

- name: GetExpandedLocationCode
description: >
Expand All @@ -94,8 +94,8 @@ methods:
Location code in expanded format.
errors:
- xyz.openbmc_project.Common.Error.InvalidArgument
- com.ibm.VPD.Error.LocationNotFound
- com.ibm.VPD.Error.NodeNotFound
- com.ibm.VPD.Parser.Error.LocationNotFound
- com.ibm.VPD.Parser.Error.NodeNotFound

- name: PerformVPDRecollection
description: >
Expand Down
25 changes: 25 additions & 0 deletions yaml/com/ibm/VPD/Parser.errors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- name: LocationNotFound
description: Location is not found.
- name: NodeNotFound
description: Node number is not found.
- name: PathNotFound
description: Inventory path is not found.
- name: RecordNotFound
description: Record not found.
- name: KeywordNotFound
description: Keyword is not found.
- name: BlankSystemVPD
description:
System VPD is blank on both hardware and cache. On IBM systems, certain
VPD data must be available for the system to boot. This error is used to
indicate that no valid data was found by the BMC.
- name: InvalidEepromPath
description: EEPROM path is invalid. Parser failed to access the path.
- name: InvalidVPD
description: VPD file is not valid. Mandatory records are missing in VPD file.
- name: EccCheckFailed
desciption: Invalid VPD data. Ecc check for the data failed.
- name: InvalidJson
description: Invalid Json file.
- name: DbusFailure
description: DBus error occurred.