schema: use pid, zone, stepwise schemas
These schemas were defined, but not referenced anywhere. Use them, and
remove the duplicated properties from the legacy aggregate schema.
Change-Id: I75ba8099059127cfa5c2d6492908333ca5c3bf67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/schemas/Stepwise.json b/schemas/Stepwise.json
index e6814ff..1111af8 100644
--- a/schemas/Stepwise.json
+++ b/schemas/Stepwise.json
@@ -1,62 +1,66 @@
{
- "$schema": "http://json-schema.org/schema#",
- "type": "object",
- "properties": {
- "Class": {
- "type": "string"
- },
- "Inputs": {
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "Name": {
- "type": "string"
- },
- "NegativeHysteresis": {
- "type": "number"
- },
- "Output": {
- "type": "array",
- "items": {
- "type": "number"
- }
- },
- "PositiveHysteresis": {
- "type": "number"
- },
- "Profiles": {
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "Reading": {
- "type": "array",
- "items": {
- "type": "number"
- }
- },
- "Type": {
- "type": "string"
- },
- "Zones": {
- "type": "array",
- "items": {
- "type": "string"
- }
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "definitions": {
+ "Stepwise": {
+ "type": "object",
+ "properties": {
+ "Class": {
+ "type": "string"
+ },
+ "Inputs": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "Name": {
+ "type": "string"
+ },
+ "NegativeHysteresis": {
+ "type": "number"
+ },
+ "Output": {
+ "type": "array",
+ "items": {
+ "type": "number"
+ }
+ },
+ "PositiveHysteresis": {
+ "type": "number"
+ },
+ "Profiles": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "Reading": {
+ "type": "array",
+ "items": {
+ "type": "number"
+ }
+ },
+ "Type": {
+ "type": "string"
+ },
+ "Zones": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ },
+ "required": [
+ "Class",
+ "Inputs",
+ "Name",
+ "NegativeHysteresis",
+ "Output",
+ "PositiveHysteresis",
+ "Reading",
+ "Type",
+ "Zones"
+ ]
}
- },
- "required": [
- "Class",
- "Inputs",
- "Name",
- "NegativeHysteresis",
- "Output",
- "PositiveHysteresis",
- "Reading",
- "Type",
- "Zones"
- ]
+ }
}