X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fclient%2Fschemas.json;h=90ba2bbc769d00f71849b93ef93160783eb4e1fd;hb=46887b86181254efd72f59a8d6be468342afad83;hp=0c196489f43e62857c6f56e5319fd74c39ca0a7c;hpb=edf3beda420d3a2c66d6ef8fe9b5e45a76d052b9;p=osm%2FN2VC.git diff --git a/juju/client/schemas.json b/juju/client/schemas.json index 0c19648..90ba2bb 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,46 @@ }, "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": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/BoolResult" - } - } - }, - "CleanupIPAddresses": { + "ClearReboot": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchIPAddresses": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/EntitiesWatchResult" - } - } - } - }, - "definitions": { - "BoolResult": { + "CloudSpec": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/Entities" }, "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" + "$ref": "#/definitions/CloudSpecResults" } - }, - "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": { + "ControllerConfig": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/ControllerConfigResult" } } }, @@ -837,34 +586,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 +621,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 +778,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 +815,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 +833,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 +867,58 @@ }, "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" ] }, "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 +958,7 @@ "AllWatcherNextResults": { "type": "object", "properties": { - "Deltas": { + "deltas": { "type": "array", "items": { "$ref": "#/definitions/Delta" @@ -1197,24 +967,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 +1012,7 @@ "AllWatcherNextResults": { "type": "object", "properties": { - "Deltas": { + "deltas": { "type": "array", "items": { "$ref": "#/definitions/Delta" @@ -1251,24 +1021,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 +1077,7 @@ "AnnotationsGetResult": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "object", "patternProperties": { ".*": { @@ -1315,24 +1085,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 +1110,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "AnnotationsSet": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "array", "items": { "$ref": "#/definitions/EntityAnnotations" @@ -1356,13 +1125,13 @@ }, "additionalProperties": false, "required": [ - "Annotations" + "annotations" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -1371,25 +1140,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 +1166,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 +1210,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,85 +1228,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 } } } @@ -1724,13 +1417,13 @@ "AddApplicationUnits": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "NumUnits": { + "num-units": { "type": "integer" }, - "Placement": { + "placement": { "type": "array", "items": { "$ref": "#/definitions/Placement" @@ -1739,15 +1432,15 @@ }, "additionalProperties": false, "required": [ - "ApplicationName", - "NumUnits", - "Placement" + "application", + "num-units", + "placement" ] }, "AddApplicationUnitsResults": { "type": "object", "properties": { - "Units": { + "units": { "type": "array", "items": { "type": "string" @@ -1756,13 +1449,13 @@ }, "additionalProperties": false, "required": [ - "Units" + "units" ] }, "AddRelation": { "type": "object", "properties": { - "Endpoints": { + "endpoints": { "type": "array", "items": { "type": "string" @@ -1771,42 +1464,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 +1508,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 +1531,13 @@ } } }, - "ConfigYAML": { + "config-yaml": { "type": "string" }, - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" }, - "EndpointBindings": { + "endpoint-bindings": { "type": "object", "patternProperties": { ".*": { @@ -1852,16 +1545,16 @@ } } }, - "NumUnits": { + "num-units": { "type": "integer" }, - "Placement": { + "placement": { "type": "array", "items": { "$ref": "#/definitions/Placement" } }, - "Resources": { + "resources": { "type": "object", "patternProperties": { ".*": { @@ -1869,10 +1562,10 @@ } } }, - "Series": { + "series": { "type": "string" }, - "Storage": { + "storage": { "type": "object", "patternProperties": { ".*": { @@ -1883,66 +1576,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 +1639,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 +1670,14 @@ }, "additionalProperties": false, "required": [ - "ApplicationName", - "MetricCredentials" + "application", + "metrics-credentials" ] }, "ApplicationMetricCredentials": { "type": "object", "properties": { - "Creds": { + "creds": { "type": "array", "items": { "$ref": "#/definitions/ApplicationMetricCredential" @@ -1994,16 +1686,16 @@ }, "additionalProperties": false, "required": [ - "Creds" + "creds" ] }, "ApplicationSet": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "Options": { + "options": { "type": "object", "patternProperties": { ".*": { @@ -2014,29 +1706,29 @@ }, "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": { + "force-series": { "type": "boolean" }, - "forceunits": { + "force-units": { "type": "boolean" }, - "resourceids": { + "resource-ids": { "type": "object", "patternProperties": { ".*": { @@ -2047,33 +1739,32 @@ }, "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 +1773,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 +1806,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 +1831,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 +1889,7 @@ "DestroyApplicationUnits": { "type": "object", "properties": { - "UnitNames": { + "unit-names": { "type": "array", "items": { "type": "string" @@ -2178,13 +1898,13 @@ }, "additionalProperties": false, "required": [ - "UnitNames" + "unit-names" ] }, "DestroyRelation": { "type": "object", "properties": { - "Endpoints": { + "endpoints": { "type": "array", "items": { "type": "string" @@ -2193,35 +1913,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 +1950,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 +1968,82 @@ }, "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": { - "type": "string" - }, - "Scope": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Scope", - "Directive" - ] - }, - "Relation": { - "type": "object", - "properties": { - "Interface": { - "type": "string" - }, - "Limit": { - "type": "integer" - }, - "Name": { - "type": "string" - }, - "Optional": { - "type": "boolean" - }, - "Role": { + "directive": { "type": "string" }, - "Scope": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "Role", - "Interface", - "Optional", - "Limit", - "Scope" + "scope", + "directive" ] }, "SetConstraints": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "ApplicationName", - "Constraints" + "application", + "constraints" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "Value": { @@ -2436,46 +2087,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" - ] } } } @@ -2510,7 +2121,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -2519,47 +2130,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 +2179,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 +2197,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 +2294,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 +2322,7 @@ "BackupsListResult": { "type": "object", "properties": { - "List": { + "list": { "type": "array", "items": { "$ref": "#/definitions/BackupsMetadataResult" @@ -2798,90 +2331,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 +2448,13 @@ "RestoreArgs": { "type": "object", "properties": { - "BackupId": { + "backup-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "BackupId" + "backup-id" ] } } @@ -3033,29 +2566,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 +2597,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 } } } @@ -3172,29 +2629,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 +2660,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 +2683,7 @@ "type": "object", "properties": { "Params": { - "$ref": "#/definitions/CharmInfo" + "$ref": "#/definitions/CharmURL" }, "Result": { "$ref": "#/definitions/CharmInfo" @@ -3313,7 +2694,7 @@ "type": "object", "properties": { "Params": { - "$ref": "#/definitions/CharmInfo" + "$ref": "#/definitions/CharmURL" }, "Result": { "$ref": "#/definitions/IsMeteredResult" @@ -3333,206 +2714,498 @@ } }, "definitions": { - "CharmInfo": { + "CharmActionSpec": { "type": "object", "properties": { - "CharmURL": { + "description": { "type": "string" + }, + "params": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "CharmURL" + "description", + "params" ] }, - "CharmsList": { + "CharmActions": { "type": "object", "properties": { - "Names": { - "type": "array", - "items": { - "type": "string" + "specs": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmActionSpec" + } } } }, - "additionalProperties": false, - "required": [ - "Names" - ] + "additionalProperties": false }, - "CharmsListResult": { + "CharmInfo": { "type": "object", "properties": { - "CharmURLs": { - "type": "array", - "items": { - "type": "string" + "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": [ - "CharmURLs" + "revision", + "url", + "config" ] }, - "IsMeteredResult": { + "CharmMeta": { "type": "object", "properties": { - "Metered": { + "categories": { + "type": "array", + "items": { + "type": "string" + } + }, + "description": { + "type": "string" + }, + "extra-bindings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "min-juju-version": { + "type": "string" + }, + "name": { + "type": "string" + }, + "payload-classes": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmPayloadClass" + } + } + }, + "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": "string" + } + }, + "storage": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmStorage" + } + } + }, + "subordinate": { "type": "boolean" + }, + "summary": { + "type": "string" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "terms": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Metered" + "name", + "summary", + "description", + "subordinate" ] - } - } - } - }, - { - "Name": "Cleaner", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "Cleanup": { - "type": "object" }, - "WatchCleanups": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - } - }, - "definitions": { - "Error": { + "CharmMetric": { "type": "object", "properties": { - "Code": { + "description": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "type", + "description" ] }, - "ErrorInfo": { + "CharmMetrics": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "metrics": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmMetric" + } + } }, - "MacaroonPath": { - "type": "string" + "plan": { + "$ref": "#/definitions/CharmPlan" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "metrics", + "plan" + ] }, - "Macaroon": { + "CharmOption": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "default": { + "type": "object", + "additionalProperties": true }, - "location": { - "$ref": "#/definitions/packet" + "description": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "type" ] }, - "NotifyWatchResult": { + "CharmPayloadClass": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "name": { + "type": "string" }, - "NotifyWatcherId": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "name", + "type" ] }, - "caveat": { + "CharmPlan": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "required": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "required" ] }, - "packet": { + "CharmRelation": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "interface": { + "type": "string" }, - "start": { + "limit": { "type": "integer" }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } + "name": { + "type": "string" + }, + "optional": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "scope": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "role", + "interface", + "optional", + "limit", + "scope" + ] + }, + "CharmResourceMeta": { + "type": "object", + "properties": { + "description": { + "type": "string" + }, + "name": { + "type": "string" + }, + "path": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "type", + "path", + "description" + ] + }, + "CharmStorage": { + "type": "object", + "properties": { + "count-max": { + "type": "integer" + }, + "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" + ] + }, + "CharmURL": { + "type": "object", + "properties": { + "url": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "url" + ] + }, + "CharmsList": { + "type": "object", + "properties": { + "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" + ] + } } } }, @@ -3599,17 +3272,6 @@ } } }, - "CharmInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/CharmInfo" - }, - "Result": { - "$ref": "#/definitions/CharmInfo" - } - } - }, "DestroyMachines": { "type": "object", "properties": { @@ -3618,9 +3280,6 @@ } } }, - "DestroyModel": { - "type": "object" - }, "FindTools": { "type": "object", "properties": { @@ -3673,6 +3332,14 @@ } } }, + "ModelDefaults": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelDefaultsResult" + } + } + }, "ModelGet": { "type": "object", "properties": { @@ -3792,6 +3459,17 @@ } } }, + "SetModelDefaults": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetModelDefaults" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "StatusHistory": { "type": "object", "properties": { @@ -3803,6 +3481,17 @@ } } }, + "UnsetModelDefaults": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/UnsetModelDefaults" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "WatchAll": { "type": "object", "properties": { @@ -3816,7 +3505,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -3828,110 +3517,108 @@ }, "additionalProperties": false, "required": [ - "Servers" + "servers" ] }, "AddCharm": { "type": "object", "properties": { - "Channel": { + "channel": { "type": "string" }, - "URL": { + "url": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL", - "Channel" + "url", + "channel" ] }, "AddCharmWithAuthorization": { "type": "object", "properties": { - "Channel": { + "channel": { "type": "string" }, - "CharmStoreMacaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "URL": { + "url": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL", - "Channel", - "CharmStoreMacaroon" + "url", + "channel", + "macaroon" ] }, "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" @@ -3940,29 +3627,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" @@ -3971,76 +3657,76 @@ }, "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" ] }, "AgentVersionResult": { "type": "object", "properties": { - "Version": { + "version": { "$ref": "#/definitions/Number" } }, "additionalProperties": false, "required": [ - "Version" + "version" ] }, "AllWatcherId": { "type": "object", "properties": { - "AllWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "AllWatcherId" + "watcher-id" ] }, "ApplicationStatus": { "type": "object", "properties": { - "CanUpgradeTo": { + "can-upgrade-to": { "type": "string" }, - "Charm": { + "charm": { "type": "string" }, - "Err": { + "err": { "type": "object", "additionalProperties": true }, - "Exposed": { + "exposed": { "type": "boolean" }, - "Life": { + "life": { "type": "string" }, - "MeterStatuses": { + "meter-statuses": { "type": "object", "patternProperties": { ".*": { @@ -4048,7 +3734,7 @@ } } }, - "Relations": { + "relations": { "type": "object", "patternProperties": { ".*": { @@ -4059,36 +3745,43 @@ } } }, - "Status": { + "series": { + "type": "string" + }, + "status": { "$ref": "#/definitions/DetailedStatus" }, - "SubordinateTo": { + "subordinate-to": { "type": "array", "items": { "type": "string" } }, - "Units": { + "units": { "type": "object", "patternProperties": { ".*": { "$ref": "#/definitions/UnitStatus" } } + }, + "workload-version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Err", - "Charm", - "Exposed", - "Life", - "Relations", - "CanUpgradeTo", - "SubordinateTo", - "Units", - "MeterStatuses", - "Status" + "charm", + "series", + "exposed", + "life", + "relations", + "can-upgrade-to", + "subordinate-to", + "units", + "meter-statuses", + "status", + "workload-version" ] }, "Binary": { @@ -4142,16 +3835,21 @@ "requires" ] }, - "CharmInfo": { + "ConfigValue": { "type": "object", "properties": { - "CharmURL": { + "source": { "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true } }, "additionalProperties": false, "required": [ - "CharmURL" + "value", + "source" ] }, "Constraints": { @@ -4177,10 +3875,10 @@ "DestroyMachines": { "type": "object", "properties": { - "Force": { + "force": { "type": "boolean" }, - "MachineNames": { + "machine-names": { "type": "array", "items": { "type": "string" @@ -4189,14 +3887,14 @@ }, "additionalProperties": false, "required": [ - "MachineNames", - "Force" + "machine-names", + "force" ] }, "DetailedStatus": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -4205,70 +3903,69 @@ } } }, - "Err": { + "err": { "type": "object", "additionalProperties": true }, - "Info": { + "info": { "type": "string" }, - "Kind": { + "kind": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" }, - "Version": { + "version": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since", - "Kind", - "Version", - "Life", - "Err" + "status", + "info", + "data", + "since", + "kind", + "version", + "life" ] }, "EndpointStatus": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "Name": { + "name": { "type": "string" }, - "Role": { + "role": { "type": "string" }, - "Subordinate": { + "subordinate": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "ApplicationName", - "Name", - "Role", - "Subordinate" + "application", + "name", + "role", + "subordinate" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -4277,25 +3974,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": { ".*": { @@ -4304,51 +4001,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" } }, @@ -4357,19 +4053,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" @@ -4378,44 +4071,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" @@ -4424,14 +4117,13 @@ }, "additionalProperties": false, "required": [ - "List", - "Error" + "list" ] }, "FullStatus": { "type": "object", "properties": { - "Applications": { + "applications": { "type": "object", "patternProperties": { ".*": { @@ -4439,10 +4131,7 @@ } } }, - "AvailableVersion": { - "type": "string" - }, - "Machines": { + "machines": { "type": "object", "patternProperties": { ".*": { @@ -4450,10 +4139,10 @@ } } }, - "ModelName": { - "type": "string" + "model": { + "$ref": "#/definitions/ModelStatusInfo" }, - "Relations": { + "relations": { "type": "array", "items": { "$ref": "#/definitions/RelationStatus" @@ -4462,11 +4151,10 @@ }, "additionalProperties": false, "required": [ - "ModelName", - "AvailableVersion", - "Machines", - "Applications", - "Relations" + "model", + "machines", + "applications", + "relations" ] }, "GetBundleChangesParams": { @@ -4502,37 +4190,37 @@ "GetConstraintsResults": { "type": "object", "properties": { - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "Constraints" + "constraints" ] }, "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" @@ -4544,10 +4232,10 @@ "History": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Statuses": { + "statuses": { "type": "array", "items": { "$ref": "#/definitions/DetailedStatus" @@ -4556,7 +4244,7 @@ }, "additionalProperties": false, "required": [ - "Statuses" + "statuses" ] }, "HostPort": { @@ -4565,60 +4253,57 @@ "Address": { "$ref": "#/definitions/Address" }, - "Port": { + "port": { "type": "integer" } }, "additionalProperties": false, "required": [ "Address", - "Port" + "port" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineHardware": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "arch": { + "type": "string" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "availability-zone": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" + "cores": { + "type": "integer" }, - "location": { - "$ref": "#/definitions/packet" + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" }, - "sig": { + "tags": { "type": "array", "items": { - "type": "integer" + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineStatus": { "type": "object", "properties": { - "AgentStatus": { + "agent-status": { "$ref": "#/definitions/DetailedStatus" }, - "Containers": { + "containers": { "type": "object", "patternProperties": { ".*": { @@ -4626,72 +4311,95 @@ } } }, - "DNSName": { + "dns-name": { "type": "string" }, - "Hardware": { + "hardware": { "type": "string" }, - "HasVote": { + "has-vote": { "type": "boolean" }, - "Id": { + "id": { "type": "string" }, - "InstanceId": { + "instance-id": { "type": "string" }, - "InstanceStatus": { + "instance-status": { "$ref": "#/definitions/DetailedStatus" }, - "Jobs": { + "jobs": { "type": "array", "items": { "type": "string" } }, - "Series": { + "series": { "type": "string" }, - "WantsVote": { + "wants-vote": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "AgentStatus", - "InstanceStatus", - "DNSName", - "InstanceId", - "Series", - "Id", - "Containers", - "Hardware", - "Jobs", - "HasVote", - "WantsVote" + "agent-status", + "instance-status", + "dns-name", + "instance-id", + "series", + "id", + "containers", + "hardware", + "jobs", + "has-vote", + "wants-vote" ] }, "MeterStatus": { "type": "object", "properties": { - "Color": { + "color": { "type": "string" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Color", - "Message" + "color", + "message" ] }, "ModelConfigResults": { "type": "object", "properties": { - "Config": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ConfigValue" + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelDefaultValues": { + "type": "object", + "properties": { + "cloud-region": { + "type": "string" + }, + "cloud-tag": { + "type": "string" + }, + "config": { "type": "object", "patternProperties": { ".*": { @@ -4703,64 +4411,129 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" + ] + }, + "ModelDefaults": { + "type": "object", + "properties": { + "controller": { + "type": "object", + "additionalProperties": true + }, + "default": { + "type": "object", + "additionalProperties": true + }, + "regions": { + "type": "array", + "items": { + "$ref": "#/definitions/RegionDefaults" + } + } + }, + "additionalProperties": false + }, + "ModelDefaultsResult": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ModelDefaults" + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" ] }, "ModelInfo": { "type": "object", "properties": { - "Cloud": { + "cloud": { "type": "string" }, - "DefaultSeries": { + "cloud-credential-tag": { "type": "string" }, - "Life": { + "cloud-region": { "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", + "owner-tag", + "life", + "status", + "users", + "machines" + ] + }, + "ModelMachineInfo": { + "type": "object", + "properties": { + "hardware": { + "$ref": "#/definitions/MachineHardware" + }, + "id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "id" ] }, "ModelSet": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -4772,13 +4545,64 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" + ] + }, + "ModelStatusInfo": { + "type": "object", + "properties": { + "available-version": { + "type": "string" + }, + "cloud": { + "type": "string" + }, + "migration": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "cloud", + "version", + "available-version" ] }, "ModelUnset": { "type": "object", "properties": { - "Keys": { + "keys": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "keys" + ] + }, + "ModelUnsetKeys": { + "type": "object", + "properties": { + "cloud-region": { + "type": "string" + }, + "cloud-tag": { + "type": "string" + }, + "keys": { "type": "array", "items": { "type": "string" @@ -4787,7 +4611,7 @@ }, "additionalProperties": false, "required": [ - "Keys" + "keys" ] }, "ModelUserInfo": { @@ -4796,10 +4620,10 @@ "access": { "type": "string" }, - "displayname": { + "display-name": { "type": "string" }, - "lastconnection": { + "last-connection": { "type": "string", "format": "date-time" }, @@ -4810,8 +4634,8 @@ "additionalProperties": false, "required": [ "user", - "displayname", - "lastconnection", + "display-name", + "last-connection", "access" ] }, @@ -4873,142 +4697,159 @@ "Placement": { "type": "object", "properties": { - "Directive": { + "directive": { "type": "string" }, - "Scope": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Scope", - "Directive" + "scope", + "directive" ] }, "PrivateAddress": { "type": "object", "properties": { - "Target": { + "target": { "type": "string" } }, "additionalProperties": false, "required": [ - "Target" + "target" ] }, "PrivateAddressResults": { "type": "object", "properties": { - "PrivateAddress": { + "private-address": { "type": "string" } }, "additionalProperties": false, "required": [ - "PrivateAddress" + "private-address" ] }, "ProvisioningScriptParams": { "type": "object", "properties": { - "DataDir": { + "data-dir": { "type": "string" }, - "DisablePackageCommands": { + "disable-package-commands": { "type": "boolean" }, - "MachineId": { + "machine-id": { "type": "string" }, - "Nonce": { + "nonce": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineId", - "Nonce", - "DataDir", - "DisablePackageCommands" + "machine-id", + "nonce", + "data-dir", + "disable-package-commands" ] }, "ProvisioningScriptResult": { "type": "object", "properties": { - "Script": { + "script": { "type": "string" } }, "additionalProperties": false, "required": [ - "Script" + "script" ] }, "PublicAddress": { "type": "object", "properties": { - "Target": { + "target": { "type": "string" } }, "additionalProperties": false, "required": [ - "Target" + "target" ] }, "PublicAddressResults": { "type": "object", "properties": { - "PublicAddress": { + "public-address": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "public-address" + ] + }, + "RegionDefaults": { + "type": "object", + "properties": { + "region-name": { "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true } }, "additionalProperties": false, "required": [ - "PublicAddress" + "region-name", + "value" ] }, "RelationStatus": { "type": "object", "properties": { - "Endpoints": { + "endpoints": { "type": "array", "items": { "$ref": "#/definitions/EndpointStatus" } }, - "Id": { + "id": { "type": "integer" }, - "Interface": { + "interface": { "type": "string" }, - "Key": { + "key": { "type": "string" }, - "Scope": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Id", - "Key", - "Interface", - "Scope", - "Endpoints" + "id", + "key", + "interface", + "scope", + "endpoints" ] }, "ResolveCharmResult": { "type": "object", "properties": { - "Error": { + "error": { "type": "string" }, - "URL": { - "$ref": "#/definitions/URL" + "url": { + "type": "string" } }, "additionalProperties": false @@ -5016,7 +4857,7 @@ "ResolveCharmResults": { "type": "object", "properties": { - "URLs": { + "urls": { "type": "array", "items": { "$ref": "#/definitions/ResolveCharmResult" @@ -5025,117 +4866,132 @@ }, "additionalProperties": false, "required": [ - "URLs" + "urls" ] }, "ResolveCharms": { "type": "object", "properties": { - "References": { + "references": { "type": "array", "items": { - "$ref": "#/definitions/URL" + "type": "string" } } }, "additionalProperties": false, "required": [ - "References" + "references" ] }, "Resolved": { "type": "object", "properties": { - "Retry": { + "retry": { "type": "boolean" }, - "UnitName": { + "unit-name": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitName", - "Retry" + "unit-name", + "retry" ] }, "SetConstraints": { "type": "object", "properties": { - "ApplicationName": { + "application": { "type": "string" }, - "Constraints": { + "constraints": { "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "ApplicationName", - "Constraints" + "application", + "constraints" ] }, "SetModelAgentVersion": { "type": "object", "properties": { - "Version": { + "version": { "$ref": "#/definitions/Number" } }, "additionalProperties": false, "required": [ - "Version" + "version" + ] + }, + "SetModelDefaults": { + "type": "object", + "properties": { + "config": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelDefaultValues" + } + } + }, + "additionalProperties": false, + "required": [ + "config" ] }, "StatusHistoryFilter": { "type": "object", "properties": { - "Date": { + "date": { "type": "string", "format": "date-time" }, - "Delta": { + "delta": { "type": "integer" }, - "Size": { + "size": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Size", - "Date", - "Delta" + "size", + "date", + "delta" ] }, "StatusHistoryRequest": { "type": "object", "properties": { - "Filter": { + "filter": { "$ref": "#/definitions/StatusHistoryFilter" }, - "HistoryKind": { + "historyKind": { "type": "string" }, - "Size": { + "size": { "type": "integer" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "HistoryKind", - "Size", - "Filter", - "Tag" + "historyKind", + "size", + "filter", + "tag" ] }, "StatusHistoryRequests": { "type": "object", "properties": { - "Requests": { + "requests": { "type": "array", "items": { "$ref": "#/definitions/StatusHistoryRequest" @@ -5144,28 +5000,28 @@ }, "additionalProperties": false, "required": [ - "Requests" + "requests" ] }, "StatusHistoryResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "History": { + "history": { "$ref": "#/definitions/History" } }, "additionalProperties": false, "required": [ - "History" + "history" ] }, "StatusHistoryResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StatusHistoryResult" @@ -5174,13 +5030,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StatusParams": { "type": "object", "properties": { - "Patterns": { + "patterns": { "type": "array", "items": { "type": "string" @@ -5189,7 +5045,7 @@ }, "additionalProperties": false, "required": [ - "Patterns" + "patterns" ] }, "Tools": { @@ -5215,60 +5071,28 @@ "size" ] }, - "URL": { - "type": "object", - "properties": { - "Channel": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "Revision": { - "type": "integer" - }, - "Schema": { - "type": "string" - }, - "Series": { - "type": "string" - }, - "User": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Schema", - "User", - "Name", - "Revision", - "Series", - "Channel" - ] - }, "UnitStatus": { "type": "object", "properties": { - "AgentStatus": { + "agent-status": { "$ref": "#/definitions/DetailedStatus" }, - "Charm": { + "charm": { "type": "string" }, - "Machine": { + "machine": { "type": "string" }, - "OpenedPorts": { + "opened-ports": { "type": "array", "items": { "type": "string" } }, - "PublicAddress": { + "public-address": { "type": "string" }, - "Subordinates": { + "subordinates": { "type": "object", "patternProperties": { ".*": { @@ -5276,19 +5100,38 @@ } } }, - "WorkloadStatus": { + "workload-status": { "$ref": "#/definitions/DetailedStatus" + }, + "workload-version": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "agent-status", + "workload-status", + "workload-version", + "machine", + "opened-ports", + "public-address", + "charm", + "subordinates" + ] + }, + "UnsetModelDefaults": { + "type": "object", + "properties": { + "keys": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelUnsetKeys" + } } }, "additionalProperties": false, "required": [ - "AgentStatus", - "WorkloadStatus", - "Machine", - "OpenedPorts", - "PublicAddress", - "Charm", - "Subordinates" + "keys" ] }, "Value": { @@ -5332,156 +5175,235 @@ } }, "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" - ] } } } }, { - "Name": "Controller", - "Version": 3, + "Name": "Cloud", + "Version": 1, "Schema": { "type": "object", "properties": { - "AllModels": { + "Cloud": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/UserModelList" + "$ref": "#/definitions/CloudResults" } } }, - "DestroyController": { + "Clouds": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/DestroyControllerArgs" + "Result": { + "$ref": "#/definitions/CloudsResult" } } }, - "InitiateModelMigration": { + "Credential": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/InitiateModelMigrationArgs" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/InitiateModelMigrationResults" - } - } - }, - "ListBlockedModels": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelBlockInfoList" + "$ref": "#/definitions/CloudCredentialResults" } } }, - "ModelConfig": { + "DefaultCloud": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/ModelConfigResults" + "$ref": "#/definitions/StringResult" } } }, - "ModelStatus": { + "RevokeCredentials": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ModelStatusResults" + "$ref": "#/definitions/ErrorResults" } } }, - "RemoveBlocks": { + "UpdateCredentials": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/RemoveBlocksArgs" + "$ref": "#/definitions/UpdateCloudCredentials" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } } }, - "WatchAllModels": { + "UserCredentials": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/UserClouds" + }, "Result": { - "$ref": "#/definitions/AllWatcherId" + "$ref": "#/definitions/StringsResults" } } } }, "definitions": { - "AllWatcherId": { + "Cloud": { + "type": "object", + "properties": { + "auth-types": { + "type": "array", + "items": { + "type": "string" + } + }, + "endpoint": { + "type": "string" + }, + "identity-endpoint": { + "type": "string" + }, + "regions": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudRegion" + } + }, + "storage-endpoint": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "type" + ] + }, + "CloudCredential": { "type": "object", "properties": { - "AllWatcherId": { + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "auth-type": { "type": "string" + }, + "redacted": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "AllWatcherId" + "auth-type" ] }, - "DestroyControllerArgs": { + "CloudCredentialResult": { "type": "object", "properties": { - "destroy-models": { - "type": "boolean" + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/CloudCredential" + } + }, + "additionalProperties": false + }, + "CloudCredentialResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudCredentialResult" + } + } + }, + "additionalProperties": false + }, + "CloudRegion": { + "type": "object", + "properties": { + "endpoint": { + "type": "string" + }, + "identity-endpoint": { + "type": "string" + }, + "name": { + "type": "string" + }, + "storage-endpoint": { + "type": "string" } }, "additionalProperties": false, "required": [ - "destroy-models" + "name" ] }, + "CloudResult": { + "type": "object", + "properties": { + "cloud": { + "$ref": "#/definitions/Cloud" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "CloudResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudResult" + } + } + }, + "additionalProperties": false + }, + "CloudsResult": { + "type": "object", + "properties": { + "clouds": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/Cloud" + } + } + } + }, + "additionalProperties": false + }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -5490,94 +5412,117 @@ }, "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": { - "specs": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ModelMigrationSpec" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "specs" + "results" ] }, - "InitiateModelMigrationResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "StringResult": { "type": "object", "properties": { "error": { "$ref": "#/definitions/Error" }, - "id": { - "type": "string" - }, - "model-tag": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "model-tag", - "error", - "id" + "result" ] }, - "InitiateModelMigrationResults": { + "StringsResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false + }, + "StringsResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/InitiateModelMigrationResult" + "$ref": "#/definitions/StringsResult" } } }, @@ -5586,61 +5531,560 @@ "results" ] }, - "Macaroon": { + "UpdateCloudCredential": { + "type": "object", + "properties": { + "credential": { + "$ref": "#/definitions/CloudCredential" + }, + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "credential" + ] + }, + "UpdateCloudCredentials": { "type": "object", "properties": { - "caveats": { + "credentials": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "$ref": "#/definitions/UpdateCloudCredential" } + } + }, + "additionalProperties": false + }, + "UserCloud": { + "type": "object", + "properties": { + "cloud-tag": { + "type": "string" }, - "data": { + "user-tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "user-tag", + "cloud-tag" + ] + }, + "UserClouds": { + "type": "object", + "properties": { + "user-clouds": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/UserCloud" } + } + }, + "additionalProperties": false + } + } + } + }, + { + "Name": "Controller", + "Version": 3, + "Schema": { + "type": "object", + "properties": { + "AllModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/UserModelList" + } + } + }, + "CloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "id": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/CloudSpecResults" + } + } + }, + "ControllerConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ControllerConfigResult" + } + } + }, + "DestroyController": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/DestroyControllerArgs" + } + } + }, + "GetControllerAccess": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/UserAccessResults" + } + } + }, + "InitiateMigration": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/InitiateMigrationArgs" + }, + "Result": { + "$ref": "#/definitions/InitiateMigrationResults" + } + } + }, + "ListBlockedModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelBlockInfoList" + } + } + }, + "ModelConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResults" + } + } + }, + "ModelStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { + "Result": { + "$ref": "#/definitions/ModelStatusResults" + } + } + }, + "ModifyControllerAccess": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModifyControllerAccessRequest" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "RemoveBlocks": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/RemoveBlocksArgs" + } + } + }, + "WatchAllModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/AllWatcherId" + } + } + } + }, + "definitions": { + "AllWatcherId": { + "type": "object", + "properties": { + "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": "integer" + "type": "string" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "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": [ + "config" + ] + }, + "DestroyControllerArgs": { + "type": "object", + "properties": { + "destroy-models": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "destroy-models" + ] + }, + "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": { + "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 + }, + "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" + ] + }, + "InitiateMigrationArgs": { + "type": "object", + "properties": { + "specs": { + "type": "array", + "items": { + "$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 + }, + "MigrationSpec": { + "type": "object", + "properties": { + "external-control": { + "type": "boolean" + }, + "model-tag": { + "type": "string" + }, + "target-info": { + "$ref": "#/definitions/MigrationTargetInfo" + } + }, + "additionalProperties": false, + "required": [ + "model-tag", + "target-info", + "external-control" + ] + }, + "MigrationTargetInfo": { + "type": "object", + "properties": { + "addrs": { + "type": "array", + "items": { + "type": "string" + } + }, + "auth-tag": { + "type": "string" + }, + "ca-cert": { + "type": "string" + }, + "controller-tag": { + "type": "string" + }, + "macaroons": { + "type": "string" + }, + "password": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "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 +6129,33 @@ "ModelConfigResults": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/ConfigValue" } } } }, "additionalProperties": false, "required": [ - "Config" - ] - }, - "ModelMigrationSpec": { - "type": "object", - "properties": { - "model-tag": { - "type": "string" - }, - "target-info": { - "$ref": "#/definitions/ModelMigrationTargetInfo" - } - }, - "additionalProperties": false, - "required": [ - "model-tag", - "target-info" + "config" ] }, - "ModelMigrationTargetInfo": { + "ModelMachineInfo": { "type": "object", "properties": { - "addrs": { - "type": "array", - "items": { - "type": "string" - } - }, - "auth-tag": { - "type": "string" - }, - "ca-cert": { - "type": "string" - }, - "controller-tag": { - "type": "string" + "hardware": { + "$ref": "#/definitions/MachineHardware" }, - "password": { + "id": { "type": "string" } }, "additionalProperties": false, "required": [ - "controller-tag", - "addrs", - "ca-cert", - "auth-tag", - "password" + "id" ] }, "ModelStatus": { @@ -5759,6 +6170,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "model-tag": { "type": "string" }, @@ -5790,6 +6207,41 @@ "models" ] }, + "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 +6254,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" ] } } @@ -5988,7 +6440,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -6000,36 +6452,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 +6490,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 +6511,14 @@ }, "additionalProperties": false, "required": [ - "StateAddresses", - "APIAddresses" + "state-addresses", + "api-addresses" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -6075,41 +6527,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 +6570,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" } }, @@ -6155,19 +6607,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 +6625,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "HostPort": { @@ -6185,36 +6634,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 +6671,83 @@ }, "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" ] }, "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 +6756,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 +6822,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 +6840,13 @@ }, "additionalProperties": false, "required": [ - "SpaceTag" + "space-tag" ] }, "AddSubnetsParams": { "type": "object", "properties": { - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/AddSubnetParams" @@ -6488,22 +6855,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 +6879,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 +6896,13 @@ }, "additionalProperties": false, "required": [ - "Spaces" + "spaces" ] }, "DiscoverSpacesResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ProviderSpace" @@ -6544,35 +6911,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,86 +6948,50 @@ "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" - ] - }, - "ListSubnetsResults": { - "type": "object", - "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Subnet" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "ListSubnetsResults": { "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/Subnet" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -6672,22 +7003,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 +7027,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 +7062,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 +7157,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 +7188,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 +7206,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" @@ -6991,7 +7234,7 @@ "SetMachineBlockDevices": { "type": "object", "properties": { - "machineblockdevices": { + "machine-block-devices": { "type": "array", "items": { "$ref": "#/definitions/MachineBlockDevices" @@ -7000,47 +7243,7 @@ }, "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" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "machine-block-devices" ] } } @@ -7068,52 +7271,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 +7322,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 +7349,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 +7379,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": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineStorageId" - } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "MachineStorageIdsWatcherId": { - "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" + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/MachineStorageId" + } }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id", + "changes" ] } } @@ -7374,6 +7428,17 @@ "Schema": { "type": "object", "properties": { + "CloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResults" + } + } + }, "GetAssignedMachine": { "type": "object", "properties": { @@ -7502,23 +7567,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 +7591,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 +7687,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,23 +7736,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" @@ -7616,86 +7760,53 @@ }, "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" ] }, "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 +7815,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 +7833,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Ports" + "ports" ] }, "MachinePortsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachinePortsResult" @@ -7738,13 +7848,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -7756,29 +7866,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" @@ -7787,49 +7896,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 +7946,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 +7976,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 +8012,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 +8087,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 +8111,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ControllersChanges": { @@ -8098,12 +8159,12 @@ "ControllersSpec": { "type": "object", "properties": { - "ModelTag": { - "type": "string" - }, "constraints": { "$ref": "#/definitions/Value" }, + "model-tag": { + "type": "string" + }, "num-controllers": { "type": "integer" }, @@ -8119,14 +8180,14 @@ }, "additionalProperties": false, "required": [ - "ModelTag", + "model-tag", "num-controllers" ] }, "ControllersSpecs": { "type": "object", "properties": { - "Specs": { + "specs": { "type": "array", "items": { "$ref": "#/definitions/ControllersSpec" @@ -8135,35 +8196,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 +8233,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,33 +8306,57 @@ "MongoUpgradeResults": { "type": "object", "properties": { - "Master": { + "ha-members": { + "type": "array", + "items": { + "$ref": "#/definitions/HAMember" + } + }, + "master": { "$ref": "#/definitions/HAMember" }, - "Members": { - "type": "array", - "items": { - "$ref": "#/definitions/HAMember" - } + "rs-members": { + "type": "array", + "items": { + "$ref": "#/definitions/Member" + } + } + }, + "additionalProperties": false, + "required": [ + "rs-members", + "master", + "ha-members" + ] + }, + "MongoVersion": { + "type": "object", + "properties": { + "engine": { + "type": "string" + }, + "major": { + "type": "integer" }, - "RsMembers": { - "type": "array", - "items": { - "$ref": "#/definitions/Member" - } + "minor": { + "type": "integer" + }, + "patch": { + "type": "string" } }, "additionalProperties": false, "required": [ - "RsMembers", - "Master", - "Members" + "major", + "minor", + "patch", + "engine" ] }, "ResumeReplicationParams": { "type": "object", "properties": { - "Members": { + "members": { "type": "array", "items": { "$ref": "#/definitions/Member" @@ -8313,19 +8365,19 @@ }, "additionalProperties": false, "required": [ - "Members" + "members" ] }, "UpgradeMongoParams": { "type": "object", "properties": { - "Target": { - "$ref": "#/definitions/Version" + "target": { + "$ref": "#/definitions/MongoVersion" } }, "additionalProperties": false, "required": [ - "Target" + "target" ] }, "Value": { @@ -8369,70 +8421,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 +8447,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 +8478,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 +8496,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 +8536,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 +8573,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 +8604,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 +8622,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ImageFilterParams": { @@ -8797,80 +8706,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 +8761,7 @@ "arch": { "type": "string" }, - "image_id": { + "image-id": { "type": "string" }, "priority": { @@ -8934,10 +8770,10 @@ "region": { "type": "string" }, - "root_storage_size": { + "root-storage-size": { "type": "integer" }, - "root_storage_type": { + "root-storage-type": { "type": "string" }, "series": { @@ -8952,13 +8788,13 @@ "version": { "type": "string" }, - "virt_type": { + "virt-type": { "type": "string" } }, "additionalProperties": false, "required": [ - "image_id", + "image-id", "region", "version", "series", @@ -8982,29 +8818,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 +8849,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 +8867,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ImageMetadataFilter": { @@ -9061,7 +8894,7 @@ "stream": { "type": "string" }, - "virt_type": { + "virt-type": { "type": "string" } }, @@ -9084,45 +8917,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,60 +8931,20 @@ }, "additionalProperties": false, "required": [ - "image_ids" + "image-ids" ] }, "MetadataSaveParams": { "type": "object", "properties": { - "metadata": { - "type": "array", - "items": { - "$ref": "#/definitions/CloudImageMetadataList" - } - } - }, - "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" + "metadata": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudImageMetadataList" + } } }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } @@ -9312,46 +9072,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 +9119,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -9375,25 +9134,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 +9161,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 +9213,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 +9231,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 +9261,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 +9317,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -9614,29 +9335,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 +9365,13 @@ }, "additionalProperties": false, "required": [ - "MachineAddresses" + "machine-addresses" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -9660,13 +9380,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "StatusResult": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -9675,41 +9395,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 +9437,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 +9467,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 +9549,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -9882,47 +9558,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 +9607,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 +9625,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 +9694,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 +9733,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -10146,109 +9742,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" - ] + } + }, + "additionalProperties": false + }, + "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" @@ -10257,32 +9819,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 +9849,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 +9900,7 @@ "ClaimLeadershipBulkParams": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/ClaimLeadershipParams" @@ -10391,13 +9909,13 @@ }, "additionalProperties": false, "required": [ - "Params" + "params" ] }, "ClaimLeadershipBulkResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -10406,55 +9924,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,91 +9981,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 } } } @@ -10585,7 +10027,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -10594,47 +10036,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" } }, @@ -10643,23 +10085,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" @@ -10668,116 +10109,235 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "NotifyWatcherId": { + "type": "string" }, - "data": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/NotifyWatchResult" } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "Name": "LogForwarding", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "GetLastSent": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/LogForwardingGetLastSentParams" }, - "id": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/LogForwardingGetLastSentResults" + } + } + }, + "SetLastSent": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/LogForwardingSetLastSentParams" }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + } + }, + "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" }, - "sig": { + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, - "NotifyWatchResult": { + "LogForwardingGetLastSentParams": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "$ref": "#/definitions/LogForwardingID" + } + } + }, + "additionalProperties": false, + "required": [ + "ids" + ] + }, + "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" + ] + }, + "LogForwardingID": { + "type": "object", + "properties": { + "model": { + "type": "string" + }, + "sink": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "model", + "sink" ] }, - "caveat": { + "LogForwardingSetLastSentParam": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "LogForwardingID": { + "$ref": "#/definitions/LogForwardingID" }, - "location": { - "$ref": "#/definitions/packet" + "record-id": { + "type": "integer" }, - "verificationId": { - "$ref": "#/definitions/packet" + "record-timestamp": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "LogForwardingID", + "record-id", + "record-timestamp" ] }, - "packet": { + "LogForwardingSetLastSentParams": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/LogForwardingSetLastSentParam" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "params" ] + }, + "Macaroon": { + "type": "object", + "additionalProperties": false } } } @@ -10815,7 +10375,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -10824,47 +10384,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 +10432,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 +10461,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 +10491,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 +10592,7 @@ "ActionExecutionResult": { "type": "object", "properties": { - "actiontag": { + "action-tag": { "type": "string" }, "message": { @@ -11128,7 +10613,7 @@ }, "additionalProperties": false, "required": [ - "actiontag", + "action-tag", "status" ] }, @@ -11223,574 +10708,654 @@ } } }, - "additionalProperties": false + "additionalProperties": false + }, + "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": { + "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 + }, + "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" + ] + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "StringsWatchResult": { + "type": "object", + "properties": { + "changes": { + "type": "array", + "items": { + "type": "string" + } + }, + "error": { + "$ref": "#/definitions/Error" + }, + "watcher-id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "watcher-id" + ] + }, + "StringsWatchResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringsWatchResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "Name": "MachineManager", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "AddMachines": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/AddMachines" + }, + "Result": { + "$ref": "#/definitions/AddMachinesResults" + } + } + } + }, + "definitions": { + "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" + ] }, - "Entities": { + "AddMachines": { "type": "object", "properties": { - "Entities": { + "params": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/AddMachineParams" } } }, "additionalProperties": false, "required": [ - "Entities" + "params" ] }, - "Entity": { + "AddMachinesResult": { "type": "object", "properties": { - "Tag": { + "error": { + "$ref": "#/definitions/Error" + }, + "machine": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "machine" ] }, - "Error": { + "AddMachinesResults": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/AddMachinesResult" + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "machines" ] }, - "ErrorInfo": { + "Address": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "scope": { + "type": "string" }, - "MacaroonPath": { + "space-name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "value": { "type": "string" - } - }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Error" + "value", + "type", + "scope" ] }, - "ErrorResults": { + "Constraints": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } + "Count": { + "type": "integer" + }, + "Pool": { + "type": "string" + }, + "Size": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Results" + "Pool", + "Size", + "Count" ] }, - "Macaroon": { + "Error": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "code": { + "type": "string" }, - "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" ] }, - "StringsWatchResult": { + "ErrorInfo": { "type": "object", "properties": { - "Changes": { - "type": "array", - "items": { - "type": "string" - } - }, - "Error": { - "$ref": "#/definitions/Error" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "StringsWatcherId": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] + "additionalProperties": false }, - "StringsWatchResults": { + "HardwareCharacteristics": { "type": "object", "properties": { - "Results": { + "arch": { + "type": "string" + }, + "availability-zone": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { "type": "array", "items": { - "$ref": "#/definitions/StringsWatchResult" + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false }, - "caveat": { + "Placement": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "directive": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "scope": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "scope", + "directive" ] }, - "packet": { + "Value": { "type": "object", "properties": { - "headerLen": { + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { "type": "integer" }, - "start": { + "instance-type": { + "type": "string" + }, + "mem": { "type": "integer" }, - "totalLen": { + "root-disk": { "type": "integer" + }, + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } }, { - "Name": "MachineManager", - "Version": 2, + "Name": "MachineUndertaker", + "Version": 1, "Schema": { "type": "object", "properties": { - "AddMachines": { + "AllMachineRemovals": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddMachines" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/AddMachinesResults" + "$ref": "#/definitions/EntitiesResults" } } - } - }, - "definitions": { - "AddMachineParams": { + }, + "CompleteMachineRemovals": { "type": "object", "properties": { - "Addrs": { - "type": "array", - "items": { - "$ref": "#/definitions/Address" - } - }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "ContainerType": { - "type": "string" - }, - "Disks": { - "type": "array", - "items": { - "$ref": "#/definitions/Constraints" - } - }, - "HardwareCharacteristics": { - "$ref": "#/definitions/HardwareCharacteristics" - }, - "InstanceId": { - "type": "string" - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } - }, - "Nonce": { - "type": "string" - }, - "ParentId": { - "type": "string" - }, - "Placement": { - "$ref": "#/definitions/Placement" + "Params": { + "$ref": "#/definitions/Entities" + } + } + }, + "GetMachineProviderInterfaceInfo": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "Series": { - "type": "string" + "Result": { + "$ref": "#/definitions/ProviderInterfaceInfoResults" } - }, - "additionalProperties": false, - "required": [ - "Series", - "Constraints", - "Jobs", - "Disks", - "Placement", - "ParentId", - "ContainerType", - "InstanceId", - "Nonce", - "HardwareCharacteristics", - "Addrs" - ] + } }, - "AddMachines": { + "WatchMachineRemovals": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "MachineParams": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/AddMachineParams" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "MachineParams" + "entities" ] }, - "AddMachinesResult": { + "EntitiesResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } }, - "Machine": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Machine", - "Error" + "entities" ] }, - "AddMachinesResults": { + "EntitiesResults": { "type": "object", "properties": { - "Machines": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/AddMachinesResult" + "$ref": "#/definitions/EntitiesResult" } } }, "additionalProperties": false, "required": [ - "Machines" - ] - }, - "Address": { - "type": "object", - "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "Type": { - "type": "string" - }, - "Value": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Value", - "Type", - "Scope" + "results" ] }, - "Constraints": { + "Entity": { "type": "object", "properties": { - "Count": { - "type": "integer" - }, - "Pool": { + "tag": { "type": "string" - }, - "Size": { - "type": "integer" } }, "additionalProperties": false, "required": [ - "Pool", - "Size", - "Count" + "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 }, - "HardwareCharacteristics": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Arch": { - "type": "string" - }, - "AvailabilityZone": { + "NotifyWatcherId": { "type": "string" }, - "CpuCores": { - "type": "integer" - }, - "CpuPower": { - "type": "integer" - }, - "Mem": { - "type": "integer" - }, - "RootDisk": { - "type": "integer" - }, - "Tags": { - "type": "array", - "items": { - "type": "string" - } + "error": { + "$ref": "#/definitions/Error" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] }, - "Macaroon": { + "NotifyWatchResults": { "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/NotifyWatchResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, - "Placement": { + "ProviderInterfaceInfo": { "type": "object", "properties": { - "Directive": { + "interface-name": { "type": "string" }, - "Scope": { + "mac-address": { + "type": "string" + }, + "provider-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "Scope", - "Directive" + "interface-name", + "mac-address", + "provider-id" ] }, - "Value": { + "ProviderInterfaceInfoResult": { "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" - } + "error": { + "$ref": "#/definitions/Error" }, - "tags": { + "interfaces": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/ProviderInterfaceInfo" } }, - "virt-type": { + "machine-tag": { "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" + "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 +11508,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -11955,36 +11520,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 +11558,13 @@ }, "additionalProperties": false, "required": [ - "Result" + "result" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -12008,25 +11573,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 +11600,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 +11652,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 +11670,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "HostPort": { @@ -12117,23 +11679,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 +11704,13 @@ }, "additionalProperties": false, "required": [ - "Jobs", - "Error" + "jobs" ] }, "JobsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/JobsResult" @@ -12158,29 +11719,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 +11749,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 +11890,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 +11924,13 @@ }, "additionalProperties": false, "required": [ - "MachineAddresses" + "machine-addresses" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -12413,83 +11939,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 +12008,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -12536,243 +12017,382 @@ }, "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 + }, + "MeterStatusResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "code": { + "type": "string" }, - "data": { + "error": { + "$ref": "#/definitions/Error" + }, + "info": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "code", + "info" + ] + }, + "MeterStatusResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/MeterStatusResult" } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/NotifyWatchResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] - }, - "MeterStatusResult": { + } + } + } + }, + { + "Name": "MetricsAdder", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "AddMetricBatches": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/MetricBatchParams" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + } + }, + "definitions": { + "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Error": { - "$ref": "#/definitions/Error" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "Info": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Code", - "Info", - "Error" + "message", + "code" ] }, - "MeterStatusResults": { + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/MeterStatusResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "NotifyWatchResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "Metric": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "key": { + "type": "string" }, - "NotifyWatcherId": { + "time": { + "type": "string", + "format": "date-time" + }, + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "key", + "value", + "time" ] }, - "NotifyWatchResults": { + "MetricBatch": { "type": "object", "properties": { - "Results": { + "charm-url": { + "type": "string" + }, + "created": { + "type": "string", + "format": "date-time" + }, + "metrics": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/Metric" } + }, + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "uuid", + "charm-url", + "created", + "metrics" ] }, - "caveat": { + "MetricBatchParam": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "batch": { + "$ref": "#/definitions/MetricBatch" }, - "verificationId": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "tag", + "batch" ] }, - "packet": { + "MetricBatchParams": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "batches": { + "type": "array", + "items": { + "$ref": "#/definitions/MetricBatchParam" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "batches" ] } } } }, { - "Name": "MetricsAdder", + "Name": "MetricsDebug", "Version": 2, "Schema": { "type": "object", "properties": { - "AddMetricBatches": { + "GetMetrics": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/MetricResults" + } + } + }, + "SetMeterStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/MeterStatusParams" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + } + }, + "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "Entity": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/MetricBatchParams" + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "EntityMetrics": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "metrics": { + "type": "array", + "items": { + "$ref": "#/definitions/MetricResult" + } } - } - } - }, - "definitions": { + }, + "additionalProperties": false + }, "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 +12401,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,191 +12419,113 @@ }, "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": { + "MeterStatusParam": { "type": "object", "properties": { - "Key": { + "code": { "type": "string" }, - "Time": { - "type": "string", - "format": "date-time" + "info": { + "type": "string" }, - "Value": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Key", - "Value", - "Time" + "tag", + "code", + "info" ] }, - "MetricBatch": { + "MeterStatusParams": { "type": "object", "properties": { - "CharmURL": { - "type": "string" - }, - "Created": { - "type": "string", - "format": "date-time" - }, - "Metrics": { + "statues": { "type": "array", "items": { - "$ref": "#/definitions/Metric" + "$ref": "#/definitions/MeterStatusParam" } - }, - "UUID": { - "type": "string" } }, "additionalProperties": false, "required": [ - "UUID", - "CharmURL", - "Created", - "Metrics" + "statues" ] }, - "MetricBatchParam": { + "MetricResult": { "type": "object", "properties": { - "Batch": { - "$ref": "#/definitions/MetricBatch" + "key": { + "type": "string" }, - "Tag": { + "time": { + "type": "string", + "format": "date-time" + }, + "unit": { + "type": "string" + }, + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Batch" + "time", + "key", + "value", + "unit" ] }, - "MetricBatchParams": { + "MetricResults": { "type": "object", "properties": { - "Batches": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/MetricBatchParam" + "$ref": "#/definitions/EntityMetrics" } } }, "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" + "results" ] } } } }, { - "Name": "MetricsDebug", - "Version": 2, + "Name": "MetricsManager", + "Version": 1, "Schema": { "type": "object", "properties": { - "GetMetrics": { + "CleanupOldMetrics": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/MetricResults" + "$ref": "#/definitions/ErrorResults" } } }, - "SetMeterStatus": { + "SendMetrics": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/MeterStatusParams" + "$ref": "#/definitions/Entities" }, "Result": { "$ref": "#/definitions/ErrorResults" @@ -12998,7 +12537,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -13007,62 +12546,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, - "EntityMetrics": { - "type": "object", - "properties": { - "error": { - "$ref": "#/definitions/Error" - }, - "metrics": { - "type": "array", - "items": { - "$ref": "#/definitions/MetricResult" - } - } - }, - "additionalProperties": false - }, "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 +12595,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,109 +12613,130 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "MigrationFlag", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Phase": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/PhaseResults" + } + } + }, + "Watch": { + "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" ] }, - "MeterStatusParam": { + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { "type": "object", "properties": { "code": { "type": "string" }, "info": { - "type": "string" + "$ref": "#/definitions/ErrorInfo" }, - "tag": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "tag", - "code", - "info" + "message", + "code" ] }, - "MeterStatusParams": { + "ErrorInfo": { "type": "object", "properties": { - "statues": { - "type": "array", - "items": { - "$ref": "#/definitions/MeterStatusParam" - } + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "statues" - ] + "additionalProperties": false }, - "MetricResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "key": { + "NotifyWatcherId": { "type": "string" }, - "time": { - "type": "string", - "format": "date-time" - }, - "value": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "time", - "key", - "value" + "NotifyWatcherId" ] }, - "MetricResults": { + "NotifyWatchResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/EntityMetrics" + "$ref": "#/definitions/NotifyWatchResult" } } }, @@ -13203,995 +12745,1032 @@ "results" ] }, - "caveat": { + "PhaseResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "phase": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "PhaseResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/PhaseResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "MetricsManager", + "Name": "MigrationMaster", "Version": 1, "Schema": { "type": "object", "properties": { - "CleanupOldMetrics": { + "Export": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/SerializedModel" } } }, - "SendMetrics": { + "MigrationStatus": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/MasterMigrationStatus" + } + } + }, + "MinionReports": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/MinionReports" + } + } + }, + "ModelInfo": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/MigrationModelInfo" + } + } + }, + "Prechecks": { + "type": "object" + }, + "Reap": { + "type": "object" + }, + "SetPhase": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" - }, + "$ref": "#/definitions/SetMigrationPhaseArgs" + } + } + }, + "SetStatusMessage": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMigrationStatusMessageArgs" + } + } + }, + "Watch": { + "type": "object", + "properties": { "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "WatchMinionReports": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" } } } }, "definitions": { - "Entities": { + "Error": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Entities" + "message", + "code" ] }, - "Entity": { + "ErrorInfo": { "type": "object", "properties": { - "Tag": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MasterMigrationStatus": { + "type": "object", + "properties": { + "migration-id": { + "type": "string" + }, + "phase": { "type": "string" + }, + "phase-changed-time": { + "type": "string", + "format": "date-time" + }, + "spec": { + "$ref": "#/definitions/MigrationSpec" } }, "additionalProperties": false, "required": [ - "Tag" + "spec", + "migration-id", + "phase", + "phase-changed-time" ] }, - "Error": { + "MigrationModelInfo": { "type": "object", "properties": { - "Code": { + "agent-version": { + "$ref": "#/definitions/Number" + }, + "name": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "owner-tag": { + "type": "string" }, - "Message": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "uuid", + "name", + "owner-tag", + "agent-version" ] }, - "ErrorInfo": { + "MigrationSpec": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "external-control": { + "type": "boolean" }, - "MacaroonPath": { + "model-tag": { "type": "string" + }, + "target-info": { + "$ref": "#/definitions/MigrationTargetInfo" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "model-tag", + "target-info", + "external-control" + ] }, - "ErrorResult": { + "MigrationTargetInfo": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "addrs": { + "type": "array", + "items": { + "type": "string" + } + }, + "auth-tag": { + "type": "string" + }, + "ca-cert": { + "type": "string" + }, + "controller-tag": { + "type": "string" + }, + "macaroons": { + "type": "string" + }, + "password": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error" + "controller-tag", + "addrs", + "ca-cert", + "auth-tag" ] }, - "ErrorResults": { + "MinionReports": { "type": "object", "properties": { - "Results": { + "failed": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "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": { + "NotifyWatcherId": { + "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "Number": { + "type": "object", + "properties": { + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "Major", + "Minor", + "Tag", + "Patch", + "Build" ] }, - "Macaroon": { + "SerializedModel": { "type": "object", "properties": { - "caveats": { + "bytes": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "type": "integer" } }, - "data": { + "charms": { "type": "array", "items": { - "type": "integer" + "type": "string" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "tools": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/SerializedModelTools" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "bytes", + "charms", + "tools" ] }, - "caveat": { + "SerializedModelTools": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "uri": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "version", + "uri" + ] + }, + "SetMigrationPhaseArgs": { + "type": "object", + "properties": { + "phase": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "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" ] } } } }, { - "Name": "MigrationFlag", + "Name": "MigrationMinion", "Version": 1, "Schema": { "type": "object", "properties": { - "Phase": { + "Report": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/PhaseResults" + "$ref": "#/definitions/MinionReport" } } }, "Watch": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/NotifyWatchResult" } } } }, "definitions": { - "Entities": { + "Error": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Entities" + "message", + "code" ] }, - "Entity": { + "ErrorInfo": { "type": "object", "properties": { - "Tag": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Tag" - ] + "additionalProperties": false }, - "Error": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MinionReport": { "type": "object", "properties": { - "Code": { + "migration-id": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { + "phase": { "type": "string" + }, + "success": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "migration-id", + "phase", + "success" ] }, - "ErrorInfo": { + "NotifyWatchResult": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { + "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + } + } + } + }, + { + "Name": "MigrationStatusWatcher", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Next": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/MigrationStatus" + } + } }, - "Macaroon": { + "Stop": { + "type": "object" + } + }, + "definitions": { + "MigrationStatus": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "attempt": { + "type": "integer" }, - "data": { + "migration-id": { + "type": "string" + }, + "phase": { + "type": "string" + }, + "source-api-addrs": { "type": "array", "items": { - "type": "integer" + "type": "string" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "source-ca-cert": { + "type": "string" }, - "sig": { + "target-api-addrs": { "type": "array", "items": { - "type": "integer" + "type": "string" } + }, + "target-ca-cert": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "migration-id", + "attempt", + "phase", + "source-api-addrs", + "source-ca-cert", + "target-api-addrs", + "target-ca-cert" ] + } + } + } + }, + { + "Name": "MigrationTarget", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Abort": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelArgs" + } + } }, - "NotifyWatchResult": { + "Activate": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" + "Params": { + "$ref": "#/definitions/ModelArgs" } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + } }, - "NotifyWatchResults": { + "Import": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/NotifyWatchResult" - } + "Params": { + "$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": [ - "Results" + "uuid", + "name", + "owner-tag", + "agent-version" ] }, - "PhaseResult": { + "ModelArgs": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "phase": { + "model-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "phase", - "Error" + "model-tag" ] }, - "PhaseResults": { + "Number": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/PhaseResult" - } + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "Major", + "Minor", + "Tag", + "Patch", + "Build" ] }, - "caveat": { + "SerializedModel": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "bytes": { + "type": "array", + "items": { + "type": "integer" + } }, - "location": { - "$ref": "#/definitions/packet" + "charms": { + "type": "array", + "items": { + "type": "string" + } }, - "verificationId": { - "$ref": "#/definitions/packet" + "tools": { + "type": "array", + "items": { + "$ref": "#/definitions/SerializedModelTools" + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "bytes", + "charms", + "tools" ] }, - "packet": { + "SerializedModelTools": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "uri": { + "type": "string" }, - "totalLen": { - "type": "integer" + "version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "version", + "uri" ] } } } }, { - "Name": "MigrationMaster", + "Name": "ModelConfig", "Version": 1, "Schema": { "type": "object", "properties": { - "Export": { + "ModelDefaults": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/SerializedModel" + "$ref": "#/definitions/ModelDefaultsResult" } } }, - "GetMigrationStatus": { + "ModelGet": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/FullMigrationStatus" + "$ref": "#/definitions/ModelConfigResults" } } }, - "SetPhase": { + "ModelSet": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SetMigrationPhaseArgs" + "$ref": "#/definitions/ModelSet" } } }, - "Watch": { + "ModelUnset": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" + "Params": { + "$ref": "#/definitions/ModelUnset" } } - } - }, - "definitions": { - "Error": { + }, + "SetModelDefaults": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Params": { + "$ref": "#/definitions/SetModelDefaults" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "UnsetModelDefaults": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/UnsetModelDefaults" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false - }, - "FullMigrationStatus": { + } + } + }, + "definitions": { + "ConfigValue": { "type": "object", "properties": { - "attempt": { - "type": "integer" - }, - "phase": { + "source": { "type": "string" }, - "spec": { - "$ref": "#/definitions/ModelMigrationSpec" + "value": { + "type": "object", + "additionalProperties": true } }, "additionalProperties": false, "required": [ - "spec", - "attempt", - "phase" + "value", + "source" ] }, - "Macaroon": { + "Error": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "code": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "ModelMigrationSpec": { - "type": "object", - "properties": { - "model-tag": { + "message": { "type": "string" - }, - "target-info": { - "$ref": "#/definitions/ModelMigrationTargetInfo" } }, "additionalProperties": false, "required": [ - "model-tag", - "target-info" + "message", + "code" ] }, - "ModelMigrationTargetInfo": { + "ErrorInfo": { "type": "object", "properties": { - "addrs": { - "type": "array", - "items": { - "type": "string" - } - }, - "auth-tag": { - "type": "string" - }, - "ca-cert": { - "type": "string" - }, - "controller-tag": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "password": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "controller-tag", - "addrs", - "ca-cert", - "auth-tag", - "password" - ] + "additionalProperties": false }, - "NotifyWatchResult": { + "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" } }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + "additionalProperties": false }, - "SerializedModel": { + "ErrorResults": { "type": "object", "properties": { - "bytes": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "bytes" + "results" ] }, - "SetMigrationPhaseArgs": { + "Macaroon": { "type": "object", - "properties": { - "phase": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "phase" - ] + "additionalProperties": false }, - "caveat": { + "ModelConfigResults": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ConfigValue" + } + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "config" ] }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "MigrationMinion", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Watch": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - } - }, - "definitions": { - "Error": { + "ModelDefaultValues": { "type": "object", "properties": { - "Code": { + "cloud-region": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { + "cloud-tag": { "type": "string" + }, + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "config" ] }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" - } - }, - "additionalProperties": false - }, - "Macaroon": { + "ModelDefaults": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "controller": { + "type": "object", + "additionalProperties": true }, - "location": { - "$ref": "#/definitions/packet" + "default": { + "type": "object", + "additionalProperties": true }, - "sig": { + "regions": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/RegionDefaults" } } }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, - "NotifyWatchResult": { + "ModelDefaultsResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ModelDefaults" + } + } } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "config" ] }, - "caveat": { + "ModelSet": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "config" ] }, - "packet": { + "ModelUnset": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "keys": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "keys" ] - } - } - } - }, - { - "Name": "MigrationStatusWatcher", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Next": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/MigrationStatus" - } - } }, - "Stop": { - "type": "object" - } - }, - "definitions": { - "MigrationStatus": { + "ModelUnsetKeys": { "type": "object", "properties": { - "attempt": { - "type": "integer" - }, - "phase": { + "cloud-region": { "type": "string" }, - "source-api-addrs": { - "type": "array", - "items": { - "type": "string" - } - }, - "source-ca-cert": { + "cloud-tag": { "type": "string" }, - "target-api-addrs": { + "keys": { "type": "array", "items": { "type": "string" } - }, - "target-ca-cert": { - "type": "string" } }, "additionalProperties": false, "required": [ - "attempt", - "phase", - "source-api-addrs", - "source-ca-cert", - "target-api-addrs", - "target-ca-cert" + "keys" ] - } - } - } - }, - { - "Name": "MigrationTarget", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Abort": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModelArgs" - } - } }, - "Activate": { + "RegionDefaults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ModelArgs" + "region-name": { + "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true } - } + }, + "additionalProperties": false, + "required": [ + "region-name", + "value" + ] }, - "Import": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SerializedModel" - } - } - } - }, - "definitions": { - "ModelArgs": { + "SetModelDefaults": { "type": "object", "properties": { - "model-tag": { - "type": "string" + "config": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelDefaultValues" + } } }, "additionalProperties": false, "required": [ - "model-tag" + "config" ] }, - "SerializedModel": { + "UnsetModelDefaults": { "type": "object", "properties": { - "bytes": { + "keys": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ModelUnsetKeys" } } }, "additionalProperties": false, "required": [ - "bytes" + "keys" ] } } @@ -14203,25 +13782,50 @@ "Schema": { "type": "object", "properties": { - "ConfigSkeleton": { + "CreateModel": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ModelSkeletonConfigArgs" + "$ref": "#/definitions/ModelCreateArgs" }, "Result": { - "$ref": "#/definitions/ModelConfigResult" + "$ref": "#/definitions/ModelInfo" } } }, - "CreateModel": { + "DestroyModel": { + "type": "object" + }, + "DestroyModels": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ModelCreateArgs" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/Model" + "$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" } } }, @@ -14263,7 +13867,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -14272,25 +13876,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 +13903,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 +13955,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,97 +13973,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": { - "type": "array", - "items": { - "type": "integer" - } + "availability-zone": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" + "cores": { + "type": "integer" }, - "location": { - "$ref": "#/definitions/packet" + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" }, - "sig": { + "tags": { "type": "array", "items": { - "type": "integer" + "type": "string" + } + } + }, + "additionalProperties": false + }, + "MapResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "result" ] }, - "Model": { + "MapResults": { "type": "object", "properties": { - "Name": { - "type": "string" - }, - "OwnerTag": { - "type": "string" - }, - "UUID": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/MapResult" + } } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "OwnerTag" + "results" ] }, - "ModelConfigResult": { + "Model": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Config" + "name", + "uuid", + "owner-tag" ] }, "ModelCreateArgs": { "type": "object", "properties": { - "Account": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "cloud-tag": { + "type": "string" }, - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -14472,66 +14081,87 @@ } } }, - "OwnerTag": { + "credential": { + "type": "string" + }, + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "region": { "type": "string" } }, "additionalProperties": false, "required": [ - "OwnerTag", - "Account", - "Config" + "name", + "owner-tag" ] }, "ModelInfo": { "type": "object", "properties": { - "Cloud": { + "cloud": { "type": "string" }, - "DefaultSeries": { + "cloud-credential-tag": { "type": "string" }, - "Life": { + "cloud-region": { "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", + "owner-tag", + "life", + "status", + "users", + "machines" ] }, "ModelInfoResult": { @@ -14561,20 +14191,19 @@ "results" ] }, - "ModelSkeletonConfigArgs": { + "ModelMachineInfo": { "type": "object", "properties": { - "Provider": { - "type": "string" + "hardware": { + "$ref": "#/definitions/MachineHardware" }, - "Region": { + "id": { "type": "string" } }, "additionalProperties": false, "required": [ - "Provider", - "Region" + "id" ] }, "ModelUserInfo": { @@ -14583,10 +14212,10 @@ "access": { "type": "string" }, - "displayname": { + "display-name": { "type": "string" }, - "lastconnection": { + "last-connection": { "type": "string", "format": "date-time" }, @@ -14597,8 +14226,8 @@ "additionalProperties": false, "required": [ "user", - "displayname", - "lastconnection", + "display-name", + "last-connection", "access" ] }, @@ -14644,24 +14273,24 @@ "UserModel": { "type": "object", "properties": { - "LastConnection": { + "last-connection": { "type": "string", "format": "date-time" }, - "Model": { + "model": { "$ref": "#/definitions/Model" } }, "additionalProperties": false, "required": [ - "Model", - "LastConnection" + "model", + "last-connection" ] }, "UserModelList": { "type": "object", "properties": { - "UserModels": { + "user-models": { "type": "array", "items": { "$ref": "#/definitions/UserModel" @@ -14670,47 +14299,7 @@ }, "additionalProperties": false, "required": [ - "UserModels" - ] - }, - "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" + "user-models" ] } } @@ -14806,6 +14395,14 @@ } } }, + "ControllerConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ControllerConfigResult" + } + } + }, "DistributionGroup": { "type": "object", "properties": { @@ -14891,6 +14488,17 @@ } } }, + "MarkMachinesForRemoval": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "ModelConfig": { "type": "object", "properties": { @@ -15117,7 +14725,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -15129,30 +14737,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 +14786,7 @@ "BytesResult": { "type": "object", "properties": { - "Result": { + "result": { "type": "array", "items": { "type": "integer" @@ -15187,7 +14795,7 @@ }, "additionalProperties": false, "required": [ - "Result" + "result" ] }, "CloudImageMetadata": { @@ -15196,7 +14804,7 @@ "arch": { "type": "string" }, - "image_id": { + "image-id": { "type": "string" }, "priority": { @@ -15205,10 +14813,10 @@ "region": { "type": "string" }, - "root_storage_size": { + "root-storage-size": { "type": "integer" }, - "root_storage_type": { + "root-storage-type": { "type": "string" }, "series": { @@ -15223,13 +14831,13 @@ "version": { "type": "string" }, - "virt_type": { + "virt-type": { "type": "string" } }, "additionalProperties": false, "required": [ - "image_id", + "image-id", "region", "version", "series", @@ -15241,23 +14849,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 +14873,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 +14926,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 +14974,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "DistributionGroupResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/DistributionGroupResult" @@ -15369,13 +14989,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -15384,41 +15004,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 +15047,13 @@ }, "additionalProperties": false, "required": [ - "Changes" + "changes" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -15442,50 +15062,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 +15114,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 +15132,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 +15178,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 +15217,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 +15256,7 @@ } } }, - "Volumes": { + "volumes": { "type": "array", "items": { "$ref": "#/definitions/Volume" @@ -15649,19 +15265,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 +15286,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 +15316,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 +15354,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 +15372,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Info" + "info" ] }, "MachineNetworkConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachineNetworkConfigResult" @@ -15806,13 +15387,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -15824,111 +15405,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 +15542,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 +15562,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 +15591,7 @@ } } }, - "Tags": { + "tags": { "type": "object", "patternProperties": { ".*": { @@ -16010,7 +15599,7 @@ } } }, - "Volumes": { + "volumes": { "type": "array", "items": { "$ref": "#/definitions/VolumeParams" @@ -16019,37 +15608,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 +15641,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -16073,7 +15656,7 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Settings": { @@ -16103,7 +15686,7 @@ "StatusResult": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -16112,41 +15695,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 +15737,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 +15767,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 +15818,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Tools": { @@ -16272,13 +15847,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 +15862,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 +15878,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": { @@ -16371,26 +15945,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 +15976,10 @@ "VolumeAttachmentParams": { "type": "object", "properties": { - "instanceid": { + "instance-id": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, "provider": { @@ -16414,24 +15988,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 +16014,13 @@ "size": { "type": "integer" }, - "volumeid": { + "volume-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumeid", + "volume-id", "size", "persistent" ] @@ -16480,13 +16054,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "size", "provider" ] @@ -16494,23 +16068,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 +16093,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 +16132,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -16607,47 +16141,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 +16189,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 +16218,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 +16276,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 +16334,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -16883,47 +16343,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 +16392,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 +16410,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 +16455,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,75 +16481,42 @@ "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": { - "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" - } + }, + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false }, "RelationUnitsChange": { "type": "object", "properties": { - "Changed": { + "changed": { "type": "object", "patternProperties": { ".*": { @@ -17174,7 +16524,7 @@ } } }, - "Departed": { + "departed": { "type": "array", "items": { "type": "string" @@ -17183,80 +16533,38 @@ }, "additionalProperties": false, "required": [ - "Changed", - "Departed" + "changed" ] }, "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" ] }, "UnitSettings": { "type": "object", "properties": { - "Version": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "Version" - ] - }, - "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": { + "version": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "version" ] } } @@ -17307,7 +16615,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17316,47 +16624,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 +16672,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 +16701,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 +16756,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" ] } } @@ -17584,7 +16814,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17593,47 +16823,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" } }, @@ -17641,40 +16871,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" - ] + "additionalProperties": false }, "SSHAddressResult": { "type": "object", @@ -17744,46 +16941,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 +16978,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17830,47 +16987,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 +17036,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,70 +17054,37 @@ }, "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": { + "claims": { "type": "array", "items": { "$ref": "#/definitions/SingularClaim" @@ -17972,47 +17093,7 @@ }, "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" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "claims" ] } } @@ -18048,16 +17129,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 +17147,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 +17164,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 +17201,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 +17219,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ListSpacesResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/Space" @@ -18156,56 +17234,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 +17259,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 +17293,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 +17322,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 +17340,7 @@ }, { "Name": "Storage", - "Version": 2, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -18430,7 +17423,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -18439,25 +17432,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 +17459,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 +17511,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 +17529,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "FilesystemAttachmentInfo": { "type": "object", "properties": { - "mountpoint": { + "mount-point": { "type": "string" }, "read-only": { @@ -18558,13 +17547,13 @@ "FilesystemDetails": { "type": "object", "properties": { - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "info": { "$ref": "#/definitions/FilesystemInfo" }, - "machineattachments": { + "machine-attachments": { "type": "object", "patternProperties": { ".*": { @@ -18578,13 +17567,13 @@ "storage": { "$ref": "#/definitions/StorageDetails" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "info", "status" ] @@ -18643,7 +17632,7 @@ "FilesystemInfo": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, "size": { @@ -18652,51 +17641,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 +17665,7 @@ "additionalProperties": false, "required": [ "unit", - "StorageName", + "name", "storage" ] }, @@ -18719,49 +17675,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 +17721,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 +17872,7 @@ "error": { "$ref": "#/definitions/Error" }, - "storagepools": { + "storage-pools": { "type": "array", "items": { "$ref": "#/definitions/StoragePool" @@ -18960,13 +17911,13 @@ "VolumeAttachmentInfo": { "type": "object", "properties": { - "busaddress": { + "bus-address": { "type": "string" }, - "devicelink": { + "device-link": { "type": "string" }, - "devicename": { + "device-name": { "type": "string" }, "read-only": { @@ -18981,7 +17932,7 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "machineattachments": { + "machine-attachments": { "type": "object", "patternProperties": { ".*": { @@ -18995,13 +17946,13 @@ "storage": { "$ref": "#/definitions/StorageDetails" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info", "status" ] @@ -19060,7 +18011,7 @@ "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -19069,63 +18020,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 +18128,6 @@ } } }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, "Remove": { "type": "object", "properties": { @@ -19401,14 +18304,6 @@ } } }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, "WatchMachines": { "type": "object", "properties": { @@ -19525,7 +18420,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -19534,25 +18429,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 +18456,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 +18508,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 +18526,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 +18583,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 +18607,8 @@ }, "additionalProperties": false, "required": [ - "filesystemtag", - "machinetag", + "filesystem-tag", + "machine-tag", "provider" ] }, @@ -19777,7 +18669,7 @@ "FilesystemAttachments": { "type": "object", "properties": { - "filesystemattachments": { + "filesystem-attachments": { "type": "array", "items": { "$ref": "#/definitions/FilesystemAttachment" @@ -19786,13 +18678,13 @@ }, "additionalProperties": false, "required": [ - "filesystemattachments" + "filesystem-attachments" ] }, "FilesystemInfo": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, "size": { @@ -19801,7 +18693,7 @@ }, "additionalProperties": false, "required": [ - "filesystemid", + "filesystem-id", "size" ] }, @@ -19820,7 +18712,7 @@ } } }, - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "provider": { @@ -19837,13 +18729,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "size", "provider" ] @@ -19920,23 +18812,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 +18836,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,79 +18877,59 @@ "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageId" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "MachineStorageIdsWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" - ] - }, - "MachineStorageIdsWatchResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineStorageIdsWatchResult" - } + }, + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "watcher-id", + "changes" ] }, - "ModelConfigResult": { + "MachineStorageIdsWatchResults": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/MachineStorageIdsWatchResult" } } }, "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 +18938,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -20115,29 +18953,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 +18983,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 +19019,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Volume": { @@ -20193,13 +19028,13 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info" ] }, @@ -20209,30 +19044,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 +19079,10 @@ "VolumeAttachmentParams": { "type": "object", "properties": { - "instanceid": { + "instance-id": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, "provider": { @@ -20256,17 +19091,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 +19162,7 @@ "VolumeAttachments": { "type": "object", "properties": { - "volumeattachments": { + "volume-attachments": { "type": "array", "items": { "$ref": "#/definitions/VolumeAttachment" @@ -20336,13 +19171,13 @@ }, "additionalProperties": false, "required": [ - "volumeattachments" + "volume-attachments" ] }, "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -20351,13 +19186,13 @@ "size": { "type": "integer" }, - "volumeid": { + "volume-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumeid", + "volume-id", "size", "persistent" ] @@ -20391,13 +19226,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "size", "provider" ] @@ -20470,46 +19305,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 +19331,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 +19361,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 +19436,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 +19454,13 @@ }, "additionalProperties": false, "required": [ - "SpaceTag" + "space-tag" ] }, "AddSubnetsParams": { "type": "object", "properties": { - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/AddSubnetParams" @@ -20749,35 +19469,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 +19506,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 +19524,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ListSubnetsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -20822,66 +19539,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 +19573,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 +19606,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 +19628,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 +19656,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 +19725,7 @@ "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -21104,50 +19734,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 +19786,35 @@ "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" } } }, - "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": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "additionalProperties": false, + "required": [ + "results" ] }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -21232,29 +19826,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 +19856,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -21278,91 +19871,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 +19961,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -21418,25 +19970,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 +19997,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 +20049,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 +20067,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 +20086,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 +20179,6 @@ } } }, - "ApplicationOwner": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, "ApplicationStatus": { "type": "object", "properties": { @@ -22196,6 +20659,17 @@ } } }, + "SetWorkloadVersion": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/EntityWorkloadVersions" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "StorageAttachmentLife": { "type": "object", "properties": { @@ -22376,13 +20850,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 +20879,7 @@ }, "additionalProperties": false, "required": [ - "Servers" + "servers" ] }, "Action": { @@ -22429,7 +20914,7 @@ "ActionExecutionResult": { "type": "object", "properties": { - "actiontag": { + "action-tag": { "type": "string" }, "message": { @@ -22450,7 +20935,7 @@ }, "additionalProperties": false, "required": [ - "actiontag", + "action-tag", "status" ] }, @@ -22520,36 +21005,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 +21045,14 @@ }, "additionalProperties": false, "required": [ - "Application", - "Units", - "Error" + "application", + "units" ] }, "ApplicationStatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ApplicationStatusResult" @@ -22577,29 +21061,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 +21091,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "BytesResult": { "type": "object", "properties": { - "Result": { + "result": { "type": "array", "items": { "type": "integer" @@ -22623,25 +21106,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 +21165,16 @@ }, "additionalProperties": false, "required": [ - "URLs" + "urls" ] }, "ConfigSettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22671,14 +21186,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Settings" + "settings" ] }, "ConfigSettingsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ConfigSettingsResult" @@ -22687,29 +21201,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 +21232,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesCharmURL": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityCharmURL" @@ -22733,13 +21247,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesPortRanges": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityPortRange" @@ -22748,117 +21262,148 @@ }, "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": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "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" ] }, - "EntityStatusArgs": { + "EntityWorkloadVersions": { "type": "object", "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityWorkloadVersion" } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { - "type": "string" } }, "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 +21412,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 +21430,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetLeadershipSettingsBulkResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/GetLeadershipSettingsResult" @@ -22903,16 +21445,16 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetLeadershipSettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22923,8 +21465,7 @@ }, "additionalProperties": false, "required": [ - "Settings", - "Error" + "settings" ] }, "HostPort": { @@ -22933,36 +21474,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 +21511,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 +21541,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 +21583,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Ports" + "ports" ] }, "MachinePortsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachinePortsResult" @@ -23093,13 +21598,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "MergeLeadershipSettingsBulkParams": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/MergeLeadershipSettingsParam" @@ -23108,16 +21613,16 @@ }, "additionalProperties": false, "required": [ - "Params" + "params" ] }, "MergeLeadershipSettingsParam": { "type": "object", "properties": { - "ApplicationTag": { + "application-tag": { "type": "string" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23128,34 +21633,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 +21668,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 +21748,13 @@ }, "additionalProperties": false, "required": [ - "Batches" + "batches" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -23262,137 +21766,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 +21903,33 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "PortRange": { "type": "object", "properties": { - "FromPort": { + "from-port": { "type": "integer" }, - "Protocol": { - "type": "string" - }, - "ToPort": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "FromPort", - "ToPort", - "Protocol" - ] - }, - "Relation": { - "type": "object", - "properties": { - "Interface": { + "protocol": { "type": "string" }, - "Limit": { + "to-port": { "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 +21938,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 +21980,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 +22031,16 @@ }, "additionalProperties": false, "required": [ - "RelationUnitPairs" + "relation-unit-pairs" ] }, "RelationUnitSettings": { "type": "object", "properties": { - "Relation": { + "relation": { "type": "string" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23579,21 +22048,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 +22071,13 @@ }, "additionalProperties": false, "required": [ - "RelationUnits" + "relation-units" ] }, "RelationUnitsChange": { "type": "object", "properties": { - "Changed": { + "changed": { "type": "object", "patternProperties": { ".*": { @@ -23616,7 +22085,7 @@ } } }, - "Departed": { + "departed": { "type": "array", "items": { "type": "string" @@ -23625,14 +22094,13 @@ }, "additionalProperties": false, "required": [ - "Changed", - "Departed" + "changed" ] }, "RelationUnitsSettings": { "type": "object", "properties": { - "RelationUnits": { + "relation-units": { "type": "array", "items": { "$ref": "#/definitions/RelationUnitSettings" @@ -23641,33 +22109,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 +22143,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 +22173,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -23722,16 +22188,16 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "SettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23742,14 +22208,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Settings" + "settings" ] }, "SettingsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/SettingsResult" @@ -23758,13 +22223,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StatusResult": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -23773,41 +22238,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 +22280,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StorageAddParams": { "type": "object", "properties": { - "StorageName": { + "name": { "type": "string" }, "storage": { @@ -23835,56 +22299,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 +22423,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 +22453,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 +22481,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 +22511,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 +22541,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 +22577,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 +22611,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Info" + "info" ] }, "UnitNetworkConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/UnitNetworkConfigResult" @@ -24176,74 +22626,34 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "UnitSettings": { "type": "object", "properties": { - "Version": { + "version": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Version" - ] - }, - "UnitsNetworkConfig": { - "type": "object", - "properties": { - "Args": { - "type": "array", - "items": { - "$ref": "#/definitions/UnitNetworkConfig" - } - } - }, - "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" + "version" ] }, - "packet": { + "UnitsNetworkConfig": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "args": { + "type": "array", + "items": { + "$ref": "#/definitions/UnitNetworkConfig" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "args" ] } } @@ -24324,7 +22734,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -24333,13 +22743,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesVersion": { "type": "object", "properties": { - "AgentTools": { + "agent-tools": { "type": "array", "items": { "$ref": "#/definitions/EntityVersion" @@ -24348,63 +22758,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 +22823,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 +22841,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 +22875,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Number": { @@ -24559,13 +22932,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 +22947,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 +22963,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 +23002,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" ] } } @@ -24730,6 +23058,17 @@ } } }, + "RemoveUser": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "SetPassword": { "type": "object", "properties": { @@ -24760,18 +23099,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 +23109,7 @@ "additionalProperties": false, "required": [ "username", - "display-name", - "shared-model-tags" + "display-name" ] }, "AddUserResult": { @@ -24834,7 +23163,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -24843,41 +23172,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 +23215,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 +23252,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,45 +23270,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 }, "MacaroonResult": { "type": "object", @@ -25014,6 +23307,9 @@ "UserInfo": { "type": "object", "properties": { + "access": { + "type": "string" + }, "created-by": { "type": "string" }, @@ -25039,6 +23335,7 @@ "required": [ "username", "display-name", + "access", "created-by", "date-created", "disabled" @@ -25089,46 +23386,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 +23412,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 +23442,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" ] } } } } ] -