commit 8e659b5bde8f59197480f3b93b6ec3cbbdc7bb9b
author Brad Bishop <bradleyb@fuzziesquirrel.com> Thu May 07 17:31:04 2020 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Jun 29 22:07:50 2020 +0000
tree be215fc52271df0d1e0de80ca0cf3519b774655a
parent b980991b9403c5f9989ddf52a3e82d3bb3a7b05a

schema: Add EMConfig

Entity Manager configuration documents can contain either a single
configuration (an object) or an array of that same object.  Introduce a
new definition "EMConfig" which makes this obvious.

Change-Id: I3189743d218f8ae7a00a70c4f2295dcc449997ef
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

schemas/global.json

diff --git a/schemas/global.json b/schemas/global.json
index 0ffd78b..844f79a 100644
--- a/schemas/global.json
+++ b/schemas/global.json
@@ -1,39 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "anyOf": [
-        {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "Exposes": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "legacy.json#/definitions/Aggregate"
-                        }
-                    },
-                    "Name": {
-                        "type": "string"
-                    },
-                    "Probe": {
-                        "type": "string"
-                    },
-                    "Type": {
-                        "type": "string"
-                    },
-                    "xyz.openbmc_project.Inventory.Decorator.Asset": {
-                        "$ref": "openbmc-dbus.json#/definitions/xyz/openbmc_project/Inventory/Decorator/Asset"
-                    }
-                },
-                "required": [
-                    "Exposes",
-                    "Name",
-                    "Probe",
-                    "xyz.openbmc_project.Inventory.Decorator.Asset"
-                ]
-            }
-        },
-        {
+    "definitions": {
+        "EMConfig": {
             "type": "object",
             "properties": {
                 "Exposes": {
@@ -80,5 +48,16 @@
                 "Probe"
             ]
         }
+    },
+    "anyOf": [
+        {
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/EMConfig"
+            }
+        },
+        {
+            "$ref": "#/definitions/EMConfig"
+        }
     ]
 }