From b169344eb8752f54b83506b784ba3ef309b7f2b0 Mon Sep 17 00:00:00 2001 From: Alpana Kumari Date: Sun, 26 Nov 2023 20:58:34 -0600 Subject: [PATCH] 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 --- gen/com/ibm/VPD/Parser/meson.build | 15 +++++++++++++++ gen/com/ibm/VPD/meson.build | 23 ++++++++++++----------- yaml/com/ibm/VPD/Manager.interface.yaml | 18 +++++++++--------- yaml/com/ibm/VPD/Parser.errors.yaml | 25 +++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 20 deletions(-) create mode 100644 gen/com/ibm/VPD/Parser/meson.build create mode 100644 yaml/com/ibm/VPD/Parser.errors.yaml diff --git a/gen/com/ibm/VPD/Parser/meson.build b/gen/com/ibm/VPD/Parser/meson.build new file mode 100644 index 00000000..d6a409e3 --- /dev/null +++ b/gen/com/ibm/VPD/Parser/meson.build @@ -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', + ], +) + diff --git a/gen/com/ibm/VPD/meson.build b/gen/com/ibm/VPD/meson.build index d068efd7..22495cff 100644 --- a/gen/com/ibm/VPD/meson.build +++ b/gen/com/ibm/VPD/meson.build @@ -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', ], ) diff --git a/yaml/com/ibm/VPD/Manager.interface.yaml b/yaml/com/ibm/VPD/Manager.interface.yaml index 81710dfa..02891ae4 100644 --- a/yaml/com/ibm/VPD/Manager.interface.yaml +++ b/yaml/com/ibm/VPD/Manager.interface.yaml @@ -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: > @@ -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: > @@ -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: > @@ -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: > diff --git a/yaml/com/ibm/VPD/Parser.errors.yaml b/yaml/com/ibm/VPD/Parser.errors.yaml new file mode 100644 index 00000000..da408f0f --- /dev/null +++ b/yaml/com/ibm/VPD/Parser.errors.yaml @@ -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.