diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-02-13 22:29:21 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-02-20 13:04:58 +0000 |
| commit | 17944e13e5d00d17427b5d49c6e84dbfd0033b45 (patch) | |
| tree | 942d3a77b0f015ed0767ee0ba537b90cf5f9d65a /tools/example | |
| parent | 6f29913919793ae1630b02d7682109e7a608363f (diff) | |
| download | phosphor-logging-17944e13e5d00d17427b5d49c6e84dbfd0033b45.tar.gz phosphor-logging-17944e13e5d00d17427b5d49c6e84dbfd0033b45.zip | |
Move inherits keyword from errors.yaml to metadata.yaml
The metadata.yaml file is the correct location for the inherits.
Update the elog-gen.py parser to support this change.
Change-Id: Iac7f67ec72e761ab3dafbf89c7e4d5495b34f00d
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'tools/example')
6 files changed, 6 insertions, 6 deletions
diff --git a/tools/example/xyz/openbmc_project/Example/Bar.errors.yaml b/tools/example/xyz/openbmc_project/Example/Bar.errors.yaml index cff338b..db5fff2 100644 --- a/tools/example/xyz/openbmc_project/Example/Bar.errors.yaml +++ b/tools/example/xyz/openbmc_project/Example/Bar.errors.yaml @@ -1,4 +1,2 @@ - name: Bar description: this is test error Bar - inherits: - - Foo diff --git a/tools/example/xyz/openbmc_project/Example/Bar.metadata.yaml b/tools/example/xyz/openbmc_project/Example/Bar.metadata.yaml index ceebffd..bc7381a 100644 --- a/tools/example/xyz/openbmc_project/Example/Bar.metadata.yaml +++ b/tools/example/xyz/openbmc_project/Example/Bar.metadata.yaml @@ -3,3 +3,5 @@ meta: - str: "BAR_DATA=%s" type: string + inherits: + - Foo diff --git a/tools/example/xyz/openbmc_project/Example/Elog.errors.yaml b/tools/example/xyz/openbmc_project/Example/Elog.errors.yaml index 6f75178..1ec9997 100644 --- a/tools/example/xyz/openbmc_project/Example/Elog.errors.yaml +++ b/tools/example/xyz/openbmc_project/Example/Elog.errors.yaml @@ -1,7 +1,5 @@ - name: TestErrorOne description: this is test error one - inherits: - - TestErrorTwo - name: TestErrorTwo description: This is test error two diff --git a/tools/example/xyz/openbmc_project/Example/Elog.metadata.yaml b/tools/example/xyz/openbmc_project/Example/Elog.metadata.yaml index 244127c..f0838e0 100644 --- a/tools/example/xyz/openbmc_project/Example/Elog.metadata.yaml +++ b/tools/example/xyz/openbmc_project/Example/Elog.metadata.yaml @@ -7,6 +7,8 @@ type: string - str: FILE_NAME=%s type: string + inherits: + - TestErrorTwo - name: TestErrorTwo level: ERR diff --git a/tools/example/xyz/openbmc_project/Example/Foo.errors.yaml b/tools/example/xyz/openbmc_project/Example/Foo.errors.yaml index e81571c..73fe62b 100644 --- a/tools/example/xyz/openbmc_project/Example/Foo.errors.yaml +++ b/tools/example/xyz/openbmc_project/Example/Foo.errors.yaml @@ -1,4 +1,2 @@ - name: Foo description: this is test error Foo - inherits: - - example.xyz.openbmc_project.Example.TestErrorOne diff --git a/tools/example/xyz/openbmc_project/Example/Foo.metadata.yaml b/tools/example/xyz/openbmc_project/Example/Foo.metadata.yaml index 2ac0532..02963aa 100644 --- a/tools/example/xyz/openbmc_project/Example/Foo.metadata.yaml +++ b/tools/example/xyz/openbmc_project/Example/Foo.metadata.yaml @@ -3,3 +3,5 @@ meta: - str: "FOO_DATA=%s" type: string + inherits: + - example.xyz.openbmc_project.Example.TestErrorOne |
