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>
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