X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fclient%2Fschemas.json;h=1191024379a35905083ed127f4b7c6b7aab3382e;hb=2cafbe27c9fa355963e1f711c55183ac92ed0caf;hp=0c196489f43e62857c6f56e5319fd74c39ca0a7c;hpb=edf3beda420d3a2c66d6ef8fe9b5e45a76d052b9;p=osm%2FN2VC.git diff --git a/juju/client/schemas.json b/juju/client/schemas.json index 0c19648..1191024 100644 --- a/juju/client/schemas.json +++ b/juju/client/schemas.json @@ -222,10 +222,10 @@ "ActionSpec": { "type": "object", "properties": { - "Description": { + "description": { "type": "string" }, - "Params": { + "params": { "type": "object", "patternProperties": { ".*": { @@ -237,26 +237,21 @@ }, "additionalProperties": false, "required": [ - "Description", - "Params" + "description", + "params" ] }, "Actions": { "type": "object", "properties": { - "ActionSpecs": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/ActionSpec" - } + "actions": { + "type": "array", + "items": { + "$ref": "#/definitions/Action" } } }, - "additionalProperties": false, - "required": [ - "ActionSpecs" - ] + "additionalProperties": false }, "ActionsByName": { "type": "object", @@ -321,11 +316,16 @@ "ApplicationCharmActionsResult": { "type": "object", "properties": { - "ApplicationTag": { - "type": "string" - }, "actions": { - "$ref": "#/definitions/Actions" + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ActionSpec" + } + } + }, + "application-tag": { + "type": "string" }, "error": { "$ref": "#/definitions/Error" @@ -348,7 +348,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -357,47 +357,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -452,63 +452,30 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "RunParams": { "type": "object", "properties": { - "Applications": { + "applications": { "type": "array", "items": { "type": "string" } }, - "Commands": { + "commands": { "type": "string" }, - "Machines": { + "machines": { "type": "array", "items": { "type": "string" } }, - "Timeout": { + "timeout": { "type": "integer" }, - "Units": { + "units": { "type": "array", "items": { "type": "string" @@ -517,264 +484,57 @@ }, "additionalProperties": false, "required": [ - "Commands", - "Timeout", - "Machines", - "Applications", - "Units" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "commands", + "timeout" ] } } } }, { - "Name": "Addresser", + "Name": "Agent", "Version": 2, "Schema": { "type": "object", "properties": { - "CanDeallocateAddresses": { + "ClearReboot": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/BoolResult" + "$ref": "#/definitions/ErrorResults" } } }, - "CleanupIPAddresses": { + "CloudSpec": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/CloudSpecResults" } } }, - "WatchIPAddresses": { + "ControllerConfig": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/EntitiesWatchResult" + "$ref": "#/definitions/ControllerConfigResult" } } - } - }, - "definitions": { - "BoolResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "boolean" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "EntitiesWatchResult": { - "type": "object", - "properties": { - "Changes": { - "type": "array", - "items": { - "type": "string" - } - }, - "EntityWatcherId": { - "type": "string" - }, - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "EntityWatcherId", - "Changes", - "Error" - ] - }, - "Error": { - "type": "object", - "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] - }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" - } - }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "Error" - ] - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "Agent", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "ClearReboot": { + "GetCloudSpec": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ModelTag" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/CloudSpecResult" } } }, @@ -824,6 +584,17 @@ } } }, + "WatchCredentials": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + }, "WatchForModelConfigChanges": { "type": "object", "properties": { @@ -837,34 +608,33 @@ "AgentGetEntitiesResult": { "type": "object", "properties": { - "ContainerType": { + "container-type": { "type": "string" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Jobs": { + "jobs": { "type": "array", "items": { "type": "string" } }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Jobs", - "ContainerType", - "Error" + "life", + "jobs", + "container-type" ] }, "AgentGetEntitiesResults": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/AgentGetEntitiesResult" @@ -873,56 +643,155 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, - "Entities": { + "CloudCredential": { "type": "object", "properties": { - "Entities": { + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "auth-type": { + "type": "string" + }, + "redacted": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "type": "string" } } }, "additionalProperties": false, "required": [ - "Entities" + "auth-type" ] }, - "Entity": { + "CloudSpec": { "type": "object", "properties": { - "Tag": { + "credential": { + "$ref": "#/definitions/CloudCredential" + }, + "endpoint": { + "type": "string" + }, + "identity-endpoint": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "storage-endpoint": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "type", + "name" + ] + }, + "CloudSpecResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/CloudSpec" + } + }, + "additionalProperties": false + }, + "CloudSpecResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, + "additionalProperties": false + }, + "ControllerConfigResult": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "Entities": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityPassword": { "type": "object", "properties": { - "Password": { + "password": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Password" + "tag", + "password" ] }, "EntityPasswords": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/EntityPassword" @@ -931,35 +800,35 @@ }, "additionalProperties": false, "required": [ - "Changes" + "changes" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -968,19 +837,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -989,62 +855,29 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "IsMasterResult": { "type": "object", "properties": { - "Master": { + "master": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Master" + "master" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -1056,99 +889,77 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, + "ModelTag": { + "type": "object", + "additionalProperties": false + }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "results" ] }, "StateServingInfo": { "type": "object", "properties": { - "APIPort": { + "api-port": { "type": "integer" }, - "CAPrivateKey": { + "ca-private-key": { "type": "string" }, - "Cert": { + "cert": { "type": "string" }, - "PrivateKey": { + "private-key": { "type": "string" }, - "SharedSecret": { + "shared-secret": { "type": "string" }, - "StatePort": { + "state-port": { "type": "integer" }, - "SystemIdentity": { + "system-identity": { "type": "string" } }, "additionalProperties": false, "required": [ - "APIPort", - "StatePort", - "Cert", - "PrivateKey", - "CAPrivateKey", - "SharedSecret", - "SystemIdentity" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "api-port", + "state-port", + "cert", + "private-key", + "ca-private-key", + "shared-secret", + "system-identity" ] } } @@ -1188,7 +999,7 @@ "AllWatcherNextResults": { "type": "object", "properties": { - "Deltas": { + "deltas": { "type": "array", "items": { "$ref": "#/definitions/Delta" @@ -1197,24 +1008,24 @@ }, "additionalProperties": false, "required": [ - "Deltas" + "deltas" ] }, "Delta": { "type": "object", "properties": { - "Entity": { + "entity": { "type": "object", "additionalProperties": true }, - "Removed": { + "removed": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Removed", - "Entity" + "removed", + "entity" ] } } @@ -1242,7 +1053,7 @@ "AllWatcherNextResults": { "type": "object", "properties": { - "Deltas": { + "deltas": { "type": "array", "items": { "$ref": "#/definitions/Delta" @@ -1251,24 +1062,24 @@ }, "additionalProperties": false, "required": [ - "Deltas" + "deltas" ] }, "Delta": { "type": "object", "properties": { - "Entity": { + "entity": { "type": "object", "additionalProperties": true }, - "Removed": { + "removed": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Removed", - "Entity" + "removed", + "entity" ] } } @@ -1307,7 +1118,7 @@ "AnnotationsGetResult": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "object", "patternProperties": { ".*": { @@ -1315,24 +1126,23 @@ } } }, - "EntityTag": { + "entity": { "type": "string" }, - "Error": { + "error": { "$ref": "#/definitions/ErrorResult" } }, "additionalProperties": false, "required": [ - "EntityTag", - "Annotations", - "Error" + "entity", + "annotations" ] }, "AnnotationsGetResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/AnnotationsGetResult" @@ -1341,13 +1151,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "AnnotationsSet": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "array", "items": { "$ref": "#/definitions/EntityAnnotations" @@ -1356,13 +1166,13 @@ }, "additionalProperties": false, "required": [ - "Annotations" + "annotations" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -1371,25 +1181,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityAnnotations": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "object", "patternProperties": { ".*": { @@ -1397,42 +1207,42 @@ } } }, - "EntityTag": { + "entity": { "type": "string" } }, "additionalProperties": false, "required": [ - "EntityTag", - "Annotations" + "entity", + "annotations" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -1441,19 +1251,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -1462,92 +1269,19 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } }, { "Name": "Application", - "Version": 1, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -1724,13 +1458,13 @@ "AddApplicationUnits": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "NumUnits": { + "num-units": { "type": "integer" }, - "Placement": { + "placement": { "type": "array", "items": { "$ref": "#/definitions/Placement" @@ -1739,15 +1473,15 @@ }, "additionalProperties": false, "required": [ - "ApplicationName", - "NumUnits", - "Placement" + "application", + "num-units", + "placement" ] }, "AddApplicationUnitsResults": { "type": "object", "properties": { - "Units": { + "units": { "type": "array", "items": { "type": "string" @@ -1756,13 +1490,13 @@ }, "additionalProperties": false, "required": [ - "Units" + "units" ] }, "AddRelation": { "type": "object", "properties": { - "Endpoints": { + "endpoints": { "type": "array", "items": { "type": "string" @@ -1771,42 +1505,42 @@ }, "additionalProperties": false, "required": [ - "Endpoints" + "endpoints" ] }, "AddRelationResults": { "type": "object", "properties": { - "Endpoints": { + "endpoints": { "type": "object", "patternProperties": { ".*": { - "$ref": "#/definitions/Relation" + "$ref": "#/definitions/CharmRelation" } } } }, "additionalProperties": false, "required": [ - "Endpoints" + "endpoints" ] }, "ApplicationCharmRelations": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "ApplicationName" + "application" ] }, "ApplicationCharmRelationsResults": { "type": "object", "properties": { - "CharmRelations": { + "charm-relations": { "type": "array", "items": { "type": "string" @@ -1815,22 +1549,22 @@ }, "additionalProperties": false, "required": [ - "CharmRelations" + "charm-relations" ] }, "ApplicationDeploy": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "Channel": { + "channel": { "type": "string" }, - "CharmUrl": { + "charm-url": { "type": "string" }, - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -1838,13 +1572,13 @@ } } }, - "ConfigYAML": { + "config-yaml": { "type": "string" }, - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" }, - "EndpointBindings": { + "endpoint-bindings": { "type": "object", "patternProperties": { ".*": { @@ -1852,16 +1586,16 @@ } } }, - "NumUnits": { + "num-units": { "type": "integer" }, - "Placement": { + "placement": { "type": "array", "items": { "$ref": "#/definitions/Placement" } }, - "Resources": { + "resources": { "type": "object", "patternProperties": { ".*": { @@ -1869,10 +1603,10 @@ } } }, - "Series": { + "series": { "type": "string" }, - "Storage": { + "storage": { "type": "object", "patternProperties": { ".*": { @@ -1883,66 +1617,61 @@ }, "additionalProperties": false, "required": [ - "ApplicationName", - "Series", - "CharmUrl", - "Channel", - "NumUnits", - "Config", - "ConfigYAML", - "Constraints", - "Placement", - "Storage", - "EndpointBindings", - "Resources" + "application", + "series", + "charm-url", + "channel", + "num-units", + "config-yaml", + "constraints" ] }, "ApplicationDestroy": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "ApplicationName" + "application" ] }, "ApplicationExpose": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "ApplicationName" + "application" ] }, "ApplicationGet": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "ApplicationName" + "application" ] }, "ApplicationGetResults": { "type": "object", "properties": { - "Application": { + "application": { "type": "string" }, - "Charm": { + "charm": { "type": "string" }, - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -1951,25 +1680,29 @@ } } }, - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" + }, + "series": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Application", - "Charm", - "Config", - "Constraints" + "application", + "charm", + "config", + "constraints", + "series" ] }, "ApplicationMetricCredential": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "MetricCredentials": { + "metrics-credentials": { "type": "array", "items": { "type": "integer" @@ -1978,14 +1711,14 @@ }, "additionalProperties": false, "required": [ - "ApplicationName", - "MetricCredentials" + "application", + "metrics-credentials" ] }, "ApplicationMetricCredentials": { "type": "object", "properties": { - "Creds": { + "creds": { "type": "array", "items": { "$ref": "#/definitions/ApplicationMetricCredential" @@ -1994,16 +1727,16 @@ }, "additionalProperties": false, "required": [ - "Creds" + "creds" ] }, "ApplicationSet": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "Options": { + "options": { "type": "object", "patternProperties": { ".*": { @@ -2014,66 +1747,84 @@ }, "additionalProperties": false, "required": [ - "ApplicationName", - "Options" + "application", + "options" ] }, "ApplicationSetCharm": { "type": "object", "properties": { - "applicationname": { + "application": { "type": "string" }, - "charmurl": { + "channel": { "type": "string" }, - "cs-channel": { + "charm-url": { "type": "string" }, - "forceseries": { + "config-settings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "config-settings-yaml": { + "type": "string" + }, + "force-series": { "type": "boolean" }, - "forceunits": { + "force-units": { "type": "boolean" }, - "resourceids": { + "resource-ids": { "type": "object", "patternProperties": { ".*": { "type": "string" } } + }, + "storage-constraints": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/StorageConstraints" + } + } } }, "additionalProperties": false, "required": [ - "applicationname", - "charmurl", - "cs-channel", - "forceunits", - "forceseries", - "resourceids" + "application", + "charm-url", + "channel", + "force-units", + "force-series" ] }, "ApplicationUnexpose": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "ApplicationName" + "application" ] }, "ApplicationUnset": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "Options": { + "options": { "type": "array", "items": { "type": "string" @@ -2082,32 +1833,32 @@ }, "additionalProperties": false, "required": [ - "ApplicationName", - "Options" + "application", + "options" ] }, "ApplicationUpdate": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "CharmUrl": { + "charm-url": { "type": "string" }, - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" }, - "ForceCharmUrl": { + "force-charm-url": { "type": "boolean" }, - "ForceSeries": { + "force-series": { "type": "boolean" }, - "MinUnits": { + "min-units": { "type": "integer" }, - "SettingsStrings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -2115,26 +1866,23 @@ } } }, - "SettingsYAML": { + "settings-yaml": { "type": "string" } }, "additionalProperties": false, "required": [ - "ApplicationName", - "CharmUrl", - "ForceCharmUrl", - "ForceSeries", - "MinUnits", - "SettingsStrings", - "SettingsYAML", - "Constraints" + "application", + "charm-url", + "force-charm-url", + "force-series", + "settings-yaml" ] }, "ApplicationsDeploy": { "type": "object", "properties": { - "Applications": { + "applications": { "type": "array", "items": { "$ref": "#/definitions/ApplicationDeploy" @@ -2143,7 +1891,39 @@ }, "additionalProperties": false, "required": [ - "Applications" + "applications" + ] + }, + "CharmRelation": { + "type": "object", + "properties": { + "interface": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "optional": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "scope": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "role", + "interface", + "optional", + "limit", + "scope" ] }, "Constraints": { @@ -2169,7 +1949,7 @@ "DestroyApplicationUnits": { "type": "object", "properties": { - "UnitNames": { + "unit-names": { "type": "array", "items": { "type": "string" @@ -2178,13 +1958,13 @@ }, "additionalProperties": false, "required": [ - "UnitNames" + "unit-names" ] }, "DestroyRelation": { "type": "object", "properties": { - "Endpoints": { + "endpoints": { "type": "array", "items": { "type": "string" @@ -2193,35 +1973,35 @@ }, "additionalProperties": false, "required": [ - "Endpoints" + "endpoints" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -2230,19 +2010,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -2251,148 +2028,97 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetApplicationConstraints": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "ApplicationName" + "application" ] }, "GetConstraintsResults": { "type": "object", "properties": { - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "Constraints" + "constraints" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "Placement": { "type": "object", "properties": { - "Directive": { + "directive": { "type": "string" }, - "Scope": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Scope", - "Directive" + "scope", + "directive" ] }, - "Relation": { + "SetConstraints": { "type": "object", "properties": { - "Interface": { + "application": { "type": "string" }, - "Limit": { - "type": "integer" - }, - "Name": { - "type": "string" - }, - "Optional": { - "type": "boolean" - }, - "Role": { - "type": "string" - }, - "Scope": { - "type": "string" + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "Name", - "Role", - "Interface", - "Optional", - "Limit", - "Scope" + "application", + "constraints" ] }, - "SetConstraints": { + "StorageConstraints": { "type": "object", "properties": { - "ApplicationName": { + "count": { + "type": "integer" + }, + "pool": { "type": "string" }, - "Constraints": { - "$ref": "#/definitions/Value" + "size": { + "type": "integer" } }, - "additionalProperties": false, - "required": [ - "ApplicationName", - "Constraints" - ] + "additionalProperties": false }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "Value": { @@ -2404,7 +2130,7 @@ "container": { "type": "string" }, - "cpu-cores": { + "cores": { "type": "integer" }, "cpu-power": { @@ -2436,46 +2162,144 @@ } }, "additionalProperties": false + } + } + } + }, + { + "Name": "ApplicationRelationsWatcher", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Next": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ApplicationRelationsWatchResult" + } + } + }, + "Stop": { + "type": "object" + } + }, + "definitions": { + "ApplicationRelationsChange": { + "type": "object", + "properties": { + "changed": { + "type": "array", + "items": { + "$ref": "#/definitions/RelationChange" + } + }, + "removed": { + "type": "array", + "items": { + "type": "integer" + } + } + }, + "additionalProperties": false }, - "caveat": { + "ApplicationRelationsWatchResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "ApplicationRelationsWatcherId": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "changes": { + "$ref": "#/definitions/ApplicationRelationsChange" }, - "verificationId": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "ApplicationRelationsWatcherId" ] }, - "packet": { + "Error": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "code": { + "type": "string" }, - "start": { - "type": "integer" + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "RelationChange": { + "type": "object", + "properties": { + "changedunits": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/RelationUnitChange" + } + } + }, + "departedunits": { + "type": "array", + "items": { + "type": "string" + } }, - "totalLen": { + "id": { "type": "integer" + }, + "life": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "id", + "life" ] + }, + "RelationUnitChange": { + "type": "object", + "properties": { + "settings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false } } } @@ -2510,7 +2334,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -2519,47 +2343,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -2568,19 +2392,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -2589,107 +2410,32 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } @@ -2761,25 +2507,25 @@ "BackupsCreateArgs": { "type": "object", "properties": { - "Notes": { + "notes": { "type": "string" } }, "additionalProperties": false, "required": [ - "Notes" + "notes" ] }, "BackupsInfoArgs": { "type": "object", "properties": { - "ID": { + "id": { "type": "string" } }, "additionalProperties": false, "required": [ - "ID" + "id" ] }, "BackupsListArgs": { @@ -2789,7 +2535,7 @@ "BackupsListResult": { "type": "object", "properties": { - "List": { + "list": { "type": "array", "items": { "$ref": "#/definitions/BackupsMetadataResult" @@ -2798,90 +2544,90 @@ }, "additionalProperties": false, "required": [ - "List" + "list" ] }, "BackupsMetadataResult": { "type": "object", "properties": { - "CACert": { + "ca-cert": { "type": "string" }, - "CAPrivateKey": { + "ca-private-key": { "type": "string" }, - "Checksum": { + "checksum": { "type": "string" }, - "ChecksumFormat": { + "checksum-format": { "type": "string" }, - "Finished": { + "finished": { "type": "string", "format": "date-time" }, - "Hostname": { + "hostname": { "type": "string" }, - "ID": { + "id": { "type": "string" }, - "Machine": { + "machine": { "type": "string" }, - "Model": { + "model": { "type": "string" }, - "Notes": { + "notes": { "type": "string" }, - "Series": { + "series": { "type": "string" }, - "Size": { + "size": { "type": "integer" }, - "Started": { + "started": { "type": "string", "format": "date-time" }, - "Stored": { + "stored": { "type": "string", "format": "date-time" }, - "Version": { + "version": { "$ref": "#/definitions/Number" } }, "additionalProperties": false, "required": [ - "ID", - "Checksum", - "ChecksumFormat", - "Size", - "Stored", - "Started", - "Finished", - "Notes", - "Model", - "Machine", - "Hostname", - "Version", - "Series", - "CACert", - "CAPrivateKey" + "id", + "checksum", + "checksum-format", + "size", + "stored", + "started", + "finished", + "notes", + "model", + "machine", + "hostname", + "version", + "series", + "ca-cert", + "ca-private-key" ] }, "BackupsRemoveArgs": { "type": "object", "properties": { - "ID": { + "id": { "type": "string" } }, "additionalProperties": false, "required": [ - "ID" + "id" ] }, "Number": { @@ -2915,13 +2661,13 @@ "RestoreArgs": { "type": "object", "properties": { - "BackupId": { + "backup-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "BackupId" + "backup-id" ] } } @@ -3033,29 +2779,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -3064,91 +2810,98 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "Bundle", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "GetChanges": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Params": { + "$ref": "#/definitions/BundleChangesParams" }, - "data": { + "Result": { + "$ref": "#/definitions/BundleChangesResults" + } + } + } + }, + "definitions": { + "BundleChange": { + "type": "object", + "properties": { + "args": { "type": "array", "items": { - "type": "integer" + "type": "object", + "additionalProperties": true } }, "id": { - "$ref": "#/definitions/packet" + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "method": { + "type": "string" }, - "sig": { + "requires": { "type": "array", "items": { - "type": "integer" + "type": "string" } } }, "additionalProperties": false, "required": [ - "data", - "location", "id", - "caveats", - "sig" + "method", + "args", + "requires" ] }, - "caveat": { + "BundleChangesParams": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "yaml": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "yaml" ] }, - "packet": { + "BundleChangesResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/BundleChange" + } }, - "totalLen": { - "type": "integer" + "errors": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } @@ -3172,29 +2925,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -3203,91 +2956,15 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } @@ -3302,7 +2979,7 @@ "type": "object", "properties": { "Params": { - "$ref": "#/definitions/CharmInfo" + "$ref": "#/definitions/CharmURL" }, "Result": { "$ref": "#/definitions/CharmInfo" @@ -3313,7 +2990,7 @@ "type": "object", "properties": { "Params": { - "$ref": "#/definitions/CharmInfo" + "$ref": "#/definitions/CharmURL" }, "Result": { "$ref": "#/definitions/IsMeteredResult" @@ -3333,282 +3010,563 @@ } }, "definitions": { - "CharmInfo": { + "CharmActionSpec": { "type": "object", "properties": { - "CharmURL": { + "description": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "CharmURL" - ] - }, - "CharmsList": { - "type": "object", - "properties": { - "Names": { - "type": "array", - "items": { - "type": "string" + }, + "params": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } } }, "additionalProperties": false, "required": [ - "Names" + "description", + "params" ] }, - "CharmsListResult": { + "CharmActions": { "type": "object", "properties": { - "CharmURLs": { - "type": "array", - "items": { - "type": "string" + "specs": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmActionSpec" + } } } }, - "additionalProperties": false, - "required": [ - "CharmURLs" - ] + "additionalProperties": false }, - "IsMeteredResult": { + "CharmInfo": { "type": "object", "properties": { - "Metered": { - "type": "boolean" + "actions": { + "$ref": "#/definitions/CharmActions" + }, + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmOption" + } + } + }, + "meta": { + "$ref": "#/definitions/CharmMeta" + }, + "metrics": { + "$ref": "#/definitions/CharmMetrics" + }, + "revision": { + "type": "integer" + }, + "url": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Metered" + "revision", + "url", + "config" ] - } - } - } - }, - { - "Name": "Cleaner", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "Cleanup": { - "type": "object" }, - "WatchCleanups": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - } - }, - "definitions": { - "Error": { + "CharmMeta": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { + "categories": { + "type": "array", + "items": { + "type": "string" + } + }, + "description": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] - }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "extra-bindings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "min-juju-version": { "type": "string" - } - }, - "additionalProperties": false - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" + }, + "name": { + "type": "string" + }, + "payload-classes": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmPayloadClass" + } } }, - "data": { + "peers": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } + }, + "provides": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } + }, + "requires": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } + }, + "resources": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmResourceMeta" + } + } + }, + "series": { "type": "array", "items": { - "type": "integer" + "type": "string" } }, - "id": { - "$ref": "#/definitions/packet" + "storage": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmStorage" + } + } }, - "location": { - "$ref": "#/definitions/packet" + "subordinate": { + "type": "boolean" + }, + "summary": { + "type": "string" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } }, - "sig": { + "terms": { "type": "array", "items": { - "type": "integer" + "type": "string" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "name", + "summary", + "description", + "subordinate" ] }, - "NotifyWatchResult": { + "CharmMetric": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "description": { + "type": "string" }, - "NotifyWatcherId": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "type", + "description" ] }, - "caveat": { + "CharmMetrics": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "metrics": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmMetric" + } + } }, - "verificationId": { - "$ref": "#/definitions/packet" + "plan": { + "$ref": "#/definitions/CharmPlan" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "metrics", + "plan" ] }, - "packet": { + "CharmOption": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "default": { + "type": "object", + "additionalProperties": true }, - "start": { - "type": "integer" + "description": { + "type": "string" }, - "totalLen": { - "type": "integer" + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "type" ] - } - } - } - }, - { - "Name": "Client", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "APIHostPorts": { + }, + "CharmPayloadClass": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/APIHostPortsResult" + "name": { + "type": "string" + }, + "type": { + "type": "string" } - } - }, - "AbortCurrentUpgrade": { - "type": "object" + }, + "additionalProperties": false, + "required": [ + "name", + "type" + ] }, - "AddCharm": { + "CharmPlan": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/AddCharm" + "required": { + "type": "boolean" } - } + }, + "additionalProperties": false, + "required": [ + "required" + ] }, - "AddCharmWithAuthorization": { + "CharmRelation": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/AddCharmWithAuthorization" + "interface": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "optional": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "scope": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "name", + "role", + "interface", + "optional", + "limit", + "scope" + ] }, - "AddMachines": { + "CharmResourceMeta": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/AddMachines" + "description": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/AddMachinesResults" + "name": { + "type": "string" + }, + "path": { + "type": "string" + }, + "type": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "name", + "type", + "path", + "description" + ] }, - "AddMachinesV2": { + "CharmStorage": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/AddMachines" + "count-max": { + "type": "integer" }, - "Result": { - "$ref": "#/definitions/AddMachinesResults" + "count-min": { + "type": "integer" + }, + "description": { + "type": "string" + }, + "location": { + "type": "string" + }, + "minimum-size": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "properties": { + "type": "array", + "items": { + "type": "string" + } + }, + "read-only": { + "type": "boolean" + }, + "shared": { + "type": "boolean" + }, + "type": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "name", + "description", + "type", + "shared", + "read-only", + "count-min", + "count-max", + "minimum-size" + ] }, - "AgentVersion": { + "CharmURL": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/AgentVersionResult" + "url": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "url" + ] }, - "CharmInfo": { + "CharmsList": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/CharmInfo" - }, - "Result": { - "$ref": "#/definitions/CharmInfo" + "names": { + "type": "array", + "items": { + "type": "string" + } } - } + }, + "additionalProperties": false, + "required": [ + "names" + ] + }, + "CharmsListResult": { + "type": "object", + "properties": { + "charm-urls": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "charm-urls" + ] + }, + "IsMeteredResult": { + "type": "object", + "properties": { + "metered": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "metered" + ] + } + } + } + }, + { + "Name": "Cleaner", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "Cleanup": { + "type": "object" + }, + "WatchCleanups": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + } + }, + "definitions": { + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { + "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + } + } + } + }, + { + "Name": "Client", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "APIHostPorts": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/APIHostPortsResult" + } + } + }, + "AbortCurrentUpgrade": { + "type": "object" + }, + "AddCharm": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/AddCharm" + } + } + }, + "AddCharmWithAuthorization": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/AddCharmWithAuthorization" + } + } + }, + "AddMachines": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/AddMachines" + }, + "Result": { + "$ref": "#/definitions/AddMachinesResults" + } + } + }, + "AddMachinesV2": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/AddMachines" + }, + "Result": { + "$ref": "#/definitions/AddMachinesResults" + } + } + }, + "AgentVersion": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/AgentVersionResult" + } + } }, "DestroyMachines": { "type": "object", @@ -3618,9 +3576,6 @@ } } }, - "DestroyModel": { - "type": "object" - }, "FindTools": { "type": "object", "properties": { @@ -3647,10 +3602,10 @@ "type": "object", "properties": { "Params": { - "$ref": "#/definitions/GetBundleChangesParams" + "$ref": "#/definitions/BundleChangesParams" }, "Result": { - "$ref": "#/definitions/GetBundleChangesResults" + "$ref": "#/definitions/BundleChangesResults" } } }, @@ -3776,411 +3731,1090 @@ } } }, - "SetModelAgentVersion": { + "SetModelAgentVersion": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetModelAgentVersion" + } + } + }, + "SetModelConstraints": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetConstraints" + } + } + }, + "StatusHistory": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/StatusHistoryRequests" + }, + "Result": { + "$ref": "#/definitions/StatusHistoryResults" + } + } + }, + "WatchAll": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/AllWatcherId" + } + } + } + }, + "definitions": { + "APIHostPortsResult": { + "type": "object", + "properties": { + "servers": { + "type": "array", + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } + } + } + }, + "additionalProperties": false, + "required": [ + "servers" + ] + }, + "AddCharm": { + "type": "object", + "properties": { + "channel": { + "type": "string" + }, + "url": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "url", + "channel" + ] + }, + "AddCharmWithAuthorization": { + "type": "object", + "properties": { + "channel": { + "type": "string" + }, + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "url": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "url", + "channel", + "macaroon" + ] + }, + "AddMachineParams": { + "type": "object", + "properties": { + "addresses": { + "type": "array", + "items": { + "$ref": "#/definitions/Address" + } + }, + "constraints": { + "$ref": "#/definitions/Value" + }, + "container-type": { + "type": "string" + }, + "disks": { + "type": "array", + "items": { + "$ref": "#/definitions/Constraints" + } + }, + "hardware-characteristics": { + "$ref": "#/definitions/HardwareCharacteristics" + }, + "instance-id": { + "type": "string" + }, + "jobs": { + "type": "array", + "items": { + "type": "string" + } + }, + "nonce": { + "type": "string" + }, + "parent-id": { + "type": "string" + }, + "placement": { + "$ref": "#/definitions/Placement" + }, + "series": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "series", + "constraints", + "jobs", + "parent-id", + "container-type", + "instance-id", + "nonce", + "hardware-characteristics", + "addresses" + ] + }, + "AddMachines": { + "type": "object", + "properties": { + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/AddMachineParams" + } + } + }, + "additionalProperties": false, + "required": [ + "params" + ] + }, + "AddMachinesResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "machine": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "machine" + ] + }, + "AddMachinesResults": { + "type": "object", + "properties": { + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/AddMachinesResult" + } + } + }, + "additionalProperties": false, + "required": [ + "machines" + ] + }, + "Address": { + "type": "object", + "properties": { + "scope": { + "type": "string" + }, + "space-name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "value", + "type", + "scope" + ] + }, + "AgentVersionResult": { + "type": "object", + "properties": { + "version": { + "$ref": "#/definitions/Number" + } + }, + "additionalProperties": false, + "required": [ + "version" + ] + }, + "AllWatcherId": { + "type": "object", + "properties": { + "watcher-id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "watcher-id" + ] + }, + "ApplicationStatus": { + "type": "object", + "properties": { + "can-upgrade-to": { + "type": "string" + }, + "charm": { + "type": "string" + }, + "err": { + "type": "object", + "additionalProperties": true + }, + "exposed": { + "type": "boolean" + }, + "life": { + "type": "string" + }, + "meter-statuses": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MeterStatus" + } + } + }, + "relations": { + "type": "object", + "patternProperties": { + ".*": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "series": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/DetailedStatus" + }, + "subordinate-to": { + "type": "array", + "items": { + "type": "string" + } + }, + "units": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/UnitStatus" + } + } + }, + "workload-version": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "charm", + "series", + "exposed", + "life", + "relations", + "can-upgrade-to", + "subordinate-to", + "units", + "meter-statuses", + "status", + "workload-version" + ] + }, + "Binary": { + "type": "object", + "properties": { + "Arch": { + "type": "string" + }, + "Number": { + "$ref": "#/definitions/Number" + }, + "Series": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "Number", + "Series", + "Arch" + ] + }, + "BundleChange": { + "type": "object", + "properties": { + "args": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } + }, + "id": { + "type": "string" + }, + "method": { + "type": "string" + }, + "requires": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "id", + "method", + "args", + "requires" + ] + }, + "BundleChangesParams": { + "type": "object", + "properties": { + "yaml": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "yaml" + ] + }, + "BundleChangesResults": { + "type": "object", + "properties": { + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/BundleChange" + } + }, + "errors": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false + }, + "ConfigValue": { + "type": "object", + "properties": { + "source": { + "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true + } + }, + "additionalProperties": false, + "required": [ + "value", + "source" + ] + }, + "Constraints": { + "type": "object", + "properties": { + "Count": { + "type": "integer" + }, + "Pool": { + "type": "string" + }, + "Size": { + "type": "integer" + } + }, + "additionalProperties": false, + "required": [ + "Pool", + "Size", + "Count" + ] + }, + "DestroyMachines": { + "type": "object", + "properties": { + "force": { + "type": "boolean" + }, + "machine-names": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "machine-names", + "force" + ] + }, + "DetailedStatus": { + "type": "object", + "properties": { + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "err": { + "type": "object", + "additionalProperties": true + }, + "info": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "life": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "status", + "info", + "data", + "since", + "kind", + "version", + "life" + ] + }, + "EndpointStatus": { + "type": "object", + "properties": { + "application": { + "type": "string" + }, + "name": { + "type": "string" + }, + "role": { + "type": "string" + }, + "subordinate": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "application", + "name", + "role", + "subordinate" + ] + }, + "Entities": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "EntityStatus": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetModelAgentVersion" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "info": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "status", + "info", + "since" + ] }, - "SetModelConstraints": { + "Error": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetConstraints" + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] }, - "StatusHistory": { + "ErrorInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/StatusHistoryRequests" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Result": { - "$ref": "#/definitions/StatusHistoryResults" + "macaroon-path": { + "type": "string" } - } + }, + "additionalProperties": false }, - "WatchAll": { + "ErrorResult": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/AllWatcherId" + "error": { + "$ref": "#/definitions/Error" } - } - } - }, - "definitions": { - "APIHostPortsResult": { + }, + "additionalProperties": false + }, + "ErrorResults": { "type": "object", "properties": { - "Servers": { + "results": { "type": "array", "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Servers" + "results" ] }, - "AddCharm": { + "FindToolsParams": { "type": "object", "properties": { - "Channel": { + "arch": { "type": "string" }, - "URL": { + "major": { + "type": "integer" + }, + "minor": { + "type": "integer" + }, + "number": { + "$ref": "#/definitions/Number" + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL", - "Channel" + "number", + "major", + "minor", + "arch", + "series" ] }, - "AddCharmWithAuthorization": { + "FindToolsResult": { "type": "object", "properties": { - "Channel": { - "type": "string" - }, - "CharmStoreMacaroon": { - "$ref": "#/definitions/Macaroon" + "error": { + "$ref": "#/definitions/Error" }, - "URL": { - "type": "string" + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/Tools" + } } }, "additionalProperties": false, "required": [ - "URL", - "Channel", - "CharmStoreMacaroon" + "list" ] }, - "AddMachineParams": { + "FullStatus": { "type": "object", "properties": { - "Addrs": { - "type": "array", - "items": { - "$ref": "#/definitions/Address" + "applications": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ApplicationStatus" + } } }, - "Constraints": { - "$ref": "#/definitions/Value" + "machines": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MachineStatus" + } + } }, - "ContainerType": { - "type": "string" + "model": { + "$ref": "#/definitions/ModelStatusInfo" }, - "Disks": { + "relations": { "type": "array", "items": { - "$ref": "#/definitions/Constraints" + "$ref": "#/definitions/RelationStatus" } }, - "HardwareCharacteristics": { - "$ref": "#/definitions/HardwareCharacteristics" + "remote-applications": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/RemoteApplicationStatus" + } + } + } + }, + "additionalProperties": false, + "required": [ + "model", + "machines", + "applications", + "remote-applications", + "relations" + ] + }, + "GetConstraintsResults": { + "type": "object", + "properties": { + "constraints": { + "$ref": "#/definitions/Value" + } + }, + "additionalProperties": false, + "required": [ + "constraints" + ] + }, + "HardwareCharacteristics": { + "type": "object", + "properties": { + "arch": { + "type": "string" }, - "InstanceId": { + "availability-zone": { "type": "string" }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } + "cpu-cores": { + "type": "integer" }, - "Nonce": { - "type": "string" + "cpu-power": { + "type": "integer" }, - "ParentId": { - "type": "string" + "mem": { + "type": "integer" }, - "Placement": { - "$ref": "#/definitions/Placement" + "root-disk": { + "type": "integer" }, - "Series": { - "type": "string" + "tags": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "Series", - "Constraints", - "Jobs", - "Disks", - "Placement", - "ParentId", - "ContainerType", - "InstanceId", - "Nonce", - "HardwareCharacteristics", - "Addrs" - ] + "additionalProperties": false }, - "AddMachines": { + "History": { "type": "object", "properties": { - "MachineParams": { + "error": { + "$ref": "#/definitions/Error" + }, + "statuses": { "type": "array", "items": { - "$ref": "#/definitions/AddMachineParams" + "$ref": "#/definitions/DetailedStatus" } } }, "additionalProperties": false, "required": [ - "MachineParams" + "statuses" ] }, - "AddMachinesResult": { + "HostPort": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Address": { + "$ref": "#/definitions/Address" }, - "Machine": { - "type": "string" + "port": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Machine", - "Error" + "Address", + "port" ] }, - "AddMachinesResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineHardware": { "type": "object", "properties": { - "Machines": { + "arch": { + "type": "string" + }, + "availability-zone": { + "type": "string" + }, + "cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { "type": "array", "items": { - "$ref": "#/definitions/AddMachinesResult" + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Machines" - ] + "additionalProperties": false }, - "Address": { + "MachineStatus": { "type": "object", "properties": { - "Scope": { + "agent-status": { + "$ref": "#/definitions/DetailedStatus" + }, + "containers": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MachineStatus" + } + } + }, + "dns-name": { "type": "string" }, - "SpaceName": { + "hardware": { "type": "string" }, - "Type": { + "has-vote": { + "type": "boolean" + }, + "id": { "type": "string" }, - "Value": { + "instance-id": { + "type": "string" + }, + "instance-status": { + "$ref": "#/definitions/DetailedStatus" + }, + "ip-addresses": { + "type": "array", + "items": { + "type": "string" + } + }, + "jobs": { + "type": "array", + "items": { + "type": "string" + } + }, + "series": { "type": "string" + }, + "wants-vote": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "agent-status", + "instance-status", + "dns-name", + "ip-addresses", + "instance-id", + "series", + "id", + "containers", + "hardware", + "jobs", + "has-vote", + "wants-vote" ] }, - "AgentVersionResult": { + "MeterStatus": { "type": "object", "properties": { - "Version": { - "$ref": "#/definitions/Number" + "color": { + "type": "string" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Version" + "color", + "message" ] }, - "AllWatcherId": { + "ModelConfigResults": { "type": "object", "properties": { - "AllWatcherId": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ConfigValue" + } + } } }, "additionalProperties": false, "required": [ - "AllWatcherId" + "config" ] }, - "ApplicationStatus": { + "ModelInfo": { "type": "object", "properties": { - "CanUpgradeTo": { + "cloud-credential-tag": { "type": "string" }, - "Charm": { + "cloud-region": { "type": "string" }, - "Err": { - "type": "object", - "additionalProperties": true + "cloud-tag": { + "type": "string" }, - "Exposed": { - "type": "boolean" + "controller-uuid": { + "type": "string" }, - "Life": { + "default-series": { "type": "string" }, - "MeterStatuses": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/MeterStatus" - } - } + "life": { + "type": "string" }, - "Relations": { - "type": "object", - "patternProperties": { - ".*": { - "type": "array", - "items": { - "type": "string" - } - } + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" } }, - "Status": { - "$ref": "#/definitions/DetailedStatus" + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "provider-type": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/EntityStatus" }, - "SubordinateTo": { + "users": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/ModelUserInfo" } }, - "Units": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/UnitStatus" - } - } + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Err", - "Charm", - "Exposed", - "Life", - "Relations", - "CanUpgradeTo", - "SubordinateTo", - "Units", - "MeterStatuses", - "Status" + "name", + "uuid", + "controller-uuid", + "provider-type", + "default-series", + "cloud-tag", + "owner-tag", + "life", + "status", + "users", + "machines" ] }, - "Binary": { + "ModelMachineInfo": { "type": "object", "properties": { - "Arch": { - "type": "string" + "hardware": { + "$ref": "#/definitions/MachineHardware" }, - "Number": { - "$ref": "#/definitions/Number" + "has-vote": { + "type": "boolean" }, - "Series": { + "id": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Number", - "Series", - "Arch" - ] - }, - "BundleChangesChange": { - "type": "object", - "properties": { - "args": { - "type": "array", - "items": { - "type": "object", - "additionalProperties": true - } }, - "id": { + "instance-id": { "type": "string" }, - "method": { + "status": { "type": "string" }, - "requires": { - "type": "array", - "items": { - "type": "string" - } + "wants-vote": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "id", - "method", - "args", - "requires" + "id" ] }, - "CharmInfo": { + "ModelSet": { "type": "object", "properties": { - "CharmURL": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "CharmURL" + "config" ] }, - "Constraints": { + "ModelStatusInfo": { "type": "object", "properties": { - "Count": { - "type": "integer" + "available-version": { + "type": "string" }, - "Pool": { + "cloud-tag": { "type": "string" }, - "Size": { - "type": "integer" + "migration": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Pool", - "Size", - "Count" + "name", + "cloud-tag", + "version", + "available-version" ] }, - "DestroyMachines": { + "ModelUnset": { "type": "object", "properties": { - "Force": { - "type": "boolean" - }, - "MachineNames": { + "keys": { "type": "array", "items": { "type": "string" @@ -4189,596 +4823,475 @@ }, "additionalProperties": false, "required": [ - "MachineNames", - "Force" + "keys" ] }, - "DetailedStatus": { + "ModelUserInfo": { "type": "object", "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Err": { - "type": "object", - "additionalProperties": true - }, - "Info": { - "type": "string" - }, - "Kind": { + "access": { "type": "string" }, - "Life": { + "display-name": { "type": "string" }, - "Since": { + "last-connection": { "type": "string", "format": "date-time" }, - "Status": { - "type": "string" - }, - "Version": { + "user": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since", - "Kind", - "Version", - "Life", - "Err" + "user", + "display-name", + "last-connection", + "access" ] }, - "EndpointStatus": { + "ModelUserInfoResult": { "type": "object", "properties": { - "ApplicationName": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "Role": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "Subordinate": { - "type": "boolean" + "result": { + "$ref": "#/definitions/ModelUserInfo" } }, - "additionalProperties": false, - "required": [ - "ApplicationName", - "Name", - "Role", - "Subordinate" - ] + "additionalProperties": false }, - "Entities": { + "ModelUserInfoResults": { "type": "object", "properties": { - "Entities": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/ModelUserInfoResult" } } }, "additionalProperties": false, "required": [ - "Entities" + "results" ] }, - "Entity": { + "Number": { "type": "object", "properties": { + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, "Tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "Major", + "Minor", + "Tag", + "Patch", + "Build" ] }, - "EntityStatus": { + "Placement": { "type": "object", "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Info": { + "directive": { "type": "string" }, - "Since": { - "type": "string", - "format": "date-time" - }, - "Status": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since" + "scope", + "directive" ] }, - "Error": { + "PrivateAddress": { + "type": "object", + "properties": { + "target": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "target" + ] + }, + "PrivateAddressResults": { + "type": "object", + "properties": { + "private-address": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "private-address" + ] + }, + "ProvisioningScriptParams": { "type": "object", "properties": { - "Code": { + "data-dir": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "disable-package-commands": { + "type": "boolean" + }, + "machine-id": { + "type": "string" }, - "Message": { + "nonce": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "machine-id", + "nonce", + "data-dir", + "disable-package-commands" ] }, - "ErrorInfo": { + "ProvisioningScriptResult": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { + "script": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "script" + ] }, - "ErrorResult": { + "PublicAddress": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "target": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error" + "target" ] }, - "ErrorResults": { + "PublicAddressResults": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } + "public-address": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "public-address" ] }, - "FindToolsParams": { + "RelationStatus": { "type": "object", "properties": { - "Arch": { - "type": "string" + "endpoints": { + "type": "array", + "items": { + "$ref": "#/definitions/EndpointStatus" + } }, - "MajorVersion": { + "id": { "type": "integer" }, - "MinorVersion": { - "type": "integer" + "interface": { + "type": "string" }, - "Number": { - "$ref": "#/definitions/Number" + "key": { + "type": "string" }, - "Series": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Number", - "MajorVersion", - "MinorVersion", - "Arch", - "Series" + "id", + "key", + "interface", + "scope", + "endpoints" ] }, - "FindToolsResult": { + "RemoteApplicationStatus": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "application-name": { + "type": "string" + }, + "application-url": { + "type": "string" }, - "List": { + "endpoints": { "type": "array", "items": { - "$ref": "#/definitions/Tools" + "$ref": "#/definitions/RemoteEndpoint" } - } - }, - "additionalProperties": false, - "required": [ - "List", - "Error" - ] - }, - "FullStatus": { - "type": "object", - "properties": { - "Applications": { + }, + "err": { "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/ApplicationStatus" - } - } + "additionalProperties": true }, - "AvailableVersion": { + "life": { "type": "string" }, - "Machines": { + "relations": { "type": "object", "patternProperties": { ".*": { - "$ref": "#/definitions/MachineStatus" + "type": "array", + "items": { + "type": "string" + } } } }, - "ModelName": { - "type": "string" - }, - "Relations": { - "type": "array", - "items": { - "$ref": "#/definitions/RelationStatus" - } + "status": { + "$ref": "#/definitions/DetailedStatus" } }, "additionalProperties": false, "required": [ - "ModelName", - "AvailableVersion", - "Machines", - "Applications", - "Relations" + "application-url", + "application-name", + "endpoints", + "life", + "relations", + "status" ] }, - "GetBundleChangesParams": { + "RemoteEndpoint": { "type": "object", "properties": { - "yaml": { + "interface": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "yaml" - ] - }, - "GetBundleChangesResults": { - "type": "object", - "properties": { - "changes": { - "type": "array", - "items": { - "$ref": "#/definitions/BundleChangesChange" - } }, - "errors": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false - }, - "GetConstraintsResults": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" + "limit": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "role": { + "type": "string" + }, + "scope": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Constraints" + "name", + "role", + "interface", + "limit", + "scope" ] }, - "HardwareCharacteristics": { + "ResolveCharmResult": { "type": "object", "properties": { - "Arch": { + "error": { "type": "string" }, - "AvailabilityZone": { + "url": { "type": "string" - }, - "CpuCores": { - "type": "integer" - }, - "CpuPower": { - "type": "integer" - }, - "Mem": { - "type": "integer" - }, - "RootDisk": { - "type": "integer" - }, - "Tags": { - "type": "array", - "items": { - "type": "string" - } } }, "additionalProperties": false }, - "History": { + "ResolveCharmResults": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Statuses": { + "urls": { "type": "array", "items": { - "$ref": "#/definitions/DetailedStatus" + "$ref": "#/definitions/ResolveCharmResult" } } }, "additionalProperties": false, "required": [ - "Statuses" + "urls" ] }, - "HostPort": { + "ResolveCharms": { "type": "object", "properties": { - "Address": { - "$ref": "#/definitions/Address" - }, - "Port": { - "type": "integer" + "references": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Address", - "Port" + "references" ] }, - "Macaroon": { + "Resolved": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "retry": { + "type": "boolean" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "unit-name": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "unit-name", + "retry" ] }, - "MachineStatus": { + "SetConstraints": { "type": "object", "properties": { - "AgentStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Containers": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/MachineStatus" - } - } - }, - "DNSName": { - "type": "string" - }, - "Hardware": { - "type": "string" - }, - "HasVote": { - "type": "boolean" - }, - "Id": { - "type": "string" - }, - "InstanceId": { - "type": "string" - }, - "InstanceStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } - }, - "Series": { + "application": { "type": "string" }, - "WantsVote": { - "type": "boolean" + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "AgentStatus", - "InstanceStatus", - "DNSName", - "InstanceId", - "Series", - "Id", - "Containers", - "Hardware", - "Jobs", - "HasVote", - "WantsVote" + "application", + "constraints" ] }, - "MeterStatus": { + "SetModelAgentVersion": { "type": "object", "properties": { - "Color": { - "type": "string" - }, - "Message": { - "type": "string" + "version": { + "$ref": "#/definitions/Number" } }, "additionalProperties": false, "required": [ - "Color", - "Message" + "version" ] }, - "ModelConfigResults": { + "StatusHistoryFilter": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "date": { + "type": "string", + "format": "date-time" + }, + "delta": { + "type": "integer" + }, + "size": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Config" + "size", + "date", + "delta" ] }, - "ModelInfo": { + "StatusHistoryRequest": { "type": "object", "properties": { - "Cloud": { - "type": "string" - }, - "DefaultSeries": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "OwnerTag": { - "type": "string" - }, - "ProviderType": { - "type": "string" + "filter": { + "$ref": "#/definitions/StatusHistoryFilter" }, - "ServerUUID": { + "historyKind": { "type": "string" }, - "Status": { - "$ref": "#/definitions/EntityStatus" + "size": { + "type": "integer" }, - "UUID": { + "tag": { "type": "string" - }, - "Users": { + } + }, + "additionalProperties": false, + "required": [ + "historyKind", + "size", + "filter", + "tag" + ] + }, + "StatusHistoryRequests": { + "type": "object", + "properties": { + "requests": { "type": "array", "items": { - "$ref": "#/definitions/ModelUserInfo" + "$ref": "#/definitions/StatusHistoryRequest" } } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "ServerUUID", - "ProviderType", - "DefaultSeries", - "Cloud", - "OwnerTag", - "Life", - "Status", - "Users" + "requests" ] }, - "ModelSet": { + "StatusHistoryResult": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "error": { + "$ref": "#/definitions/Error" + }, + "history": { + "$ref": "#/definitions/History" + } + }, + "additionalProperties": false, + "required": [ + "history" + ] + }, + "StatusHistoryResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StatusHistoryResult" } } }, "additionalProperties": false, "required": [ - "Config" + "results" ] }, - "ModelUnset": { + "StatusParams": { "type": "object", "properties": { - "Keys": { + "patterns": { "type": "array", "items": { "type": "string" @@ -4787,591 +5300,535 @@ }, "additionalProperties": false, "required": [ - "Keys" + "patterns" ] }, - "ModelUserInfo": { + "Tools": { "type": "object", "properties": { - "access": { - "type": "string" - }, - "displayname": { + "sha256": { "type": "string" }, - "lastconnection": { - "type": "string", - "format": "date-time" + "size": { + "type": "integer" }, - "user": { + "url": { "type": "string" + }, + "version": { + "$ref": "#/definitions/Binary" } }, "additionalProperties": false, "required": [ - "user", - "displayname", - "lastconnection", - "access" + "version", + "url", + "size" ] }, - "ModelUserInfoResult": { + "UnitStatus": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" + "agent-status": { + "$ref": "#/definitions/DetailedStatus" }, - "result": { - "$ref": "#/definitions/ModelUserInfo" - } - }, - "additionalProperties": false - }, - "ModelUserInfoResults": { - "type": "object", - "properties": { - "results": { + "charm": { + "type": "string" + }, + "leader": { + "type": "boolean" + }, + "machine": { + "type": "string" + }, + "opened-ports": { "type": "array", "items": { - "$ref": "#/definitions/ModelUserInfoResult" + "type": "string" + } + }, + "public-address": { + "type": "string" + }, + "subordinates": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/UnitStatus" + } } + }, + "workload-status": { + "$ref": "#/definitions/DetailedStatus" + }, + "workload-version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "results" + "agent-status", + "workload-status", + "workload-version", + "machine", + "opened-ports", + "public-address", + "charm", + "subordinates" ] }, - "Number": { + "Value": { "type": "object", "properties": { - "Build": { + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cores": { "type": "integer" }, - "Major": { + "cpu-power": { "type": "integer" }, - "Minor": { + "instance-type": { + "type": "string" + }, + "mem": { "type": "integer" }, - "Patch": { + "root-disk": { "type": "integer" }, - "Tag": { + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Major", - "Minor", - "Tag", - "Patch", - "Build" - ] + "additionalProperties": false + } + } + } + }, + { + "Name": "Cloud", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Cloud": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/CloudResults" + } + } }, - "Placement": { + "Clouds": { "type": "object", "properties": { - "Directive": { - "type": "string" + "Result": { + "$ref": "#/definitions/CloudsResult" + } + } + }, + "Credential": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "Scope": { - "type": "string" + "Result": { + "$ref": "#/definitions/CloudCredentialResults" } - }, - "additionalProperties": false, - "required": [ - "Scope", - "Directive" - ] + } }, - "PrivateAddress": { + "DefaultCloud": { "type": "object", "properties": { - "Target": { - "type": "string" + "Result": { + "$ref": "#/definitions/StringResult" } - }, - "additionalProperties": false, - "required": [ - "Target" - ] + } }, - "PrivateAddressResults": { + "RevokeCredentials": { "type": "object", "properties": { - "PrivateAddress": { - "type": "string" + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "PrivateAddress" - ] + } }, - "ProvisioningScriptParams": { + "UpdateCredentials": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/UpdateCloudCredentials" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "UserCredentials": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/UserClouds" + }, + "Result": { + "$ref": "#/definitions/StringsResults" + } + } + } + }, + "definitions": { + "Cloud": { "type": "object", "properties": { - "DataDir": { + "auth-types": { + "type": "array", + "items": { + "type": "string" + } + }, + "endpoint": { "type": "string" }, - "DisablePackageCommands": { - "type": "boolean" + "identity-endpoint": { + "type": "string" + }, + "regions": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudRegion" + } }, - "MachineId": { + "storage-endpoint": { "type": "string" }, - "Nonce": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineId", - "Nonce", - "DataDir", - "DisablePackageCommands" + "type" ] }, - "ProvisioningScriptResult": { + "CloudCredential": { "type": "object", "properties": { - "Script": { + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "auth-type": { "type": "string" + }, + "redacted": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Script" + "auth-type" ] }, - "PublicAddress": { + "CloudCredentialResult": { "type": "object", "properties": { - "Target": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/CloudCredential" } }, - "additionalProperties": false, - "required": [ - "Target" - ] + "additionalProperties": false }, - "PublicAddressResults": { + "CloudCredentialResults": { "type": "object", "properties": { - "PublicAddress": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudCredentialResult" + } } }, - "additionalProperties": false, - "required": [ - "PublicAddress" - ] + "additionalProperties": false }, - "RelationStatus": { + "CloudRegion": { "type": "object", "properties": { - "Endpoints": { - "type": "array", - "items": { - "$ref": "#/definitions/EndpointStatus" - } - }, - "Id": { - "type": "integer" + "endpoint": { + "type": "string" }, - "Interface": { + "identity-endpoint": { "type": "string" }, - "Key": { + "name": { "type": "string" }, - "Scope": { + "storage-endpoint": { "type": "string" } }, "additionalProperties": false, "required": [ - "Id", - "Key", - "Interface", - "Scope", - "Endpoints" + "name" ] }, - "ResolveCharmResult": { + "CloudResult": { "type": "object", "properties": { - "Error": { - "type": "string" + "cloud": { + "$ref": "#/definitions/Cloud" }, - "URL": { - "$ref": "#/definitions/URL" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false }, - "ResolveCharmResults": { + "CloudResults": { "type": "object", "properties": { - "URLs": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ResolveCharmResult" + "$ref": "#/definitions/CloudResult" } } }, - "additionalProperties": false, - "required": [ - "URLs" - ] + "additionalProperties": false }, - "ResolveCharms": { + "CloudsResult": { "type": "object", "properties": { - "References": { - "type": "array", - "items": { - "$ref": "#/definitions/URL" + "clouds": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/Cloud" + } } } }, - "additionalProperties": false, - "required": [ - "References" - ] + "additionalProperties": false }, - "Resolved": { + "Entities": { "type": "object", "properties": { - "Retry": { - "type": "boolean" - }, - "UnitName": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } } }, "additionalProperties": false, "required": [ - "UnitName", - "Retry" + "entities" ] }, - "SetConstraints": { + "Entity": { "type": "object", "properties": { - "ApplicationName": { + "tag": { "type": "string" - }, - "Constraints": { - "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "ApplicationName", - "Constraints" + "tag" ] }, - "SetModelAgentVersion": { + "Error": { "type": "object", "properties": { - "Version": { - "$ref": "#/definitions/Number" + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Version" + "message", + "code" ] }, - "StatusHistoryFilter": { + "ErrorInfo": { "type": "object", "properties": { - "Date": { - "type": "string", - "format": "date-time" - }, - "Delta": { - "type": "integer" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Size": { - "type": "integer" + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Size", - "Date", - "Delta" - ] + "additionalProperties": false }, - "StatusHistoryRequest": { + "ErrorResult": { "type": "object", "properties": { - "Filter": { - "$ref": "#/definitions/StatusHistoryFilter" - }, - "HistoryKind": { - "type": "string" - }, - "Size": { - "type": "integer" - }, - "Tag": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "HistoryKind", - "Size", - "Filter", - "Tag" - ] + "additionalProperties": false }, - "StatusHistoryRequests": { + "ErrorResults": { "type": "object", "properties": { - "Requests": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/StatusHistoryRequest" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Requests" + "results" ] }, - "StatusHistoryResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "History": { - "$ref": "#/definitions/History" + "result": { + "type": "string" } }, "additionalProperties": false, "required": [ - "History" + "result" ] }, - "StatusHistoryResults": { + "StringsResult": { "type": "object", "properties": { - "Results": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { "type": "array", "items": { - "$ref": "#/definitions/StatusHistoryResult" + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false }, - "StatusParams": { + "StringsResults": { "type": "object", "properties": { - "Patterns": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/StringsResult" } } }, "additionalProperties": false, "required": [ - "Patterns" + "results" ] }, - "Tools": { + "UpdateCloudCredential": { "type": "object", "properties": { - "sha256": { - "type": "string" - }, - "size": { - "type": "integer" + "credential": { + "$ref": "#/definitions/CloudCredential" }, - "url": { + "tag": { "type": "string" - }, - "version": { - "$ref": "#/definitions/Binary" } }, "additionalProperties": false, "required": [ - "version", - "url", - "size" + "tag", + "credential" ] }, - "URL": { + "UpdateCloudCredentials": { "type": "object", "properties": { - "Channel": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "Revision": { - "type": "integer" - }, - "Schema": { - "type": "string" - }, - "Series": { - "type": "string" - }, - "User": { - "type": "string" + "credentials": { + "type": "array", + "items": { + "$ref": "#/definitions/UpdateCloudCredential" + } } }, - "additionalProperties": false, - "required": [ - "Schema", - "User", - "Name", - "Revision", - "Series", - "Channel" - ] + "additionalProperties": false }, - "UnitStatus": { + "UserCloud": { "type": "object", "properties": { - "AgentStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Charm": { - "type": "string" - }, - "Machine": { + "cloud-tag": { "type": "string" }, - "OpenedPorts": { - "type": "array", - "items": { - "type": "string" - } - }, - "PublicAddress": { + "user-tag": { "type": "string" - }, - "Subordinates": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/UnitStatus" - } - } - }, - "WorkloadStatus": { - "$ref": "#/definitions/DetailedStatus" } }, "additionalProperties": false, "required": [ - "AgentStatus", - "WorkloadStatus", - "Machine", - "OpenedPorts", - "PublicAddress", - "Charm", - "Subordinates" + "user-tag", + "cloud-tag" ] }, - "Value": { + "UserClouds": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "container": { - "type": "string" - }, - "cpu-cores": { - "type": "integer" - }, - "cpu-power": { - "type": "integer" - }, - "instance-type": { - "type": "string" - }, - "mem": { - "type": "integer" - }, - "root-disk": { - "type": "integer" - }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } - }, - "tags": { + "user-clouds": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/UserCloud" } - }, - "virt-type": { - "type": "string" } }, "additionalProperties": false - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -5386,7 +5843,26 @@ "type": "object", "properties": { "Result": { - "$ref": "#/definitions/UserModelList" + "$ref": "#/definitions/UserModelList" + } + } + }, + "CloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResults" + } + } + }, + "ControllerConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ControllerConfigResult" } } }, @@ -5398,14 +5874,44 @@ } } }, - "InitiateModelMigration": { + "GetCloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelTag" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, + "GetControllerAccess": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/UserAccessResults" + } + } + }, + "HostedModelConfigs": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/HostedModelConfigsResults" + } + } + }, + "InitiateMigration": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/InitiateModelMigrationArgs" + "$ref": "#/definitions/InitiateMigrationArgs" }, "Result": { - "$ref": "#/definitions/InitiateModelMigrationResults" + "$ref": "#/definitions/InitiateMigrationResults" } } }, @@ -5436,6 +5942,17 @@ } } }, + "ModifyControllerAccess": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModifyControllerAccessRequest" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "RemoveBlocks": { "type": "object", "properties": { @@ -5457,13 +5974,129 @@ "AllWatcherId": { "type": "object", "properties": { - "AllWatcherId": { + "watcher-id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "watcher-id" + ] + }, + "CloudCredential": { + "type": "object", + "properties": { + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "auth-type": { + "type": "string" + }, + "redacted": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "auth-type" + ] + }, + "CloudSpec": { + "type": "object", + "properties": { + "credential": { + "$ref": "#/definitions/CloudCredential" + }, + "endpoint": { + "type": "string" + }, + "identity-endpoint": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "storage-endpoint": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "type", + "name" + ] + }, + "CloudSpecResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/CloudSpec" + } + }, + "additionalProperties": false + }, + "CloudSpecResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, + "additionalProperties": false + }, + "ConfigValue": { + "type": "object", + "properties": { + "source": { "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true + } + }, + "additionalProperties": false, + "required": [ + "value", + "source" + ] + }, + "ControllerConfigResult": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "AllWatcherId" + "config" ] }, "DestroyControllerArgs": { @@ -5481,7 +6114,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -5490,157 +6123,280 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "InitiateModelMigrationArgs": { + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "HostedModelConfig": { + "type": "object", + "properties": { + "cloud-spec": { + "$ref": "#/definitions/CloudSpec" + }, + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "error": { + "$ref": "#/definitions/Error" + }, + "name": { + "type": "string" + }, + "owner": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "owner" + ] + }, + "HostedModelConfigsResults": { + "type": "object", + "properties": { + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/HostedModelConfig" + } + } + }, + "additionalProperties": false, + "required": [ + "models" + ] + }, + "InitiateMigrationArgs": { "type": "object", "properties": { "specs": { "type": "array", "items": { - "$ref": "#/definitions/ModelMigrationSpec" + "$ref": "#/definitions/MigrationSpec" + } + } + }, + "additionalProperties": false, + "required": [ + "specs" + ] + }, + "InitiateMigrationResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "migration-id": { + "type": "string" + }, + "model-tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "model-tag", + "migration-id" + ] + }, + "InitiateMigrationResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/InitiateMigrationResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineHardware": { + "type": "object", + "properties": { + "arch": { + "type": "string" + }, + "availability-zone": { + "type": "string" + }, + "cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { + "type": "array", + "items": { + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "specs" - ] + "additionalProperties": false }, - "InitiateModelMigrationResult": { + "MigrationSpec": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" - }, - "id": { - "type": "string" + "external-control": { + "type": "boolean" }, "model-tag": { "type": "string" + }, + "skip-initial-prechecks": { + "type": "boolean" + }, + "target-info": { + "$ref": "#/definitions/MigrationTargetInfo" } }, "additionalProperties": false, "required": [ "model-tag", - "error", - "id" - ] - }, - "InitiateModelMigrationResults": { - "type": "object", - "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/InitiateModelMigrationResult" - } - } - }, - "additionalProperties": false, - "required": [ - "results" + "target-info", + "external-control", + "skip-initial-prechecks" ] }, - "Macaroon": { + "MigrationTargetInfo": { "type": "object", "properties": { - "caveats": { + "addrs": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "type": "string" } }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "auth-tag": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" + "ca-cert": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "controller-tag": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "macaroons": { + "type": "string" + }, + "password": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "controller-tag", + "addrs", + "ca-cert", + "auth-tag" ] }, "Model": { "type": "object", "properties": { - "Name": { + "name": { "type": "string" }, - "OwnerTag": { + "owner-tag": { "type": "string" }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "OwnerTag" + "name", + "uuid", + "owner-tag" ] }, "ModelBlockInfo": { @@ -5685,66 +6441,45 @@ "ModelConfigResults": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/ConfigValue" } } } }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, - "ModelMigrationSpec": { + "ModelMachineInfo": { "type": "object", "properties": { - "model-tag": { - "type": "string" + "hardware": { + "$ref": "#/definitions/MachineHardware" }, - "target-info": { - "$ref": "#/definitions/ModelMigrationTargetInfo" - } - }, - "additionalProperties": false, - "required": [ - "model-tag", - "target-info" - ] - }, - "ModelMigrationTargetInfo": { - "type": "object", - "properties": { - "addrs": { - "type": "array", - "items": { - "type": "string" - } + "has-vote": { + "type": "boolean" }, - "auth-tag": { + "id": { "type": "string" }, - "ca-cert": { + "instance-id": { "type": "string" }, - "controller-tag": { + "status": { "type": "string" }, - "password": { - "type": "string" + "wants-vote": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "controller-tag", - "addrs", - "ca-cert", - "auth-tag", - "password" + "id" ] }, "ModelStatus": { @@ -5759,6 +6494,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "model-tag": { "type": "string" }, @@ -5790,6 +6531,45 @@ "models" ] }, + "ModelTag": { + "type": "object", + "additionalProperties": false + }, + "ModifyControllerAccess": { + "type": "object", + "properties": { + "access": { + "type": "string" + }, + "action": { + "type": "string" + }, + "user-tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "user-tag", + "action", + "access" + ] + }, + "ModifyControllerAccessRequest": { + "type": "object", + "properties": { + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/ModifyControllerAccess" + } + } + }, + "additionalProperties": false, + "required": [ + "changes" + ] + }, "RemoveBlocksArgs": { "type": "object", "properties": { @@ -5802,76 +6582,76 @@ "all" ] }, - "UserModel": { + "UserAccess": { "type": "object", "properties": { - "LastConnection": { - "type": "string", - "format": "date-time" + "access": { + "type": "string" }, - "Model": { - "$ref": "#/definitions/Model" + "user-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Model", - "LastConnection" + "user-tag", + "access" ] }, - "UserModelList": { + "UserAccessResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/UserAccess" + } + }, + "additionalProperties": false + }, + "UserAccessResults": { "type": "object", "properties": { - "UserModels": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/UserModel" + "$ref": "#/definitions/UserAccessResult" } } }, - "additionalProperties": false, - "required": [ - "UserModels" - ] + "additionalProperties": false }, - "caveat": { + "UserModel": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "last-connection": { + "type": "string", + "format": "date-time" }, - "verificationId": { - "$ref": "#/definitions/packet" + "model": { + "$ref": "#/definitions/Model" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "model", + "last-connection" ] }, - "packet": { + "UserModelList": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "user-models": { + "type": "array", + "items": { + "$ref": "#/definitions/UserModel" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "user-models" ] } } @@ -5956,6 +6736,17 @@ } } }, + "SetStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetStatus" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "StateAddresses": { "type": "object", "properties": { @@ -5964,6 +6755,17 @@ } } }, + "UpdateStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetStatus" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "WatchAPIHostPorts": { "type": "object", "properties": { @@ -5988,7 +6790,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -6000,36 +6802,36 @@ }, "additionalProperties": false, "required": [ - "Servers" + "servers" ] }, "Address": { "type": "object", "properties": { - "Scope": { + "scope": { "type": "string" }, - "SpaceName": { + "space-name": { "type": "string" }, - "Type": { + "type": { "type": "string" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "value", + "type", + "scope" ] }, "BytesResult": { "type": "object", "properties": { - "Result": { + "result": { "type": "array", "items": { "type": "integer" @@ -6038,19 +6840,19 @@ }, "additionalProperties": false, "required": [ - "Result" + "result" ] }, "DeployerConnectionValues": { "type": "object", "properties": { - "APIAddresses": { + "api-addresses": { "type": "array", "items": { "type": "string" } }, - "StateAddresses": { + "state-addresses": { "type": "array", "items": { "type": "string" @@ -6059,14 +6861,14 @@ }, "additionalProperties": false, "required": [ - "StateAddresses", - "APIAddresses" + "state-addresses", + "api-addresses" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -6075,41 +6877,41 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityPassword": { "type": "object", "properties": { - "Password": { + "password": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Password" + "tag", + "password" ] }, "EntityPasswords": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/EntityPassword" @@ -6118,35 +6920,65 @@ }, "additionalProperties": false, "required": [ - "Changes" + "changes" + ] + }, + "EntityStatusArgs": { + "type": "object", + "properties": { + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "info": { + "type": "string" + }, + "status": { + "type": "string" + }, + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -6155,19 +6987,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -6176,7 +7005,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "HostPort": { @@ -6185,36 +7014,35 @@ "Address": { "$ref": "#/definitions/Address" }, - "Port": { + "port": { "type": "integer" } }, "additionalProperties": false, "required": [ "Address", - "Port" + "port" ] }, "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -6223,124 +7051,98 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "NotifyWatcherId": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "NotifyWatcherId" ] }, - "NotifyWatchResult": { + "SetStatus": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityStatusArgs" + } } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "entities" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsWatchResult" @@ -6349,47 +7151,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -6455,16 +7217,16 @@ "AddSubnetParams": { "type": "object", "properties": { - "SpaceTag": { + "space-tag": { "type": "string" }, - "SubnetProviderId": { + "subnet-provider-id": { "type": "string" }, - "SubnetTag": { + "subnet-tag": { "type": "string" }, - "Zones": { + "zones": { "type": "array", "items": { "type": "string" @@ -6473,13 +7235,13 @@ }, "additionalProperties": false, "required": [ - "SpaceTag" + "space-tag" ] }, "AddSubnetsParams": { "type": "object", "properties": { - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/AddSubnetParams" @@ -6488,22 +7250,22 @@ }, "additionalProperties": false, "required": [ - "Subnets" + "subnets" ] }, "CreateSpaceParams": { "type": "object", "properties": { - "ProviderId": { + "provider-id": { "type": "string" }, - "Public": { + "public": { "type": "boolean" }, - "SpaceTag": { + "space-tag": { "type": "string" }, - "SubnetTags": { + "subnet-tags": { "type": "array", "items": { "type": "string" @@ -6512,15 +7274,15 @@ }, "additionalProperties": false, "required": [ - "SubnetTags", - "SpaceTag", - "Public" + "subnet-tags", + "space-tag", + "public" ] }, "CreateSpacesParams": { "type": "object", "properties": { - "Spaces": { + "spaces": { "type": "array", "items": { "$ref": "#/definitions/CreateSpaceParams" @@ -6529,13 +7291,13 @@ }, "additionalProperties": false, "required": [ - "Spaces" + "spaces" ] }, "DiscoverSpacesResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ProviderSpace" @@ -6544,35 +7306,35 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -6581,19 +7343,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -6602,13 +7361,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ListSubnetsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -6617,50 +7376,17 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -6672,22 +7398,22 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "ProviderSpace": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Name": { + "name": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -6696,45 +7422,33 @@ }, "additionalProperties": false, "required": [ - "Name", - "ProviderId", - "Subnets" + "name", + "provider-id", + "subnets" ] }, "Subnet": { "type": "object", "properties": { - "CIDR": { + "cidr": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "SpaceTag": { + "space-tag": { "type": "string" }, - "StaticRangeHighIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "StaticRangeLowIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "Status": { + "status": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" }, - "Zones": { + "zones": { "type": "array", "items": { "type": "string" @@ -6743,64 +7457,24 @@ }, "additionalProperties": false, "required": [ - "CIDR", - "VLANTag", - "Life", - "SpaceTag", - "Zones" + "cidr", + "vlan-tag", + "life", + "space-tag", + "zones" ] }, "SubnetsFilters": { "type": "object", "properties": { - "SpaceTag": { + "space-tag": { "type": "string" }, - "Zone": { + "zone": { "type": "string" } }, "additionalProperties": false - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -6878,29 +7552,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -6909,19 +7583,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -6930,50 +7601,17 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineBlockDevices": { "type": "object", "properties": { - "blockdevices": { + "block-devices": { "type": "array", "items": { "$ref": "#/definitions/BlockDevice" @@ -6990,57 +7628,17 @@ }, "SetMachineBlockDevices": { "type": "object", - "properties": { - "machineblockdevices": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineBlockDevices" - } - } - }, - "additionalProperties": false, - "required": [ - "machineblockdevices" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "properties": { + "machine-block-devices": { + "type": "array", + "items": { + "$ref": "#/definitions/MachineBlockDevices" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "machine-block-devices" ] } } @@ -7068,52 +7666,50 @@ "EntitiesWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "EntityWatcherId": { - "type": "string" - }, - "Error": { + "error": { "$ref": "#/definitions/Error" + }, + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "EntityWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -7121,80 +7717,7 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } @@ -7221,29 +7744,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -7251,118 +7774,44 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineStorageId": { "type": "object", "properties": { - "attachmenttag": { + "attachment-tag": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "machinetag", - "attachmenttag" + "machine-tag", + "attachment-tag" ] }, "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageId" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "MachineStorageIdsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id", + "changes" ] } } @@ -7374,6 +7823,17 @@ "Schema": { "type": "object", "properties": { + "CloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResults" + } + } + }, "GetAssignedMachine": { "type": "object", "properties": { @@ -7385,6 +7845,17 @@ } } }, + "GetCloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelTag" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, "GetExposed": { "type": "object", "properties": { @@ -7502,23 +7973,22 @@ "BoolResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "BoolResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/BoolResult" @@ -7527,13 +7997,94 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" + ] + }, + "CloudCredential": { + "type": "object", + "properties": { + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "auth-type": { + "type": "string" + }, + "redacted": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "auth-type" + ] + }, + "CloudSpec": { + "type": "object", + "properties": { + "credential": { + "$ref": "#/definitions/CloudCredential" + }, + "endpoint": { + "type": "string" + }, + "identity-endpoint": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "storage-endpoint": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "type", + "name" ] }, + "CloudSpecResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/CloudSpec" + } + }, + "additionalProperties": false + }, + "CloudSpecResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, + "additionalProperties": false + }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -7542,47 +8093,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -7591,111 +8142,77 @@ "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, - "required": [ - "Life", - "Error" - ] - }, - "LifeResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "required": [ + "life" + ] + }, + "LifeResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, "MachinePortRange": { "type": "object", "properties": { - "PortRange": { + "port-range": { "$ref": "#/definitions/PortRange" }, - "RelationTag": { + "relation-tag": { "type": "string" }, - "UnitTag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitTag", - "RelationTag", - "PortRange" + "unit-tag", + "relation-tag", + "port-range" ] }, "MachinePorts": { "type": "object", "properties": { - "MachineTag": { + "machine-tag": { "type": "string" }, - "SubnetTag": { + "subnet-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineTag", - "SubnetTag" + "machine-tag", + "subnet-tag" ] }, "MachinePortsParams": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/MachinePorts" @@ -7704,16 +8221,16 @@ }, "additionalProperties": false, "required": [ - "Params" + "params" ] }, "MachinePortsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Ports": { + "ports": { "type": "array", "items": { "$ref": "#/definitions/MachinePortRange" @@ -7722,14 +8239,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Ports" + "ports" ] }, "MachinePortsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachinePortsResult" @@ -7738,13 +8254,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -7756,29 +8272,32 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, + "ModelTag": { + "type": "object", + "additionalProperties": false + }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -7787,49 +8306,48 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "PortRange": { "type": "object", "properties": { - "FromPort": { + "from-port": { "type": "integer" }, - "Protocol": { + "protocol": { "type": "string" }, - "ToPort": { + "to-port": { "type": "integer" } }, "additionalProperties": false, "required": [ - "FromPort", - "ToPort", - "Protocol" + "from-port", + "to-port", + "protocol" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringResult" @@ -7838,32 +8356,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, "StringsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsResult" @@ -7872,36 +8386,34 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsWatchResult" @@ -7910,47 +8422,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -8025,23 +8497,22 @@ "ControllersChangeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "$ref": "#/definitions/ControllersChanges" } }, "additionalProperties": false, "required": [ - "Result", - "Error" + "result" ] }, "ControllersChangeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ControllersChangeResult" @@ -8050,7 +8521,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ControllersChanges": { @@ -8098,9 +8569,6 @@ "ControllersSpec": { "type": "object", "properties": { - "ModelTag": { - "type": "string" - }, "constraints": { "$ref": "#/definitions/Value" }, @@ -8119,14 +8587,13 @@ }, "additionalProperties": false, "required": [ - "ModelTag", "num-controllers" ] }, "ControllersSpecs": { "type": "object", "properties": { - "Specs": { + "specs": { "type": "array", "items": { "$ref": "#/definitions/ControllersSpec" @@ -8135,35 +8602,35 @@ }, "additionalProperties": false, "required": [ - "Specs" + "specs" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -8172,59 +8639,26 @@ "HAMember": { "type": "object", "properties": { - "PublicAddress": { + "public-address": { "$ref": "#/definitions/Address" }, - "Series": { + "series": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "PublicAddress", - "Series" + "tag", + "public-address", + "series" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "Member": { "type": "object", @@ -8278,16 +8712,16 @@ "MongoUpgradeResults": { "type": "object", "properties": { - "Master": { - "$ref": "#/definitions/HAMember" - }, - "Members": { + "ha-members": { "type": "array", "items": { "$ref": "#/definitions/HAMember" } }, - "RsMembers": { + "master": { + "$ref": "#/definitions/HAMember" + }, + "rs-members": { "type": "array", "items": { "$ref": "#/definitions/Member" @@ -8296,15 +8730,39 @@ }, "additionalProperties": false, "required": [ - "RsMembers", - "Master", - "Members" + "rs-members", + "master", + "ha-members" + ] + }, + "MongoVersion": { + "type": "object", + "properties": { + "engine": { + "type": "string" + }, + "major": { + "type": "integer" + }, + "minor": { + "type": "integer" + }, + "patch": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "major", + "minor", + "patch", + "engine" ] }, "ResumeReplicationParams": { "type": "object", "properties": { - "Members": { + "members": { "type": "array", "items": { "$ref": "#/definitions/Member" @@ -8313,19 +8771,19 @@ }, "additionalProperties": false, "required": [ - "Members" + "members" ] }, "UpgradeMongoParams": { "type": "object", "properties": { - "Target": { - "$ref": "#/definitions/Version" + "target": { + "$ref": "#/definitions/MongoVersion" } }, "additionalProperties": false, "required": [ - "Target" + "target" ] }, "Value": { @@ -8337,7 +8795,7 @@ "container": { "type": "string" }, - "cpu-cores": { + "cores": { "type": "integer" }, "cpu-power": { @@ -8369,70 +8827,6 @@ } }, "additionalProperties": false - }, - "Version": { - "type": "object", - "properties": { - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "string" - }, - "StorageEngine": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Major", - "Minor", - "Patch", - "StorageEngine" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -8459,29 +8853,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -8490,19 +8884,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -8511,45 +8902,12 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "SSHHostKeySet": { "type": "object", @@ -8584,46 +8942,6 @@ "tag", "public-keys" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -8661,29 +8979,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -8692,19 +9010,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -8713,7 +9028,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ImageFilterParams": { @@ -8797,80 +9112,7 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } @@ -8925,7 +9167,7 @@ "arch": { "type": "string" }, - "image_id": { + "image-id": { "type": "string" }, "priority": { @@ -8934,10 +9176,10 @@ "region": { "type": "string" }, - "root_storage_size": { + "root-storage-size": { "type": "integer" }, - "root_storage_type": { + "root-storage-type": { "type": "string" }, "series": { @@ -8952,13 +9194,13 @@ "version": { "type": "string" }, - "virt_type": { + "virt-type": { "type": "string" } }, "additionalProperties": false, "required": [ - "image_id", + "image-id", "region", "version", "series", @@ -8982,29 +9224,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -9013,19 +9255,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -9034,7 +9273,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ImageMetadataFilter": { @@ -9061,7 +9300,7 @@ "stream": { "type": "string" }, - "virt_type": { + "virt-type": { "type": "string" } }, @@ -9084,45 +9323,12 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MetadataImageIds": { "type": "object", "properties": { - "image_ids": { + "image-ids": { "type": "array", "items": { "type": "string" @@ -9131,7 +9337,7 @@ }, "additionalProperties": false, "required": [ - "image_ids" + "image-ids" ] }, "MetadataSaveParams": { @@ -9145,46 +9351,6 @@ } }, "additionalProperties": false - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -9312,46 +9478,45 @@ "Address": { "type": "object", "properties": { - "Scope": { + "scope": { "type": "string" }, - "SpaceName": { + "space-name": { "type": "string" }, - "Type": { + "type": { "type": "string" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "value", + "type", + "scope" ] }, "BoolResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "BoolResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/BoolResult" @@ -9360,13 +9525,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -9375,25 +9540,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -9402,50 +9567,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -9454,19 +9619,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -9475,29 +9637,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -9506,88 +9667,54 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineAddresses": { "type": "object", "properties": { - "Addresses": { + "addresses": { "type": "array", "items": { "$ref": "#/definitions/Address" } }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Addresses" + "tag", + "addresses" ] }, "MachineAddressesResult": { "type": "object", "properties": { - "Addresses": { + "addresses": { "type": "array", "items": { "$ref": "#/definitions/Address" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Error", - "Addresses" + "addresses" ] }, "MachineAddressesResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachineAddressesResult" @@ -9596,13 +9723,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -9614,29 +9741,28 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "SetMachinesAddresses": { "type": "object", "properties": { - "MachineAddresses": { + "machine-addresses": { "type": "array", "items": { "$ref": "#/definitions/MachineAddresses" @@ -9645,13 +9771,13 @@ }, "additionalProperties": false, "required": [ - "MachineAddresses" + "machine-addresses" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -9660,13 +9786,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "StatusResult": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -9675,41 +9801,40 @@ } } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Id": { + "id": { "type": "string" }, - "Info": { + "info": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Id", - "Life", - "Status", - "Info", - "Data", - "Since" + "id", + "life", + "status", + "info", + "data", + "since" ] }, "StatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StatusResult" @@ -9718,29 +9843,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringResult" @@ -9749,70 +9873,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } @@ -9873,7 +9955,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -9882,47 +9964,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -9931,19 +10013,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -9952,104 +10031,67 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ListSSHKeys": { "type": "object", "properties": { - "Entities": { + "entities": { "$ref": "#/definitions/Entities" }, - "Mode": { + "mode": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Entities", - "Mode" + "entities", + "mode" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "ModifyUserSSHKeys": { "type": "object", "properties": { - "Keys": { + "ssh-keys": { "type": "array", "items": { "type": "string" } }, - "User": { + "user": { "type": "string" } }, "additionalProperties": false, "required": [ - "User", - "Keys" + "user", + "ssh-keys" ] }, "StringsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, "StringsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsResult" @@ -10058,47 +10100,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -10137,7 +10139,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -10146,47 +10148,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -10194,61 +10196,27 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -10257,32 +10225,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, "StringsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsResult" @@ -10291,47 +10255,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -10382,7 +10306,7 @@ "ClaimLeadershipBulkParams": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/ClaimLeadershipParams" @@ -10391,13 +10315,13 @@ }, "additionalProperties": false, "required": [ - "Params" + "params" ] }, "ClaimLeadershipBulkResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -10406,55 +10330,55 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ClaimLeadershipParams": { "type": "object", "properties": { - "ApplicationTag": { + "application-tag": { "type": "string" }, - "DurationSeconds": { + "duration": { "type": "number" }, - "UnitTag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "ApplicationTag", - "UnitTag", - "DurationSeconds" + "application-tag", + "unit-tag", + "duration" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -10463,321 +10387,363 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "LifeFlag", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Life": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Params": { + "$ref": "#/definitions/Entities" }, - "data": { + "Result": { + "$ref": "#/definitions/LifeResults" + } + } + }, + "Watch": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + } + }, + "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "location": { - "$ref": "#/definitions/packet" + "message": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "LifeResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "sig": { + "life": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "life" + ] + }, + "LifeResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, - "caveat": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "NotifyWatcherId": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "NotifyWatcherId" ] }, - "packet": { + "NotifyWatchResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "LifeFlag", + "Name": "LogForwarding", "Version": 1, "Schema": { "type": "object", "properties": { - "Life": { + "GetLastSent": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/LogForwardingGetLastSentParams" }, "Result": { - "$ref": "#/definitions/LifeResults" + "$ref": "#/definitions/LogForwardingGetLastSentResults" } } }, - "Watch": { + "SetLastSent": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/LogForwardingSetLastSentParams" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ErrorResults" } } } }, "definitions": { - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "Entity": { - "type": "object", - "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "LifeResult": { + "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "Life": { - "type": "string" } }, - "additionalProperties": false, - "required": [ - "Life", - "Error" - ] + "additionalProperties": false }, - "LifeResults": { + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/LifeResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "LogForwardingGetLastSentParams": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "ids": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/LogForwardingID" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "ids" ] }, - "NotifyWatchResult": { + "LogForwardingGetLastSentResult": { "type": "object", "properties": { - "Error": { + "err": { "$ref": "#/definitions/Error" }, - "NotifyWatcherId": { - "type": "string" + "record-id": { + "type": "integer" + }, + "record-timestamp": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "record-id", + "record-timestamp", + "err" ] }, - "NotifyWatchResults": { + "LogForwardingGetLastSentResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/LogForwardingGetLastSentResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "caveat": { + "LogForwardingID": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "model": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "sink": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "model", + "sink" ] }, - "packet": { + "LogForwardingSetLastSentParam": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "LogForwardingID": { + "$ref": "#/definitions/LogForwardingID" }, - "start": { + "record-id": { "type": "integer" }, - "totalLen": { + "record-timestamp": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "LogForwardingID", + "record-id", + "record-timestamp" + ] + }, + "LogForwardingSetLastSentParams": { + "type": "object", + "properties": { + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/LogForwardingSetLastSentParam" + } + } + }, + "additionalProperties": false, + "required": [ + "params" ] + }, + "Macaroon": { + "type": "object", + "additionalProperties": false } } } @@ -10815,7 +10781,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -10824,47 +10790,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -10872,61 +10838,27 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -10935,29 +10867,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringResult" @@ -10966,47 +10897,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -11107,7 +10998,7 @@ "ActionExecutionResult": { "type": "object", "properties": { - "actiontag": { + "action-tag": { "type": "string" }, "message": { @@ -11128,7 +11019,7 @@ }, "additionalProperties": false, "required": [ - "actiontag", + "action-tag", "status" ] }, @@ -11228,7 +11119,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -11237,47 +11128,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -11286,94 +11177,56 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsWatchResult" @@ -11382,47 +11235,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -11450,68 +11263,66 @@ "AddMachineParams": { "type": "object", "properties": { - "Addrs": { + "addresses": { "type": "array", "items": { "$ref": "#/definitions/Address" } }, - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" }, - "ContainerType": { + "container-type": { "type": "string" }, - "Disks": { + "disks": { "type": "array", "items": { "$ref": "#/definitions/Constraints" } }, - "HardwareCharacteristics": { + "hardware-characteristics": { "$ref": "#/definitions/HardwareCharacteristics" }, - "InstanceId": { + "instance-id": { "type": "string" }, - "Jobs": { + "jobs": { "type": "array", "items": { "type": "string" } }, - "Nonce": { + "nonce": { "type": "string" }, - "ParentId": { + "parent-id": { "type": "string" }, - "Placement": { + "placement": { "$ref": "#/definitions/Placement" }, - "Series": { + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "Series", - "Constraints", - "Jobs", - "Disks", - "Placement", - "ParentId", - "ContainerType", - "InstanceId", - "Nonce", - "HardwareCharacteristics", - "Addrs" + "series", + "constraints", + "jobs", + "parent-id", + "container-type", + "instance-id", + "nonce", + "hardware-characteristics", + "addresses" ] }, "AddMachines": { "type": "object", "properties": { - "MachineParams": { + "params": { "type": "array", "items": { "$ref": "#/definitions/AddMachineParams" @@ -11520,29 +11331,28 @@ }, "additionalProperties": false, "required": [ - "MachineParams" + "params" ] }, "AddMachinesResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Machine": { + "machine": { "type": "string" } }, "additionalProperties": false, "required": [ - "Machine", - "Error" + "machine" ] }, "AddMachinesResults": { "type": "object", "properties": { - "Machines": { + "machines": { "type": "array", "items": { "$ref": "#/definitions/AddMachinesResult" @@ -11551,30 +11361,30 @@ }, "additionalProperties": false, "required": [ - "Machines" + "machines" ] }, "Address": { "type": "object", "properties": { - "Scope": { + "scope": { "type": "string" }, - "SpaceName": { + "space-name": { "type": "string" }, - "Type": { + "type": { "type": "string" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "value", + "type", + "scope" ] }, "Constraints": { @@ -11600,29 +11410,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -11631,25 +11441,25 @@ "HardwareCharacteristics": { "type": "object", "properties": { - "Arch": { + "arch": { "type": "string" }, - "AvailabilityZone": { + "availability-zone": { "type": "string" }, - "CpuCores": { + "cpu-cores": { "type": "integer" }, - "CpuPower": { + "cpu-power": { "type": "integer" }, - "Mem": { + "mem": { "type": "integer" }, - "RootDisk": { + "root-disk": { "type": "integer" }, - "Tags": { + "tags": { "type": "array", "items": { "type": "string" @@ -11659,138 +11469,299 @@ "additionalProperties": false }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "Placement": { + "type": "object", + "properties": { + "directive": { + "type": "string" + }, + "scope": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "scope", + "directive" + ] + }, + "Value": { "type": "object", "properties": { - "caveats": { + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "spaces": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "type": "string" } }, - "data": { + "tags": { "type": "array", "items": { - "type": "integer" + "type": "string" } }, - "id": { - "$ref": "#/definitions/packet" + "virt-type": { + "type": "string" + } + }, + "additionalProperties": false + } + } + } + }, + { + "Name": "MachineUndertaker", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "AllMachineRemovals": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/EntitiesResults" + } + } + }, + "CompleteMachineRemovals": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + } + } + }, + "GetMachineProviderInterfaceInfo": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ProviderInterfaceInfoResults" + } + } + }, + "WatchMachineRemovals": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + } + }, + "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "entities" ] }, - "Placement": { + "EntitiesResult": { "type": "object", "properties": { - "Directive": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } }, - "Scope": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Scope", - "Directive" + "entities" ] }, - "Value": { + "EntitiesResults": { "type": "object", "properties": { - "arch": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/EntitiesResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { "type": "string" - }, - "container": { + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { + "type": "object", + "properties": { + "code": { "type": "string" }, - "cpu-cores": { - "type": "integer" - }, - "cpu-power": { - "type": "integer" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "instance-type": { + "message": { "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "mem": { - "type": "integer" - }, - "root-disk": { - "type": "integer" + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { + "type": "string" }, - "spaces": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/NotifyWatchResult" } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "ProviderInterfaceInfo": { + "type": "object", + "properties": { + "interface-name": { + "type": "string" }, - "tags": { - "type": "array", - "items": { - "type": "string" - } + "mac-address": { + "type": "string" }, - "virt-type": { + "provider-id": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "interface-name", + "mac-address", + "provider-id" + ] }, - "caveat": { + "ProviderInterfaceInfoResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "location": { - "$ref": "#/definitions/packet" + "interfaces": { + "type": "array", + "items": { + "$ref": "#/definitions/ProviderInterfaceInfo" + } }, - "verificationId": { - "$ref": "#/definitions/packet" + "machine-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "machine-tag", + "interfaces" ] }, - "packet": { + "ProviderInterfaceInfoResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ProviderInterfaceInfoResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -11943,7 +11914,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -11955,36 +11926,36 @@ }, "additionalProperties": false, "required": [ - "Servers" + "servers" ] }, "Address": { "type": "object", "properties": { - "Scope": { + "scope": { "type": "string" }, - "SpaceName": { + "space-name": { "type": "string" }, - "Type": { + "type": { "type": "string" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "value", + "type", + "scope" ] }, "BytesResult": { "type": "object", "properties": { - "Result": { + "result": { "type": "array", "items": { "type": "integer" @@ -11993,13 +11964,13 @@ }, "additionalProperties": false, "required": [ - "Result" + "result" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -12008,25 +11979,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -12035,50 +12006,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -12087,19 +12058,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -12108,7 +12076,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "HostPort": { @@ -12117,23 +12085,23 @@ "Address": { "$ref": "#/definitions/Address" }, - "Port": { + "port": { "type": "integer" } }, "additionalProperties": false, "required": [ "Address", - "Port" + "port" ] }, "JobsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Jobs": { + "jobs": { "type": "array", "items": { "type": "string" @@ -12142,14 +12110,13 @@ }, "additionalProperties": false, "required": [ - "Jobs", - "Error" + "jobs" ] }, "JobsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/JobsResult" @@ -12158,29 +12125,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -12189,173 +12155,139 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineAddresses": { "type": "object", "properties": { - "Addresses": { + "addresses": { "type": "array", "items": { "$ref": "#/definitions/Address" } }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Addresses" + "tag", + "addresses" ] }, "NetworkConfig": { "type": "object", "properties": { - "Address": { + "address": { "type": "string" }, - "CIDR": { + "cidr": { "type": "string" }, - "ConfigType": { + "config-type": { "type": "string" }, - "DNSSearchDomains": { + "device-index": { + "type": "integer" + }, + "disabled": { + "type": "boolean" + }, + "dns-search-domains": { "type": "array", "items": { "type": "string" } }, - "DNSServers": { + "dns-servers": { "type": "array", "items": { "type": "string" } }, - "DeviceIndex": { - "type": "integer" - }, - "Disabled": { - "type": "boolean" - }, - "GatewayAddress": { + "gateway-address": { "type": "string" }, - "InterfaceName": { + "interface-name": { "type": "string" }, - "InterfaceType": { + "interface-type": { "type": "string" }, - "MACAddress": { + "mac-address": { "type": "string" }, - "MTU": { + "mtu": { "type": "integer" }, - "NoAutoStart": { + "no-auto-start": { "type": "boolean" }, - "ParentInterfaceName": { + "parent-interface-name": { "type": "string" }, - "ProviderAddressId": { + "provider-address-id": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "ProviderSpaceId": { + "provider-space-id": { "type": "string" }, - "ProviderSubnetId": { + "provider-subnet-id": { "type": "string" }, - "ProviderVLANId": { + "provider-vlan-id": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" } }, "additionalProperties": false, "required": [ - "DeviceIndex", - "MACAddress", - "CIDR", - "MTU", - "ProviderId", - "ProviderSubnetId", - "ProviderSpaceId", - "ProviderAddressId", - "ProviderVLANId", - "VLANTag", - "InterfaceName", - "ParentInterfaceName", - "InterfaceType", - "Disabled" + "device-index", + "mac-address", + "cidr", + "mtu", + "provider-id", + "provider-subnet-id", + "provider-space-id", + "provider-address-id", + "provider-vlan-id", + "vlan-tag", + "interface-name", + "parent-interface-name", + "interface-type", + "disabled" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -12364,32 +12296,32 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetMachineNetworkConfig": { "type": "object", "properties": { - "Config": { + "config": { "type": "array", "items": { "$ref": "#/definitions/NetworkConfig" } }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Config" + "tag", + "config" ] }, "SetMachinesAddresses": { "type": "object", "properties": { - "MachineAddresses": { + "machine-addresses": { "type": "array", "items": { "$ref": "#/definitions/MachineAddresses" @@ -12398,13 +12330,13 @@ }, "additionalProperties": false, "required": [ - "MachineAddresses" + "machine-addresses" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -12413,83 +12345,38 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } @@ -12527,7 +12414,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -12536,47 +12423,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -12584,65 +12471,31 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MeterStatusResult": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Info": { + "info": { "type": "string" } }, "additionalProperties": false, "required": [ - "Code", - "Info", - "Error" + "code", + "info" ] }, "MeterStatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MeterStatusResult" @@ -12651,78 +12504,37 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] - }, - "NotifyWatchResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" }, - "verificationId": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "NotifyWatcherId" ] }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -12750,29 +12562,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -12781,19 +12593,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -12802,115 +12611,82 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "Metric": { "type": "object", "properties": { - "Key": { + "key": { "type": "string" }, - "Time": { + "time": { "type": "string", "format": "date-time" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Key", - "Value", - "Time" + "key", + "value", + "time" ] }, "MetricBatch": { "type": "object", "properties": { - "CharmURL": { + "charm-url": { "type": "string" }, - "Created": { + "created": { "type": "string", "format": "date-time" }, - "Metrics": { + "metrics": { "type": "array", "items": { "$ref": "#/definitions/Metric" } }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "UUID", - "CharmURL", - "Created", - "Metrics" + "uuid", + "charm-url", + "created", + "metrics" ] }, "MetricBatchParam": { "type": "object", "properties": { - "Batch": { + "batch": { "$ref": "#/definitions/MetricBatch" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Batch" + "tag", + "batch" ] }, "MetricBatchParams": { "type": "object", "properties": { - "Batches": { + "batches": { "type": "array", "items": { "$ref": "#/definitions/MetricBatchParam" @@ -12919,47 +12695,7 @@ }, "additionalProperties": false, "required": [ - "Batches" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "batches" ] } } @@ -12998,7 +12734,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -13007,19 +12743,19 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityMetrics": { @@ -13040,29 +12776,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -13071,19 +12807,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -13092,45 +12825,12 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MeterStatusParam": { "type": "object", @@ -13177,6 +12877,9 @@ "type": "string", "format": "date-time" }, + "unit": { + "type": "string" + }, "value": { "type": "string" } @@ -13185,7 +12888,8 @@ "required": [ "time", "key", - "value" + "value", + "unit" ] }, "MetricResults": { @@ -13202,46 +12906,6 @@ "required": [ "results" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -13279,7 +12943,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -13288,47 +12952,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -13337,19 +13001,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -13358,85 +13019,12 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } @@ -13474,7 +13062,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -13483,109 +13071,75 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "Macaroon": { + "type": "object", + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -13594,29 +13148,25 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "PhaseResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, "phase": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "phase", - "Error" - ] + "additionalProperties": false }, "PhaseResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/PhaseResult" @@ -13625,47 +13175,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -13685,14 +13195,36 @@ } } }, - "GetMigrationStatus": { + "MigrationStatus": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/MasterMigrationStatus" + } + } + }, + "MinionReports": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/MinionReports" + } + } + }, + "ModelInfo": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/FullMigrationStatus" + "$ref": "#/definitions/MigrationModelInfo" } } }, + "Prechecks": { + "type": "object" + }, + "Reap": { + "type": "object" + }, "SetPhase": { "type": "object", "properties": { @@ -13701,6 +13233,14 @@ } } }, + "SetStatusMessage": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMigrationStatusMessageArgs" + } + } + }, "Watch": { "type": "object", "properties": { @@ -13708,114 +13248,126 @@ "$ref": "#/definitions/NotifyWatchResult" } } + }, + "WatchMinionReports": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } } }, "definitions": { "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "FullMigrationStatus": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MasterMigrationStatus": { "type": "object", "properties": { - "attempt": { - "type": "integer" + "migration-id": { + "type": "string" }, "phase": { "type": "string" }, + "phase-changed-time": { + "type": "string", + "format": "date-time" + }, "spec": { - "$ref": "#/definitions/ModelMigrationSpec" + "$ref": "#/definitions/MigrationSpec" } }, "additionalProperties": false, "required": [ "spec", - "attempt", - "phase" + "migration-id", + "phase", + "phase-changed-time" ] }, - "Macaroon": { + "MigrationModelInfo": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "agent-version": { + "$ref": "#/definitions/Number" }, - "id": { - "$ref": "#/definitions/packet" + "name": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "owner-tag": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "uuid", + "name", + "owner-tag", + "agent-version" ] }, - "ModelMigrationSpec": { + "MigrationSpec": { "type": "object", "properties": { + "external-control": { + "type": "boolean" + }, "model-tag": { "type": "string" }, + "skip-initial-prechecks": { + "type": "boolean" + }, "target-info": { - "$ref": "#/definitions/ModelMigrationTargetInfo" + "$ref": "#/definitions/MigrationTargetInfo" } }, "additionalProperties": false, "required": [ "model-tag", - "target-info" + "target-info", + "external-control", + "skip-initial-prechecks" ] }, - "ModelMigrationTargetInfo": { + "MigrationTargetInfo": { "type": "object", "properties": { "addrs": { @@ -13833,6 +13385,9 @@ "controller-tag": { "type": "string" }, + "macaroons": { + "type": "string" + }, "password": { "type": "string" } @@ -13842,24 +13397,88 @@ "controller-tag", "addrs", "ca-cert", - "auth-tag", - "password" + "auth-tag" + ] + }, + "MinionReports": { + "type": "object", + "properties": { + "failed": { + "type": "array", + "items": { + "type": "string" + } + }, + "migration-id": { + "type": "string" + }, + "phase": { + "type": "string" + }, + "success-count": { + "type": "integer" + }, + "unknown-count": { + "type": "integer" + }, + "unknown-sample": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "migration-id", + "phase", + "success-count", + "unknown-count", + "unknown-sample", + "failed" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { + "NotifyWatcherId": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "Number": { + "type": "object", + "properties": { + "Build": { + "type": "integer" }, - "NotifyWatcherId": { + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "Major", + "Minor", + "Tag", + "Patch", + "Build" ] }, "SerializedModel": { @@ -13870,63 +13489,65 @@ "items": { "type": "integer" } + }, + "charms": { + "type": "array", + "items": { + "type": "string" + } + }, + "tools": { + "type": "array", + "items": { + "$ref": "#/definitions/SerializedModelTools" + } } }, "additionalProperties": false, "required": [ - "bytes" + "bytes", + "charms", + "tools" ] }, - "SetMigrationPhaseArgs": { + "SerializedModelTools": { "type": "object", "properties": { - "phase": { + "uri": { + "type": "string" + }, + "version": { "type": "string" } }, "additionalProperties": false, "required": [ - "phase" + "version", + "uri" ] }, - "caveat": { + "SetMigrationPhaseArgs": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "phase": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "phase" ] }, - "packet": { + "SetMigrationStatusMessageArgs": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "message" ] } } @@ -13938,6 +13559,14 @@ "Schema": { "type": "object", "properties": { + "Report": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/MinionReport" + } + } + }, "Watch": { "type": "object", "properties": { @@ -13951,125 +13580,71 @@ "Error": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] - }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { + "code": { "type": "string" - } - }, - "additionalProperties": false - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "message", + "code" ] }, - "NotifyWatchResult": { + "ErrorInfo": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "NotifyWatcherId": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false }, - "caveat": { + "MinionReport": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "migration-id": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "phase": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "success": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "migration-id", + "phase", + "success" ] }, - "packet": { + "NotifyWatchResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "NotifyWatcherId": { + "type": "string" }, - "totalLen": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "NotifyWatcherId" ] } } @@ -14100,6 +13675,12 @@ "attempt": { "type": "integer" }, + "external-control": { + "type": "boolean" + }, + "migration-id": { + "type": "string" + }, "phase": { "type": "string" }, @@ -14124,8 +13705,10 @@ }, "additionalProperties": false, "required": [ + "migration-id", "attempt", "phase", + "external-control", "source-api-addrs", "source-ca-cert", "target-api-addrs", @@ -14164,9 +13747,41 @@ "$ref": "#/definitions/SerializedModel" } } + }, + "Prechecks": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/MigrationModelInfo" + } + } } }, "definitions": { + "MigrationModelInfo": { + "type": "object", + "properties": { + "agent-version": { + "$ref": "#/definitions/Number" + }, + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "uuid", + "name", + "owner-tag", + "agent-version" + ] + }, "ModelArgs": { "type": "object", "properties": { @@ -14179,6 +13794,34 @@ "model-tag" ] }, + "Number": { + "type": "object", + "properties": { + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "Major", + "Minor", + "Tag", + "Patch", + "Build" + ] + }, "SerializedModel": { "type": "object", "properties": { @@ -14187,11 +13830,143 @@ "items": { "type": "integer" } + }, + "charms": { + "type": "array", + "items": { + "type": "string" + } + }, + "tools": { + "type": "array", + "items": { + "$ref": "#/definitions/SerializedModelTools" + } + } + }, + "additionalProperties": false, + "required": [ + "bytes", + "charms", + "tools" + ] + }, + "SerializedModelTools": { + "type": "object", + "properties": { + "uri": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "version", + "uri" + ] + } + } + } + }, + { + "Name": "ModelConfig", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "ModelGet": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResults" + } + } + }, + "ModelSet": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelSet" + } + } + }, + "ModelUnset": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelUnset" + } + } + } + }, + "definitions": { + "ConfigValue": { + "type": "object", + "properties": { + "source": { + "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true + } + }, + "additionalProperties": false, + "required": [ + "value", + "source" + ] + }, + "ModelConfigResults": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ConfigValue" + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelSet": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelUnset": { + "type": "object", + "properties": { + "keys": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "bytes" + "keys" ] } } @@ -14203,55 +13978,118 @@ "Schema": { "type": "object", "properties": { - "ConfigSkeleton": { + "CreateModel": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelCreateArgs" + }, + "Result": { + "$ref": "#/definitions/ModelInfo" + } + } + }, + "DestroyModels": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "DumpModels": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/MapResults" + } + } + }, + "DumpModelsDB": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/MapResults" + } + } + }, + "ListModels": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entity" + }, + "Result": { + "$ref": "#/definitions/UserModelList" + } + } + }, + "ModelDefaults": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelDefaultsResult" + } + } + }, + "ModelInfo": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ModelSkeletonConfigArgs" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ModelConfigResult" + "$ref": "#/definitions/ModelInfoResults" } } }, - "CreateModel": { + "ModelStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ModelCreateArgs" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/Model" + "$ref": "#/definitions/ModelStatusResults" } } }, - "ListModels": { + "ModifyModelAccess": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/ModifyModelAccessRequest" }, "Result": { - "$ref": "#/definitions/UserModelList" + "$ref": "#/definitions/ErrorResults" } } }, - "ModelInfo": { + "SetModelDefaults": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/SetModelDefaults" }, "Result": { - "$ref": "#/definitions/ModelInfoResults" + "$ref": "#/definitions/ErrorResults" } } }, - "ModifyModelAccess": { + "UnsetModelDefaults": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ModifyModelAccessRequest" + "$ref": "#/definitions/UnsetModelDefaults" }, "Result": { "$ref": "#/definitions/ErrorResults" @@ -14263,7 +14101,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -14272,25 +14110,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatus": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -14299,51 +14137,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since" + "status", + "info", + "since" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -14352,19 +14189,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -14373,70 +14207,106 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineHardware": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "arch": { + "type": "string" }, - "data": { + "availability-zone": { + "type": "string" + }, + "cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { "type": "array", "items": { - "type": "integer" + "type": "string" } + } + }, + "additionalProperties": false + }, + "MapResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "result": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "result" + ] + }, + "MapResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/MapResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, "Model": { "type": "object", "properties": { - "Name": { + "name": { "type": "string" }, - "OwnerTag": { + "owner-tag": { "type": "string" }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "OwnerTag" + "name", + "uuid", + "owner-tag" ] }, - "ModelConfigResult": { + "ModelCreateArgs": { "type": "object", "properties": { - "Config": { + "cloud-tag": { + "type": "string" + }, + "config": { "type": "object", "patternProperties": { ".*": { @@ -14444,17 +14314,36 @@ "additionalProperties": true } } + }, + "credential": { + "type": "string" + }, + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "region": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Config" + "name", + "owner-tag" ] }, - "ModelCreateArgs": { + "ModelDefaultValues": { "type": "object", "properties": { - "Account": { + "cloud-region": { + "type": "string" + }, + "cloud-tag": { + "type": "string" + }, + "config": { "type": "object", "patternProperties": { ".*": { @@ -14462,76 +14351,112 @@ "additionalProperties": true } } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelDefaults": { + "type": "object", + "properties": { + "controller": { + "type": "object", + "additionalProperties": true }, - "Config": { + "default": { + "type": "object", + "additionalProperties": true + }, + "regions": { + "type": "array", + "items": { + "$ref": "#/definitions/RegionDefaults" + } + } + }, + "additionalProperties": false + }, + "ModelDefaultsResult": { + "type": "object", + "properties": { + "config": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/ModelDefaults" } } - }, - "OwnerTag": { - "type": "string" } }, "additionalProperties": false, "required": [ - "OwnerTag", - "Account", - "Config" + "config" ] }, "ModelInfo": { "type": "object", "properties": { - "Cloud": { + "cloud-credential-tag": { "type": "string" }, - "DefaultSeries": { + "cloud-region": { "type": "string" }, - "Life": { + "cloud-tag": { "type": "string" }, - "Name": { + "controller-uuid": { "type": "string" }, - "OwnerTag": { + "default-series": { "type": "string" }, - "ProviderType": { + "life": { "type": "string" }, - "ServerUUID": { + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, + "name": { "type": "string" }, - "Status": { - "$ref": "#/definitions/EntityStatus" + "owner-tag": { + "type": "string" }, - "UUID": { + "provider-type": { "type": "string" }, - "Users": { + "status": { + "$ref": "#/definitions/EntityStatus" + }, + "users": { "type": "array", "items": { "$ref": "#/definitions/ModelUserInfo" } + }, + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "ServerUUID", - "ProviderType", - "DefaultSeries", - "Cloud", - "OwnerTag", - "Life", - "Status", - "Users" + "name", + "uuid", + "controller-uuid", + "provider-type", + "default-series", + "cloud-tag", + "owner-tag", + "life", + "status", + "users", + "machines" ] }, "ModelInfoResult": { @@ -14546,35 +14471,116 @@ }, "additionalProperties": false }, - "ModelInfoResults": { + "ModelInfoResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelInfoResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "ModelMachineInfo": { + "type": "object", + "properties": { + "hardware": { + "$ref": "#/definitions/MachineHardware" + }, + "has-vote": { + "type": "boolean" + }, + "id": { + "type": "string" + }, + "instance-id": { + "type": "string" + }, + "status": { + "type": "string" + }, + "wants-vote": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "id" + ] + }, + "ModelStatus": { + "type": "object", + "properties": { + "application-count": { + "type": "integer" + }, + "hosted-machine-count": { + "type": "integer" + }, + "life": { + "type": "string" + }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, + "model-tag": { + "type": "string" + }, + "owner-tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "model-tag", + "life", + "hosted-machine-count", + "application-count", + "owner-tag" + ] + }, + "ModelStatusResults": { "type": "object", "properties": { - "results": { + "models": { "type": "array", "items": { - "$ref": "#/definitions/ModelInfoResult" + "$ref": "#/definitions/ModelStatus" } } }, "additionalProperties": false, "required": [ - "results" + "models" ] }, - "ModelSkeletonConfigArgs": { + "ModelUnsetKeys": { "type": "object", "properties": { - "Provider": { + "cloud-region": { "type": "string" }, - "Region": { + "cloud-tag": { "type": "string" + }, + "keys": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Provider", - "Region" + "keys" ] }, "ModelUserInfo": { @@ -14583,10 +14589,10 @@ "access": { "type": "string" }, - "displayname": { + "display-name": { "type": "string" }, - "lastconnection": { + "last-connection": { "type": "string", "format": "date-time" }, @@ -14597,8 +14603,8 @@ "additionalProperties": false, "required": [ "user", - "displayname", - "lastconnection", + "display-name", + "last-connection", "access" ] }, @@ -14641,76 +14647,83 @@ "changes" ] }, - "UserModel": { + "RegionDefaults": { "type": "object", "properties": { - "LastConnection": { - "type": "string", - "format": "date-time" + "region-name": { + "type": "string" }, - "Model": { - "$ref": "#/definitions/Model" + "value": { + "type": "object", + "additionalProperties": true } }, "additionalProperties": false, "required": [ - "Model", - "LastConnection" + "region-name", + "value" ] }, - "UserModelList": { + "SetModelDefaults": { "type": "object", "properties": { - "UserModels": { + "config": { "type": "array", "items": { - "$ref": "#/definitions/UserModel" + "$ref": "#/definitions/ModelDefaultValues" } } }, "additionalProperties": false, "required": [ - "UserModels" + "config" ] }, - "caveat": { + "UnsetModelDefaults": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "keys": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelUnsetKeys" + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "keys" ] }, - "packet": { + "UserModel": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "last-connection": { + "type": "string", + "format": "date-time" }, - "totalLen": { - "type": "integer" + "model": { + "$ref": "#/definitions/Model" + } + }, + "additionalProperties": false, + "required": [ + "model", + "last-connection" + ] + }, + "UserModelList": { + "type": "object", + "properties": { + "user-models": { + "type": "array", + "items": { + "$ref": "#/definitions/UserModel" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "user-models" ] } } @@ -14806,6 +14819,14 @@ } } }, + "ControllerConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ControllerConfigResult" + } + } + }, "DistributionGroup": { "type": "object", "properties": { @@ -14891,6 +14912,17 @@ } } }, + "MarkMachinesForRemoval": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "ModelConfig": { "type": "object", "properties": { @@ -15117,7 +15149,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -15129,30 +15161,30 @@ }, "additionalProperties": false, "required": [ - "Servers" + "servers" ] }, "Address": { "type": "object", "properties": { - "Scope": { + "scope": { "type": "string" }, - "SpaceName": { + "space-name": { "type": "string" }, - "Type": { + "type": { "type": "string" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "value", + "type", + "scope" ] }, "Binary": { @@ -15178,7 +15210,7 @@ "BytesResult": { "type": "object", "properties": { - "Result": { + "result": { "type": "array", "items": { "type": "integer" @@ -15187,7 +15219,7 @@ }, "additionalProperties": false, "required": [ - "Result" + "result" ] }, "CloudImageMetadata": { @@ -15196,7 +15228,7 @@ "arch": { "type": "string" }, - "image_id": { + "image-id": { "type": "string" }, "priority": { @@ -15205,10 +15237,10 @@ "region": { "type": "string" }, - "root_storage_size": { + "root-storage-size": { "type": "integer" }, - "root_storage_type": { + "root-storage-type": { "type": "string" }, "series": { @@ -15223,13 +15255,13 @@ "version": { "type": "string" }, - "virt_type": { + "virt-type": { "type": "string" } }, "additionalProperties": false, "required": [ - "image_id", + "image-id", "region", "version", "series", @@ -15241,23 +15273,22 @@ "ConstraintsResult": { "type": "object", "properties": { - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" }, - "Error": { + "error": { "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Error", - "Constraints" + "constraints" ] }, "ConstraintsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ConstraintsResult" @@ -15266,53 +15297,49 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ContainerConfig": { "type": "object", "properties": { - "AllowLXCLoopMounts": { - "type": "boolean" + "UpdateBehavior": { + "$ref": "#/definitions/UpdateBehavior" }, - "AptMirror": { + "apt-mirror": { "type": "string" }, - "AptProxy": { + "apt-proxy": { "$ref": "#/definitions/Settings" }, - "AuthorizedKeys": { + "authorized-keys": { "type": "string" }, - "ProviderType": { + "provider-type": { "type": "string" }, - "Proxy": { + "proxy": { "$ref": "#/definitions/Settings" }, - "SSLHostnameVerification": { + "ssl-hostname-verification": { "type": "boolean" - }, - "UpdateBehavior": { - "$ref": "#/definitions/UpdateBehavior" } }, "additionalProperties": false, "required": [ - "ProviderType", - "AuthorizedKeys", - "SSLHostnameVerification", - "Proxy", - "AptProxy", - "AptMirror", - "AllowLXCLoopMounts", + "provider-type", + "authorized-keys", + "ssl-hostname-verification", + "proxy", + "apt-proxy", + "apt-mirror", "UpdateBehavior" ] }, "ContainerManagerConfig": { "type": "object", "properties": { - "ManagerConfig": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -15323,28 +15350,46 @@ }, "additionalProperties": false, "required": [ - "ManagerConfig" + "config" ] }, "ContainerManagerConfigParams": { "type": "object", "properties": { - "Type": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "Type" + "type" + ] + }, + "ControllerConfigResult": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" ] }, "DistributionGroupResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" @@ -15353,14 +15398,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "DistributionGroupResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/DistributionGroupResult" @@ -15369,13 +15413,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -15384,41 +15428,41 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityPassword": { "type": "object", "properties": { - "Password": { + "password": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Password" + "tag", + "password" ] }, "EntityPasswords": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/EntityPassword" @@ -15427,13 +15471,13 @@ }, "additionalProperties": false, "required": [ - "Changes" + "changes" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -15442,50 +15486,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -15494,19 +15538,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -15515,44 +15556,44 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "FindToolsParams": { "type": "object", "properties": { - "Arch": { + "arch": { "type": "string" }, - "MajorVersion": { + "major": { "type": "integer" }, - "MinorVersion": { + "minor": { "type": "integer" }, - "Number": { + "number": { "$ref": "#/definitions/Number" }, - "Series": { + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "Number", - "MajorVersion", - "MinorVersion", - "Arch", - "Series" + "number", + "major", + "minor", + "arch", + "series" ] }, "FindToolsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "List": { + "list": { "type": "array", "items": { "$ref": "#/definitions/Tools" @@ -15561,32 +15602,31 @@ }, "additionalProperties": false, "required": [ - "List", - "Error" + "list" ] }, "HardwareCharacteristics": { "type": "object", "properties": { - "Arch": { + "arch": { "type": "string" }, - "AvailabilityZone": { + "availability-zone": { "type": "string" }, - "CpuCores": { + "cpu-cores": { "type": "integer" }, - "CpuPower": { + "cpu-power": { "type": "integer" }, - "Mem": { + "mem": { "type": "integer" }, - "RootDisk": { + "root-disk": { "type": "integer" }, - "Tags": { + "tags": { "type": "array", "items": { "type": "string" @@ -15601,38 +15641,38 @@ "Address": { "$ref": "#/definitions/Address" }, - "Port": { + "port": { "type": "integer" } }, "additionalProperties": false, "required": [ "Address", - "Port" + "port" ] }, "InstanceInfo": { "type": "object", "properties": { - "Characteristics": { + "characteristics": { "$ref": "#/definitions/HardwareCharacteristics" }, - "InstanceId": { + "instance-id": { "type": "string" }, - "NetworkConfig": { + "network-config": { "type": "array", "items": { "$ref": "#/definitions/NetworkConfig" } }, - "Nonce": { + "nonce": { "type": "string" }, - "Tag": { + "tag": { "type": "string" }, - "VolumeAttachments": { + "volume-attachments": { "type": "object", "patternProperties": { ".*": { @@ -15640,7 +15680,7 @@ } } }, - "Volumes": { + "volumes": { "type": "array", "items": { "$ref": "#/definitions/Volume" @@ -15649,19 +15689,19 @@ }, "additionalProperties": false, "required": [ - "Tag", - "InstanceId", - "Nonce", - "Characteristics", - "Volumes", - "VolumeAttachments", - "NetworkConfig" + "tag", + "instance-id", + "nonce", + "characteristics", + "volumes", + "volume-attachments", + "network-config" ] }, "InstancesInfo": { "type": "object", "properties": { - "Machines": { + "machines": { "type": "array", "items": { "$ref": "#/definitions/InstanceInfo" @@ -15670,29 +15710,28 @@ }, "additionalProperties": false, "required": [ - "Machines" + "machines" ] }, "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -15701,69 +15740,36 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineContainers": { "type": "object", "properties": { - "ContainerTypes": { + "container-types": { "type": "array", "items": { "type": "string" } }, - "MachineTag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineTag", - "ContainerTypes" + "machine-tag", + "container-types" ] }, "MachineContainersParams": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/MachineContainers" @@ -15772,16 +15778,16 @@ }, "additionalProperties": false, "required": [ - "Params" + "params" ] }, "MachineNetworkConfigResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Info": { + "info": { "type": "array", "items": { "$ref": "#/definitions/NetworkConfig" @@ -15790,14 +15796,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Info" + "info" ] }, "MachineNetworkConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachineNetworkConfigResult" @@ -15806,13 +15811,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -15824,111 +15829,110 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "NetworkConfig": { "type": "object", "properties": { - "Address": { + "address": { "type": "string" }, - "CIDR": { + "cidr": { "type": "string" }, - "ConfigType": { + "config-type": { "type": "string" }, - "DNSSearchDomains": { + "device-index": { + "type": "integer" + }, + "disabled": { + "type": "boolean" + }, + "dns-search-domains": { "type": "array", "items": { "type": "string" } }, - "DNSServers": { + "dns-servers": { "type": "array", "items": { "type": "string" } }, - "DeviceIndex": { - "type": "integer" - }, - "Disabled": { - "type": "boolean" - }, - "GatewayAddress": { + "gateway-address": { "type": "string" }, - "InterfaceName": { + "interface-name": { "type": "string" }, - "InterfaceType": { + "interface-type": { "type": "string" }, - "MACAddress": { + "mac-address": { "type": "string" }, - "MTU": { + "mtu": { "type": "integer" }, - "NoAutoStart": { + "no-auto-start": { "type": "boolean" }, - "ParentInterfaceName": { + "parent-interface-name": { "type": "string" }, - "ProviderAddressId": { + "provider-address-id": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "ProviderSpaceId": { + "provider-space-id": { "type": "string" }, - "ProviderSubnetId": { + "provider-subnet-id": { "type": "string" }, - "ProviderVLANId": { + "provider-vlan-id": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" } }, "additionalProperties": false, "required": [ - "DeviceIndex", - "MACAddress", - "CIDR", - "MTU", - "ProviderId", - "ProviderSubnetId", - "ProviderSpaceId", - "ProviderAddressId", - "ProviderVLANId", - "VLANTag", - "InterfaceName", - "ParentInterfaceName", - "InterfaceType", - "Disabled" + "device-index", + "mac-address", + "cidr", + "mtu", + "provider-id", + "provider-subnet-id", + "provider-space-id", + "provider-address-id", + "provider-vlan-id", + "vlan-tag", + "interface-name", + "parent-interface-name", + "interface-type", + "disabled" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "Number": { @@ -15962,10 +15966,19 @@ "ProvisioningInfo": { "type": "object", "properties": { - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" }, - "EndpointBindings": { + "controller-config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "endpoint-bindings": { "type": "object", "patternProperties": { ".*": { @@ -15973,25 +15986,25 @@ } } }, - "ImageMetadata": { + "image-metadata": { "type": "array", "items": { "$ref": "#/definitions/CloudImageMetadata" } }, - "Jobs": { + "jobs": { "type": "array", "items": { "type": "string" } }, - "Placement": { + "placement": { "type": "string" }, - "Series": { + "series": { "type": "string" }, - "SubnetsToZones": { + "subnets-to-zones": { "type": "object", "patternProperties": { ".*": { @@ -16002,7 +16015,7 @@ } } }, - "Tags": { + "tags": { "type": "object", "patternProperties": { ".*": { @@ -16010,7 +16023,7 @@ } } }, - "Volumes": { + "volumes": { "type": "array", "items": { "$ref": "#/definitions/VolumeParams" @@ -16019,37 +16032,31 @@ }, "additionalProperties": false, "required": [ - "Constraints", - "Series", - "Placement", - "Jobs", - "Volumes", - "Tags", - "SubnetsToZones", - "ImageMetadata", - "EndpointBindings" + "constraints", + "series", + "placement", + "jobs" ] }, "ProvisioningInfoResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "$ref": "#/definitions/ProvisioningInfo" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "ProvisioningInfoResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ProvisioningInfoResult" @@ -16058,13 +16065,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -16073,7 +16080,7 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Settings": { @@ -16103,7 +16110,7 @@ "StatusResult": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -16112,41 +16119,40 @@ } } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Id": { + "id": { "type": "string" }, - "Info": { + "info": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Id", - "Life", - "Status", - "Info", - "Data", - "Since" + "id", + "life", + "status", + "info", + "data", + "since" ] }, "StatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StatusResult" @@ -16155,29 +16161,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringResult" @@ -16186,55 +16191,49 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsWatchResult" @@ -16243,7 +16242,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Tools": { @@ -16272,13 +16271,13 @@ "ToolsResult": { "type": "object", "properties": { - "DisableSSLHostnameVerification": { + "disable-ssl-hostname-verification": { "type": "boolean" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "ToolsList": { + "tools": { "type": "array", "items": { "$ref": "#/definitions/Tools" @@ -16287,15 +16286,14 @@ }, "additionalProperties": false, "required": [ - "ToolsList", - "DisableSSLHostnameVerification", - "Error" + "tools", + "disable-ssl-hostname-verification" ] }, "ToolsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ToolsResult" @@ -16304,23 +16302,23 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "UpdateBehavior": { "type": "object", "properties": { - "EnableOSRefreshUpdate": { + "enable-os-refresh-update": { "type": "boolean" }, - "EnableOSUpgrade": { + "enable-os-upgrade": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "EnableOSRefreshUpdate", - "EnableOSUpgrade" + "enable-os-refresh-update", + "enable-os-upgrade" ] }, "Value": { @@ -16332,7 +16330,7 @@ "container": { "type": "string" }, - "cpu-cores": { + "cores": { "type": "integer" }, "cpu-power": { @@ -16371,26 +16369,26 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info" ] }, "VolumeAttachmentInfo": { "type": "object", "properties": { - "busaddress": { + "bus-address": { "type": "string" }, - "devicelink": { + "device-link": { "type": "string" }, - "devicename": { + "device-name": { "type": "string" }, "read-only": { @@ -16402,10 +16400,10 @@ "VolumeAttachmentParams": { "type": "object", "properties": { - "instanceid": { + "instance-id": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, "provider": { @@ -16414,24 +16412,24 @@ "read-only": { "type": "boolean" }, - "volumeid": { + "volume-id": { "type": "string" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", - "machinetag", + "volume-tag", + "machine-tag", "provider" ] }, "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -16440,13 +16438,13 @@ "size": { "type": "integer" }, - "volumeid": { + "volume-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumeid", + "volume-id", "size", "persistent" ] @@ -16480,13 +16478,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "size", "provider" ] @@ -16494,23 +16492,23 @@ "WatchContainer": { "type": "object", "properties": { - "ContainerType": { + "container-type": { "type": "string" }, - "MachineTag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineTag", - "ContainerType" + "machine-tag", + "container-type" ] }, "WatchContainers": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/WatchContainer" @@ -16519,47 +16517,7 @@ }, "additionalProperties": false, "required": [ - "Params" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "params" ] } } @@ -16598,7 +16556,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -16607,47 +16565,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -16655,61 +16613,27 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -16718,56 +16642,56 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ProxyConfig": { "type": "object", "properties": { - "FTP": { + "ftp": { "type": "string" }, - "HTTP": { + "http": { "type": "string" }, - "HTTPS": { + "https": { "type": "string" }, - "NoProxy": { + "no-proxy": { "type": "string" } }, "additionalProperties": false, "required": [ - "HTTP", - "HTTPS", - "FTP", - "NoProxy" + "http", + "https", + "ftp", + "no-proxy" ] }, "ProxyConfigResult": { "type": "object", "properties": { - "APTProxySettings": { + "apt-proxy-settings": { "$ref": "#/definitions/ProxyConfig" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "ProxySettings": { + "proxy-settings": { "$ref": "#/definitions/ProxyConfig" } }, "additionalProperties": false, "required": [ - "ProxySettings", - "APTProxySettings" + "proxy-settings", + "apt-proxy-settings" ] }, "ProxyConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ProxyConfigResult" @@ -16776,47 +16700,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -16874,7 +16758,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -16883,47 +16767,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -16932,19 +16816,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -16953,60 +16834,26 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "RebootActionResult": { @@ -17032,46 +16879,6 @@ } }, "additionalProperties": false - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -17098,29 +16905,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -17128,45 +16935,12 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "RelationUnitsChange": { "type": "object", "properties": { - "Changed": { + "changed": { "type": "object", "patternProperties": { ".*": { @@ -17174,89 +16948,47 @@ } } }, - "Departed": { + "departed": { "type": "array", "items": { "type": "string" - } - } - }, - "additionalProperties": false, - "required": [ - "Changed", - "Departed" - ] - }, - "RelationUnitsWatchResult": { - "type": "object", - "properties": { - "Changes": { - "$ref": "#/definitions/RelationUnitsChange" - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "RelationUnitsWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "RelationUnitsWatcherId", - "Changes", - "Error" - ] - }, - "UnitSettings": { - "type": "object", - "properties": { - "Version": { - "type": "integer" + } } }, "additionalProperties": false, "required": [ - "Version" + "changed" ] }, - "caveat": { + "RelationUnitsWatchResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "changes": { + "$ref": "#/definitions/RelationUnitsChange" }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "watcher-id", + "changes" ] }, - "packet": { + "UnitSettings": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { + "version": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "version" ] } } @@ -17307,7 +17039,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17316,47 +17048,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -17364,61 +17096,27 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -17427,57 +17125,53 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "RetryStrategy": { "type": "object", "properties": { - "JitterRetryTime": { + "jitter-retry-time": { "type": "boolean" }, - "MaxRetryTime": { + "max-retry-time": { "type": "integer" }, - "MinRetryTime": { + "min-retry-time": { "type": "integer" }, - "RetryTimeFactor": { + "retry-time-factor": { "type": "integer" }, - "ShouldRetry": { + "should-retry": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "ShouldRetry", - "MinRetryTime", - "MaxRetryTime", - "JitterRetryTime", - "RetryTimeFactor" + "should-retry", + "min-retry-time", + "max-retry-time", + "jitter-retry-time", + "retry-time-factor" ] }, "RetryStrategyResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "$ref": "#/definitions/RetryStrategy" } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, "RetryStrategyResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/RetryStrategyResult" @@ -17486,47 +17180,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -17534,10 +17188,21 @@ }, { "Name": "SSHClient", - "Version": 1, + "Version": 2, "Schema": { "type": "object", "properties": { + "AllAddresses": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/SSHAddressesResults" + } + } + }, "PrivateAddress": { "type": "object", "properties": { @@ -17584,7 +17249,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17593,108 +17258,108 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "SSHAddressResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "address": { + "type": "string" }, - "sig": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "SSHAddressResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/SSHAddressResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, - "SSHAddressResult": { + "SSHAddressesResult": { "type": "object", "properties": { - "address": { - "type": "string" + "addresses": { + "type": "array", + "items": { + "type": "string" + } }, "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "addresses" + ] }, - "SSHAddressResults": { + "SSHAddressesResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/SSHAddressResult" + "$ref": "#/definitions/SSHAddressesResult" } } }, @@ -17744,46 +17409,6 @@ "required": [ "results" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -17821,7 +17446,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17830,47 +17455,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -17879,19 +17504,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -17900,119 +17522,46 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "SingularClaim": { "type": "object", "properties": { - "ControllerTag": { + "controller-tag": { "type": "string" }, - "Duration": { + "duration": { "type": "integer" }, - "ModelTag": { + "model-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "ModelTag", - "ControllerTag", - "Duration" + "model-tag", + "controller-tag", + "duration" ] }, "SingularClaims": { "type": "object", - "properties": { - "Claims": { - "type": "array", - "items": { - "$ref": "#/definitions/SingularClaim" - } - } - }, - "additionalProperties": false, - "required": [ - "Claims" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "properties": { + "claims": { + "type": "array", + "items": { + "$ref": "#/definitions/SingularClaim" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "claims" ] } } @@ -18048,16 +17597,16 @@ "CreateSpaceParams": { "type": "object", "properties": { - "ProviderId": { + "provider-id": { "type": "string" }, - "Public": { + "public": { "type": "boolean" }, - "SpaceTag": { + "space-tag": { "type": "string" }, - "SubnetTags": { + "subnet-tags": { "type": "array", "items": { "type": "string" @@ -18066,15 +17615,15 @@ }, "additionalProperties": false, "required": [ - "SubnetTags", - "SpaceTag", - "Public" + "subnet-tags", + "space-tag", + "public" ] }, "CreateSpacesParams": { "type": "object", "properties": { - "Spaces": { + "spaces": { "type": "array", "items": { "$ref": "#/definitions/CreateSpaceParams" @@ -18083,35 +17632,35 @@ }, "additionalProperties": false, "required": [ - "Spaces" + "spaces" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -18120,19 +17669,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -18141,13 +17687,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ListSpacesResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/Space" @@ -18156,56 +17702,23 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "Space": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Name": { + "name": { "type": "string" }, - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -18214,44 +17727,32 @@ }, "additionalProperties": false, "required": [ - "Name", - "Subnets" + "name", + "subnets" ] }, "Subnet": { "type": "object", "properties": { - "CIDR": { + "cidr": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "SpaceTag": { + "space-tag": { "type": "string" }, - "StaticRangeHighIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "StaticRangeLowIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "Status": { + "status": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" }, - "Zones": { + "zones": { "type": "array", "items": { "type": "string" @@ -18260,51 +17761,11 @@ }, "additionalProperties": false, "required": [ - "CIDR", - "VLANTag", - "Life", - "SpaceTag", - "Zones" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "cidr", + "vlan-tag", + "life", + "space-tag", + "zones" ] } } @@ -18329,17 +17790,17 @@ "StatusHistoryPruneArgs": { "type": "object", "properties": { - "MaxHistoryMB": { + "max-history-mb": { "type": "integer" }, - "MaxHistoryTime": { + "max-history-time": { "type": "integer" } }, "additionalProperties": false, "required": [ - "MaxHistoryTime", - "MaxHistoryMB" + "max-history-time", + "max-history-mb" ] } } @@ -18347,7 +17808,7 @@ }, { "Name": "Storage", - "Version": 2, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -18430,7 +17891,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -18439,25 +17900,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatus": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -18466,51 +17927,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since" + "status", + "info", + "since" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -18519,19 +17979,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -18540,13 +17997,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "FilesystemAttachmentInfo": { "type": "object", "properties": { - "mountpoint": { + "mount-point": { "type": "string" }, "read-only": { @@ -18558,13 +18015,13 @@ "FilesystemDetails": { "type": "object", "properties": { - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "info": { "$ref": "#/definitions/FilesystemInfo" }, - "machineattachments": { + "machine-attachments": { "type": "object", "patternProperties": { ".*": { @@ -18578,13 +18035,13 @@ "storage": { "$ref": "#/definitions/StorageDetails" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "info", "status" ] @@ -18643,7 +18100,7 @@ "FilesystemInfo": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, "size": { @@ -18652,51 +18109,18 @@ }, "additionalProperties": false, "required": [ - "filesystemid", + "filesystem-id", "size" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "StorageAddParams": { "type": "object", "properties": { - "StorageName": { + "name": { "type": "string" }, "storage": { @@ -18709,7 +18133,7 @@ "additionalProperties": false, "required": [ "unit", - "StorageName", + "name", "storage" ] }, @@ -18719,49 +18143,41 @@ "location": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, - "storagetag": { + "storage-tag": { "type": "string" }, - "unittag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "storagetag", - "unittag", - "machinetag" + "storage-tag", + "unit-tag", + "machine-tag" ] }, "StorageConstraints": { "type": "object", "properties": { - "Count": { + "count": { "type": "integer" }, - "Pool": { + "pool": { "type": "string" }, - "Size": { + "size": { "type": "integer" } }, - "additionalProperties": false, - "required": [ - "Pool", - "Size", - "Count" - ] + "additionalProperties": false }, "StorageDetails": { "type": "object", "properties": { - "Persistent": { - "type": "boolean" - }, "attachments": { "type": "object", "patternProperties": { @@ -18773,23 +18189,26 @@ "kind": { "type": "integer" }, - "ownertag": { + "owner-tag": { "type": "string" }, + "persistent": { + "type": "boolean" + }, "status": { "$ref": "#/definitions/EntityStatus" }, - "storagetag": { + "storage-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "storagetag", - "ownertag", + "storage-tag", + "owner-tag", "kind", "status", - "Persistent" + "persistent" ] }, "StorageDetailsListResult": { @@ -18921,7 +18340,7 @@ "error": { "$ref": "#/definitions/Error" }, - "storagepools": { + "storage-pools": { "type": "array", "items": { "$ref": "#/definitions/StoragePool" @@ -18960,13 +18379,13 @@ "VolumeAttachmentInfo": { "type": "object", "properties": { - "busaddress": { + "bus-address": { "type": "string" }, - "devicelink": { + "device-link": { "type": "string" }, - "devicename": { + "device-name": { "type": "string" }, "read-only": { @@ -18981,7 +18400,7 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "machineattachments": { + "machine-attachments": { "type": "object", "patternProperties": { ".*": { @@ -18995,13 +18414,13 @@ "storage": { "$ref": "#/definitions/StorageDetails" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info", "status" ] @@ -19060,7 +18479,7 @@ "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -19069,63 +18488,23 @@ "size": { "type": "integer" }, - "volumeid": { + "volume-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumeid", + "volume-id", "size", "persistent" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } }, { "Name": "StorageProvisioner", - "Version": 2, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -19217,14 +18596,6 @@ } } }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, "Remove": { "type": "object", "properties": { @@ -19401,14 +18772,6 @@ } } }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, "WatchMachines": { "type": "object", "properties": { @@ -19525,7 +18888,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -19534,25 +18897,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -19561,50 +18924,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -19613,19 +18976,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -19634,52 +18994,52 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Filesystem": { "type": "object", "properties": { - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "info": { "$ref": "#/definitions/FilesystemInfo" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "info" ] }, "FilesystemAttachment": { "type": "object", "properties": { - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "info": { "$ref": "#/definitions/FilesystemAttachmentInfo" }, - "machinetag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", - "machinetag", + "filesystem-tag", + "machine-tag", "info" ] }, "FilesystemAttachmentInfo": { "type": "object", "properties": { - "mountpoint": { + "mount-point": { "type": "string" }, "read-only": { @@ -19691,19 +19051,19 @@ "FilesystemAttachmentParams": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, - "filesystemtag": { + "filesystem-tag": { "type": "string" }, - "instanceid": { + "instance-id": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, - "mountpoint": { + "mount-point": { "type": "string" }, "provider": { @@ -19715,8 +19075,8 @@ }, "additionalProperties": false, "required": [ - "filesystemtag", - "machinetag", + "filesystem-tag", + "machine-tag", "provider" ] }, @@ -19777,7 +19137,7 @@ "FilesystemAttachments": { "type": "object", "properties": { - "filesystemattachments": { + "filesystem-attachments": { "type": "array", "items": { "$ref": "#/definitions/FilesystemAttachment" @@ -19786,13 +19146,13 @@ }, "additionalProperties": false, "required": [ - "filesystemattachments" + "filesystem-attachments" ] }, "FilesystemInfo": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, "size": { @@ -19801,7 +19161,7 @@ }, "additionalProperties": false, "required": [ - "filesystemid", + "filesystem-id", "size" ] }, @@ -19820,7 +19180,7 @@ } } }, - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "provider": { @@ -19837,13 +19197,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "size", "provider" ] @@ -19920,23 +19280,22 @@ "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -19945,60 +19304,27 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineStorageId": { "type": "object", "properties": { - "attachmenttag": { + "attachment-tag": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "machinetag", - "attachmenttag" + "machine-tag", + "attachment-tag" ] }, "MachineStorageIds": { @@ -20019,30 +19345,29 @@ "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageId" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "MachineStorageIdsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" + "watcher-id", + "changes" ] }, "MachineStorageIdsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageIdsWatchResult" @@ -20051,47 +19376,28 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "ModelConfigResult": { - "type": "object", - "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - } - }, - "additionalProperties": false, - "required": [ - "Config" + "results" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -20100,13 +19406,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -20115,29 +19421,28 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringResult" @@ -20146,36 +19451,34 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsWatchResult" @@ -20184,7 +19487,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Volume": { @@ -20193,13 +19496,13 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info" ] }, @@ -20209,30 +19512,30 @@ "info": { "$ref": "#/definitions/VolumeAttachmentInfo" }, - "machinetag": { + "machine-tag": { "type": "string" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", - "machinetag", + "volume-tag", + "machine-tag", "info" ] }, "VolumeAttachmentInfo": { "type": "object", "properties": { - "busaddress": { + "bus-address": { "type": "string" }, - "devicelink": { + "device-link": { "type": "string" }, - "devicename": { + "device-name": { "type": "string" }, "read-only": { @@ -20244,10 +19547,10 @@ "VolumeAttachmentParams": { "type": "object", "properties": { - "instanceid": { + "instance-id": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, "provider": { @@ -20256,17 +19559,17 @@ "read-only": { "type": "boolean" }, - "volumeid": { + "volume-id": { "type": "string" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", - "machinetag", + "volume-tag", + "machine-tag", "provider" ] }, @@ -20327,7 +19630,7 @@ "VolumeAttachments": { "type": "object", "properties": { - "volumeattachments": { + "volume-attachments": { "type": "array", "items": { "$ref": "#/definitions/VolumeAttachment" @@ -20336,13 +19639,13 @@ }, "additionalProperties": false, "required": [ - "volumeattachments" + "volume-attachments" ] }, "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -20351,13 +19654,13 @@ "size": { "type": "integer" }, - "volumeid": { + "volume-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumeid", + "volume-id", "size", "persistent" ] @@ -20391,13 +19694,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "size", "provider" ] @@ -20470,46 +19773,6 @@ "required": [ "volumes" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -20536,29 +19799,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -20566,102 +19829,27 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } @@ -20716,16 +19904,16 @@ "AddSubnetParams": { "type": "object", "properties": { - "SpaceTag": { + "space-tag": { "type": "string" }, - "SubnetProviderId": { + "subnet-provider-id": { "type": "string" }, - "SubnetTag": { + "subnet-tag": { "type": "string" }, - "Zones": { + "zones": { "type": "array", "items": { "type": "string" @@ -20734,13 +19922,13 @@ }, "additionalProperties": false, "required": [ - "SpaceTag" + "space-tag" ] }, "AddSubnetsParams": { "type": "object", "properties": { - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/AddSubnetParams" @@ -20749,35 +19937,35 @@ }, "additionalProperties": false, "required": [ - "Subnets" + "subnets" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -20786,19 +19974,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -20807,13 +19992,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ListSubnetsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -20822,66 +20007,32 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "SpaceResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Tag" + "tag" ] }, "SpaceResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/SpaceResult" @@ -20890,43 +20041,31 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Subnet": { "type": "object", "properties": { - "CIDR": { + "cidr": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "SpaceTag": { + "space-tag": { "type": "string" }, - "StaticRangeHighIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "StaticRangeLowIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "Status": { + "status": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" }, - "Zones": { + "zones": { "type": "array", "items": { "type": "string" @@ -20935,20 +20074,20 @@ }, "additionalProperties": false, "required": [ - "CIDR", - "VLANTag", - "Life", - "SpaceTag", - "Zones" + "cidr", + "vlan-tag", + "life", + "space-tag", + "zones" ] }, "SubnetsFilters": { "type": "object", "properties": { - "SpaceTag": { + "space-tag": { "type": "string" }, - "Zone": { + "zone": { "type": "string" } }, @@ -20957,27 +20096,26 @@ "ZoneResult": { "type": "object", "properties": { - "Available": { + "available": { "type": "boolean" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Name": { + "name": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Name", - "Available" + "name", + "available" ] }, "ZoneResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ZoneResult" @@ -20986,47 +20124,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -21095,7 +20193,7 @@ "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -21104,50 +20202,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -21156,71 +20254,35 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] - }, - "ErrorResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -21232,29 +20294,28 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -21263,13 +20324,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -21278,91 +20339,50 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "UndertakerModelInfo": { "type": "object", "properties": { - "GlobalName": { + "global-name": { "type": "string" }, - "IsSystem": { + "is-system": { "type": "boolean" }, - "Life": { + "life": { "type": "string" }, - "Name": { + "name": { "type": "string" }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "UUID", - "Name", - "GlobalName", - "IsSystem", - "Life" + "uuid", + "name", + "global-name", + "is-system", + "life" ] }, "UndertakerModelInfoResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "$ref": "#/definitions/UndertakerModelInfo" } }, "additionalProperties": false, "required": [ - "Error", - "Result" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "result" ] } } @@ -21409,7 +20429,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -21418,25 +20438,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -21445,50 +20465,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -21497,19 +20517,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -21518,50 +20535,17 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -21570,70 +20554,28 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } @@ -21705,17 +20647,6 @@ } } }, - "ApplicationOwner": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, "ApplicationStatus": { "type": "object", "properties": { @@ -22196,6 +21127,17 @@ } } }, + "SetWorkloadVersion": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/EntityWorkloadVersions" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "StorageAttachmentLife": { "type": "object", "properties": { @@ -22376,13 +21318,24 @@ "$ref": "#/definitions/StringsWatchResults" } } + }, + "WorkloadVersion": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StringResults" + } + } } }, "definitions": { "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -22394,7 +21347,7 @@ }, "additionalProperties": false, "required": [ - "Servers" + "servers" ] }, "Action": { @@ -22429,7 +21382,7 @@ "ActionExecutionResult": { "type": "object", "properties": { - "actiontag": { + "action-tag": { "type": "string" }, "message": { @@ -22450,7 +21403,7 @@ }, "additionalProperties": false, "required": [ - "actiontag", + "action-tag", "status" ] }, @@ -22520,36 +21473,36 @@ "Address": { "type": "object", "properties": { - "Scope": { + "scope": { "type": "string" }, - "SpaceName": { + "space-name": { "type": "string" }, - "Type": { + "type": { "type": "string" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "value", + "type", + "scope" ] }, "ApplicationStatusResult": { "type": "object", "properties": { - "Application": { + "application": { "$ref": "#/definitions/StatusResult" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Units": { + "units": { "type": "object", "patternProperties": { ".*": { @@ -22560,15 +21513,14 @@ }, "additionalProperties": false, "required": [ - "Application", - "Units", - "Error" + "application", + "units" ] }, "ApplicationStatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ApplicationStatusResult" @@ -22577,29 +21529,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "BoolResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "BoolResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/BoolResult" @@ -22608,13 +21559,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "BytesResult": { "type": "object", "properties": { - "Result": { + "result": { "type": "array", "items": { "type": "integer" @@ -22623,25 +21574,57 @@ }, "additionalProperties": false, "required": [ - "Result" + "result" + ] + }, + "CharmRelation": { + "type": "object", + "properties": { + "interface": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "optional": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "scope": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "role", + "interface", + "optional", + "limit", + "scope" ] }, "CharmURL": { "type": "object", "properties": { - "URL": { + "url": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL" + "url" ] }, "CharmURLs": { "type": "object", "properties": { - "URLs": { + "urls": { "type": "array", "items": { "$ref": "#/definitions/CharmURL" @@ -22650,16 +21633,16 @@ }, "additionalProperties": false, "required": [ - "URLs" + "urls" ] }, "ConfigSettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22671,14 +21654,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Settings" + "settings" ] }, "ConfigSettingsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ConfigSettingsResult" @@ -22687,29 +21669,29 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Endpoint": { "type": "object", "properties": { - "ApplicationName": { + "application-name": { "type": "string" }, - "Relation": { - "$ref": "#/definitions/Relation" + "relation": { + "$ref": "#/definitions/CharmRelation" } }, "additionalProperties": false, "required": [ - "ApplicationName", - "Relation" + "application-name", + "relation" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -22718,13 +21700,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesCharmURL": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityCharmURL" @@ -22733,13 +21715,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesPortRanges": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityPortRange" @@ -22748,65 +21730,65 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityCharmURL": { "type": "object", "properties": { - "CharmURL": { + "charm-url": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "CharmURL" + "tag", + "charm-url" ] }, "EntityPortRange": { "type": "object", "properties": { - "FromPort": { + "from-port": { "type": "integer" }, - "Protocol": { + "protocol": { "type": "string" }, - "Tag": { + "tag": { "type": "string" }, - "ToPort": { + "to-port": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Tag", - "Protocol", - "FromPort", - "ToPort" + "tag", + "protocol", + "from-port", + "to-port" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -22814,51 +21796,82 @@ "additionalProperties": true } } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { - "type": "string" + }, + "info": { + "type": "string" + }, + "status": { + "type": "string" + }, + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "status", + "info", + "data" + ] + }, + "EntityWorkloadVersion": { + "type": "object", + "properties": { + "tag": { + "type": "string" + }, + "workload-version": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "workload-version" + ] + }, + "EntityWorkloadVersions": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityWorkloadVersion" + } } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "entities" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -22867,19 +21880,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -22888,13 +21898,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetLeadershipSettingsBulkResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/GetLeadershipSettingsResult" @@ -22903,16 +21913,16 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetLeadershipSettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22923,8 +21933,7 @@ }, "additionalProperties": false, "required": [ - "Settings", - "Error" + "settings" ] }, "HostPort": { @@ -22933,36 +21942,35 @@ "Address": { "$ref": "#/definitions/Address" }, - "Port": { + "port": { "type": "integer" } }, "additionalProperties": false, "required": [ "Address", - "Port" + "port" ] }, "IntResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "IntResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/IntResult" @@ -22971,29 +21979,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -23002,73 +22009,40 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachinePortRange": { "type": "object", "properties": { - "PortRange": { + "port-range": { "$ref": "#/definitions/PortRange" }, - "RelationTag": { + "relation-tag": { "type": "string" }, - "UnitTag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitTag", - "RelationTag", - "PortRange" + "unit-tag", + "relation-tag", + "port-range" ] }, "MachinePortsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Ports": { + "ports": { "type": "array", "items": { "$ref": "#/definitions/MachinePortRange" @@ -23077,14 +22051,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Ports" + "ports" ] }, "MachinePortsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachinePortsResult" @@ -23093,13 +22066,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "MergeLeadershipSettingsBulkParams": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/MergeLeadershipSettingsParam" @@ -23108,16 +22081,16 @@ }, "additionalProperties": false, "required": [ - "Params" + "params" ] }, "MergeLeadershipSettingsParam": { "type": "object", "properties": { - "ApplicationTag": { + "application-tag": { "type": "string" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23128,34 +22101,33 @@ }, "additionalProperties": false, "required": [ - "ApplicationTag", - "Settings" + "application-tag", + "settings" ] }, "MeterStatusResult": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Info": { + "info": { "type": "string" } }, "additionalProperties": false, "required": [ - "Code", - "Info", - "Error" + "code", + "info" ] }, "MeterStatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MeterStatusResult" @@ -23164,78 +22136,78 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Metric": { "type": "object", "properties": { - "Key": { + "key": { "type": "string" }, - "Time": { + "time": { "type": "string", "format": "date-time" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Key", - "Value", - "Time" + "key", + "value", + "time" ] }, "MetricBatch": { "type": "object", "properties": { - "CharmURL": { + "charm-url": { "type": "string" }, - "Created": { + "created": { "type": "string", "format": "date-time" }, - "Metrics": { + "metrics": { "type": "array", "items": { "$ref": "#/definitions/Metric" } }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "UUID", - "CharmURL", - "Created", - "Metrics" + "uuid", + "charm-url", + "created", + "metrics" ] }, "MetricBatchParam": { "type": "object", "properties": { - "Batch": { + "batch": { "$ref": "#/definitions/MetricBatch" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Batch" + "tag", + "batch" ] }, "MetricBatchParams": { "type": "object", "properties": { - "Batches": { + "batches": { "type": "array", "items": { "$ref": "#/definitions/MetricBatchParam" @@ -23244,13 +22216,13 @@ }, "additionalProperties": false, "required": [ - "Batches" + "batches" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -23262,137 +22234,135 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "ModelResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Name": { + "name": { "type": "string" }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Name", - "UUID" + "name", + "uuid" ] }, "NetworkConfig": { "type": "object", "properties": { - "Address": { + "address": { "type": "string" }, - "CIDR": { + "cidr": { "type": "string" }, - "ConfigType": { + "config-type": { "type": "string" }, - "DNSSearchDomains": { + "device-index": { + "type": "integer" + }, + "disabled": { + "type": "boolean" + }, + "dns-search-domains": { "type": "array", "items": { "type": "string" } }, - "DNSServers": { + "dns-servers": { "type": "array", "items": { "type": "string" } }, - "DeviceIndex": { - "type": "integer" - }, - "Disabled": { - "type": "boolean" - }, - "GatewayAddress": { + "gateway-address": { "type": "string" }, - "InterfaceName": { + "interface-name": { "type": "string" }, - "InterfaceType": { + "interface-type": { "type": "string" }, - "MACAddress": { + "mac-address": { "type": "string" }, - "MTU": { + "mtu": { "type": "integer" }, - "NoAutoStart": { + "no-auto-start": { "type": "boolean" }, - "ParentInterfaceName": { + "parent-interface-name": { "type": "string" }, - "ProviderAddressId": { + "provider-address-id": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "ProviderSpaceId": { + "provider-space-id": { "type": "string" }, - "ProviderSubnetId": { + "provider-subnet-id": { "type": "string" }, - "ProviderVLANId": { + "provider-vlan-id": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" } }, "additionalProperties": false, "required": [ - "DeviceIndex", - "MACAddress", - "CIDR", - "MTU", - "ProviderId", - "ProviderSubnetId", - "ProviderSpaceId", - "ProviderAddressId", - "ProviderVLANId", - "VLANTag", - "InterfaceName", - "ParentInterfaceName", - "InterfaceType", - "Disabled" + "device-index", + "mac-address", + "cidr", + "mtu", + "provider-id", + "provider-subnet-id", + "provider-space-id", + "provider-address-id", + "provider-vlan-id", + "vlan-tag", + "interface-name", + "parent-interface-name", + "interface-type", + "disabled" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -23401,65 +22371,33 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "PortRange": { "type": "object", "properties": { - "FromPort": { + "from-port": { "type": "integer" }, - "Protocol": { + "protocol": { "type": "string" }, - "ToPort": { + "to-port": { "type": "integer" } }, "additionalProperties": false, "required": [ - "FromPort", - "ToPort", - "Protocol" - ] - }, - "Relation": { - "type": "object", - "properties": { - "Interface": { - "type": "string" - }, - "Limit": { - "type": "integer" - }, - "Name": { - "type": "string" - }, - "Optional": { - "type": "boolean" - }, - "Role": { - "type": "string" - }, - "Scope": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Name", - "Role", - "Interface", - "Optional", - "Limit", - "Scope" + "from-port", + "to-port", + "protocol" ] }, "RelationIds": { "type": "object", "properties": { - "RelationIds": { + "relation-ids": { "type": "array", "items": { "type": "integer" @@ -23468,41 +22406,40 @@ }, "additionalProperties": false, "required": [ - "RelationIds" + "relation-ids" ] }, "RelationResult": { "type": "object", "properties": { - "Endpoint": { + "endpoint": { "$ref": "#/definitions/Endpoint" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Id": { + "id": { "type": "integer" }, - "Key": { + "key": { "type": "string" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Life", - "Id", - "Key", - "Endpoint" + "life", + "id", + "key", + "endpoint" ] }, "RelationResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/RelationResult" @@ -23511,49 +22448,49 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "RelationUnit": { "type": "object", "properties": { - "Relation": { + "relation": { "type": "string" }, - "Unit": { + "unit": { "type": "string" } }, "additionalProperties": false, "required": [ - "Relation", - "Unit" + "relation", + "unit" ] }, "RelationUnitPair": { "type": "object", "properties": { - "LocalUnit": { + "local-unit": { "type": "string" }, - "Relation": { + "relation": { "type": "string" }, - "RemoteUnit": { + "remote-unit": { "type": "string" } }, "additionalProperties": false, "required": [ - "Relation", - "LocalUnit", - "RemoteUnit" + "relation", + "local-unit", + "remote-unit" ] }, "RelationUnitPairs": { "type": "object", "properties": { - "RelationUnitPairs": { + "relation-unit-pairs": { "type": "array", "items": { "$ref": "#/definitions/RelationUnitPair" @@ -23562,16 +22499,16 @@ }, "additionalProperties": false, "required": [ - "RelationUnitPairs" + "relation-unit-pairs" ] }, "RelationUnitSettings": { "type": "object", "properties": { - "Relation": { + "relation": { "type": "string" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23579,21 +22516,21 @@ } } }, - "Unit": { + "unit": { "type": "string" } }, "additionalProperties": false, "required": [ - "Relation", - "Unit", - "Settings" + "relation", + "unit", + "settings" ] }, "RelationUnits": { "type": "object", "properties": { - "RelationUnits": { + "relation-units": { "type": "array", "items": { "$ref": "#/definitions/RelationUnit" @@ -23602,13 +22539,13 @@ }, "additionalProperties": false, "required": [ - "RelationUnits" + "relation-units" ] }, "RelationUnitsChange": { "type": "object", "properties": { - "Changed": { + "changed": { "type": "object", "patternProperties": { ".*": { @@ -23616,7 +22553,7 @@ } } }, - "Departed": { + "departed": { "type": "array", "items": { "type": "string" @@ -23625,14 +22562,13 @@ }, "additionalProperties": false, "required": [ - "Changed", - "Departed" + "changed" ] }, "RelationUnitsSettings": { "type": "object", "properties": { - "RelationUnits": { + "relation-units": { "type": "array", "items": { "$ref": "#/definitions/RelationUnitSettings" @@ -23641,33 +22577,32 @@ }, "additionalProperties": false, "required": [ - "RelationUnits" + "relation-units" ] }, "RelationUnitsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "$ref": "#/definitions/RelationUnitsChange" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "RelationUnitsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "RelationUnitsWatcherId", - "Changes", - "Error" + "watcher-id", + "changes" ] }, "RelationUnitsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/RelationUnitsWatchResult" @@ -23676,29 +22611,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ResolvedModeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Mode": { + "mode": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Mode" + "mode" ] }, "ResolvedModeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ResolvedModeResult" @@ -23707,13 +22641,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -23722,16 +22656,16 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "SettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23742,14 +22676,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Settings" + "settings" ] }, "SettingsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/SettingsResult" @@ -23758,13 +22691,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StatusResult": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -23773,41 +22706,40 @@ } } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Id": { + "id": { "type": "string" }, - "Info": { + "info": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Id", - "Life", - "Status", - "Info", - "Data", - "Since" + "id", + "life", + "status", + "info", + "data", + "since" ] }, "StatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StatusResult" @@ -23816,13 +22748,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StorageAddParams": { "type": "object", "properties": { - "StorageName": { + "name": { "type": "string" }, "storage": { @@ -23835,56 +22767,56 @@ "additionalProperties": false, "required": [ "unit", - "StorageName", + "name", "storage" ] }, "StorageAttachment": { "type": "object", "properties": { - "Kind": { + "kind": { "type": "integer" }, - "Life": { + "life": { "type": "string" }, - "Location": { + "location": { "type": "string" }, - "OwnerTag": { + "owner-tag": { "type": "string" }, - "StorageTag": { + "storage-tag": { "type": "string" }, - "UnitTag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "StorageTag", - "OwnerTag", - "UnitTag", - "Kind", - "Location", - "Life" + "storage-tag", + "owner-tag", + "unit-tag", + "kind", + "location", + "life" ] }, "StorageAttachmentId": { "type": "object", "properties": { - "storagetag": { + "storage-tag": { "type": "string" }, - "unittag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "storagetag", - "unittag" + "storage-tag", + "unit-tag" ] }, "StorageAttachmentIds": { @@ -23959,22 +22891,17 @@ "StorageConstraints": { "type": "object", "properties": { - "Count": { + "count": { "type": "integer" }, - "Pool": { + "pool": { "type": "string" }, - "Size": { + "size": { "type": "integer" } }, - "additionalProperties": false, - "required": [ - "Pool", - "Size", - "Count" - ] + "additionalProperties": false }, "StoragesAddParams": { "type": "object", @@ -23994,27 +22921,26 @@ "StringBoolResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Ok": { + "ok": { "type": "boolean" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result", - "Ok" + "result", + "ok" ] }, "StringBoolResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringBoolResult" @@ -24023,29 +22949,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringResult" @@ -24054,32 +22979,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, "StringsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsResult" @@ -24088,36 +23009,34 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsWatchResult" @@ -24126,32 +23045,32 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "UnitNetworkConfig": { "type": "object", "properties": { - "BindingName": { + "binding-name": { "type": "string" }, - "UnitTag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitTag", - "BindingName" + "unit-tag", + "binding-name" ] }, "UnitNetworkConfigResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Info": { + "info": { "type": "array", "items": { "$ref": "#/definitions/NetworkConfig" @@ -24160,14 +23079,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Info" + "info" ] }, "UnitNetworkConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/UnitNetworkConfigResult" @@ -24176,25 +23094,25 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "UnitSettings": { "type": "object", "properties": { - "Version": { + "version": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Version" + "version" ] }, "UnitsNetworkConfig": { "type": "object", "properties": { - "Args": { + "args": { "type": "array", "items": { "$ref": "#/definitions/UnitNetworkConfig" @@ -24203,47 +23121,7 @@ }, "additionalProperties": false, "required": [ - "Args" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "args" ] } } @@ -24324,7 +23202,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -24333,13 +23211,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesVersion": { "type": "object", "properties": { - "AgentTools": { + "agent-tools": { "type": "array", "items": { "$ref": "#/definitions/EntityVersion" @@ -24348,63 +23226,63 @@ }, "additionalProperties": false, "required": [ - "AgentTools" + "agent-tools" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityVersion": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" }, - "Tools": { + "tools": { "$ref": "#/definitions/Version" } }, "additionalProperties": false, "required": [ - "Tag", - "Tools" + "tag", + "tools" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -24413,19 +23291,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -24434,66 +23309,32 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -24502,7 +23343,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Number": { @@ -24559,13 +23400,13 @@ "ToolsResult": { "type": "object", "properties": { - "DisableSSLHostnameVerification": { + "disable-ssl-hostname-verification": { "type": "boolean" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "ToolsList": { + "tools": { "type": "array", "items": { "$ref": "#/definitions/Tools" @@ -24574,15 +23415,14 @@ }, "additionalProperties": false, "required": [ - "ToolsList", - "DisableSSLHostnameVerification", - "Error" + "tools", + "disable-ssl-hostname-verification" ] }, "ToolsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ToolsResult" @@ -24591,41 +23431,37 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Version": { "type": "object", "properties": { - "Version": { + "version": { "$ref": "#/definitions/Binary" } }, "additionalProperties": false, "required": [ - "Version" + "version" ] }, "VersionResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Version": { + "version": { "$ref": "#/definitions/Number" } }, - "additionalProperties": false, - "required": [ - "Version", - "Error" - ] + "additionalProperties": false }, "VersionResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/VersionResult" @@ -24634,47 +23470,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -24697,18 +23493,18 @@ } } }, - "CreateLocalLoginMacaroon": { + "DisableUser": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/MacaroonResults" + "$ref": "#/definitions/ErrorResults" } } }, - "DisableUser": { + "EnableUser": { "type": "object", "properties": { "Params": { @@ -24719,7 +23515,7 @@ } } }, - "EnableUser": { + "RemoveUser": { "type": "object", "properties": { "Params": { @@ -24760,18 +23556,9 @@ "display-name": { "type": "string" }, - "model-access-permission": { - "type": "string" - }, "password": { "type": "string" }, - "shared-model-tags": { - "type": "array", - "items": { - "type": "string" - } - }, "username": { "type": "string" } @@ -24779,8 +23566,7 @@ "additionalProperties": false, "required": [ "username", - "display-name", - "shared-model-tags" + "display-name" ] }, "AddUserResult": { @@ -24834,7 +23620,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -24843,41 +23629,41 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityPassword": { "type": "object", "properties": { - "Password": { + "password": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Password" + "tag", + "password" ] }, "EntityPasswords": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/EntityPassword" @@ -24886,35 +23672,35 @@ }, "additionalProperties": false, "required": [ - "Changes" + "changes" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -24923,19 +23709,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -24944,76 +23727,19 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "MacaroonResult": { - "type": "object", - "properties": { - "error": { - "$ref": "#/definitions/Error" - }, - "result": { - "$ref": "#/definitions/Macaroon" - } - }, "additionalProperties": false }, - "MacaroonResults": { - "type": "object", - "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/MacaroonResult" - } - } - }, - "additionalProperties": false, - "required": [ - "results" - ] - }, "UserInfo": { "type": "object", "properties": { + "access": { + "type": "string" + }, "created-by": { "type": "string" }, @@ -25039,6 +23765,7 @@ "required": [ "username", "display-name", + "access", "created-by", "date-created", "disabled" @@ -25089,46 +23816,6 @@ "required": [ "results" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -25155,29 +23842,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -25185,122 +23872,47 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineStorageId": { "type": "object", "properties": { - "attachmenttag": { + "attachment-tag": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "machinetag", - "attachmenttag" + "machine-tag", + "attachment-tag" ] }, "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageId" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "MachineStorageIdsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id", + "changes" ] } } } } ] -