X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fclient%2Fschemas.json;h=cdbe0e275ca82cdfb5a3b204342372435fea5e91;hb=173b900fcd95b2436af55df2618302146f4a2f40;hp=9edb1fedbe0af0973a23183ac0d0a3749f1a0ef8;hpb=561a68b42d847d63606cd73a9bdf129590538a1b;p=osm%2FN2VC.git diff --git a/juju/client/schemas.json b/juju/client/schemas.json index 9edb1fe..cdbe0e2 100644 --- a/juju/client/schemas.json +++ b/juju/client/schemas.json @@ -1,7 +1,7 @@ [ { "Name": "Action", - "Version": 1, + "Version": 2, "Schema": { "type": "object", "properties": { @@ -16,6 +16,17 @@ } } }, + "ApplicationsCharmsActions": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ApplicationsCharmActionsResults" + } + } + }, "Cancel": { "type": "object", "properties": { @@ -125,17 +136,6 @@ "$ref": "#/definitions/ActionResults" } } - }, - "ServicesCharmActions": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ServicesCharmActionsResults" - } - } } }, "definitions": { @@ -219,6 +219,28 @@ }, "additionalProperties": false }, + "ActionSpec": { + "type": "object", + "properties": { + "description": { + "type": "string" + }, + "params": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "description", + "params" + ] + }, "Actions": { "type": "object", "properties": { @@ -291,10 +313,42 @@ }, "additionalProperties": false }, + "ApplicationCharmActionsResult": { + "type": "object", + "properties": { + "actions": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ActionSpec" + } + } + }, + "application-tag": { + "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ApplicationsCharmActionsResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ApplicationCharmActionsResult" + } + } + }, + "additionalProperties": false + }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -303,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" } }, @@ -398,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": { - "Commands": { - "type": "string" - }, - "Machines": { + "applications": { "type": "array", "items": { "type": "string" } }, - "Services": { + "commands": { + "type": "string" + }, + "machines": { "type": "array", "items": { "type": "string" } }, - "Timeout": { + "timeout": { "type": "integer" }, - "Units": { + "units": { "type": "array", "items": { "type": "string" @@ -463,439 +484,200 @@ }, "additionalProperties": false, "required": [ - "Commands", - "Timeout", - "Machines", - "Services", - "Units" + "commands", + "timeout" ] - }, - "ServiceCharmActionsResult": { + } + } + } + }, + { + "Name": "Agent", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "ClearReboot": { "type": "object", "properties": { - "actions": { - "$ref": "#/definitions/Actions" - }, - "error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/Entities" }, - "servicetag": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false + } }, - "ServicesCharmActionsResults": { + "ControllerConfig": { "type": "object", "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/ServiceCharmActionsResult" - } + "Result": { + "$ref": "#/definitions/ControllerConfigResult" } - }, - "additionalProperties": false + } }, - "caveat": { + "GetEntities": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/AgentGetEntitiesResults" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "IsMaster": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/IsMasterResult" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "Addresser", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "CanDeallocateAddresses": { + } + }, + "ModelConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResult" + } + } + }, + "SetPasswords": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/EntityPasswords" + }, "Result": { - "$ref": "#/definitions/BoolResult" + "$ref": "#/definitions/ErrorResults" } } }, - "CleanupIPAddresses": { + "StateServingInfo": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/StateServingInfo" } } }, - "WatchIPAddresses": { + "WatchForModelConfigChanges": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/EntitiesWatchResult" + "$ref": "#/definitions/NotifyWatchResult" } } } }, "definitions": { - "BoolResult": { + "AgentGetEntitiesResult": { "type": "object", "properties": { - "Error": { + "container-type": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" }, - "Result": { - "type": "boolean" + "jobs": { + "type": "array", + "items": { + "type": "string" + } + }, + "life": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "life", + "jobs", + "container-type" ] }, - "EntitiesWatchResult": { + "AgentGetEntitiesResults": { "type": "object", "properties": { - "Changes": { + "entities": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/AgentGetEntitiesResult" } - }, - "EntityWatcherId": { - "type": "string" - }, - "Error": { - "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "EntityWatcherId", - "Changes", - "Error" + "entities" ] }, - "Error": { + "ControllerConfigResult": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "config" ] }, - "ErrorInfo": { + "Entities": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "entities" + ] }, - "ErrorResult": { + "Entity": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error" + "tag" ] }, - "Macaroon": { + "EntityPassword": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "password": { + "type": "string" }, - "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": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "GetEntities": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/AgentGetEntitiesResults" - } - } - }, - "IsMaster": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/IsMasterResult" - } - } - }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, - "SetPasswords": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/EntityPasswords" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "StateServingInfo": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StateServingInfo" - } - } - }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - } - }, - "definitions": { - "AgentGetEntitiesResult": { - "type": "object", - "properties": { - "ContainerType": { - "type": "string" - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } - }, - "Life": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Life", - "Jobs", - "ContainerType", - "Error" - ] - }, - "AgentGetEntitiesResults": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/AgentGetEntitiesResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "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" - ] - }, - "EntityPassword": { - "type": "object", - "properties": { - "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" @@ -904,35 +686,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" } }, @@ -941,19 +723,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" @@ -962,62 +741,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": { ".*": { @@ -1029,99 +775,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" ] } } @@ -1161,7 +866,7 @@ "AllWatcherNextResults": { "type": "object", "properties": { - "Deltas": { + "deltas": { "type": "array", "items": { "$ref": "#/definitions/Delta" @@ -1170,24 +875,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" ] } } @@ -1215,7 +920,7 @@ "AllWatcherNextResults": { "type": "object", "properties": { - "Deltas": { + "deltas": { "type": "array", "items": { "$ref": "#/definitions/Delta" @@ -1224,24 +929,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" ] } } @@ -1280,7 +985,7 @@ "AnnotationsGetResult": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "object", "patternProperties": { ".*": { @@ -1288,24 +993,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" @@ -1314,13 +1018,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "AnnotationsSet": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "array", "items": { "$ref": "#/definitions/EntityAnnotations" @@ -1329,13 +1033,13 @@ }, "additionalProperties": false, "required": [ - "Annotations" + "annotations" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -1344,25 +1048,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": { ".*": { @@ -1370,42 +1074,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" } }, @@ -1414,19 +1118,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" @@ -1435,585 +1136,716 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "Application", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "AddRelation": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/AddRelation" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "Result": { + "$ref": "#/definitions/AddRelationResults" } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + } }, - "caveat": { + "AddUnits": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/AddApplicationUnits" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/AddApplicationUnitsResults" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "CharmRelations": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "Params": { + "$ref": "#/definitions/ApplicationCharmRelations" }, - "start": { - "type": "integer" + "Result": { + "$ref": "#/definitions/ApplicationCharmRelationsResults" + } + } + }, + "Deploy": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationsDeploy" }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "Backups", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Create": { + } + }, + "Destroy": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/BackupsCreateArgs" + "$ref": "#/definitions/ApplicationDestroy" + } + } + }, + "DestroyRelation": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/DestroyRelation" + } + } + }, + "DestroyUnits": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/DestroyApplicationUnits" + } + } + }, + "Expose": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationExpose" + } + } + }, + "Get": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationGet" }, "Result": { - "$ref": "#/definitions/BackupsMetadataResult" + "$ref": "#/definitions/ApplicationGetResults" } } }, - "FinishRestore": { - "type": "object" + "GetCharmURL": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationGet" + }, + "Result": { + "$ref": "#/definitions/StringResult" + } + } }, - "Info": { + "GetConstraints": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/BackupsInfoArgs" + "$ref": "#/definitions/GetApplicationConstraints" }, "Result": { - "$ref": "#/definitions/BackupsMetadataResult" + "$ref": "#/definitions/GetConstraintsResults" } } }, - "List": { + "Set": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/BackupsListArgs" + "$ref": "#/definitions/ApplicationSet" + } + } + }, + "SetCharm": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationSetCharm" + } + } + }, + "SetConstraints": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetConstraints" + } + } + }, + "SetMetricCredentials": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationMetricCredentials" }, "Result": { - "$ref": "#/definitions/BackupsListResult" + "$ref": "#/definitions/ErrorResults" } } }, - "PrepareRestore": { - "type": "object" + "Unexpose": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationUnexpose" + } + } }, - "Remove": { + "Unset": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/BackupsRemoveArgs" + "$ref": "#/definitions/ApplicationUnset" } } }, - "Restore": { + "Update": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/RestoreArgs" + "$ref": "#/definitions/ApplicationUpdate" } } } }, "definitions": { - "BackupsCreateArgs": { + "AddApplicationUnits": { "type": "object", "properties": { - "Notes": { + "application": { "type": "string" + }, + "num-units": { + "type": "integer" + }, + "placement": { + "type": "array", + "items": { + "$ref": "#/definitions/Placement" + } } }, "additionalProperties": false, "required": [ - "Notes" + "application", + "num-units", + "placement" ] }, - "BackupsInfoArgs": { + "AddApplicationUnitsResults": { "type": "object", "properties": { - "ID": { - "type": "string" + "units": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "ID" + "units" ] }, - "BackupsListArgs": { - "type": "object", - "additionalProperties": false - }, - "BackupsListResult": { + "AddRelation": { "type": "object", "properties": { - "List": { + "endpoints": { "type": "array", "items": { - "$ref": "#/definitions/BackupsMetadataResult" + "type": "string" } } }, "additionalProperties": false, "required": [ - "List" + "endpoints" ] }, - "BackupsMetadataResult": { + "AddRelationResults": { "type": "object", "properties": { - "CACert": { - "type": "string" - }, - "CAPrivateKey": { - "type": "string" - }, - "Checksum": { - "type": "string" - }, - "ChecksumFormat": { - "type": "string" - }, - "Finished": { - "type": "string", - "format": "date-time" - }, - "Hostname": { - "type": "string" - }, - "ID": { - "type": "string" - }, - "Machine": { - "type": "string" - }, - "Model": { - "type": "string" - }, - "Notes": { - "type": "string" - }, - "Size": { - "type": "integer" - }, - "Started": { - "type": "string", - "format": "date-time" - }, - "Stored": { - "type": "string", - "format": "date-time" - }, - "Version": { - "$ref": "#/definitions/Number" + "endpoints": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } } }, "additionalProperties": false, "required": [ - "ID", - "Checksum", - "ChecksumFormat", - "Size", - "Stored", - "Started", - "Finished", - "Notes", - "Model", - "Machine", - "Hostname", - "Version", - "CACert", - "CAPrivateKey" + "endpoints" ] }, - "BackupsRemoveArgs": { + "ApplicationCharmRelations": { "type": "object", "properties": { - "ID": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "ID" + "application" ] }, - "Number": { + "ApplicationCharmRelationsResults": { "type": "object", "properties": { - "Build": { - "type": "integer" + "charm-relations": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "charm-relations" + ] + }, + "ApplicationDeploy": { + "type": "object", + "properties": { + "application": { + "type": "string" }, - "Major": { - "type": "integer" + "channel": { + "type": "string" }, - "Minor": { - "type": "integer" + "charm-url": { + "type": "string" }, - "Patch": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "config-yaml": { + "type": "string" + }, + "constraints": { + "$ref": "#/definitions/Value" + }, + "endpoint-bindings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "num-units": { "type": "integer" }, - "Tag": { + "placement": { + "type": "array", + "items": { + "$ref": "#/definitions/Placement" + } + }, + "resources": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "series": { "type": "string" + }, + "storage": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/Constraints" + } + } } }, "additionalProperties": false, "required": [ - "Major", - "Minor", - "Tag", - "Patch", - "Build" + "application", + "series", + "charm-url", + "channel", + "num-units", + "config-yaml", + "constraints" ] }, - "RestoreArgs": { + "ApplicationDestroy": { "type": "object", "properties": { - "BackupId": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "BackupId" + "application" ] - } - } - } - }, - { - "Name": "Block", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "List": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/BlockResults" - } - } }, - "SwitchBlockOff": { + "ApplicationExpose": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/BlockSwitchParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResult" + "application": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "application" + ] }, - "SwitchBlockOn": { + "ApplicationGet": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/BlockSwitchParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResult" + "application": { + "type": "string" } - } - } - }, - "definitions": { - "Block": { + }, + "additionalProperties": false, + "required": [ + "application" + ] + }, + "ApplicationGetResults": { "type": "object", "properties": { - "id": { + "application": { "type": "string" }, - "message": { + "charm": { "type": "string" }, - "tag": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } }, - "type": { - "type": "string" + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "id", - "tag", - "type" + "application", + "charm", + "config", + "constraints" ] }, - "BlockResult": { + "ApplicationMetricCredential": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" + "application": { + "type": "string" }, - "result": { - "$ref": "#/definitions/Block" + "metrics-credentials": { + "type": "array", + "items": { + "type": "integer" + } } }, "additionalProperties": false, "required": [ - "result" + "application", + "metrics-credentials" ] }, - "BlockResults": { + "ApplicationMetricCredentials": { "type": "object", "properties": { - "results": { + "creds": { "type": "array", "items": { - "$ref": "#/definitions/BlockResult" + "$ref": "#/definitions/ApplicationMetricCredential" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "creds" + ] }, - "BlockSwitchParams": { + "ApplicationSet": { "type": "object", "properties": { - "message": { + "application": { "type": "string" }, - "type": { - "type": "string" + "options": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } } }, "additionalProperties": false, "required": [ - "type" + "application", + "options" ] }, - "Error": { + "ApplicationSetCharm": { "type": "object", "properties": { - "Code": { + "application": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "channel": { + "type": "string" }, - "Message": { + "charm-url": { "type": "string" + }, + "force-series": { + "type": "boolean" + }, + "force-units": { + "type": "boolean" + }, + "resource-ids": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "application", + "charm-url", + "channel", + "force-units", + "force-series" ] }, - "ErrorInfo": { + "ApplicationUnexpose": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { + "application": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "application" + ] }, - "ErrorResult": { + "ApplicationUnset": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "application": { + "type": "string" + }, + "options": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Error" + "application", + "options" ] }, - "Macaroon": { + "ApplicationUpdate": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "application": { + "type": "string" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "charm-url": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" + "constraints": { + "$ref": "#/definitions/Value" }, - "location": { - "$ref": "#/definitions/packet" + "force-charm-url": { + "type": "boolean" + }, + "force-series": { + "type": "boolean" + }, + "min-units": { + "type": "integer" + }, + "settings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } }, - "sig": { + "settings-yaml": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "application", + "charm-url", + "force-charm-url", + "force-series", + "settings-yaml" + ] + }, + "ApplicationsDeploy": { + "type": "object", + "properties": { + "applications": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ApplicationDeploy" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "applications" ] }, - "caveat": { + "CharmRelation": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "interface": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "limit": { + "type": "integer" + }, + "name": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "optional": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "scope": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "name", + "role", + "interface", + "optional", + "limit", + "scope" ] }, - "packet": { + "Constraints": { "type": "object", "properties": { - "headerLen": { + "Count": { "type": "integer" }, - "start": { - "type": "integer" + "Pool": { + "type": "string" }, - "totalLen": { + "Size": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "Pool", + "Size", + "Count" ] - } - } - } - }, - { - "Name": "CharmRevisionUpdater", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "UpdateLatestRevisions": { + }, + "DestroyApplicationUnits": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/ErrorResult" + "unit-names": { + "type": "array", + "items": { + "type": "string" + } } - } - } - }, - "definitions": { + }, + "additionalProperties": false, + "required": [ + "unit-names" + ] + }, + "DestroyRelation": { + "type": "object", + "properties": { + "endpoints": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "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" } }, @@ -2022,3299 +1854,3270 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, - "Macaroon": { + "ErrorResults": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, - "caveat": { + "GetApplicationConstraints": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "application": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "application" ] }, - "packet": { + "GetConstraintsResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "constraints" ] - } - } - } - }, - { - "Name": "Charms", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "CharmInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/CharmInfo" - }, - "Result": { - "$ref": "#/definitions/CharmInfo" - } - } }, - "IsMetered": { + "Macaroon": { "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/CharmInfo" - }, - "Result": { - "$ref": "#/definitions/IsMeteredResult" - } - } + "additionalProperties": false }, - "List": { + "Placement": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/CharmsList" + "directive": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/CharmsListResult" - } - } - } - }, - "definitions": { - "CharmInfo": { - "type": "object", - "properties": { - "CharmURL": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "CharmURL" + "scope", + "directive" ] }, - "CharmsList": { + "SetConstraints": { "type": "object", "properties": { - "Names": { - "type": "array", - "items": { - "type": "string" - } + "application": { + "type": "string" + }, + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "Names" + "application", + "constraints" ] }, - "CharmsListResult": { + "StringResult": { "type": "object", "properties": { - "CharmURLs": { - "type": "array", - "items": { - "type": "string" - } + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "string" } }, "additionalProperties": false, "required": [ - "CharmURLs" + "result" ] }, - "IsMeteredResult": { + "Value": { "type": "object", "properties": { - "Metered": { - "type": "boolean" + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Metered" - ] + "additionalProperties": false } } } }, { - "Name": "Cleaner", - "Version": 2, + "Name": "ApplicationScaler", + "Version": 1, "Schema": { "type": "object", "properties": { - "Cleanup": { - "type": "object" + "Rescale": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } }, - "WatchCleanups": { + "Watch": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/StringsWatchResult" } } } }, "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "Macaroon": { + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { "type": "object", "properties": { - "caveats": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "$ref": "#/definitions/ErrorResult" } - }, - "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" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "results" ] }, - "caveat": { + "Macaroon": { "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "StringsWatchResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "changes": { + "type": "array", + "items": { + "type": "string" + } }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } } }, { - "Name": "Client", + "Name": "Backups", "Version": 1, "Schema": { "type": "object", "properties": { - "APIHostPorts": { + "Create": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/BackupsCreateArgs" + }, "Result": { - "$ref": "#/definitions/APIHostPortsResult" + "$ref": "#/definitions/BackupsMetadataResult" } } }, - "AbortCurrentUpgrade": { + "FinishRestore": { "type": "object" }, - "AddCharm": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/AddCharm" - } - } - }, - "AddCharmWithAuthorization": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/AddCharmWithAuthorization" - } - } - }, - "AddMachines": { + "Info": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddMachines" + "$ref": "#/definitions/BackupsInfoArgs" }, "Result": { - "$ref": "#/definitions/AddMachinesResults" + "$ref": "#/definitions/BackupsMetadataResult" } } }, - "AddMachinesV2": { + "List": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddMachines" + "$ref": "#/definitions/BackupsListArgs" }, "Result": { - "$ref": "#/definitions/AddMachinesResults" + "$ref": "#/definitions/BackupsListResult" } } }, - "AgentVersion": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/AgentVersionResult" - } - } + "PrepareRestore": { + "type": "object" }, - "CharmInfo": { + "Remove": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/CharmInfo" - }, - "Result": { - "$ref": "#/definitions/CharmInfo" + "$ref": "#/definitions/BackupsRemoveArgs" } } }, - "DestroyMachines": { + "Restore": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/DestroyMachines" + "$ref": "#/definitions/RestoreArgs" } } - }, - "DestroyModel": { - "type": "object" - }, - "FindTools": { + } + }, + "definitions": { + "BackupsCreateArgs": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/FindToolsParams" - }, - "Result": { - "$ref": "#/definitions/FindToolsResult" + "notes": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "notes" + ] }, - "FullStatus": { + "BackupsInfoArgs": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/StatusParams" - }, - "Result": { - "$ref": "#/definitions/FullStatus" + "id": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "id" + ] }, - "GetBundleChanges": { + "BackupsListArgs": { "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/GetBundleChangesParams" - }, - "Result": { - "$ref": "#/definitions/GetBundleChangesResults" - } - } + "additionalProperties": false }, - "GetModelConstraints": { + "BackupsListResult": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/GetConstraintsResults" + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/BackupsMetadataResult" + } } - } + }, + "additionalProperties": false, + "required": [ + "list" + ] }, - "InjectMachines": { + "BackupsMetadataResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/AddMachines" + "ca-cert": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/AddMachinesResults" + "ca-private-key": { + "type": "string" + }, + "checksum": { + "type": "string" + }, + "checksum-format": { + "type": "string" + }, + "finished": { + "type": "string", + "format": "date-time" + }, + "hostname": { + "type": "string" + }, + "id": { + "type": "string" + }, + "machine": { + "type": "string" + }, + "model": { + "type": "string" + }, + "notes": { + "type": "string" + }, + "series": { + "type": "string" + }, + "size": { + "type": "integer" + }, + "started": { + "type": "string", + "format": "date-time" + }, + "stored": { + "type": "string", + "format": "date-time" + }, + "version": { + "$ref": "#/definitions/Number" } - } + }, + "additionalProperties": false, + "required": [ + "id", + "checksum", + "checksum-format", + "size", + "stored", + "started", + "finished", + "notes", + "model", + "machine", + "hostname", + "version", + "series", + "ca-cert", + "ca-private-key" + ] }, - "ModelGet": { + "BackupsRemoveArgs": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResults" + "id": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "id" + ] }, - "ModelInfo": { + "Number": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/ModelInfo" + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" } - } - }, - "ModelSet": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModelSet" - } - } + }, + "additionalProperties": false, + "required": [ + "Major", + "Minor", + "Tag", + "Patch", + "Build" + ] }, - "ModelUnset": { + "RestoreArgs": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ModelUnset" + "backup-id": { + "type": "string" } - } - }, - "ModelUserInfo": { + }, + "additionalProperties": false, + "required": [ + "backup-id" + ] + } + } + } + }, + { + "Name": "Block", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "List": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/ModelUserInfoResults" + "$ref": "#/definitions/BlockResults" } } }, - "PrivateAddress": { + "SwitchBlockOff": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/PrivateAddress" + "$ref": "#/definitions/BlockSwitchParams" }, "Result": { - "$ref": "#/definitions/PrivateAddressResults" + "$ref": "#/definitions/ErrorResult" } } }, - "ProvisioningScript": { + "SwitchBlockOn": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ProvisioningScriptParams" + "$ref": "#/definitions/BlockSwitchParams" }, "Result": { - "$ref": "#/definitions/ProvisioningScriptResult" + "$ref": "#/definitions/ErrorResult" } } - }, - "PublicAddress": { + } + }, + "definitions": { + "Block": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/PublicAddress" + "id": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/PublicAddressResults" - } - } - }, - "ResolveCharms": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ResolveCharms" + "message": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/ResolveCharmResults" - } - } - }, - "Resolved": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Resolved" - } - } - }, - "RetryProvisioning": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "tag": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetModelAgentVersion": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetModelAgentVersion" - } - } - }, - "SetModelConstraints": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetConstraints" + "type": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "id", + "tag", + "type" + ] }, - "StatusHistory": { + "BlockResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/StatusHistoryArgs" + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/StatusHistoryResults" + "result": { + "$ref": "#/definitions/Block" } - } + }, + "additionalProperties": false, + "required": [ + "result" + ] }, - "WatchAll": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/AllWatcherId" - } - } - } - }, - "definitions": { - "APIHostPortsResult": { + "BlockResults": { "type": "object", "properties": { - "Servers": { + "results": { "type": "array", "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } + "$ref": "#/definitions/BlockResult" } } }, - "additionalProperties": false, - "required": [ - "Servers" - ] + "additionalProperties": false }, - "AddCharm": { + "BlockSwitchParams": { "type": "object", "properties": { - "Channel": { + "message": { "type": "string" }, - "URL": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL", - "Channel" + "type" ] }, - "AddCharmWithAuthorization": { + "Error": { "type": "object", "properties": { - "Channel": { + "code": { "type": "string" }, - "CharmStoreMacaroon": { - "$ref": "#/definitions/Macaroon" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "URL": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL", - "Channel", - "CharmStoreMacaroon" + "message", + "code" ] }, - "AddMachineParams": { + "ErrorInfo": { "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" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Series": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Series", - "Constraints", - "Jobs", - "Disks", - "Placement", - "ParentId", - "ContainerType", - "InstanceId", - "Nonce", - "HardwareCharacteristics", - "Addrs" - ] + "additionalProperties": false }, - "AddMachines": { + "ErrorResult": { "type": "object", "properties": { - "MachineParams": { - "type": "array", - "items": { - "$ref": "#/definitions/AddMachineParams" - } + "error": { + "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "MachineParams" - ] + "additionalProperties": false }, - "AddMachinesResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "CharmRevisionUpdater", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "UpdateLatestRevisions": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Result": { + "$ref": "#/definitions/ErrorResult" + } + } + } + }, + "definitions": { + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "Machine": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Machine", - "Error" + "message", + "code" ] }, - "AddMachinesResults": { - "type": "object", - "properties": { - "Machines": { - "type": "array", - "items": { - "$ref": "#/definitions/AddMachinesResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Machines" - ] - }, - "Address": { + "ErrorInfo": { "type": "object", "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "Type": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Value": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Value", - "Type", - "Scope" - ] + "additionalProperties": false }, - "AgentVersionResult": { + "ErrorResult": { "type": "object", "properties": { - "Version": { - "$ref": "#/definitions/Number" + "error": { + "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Version" - ] + "additionalProperties": false }, - "AllWatcherId": { + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "Charms", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "CharmInfo": { "type": "object", "properties": { - "AllWatcherId": { - "type": "string" + "Params": { + "$ref": "#/definitions/CharmURL" + }, + "Result": { + "$ref": "#/definitions/CharmInfo" } - }, - "additionalProperties": false, - "required": [ - "AllWatcherId" - ] + } }, - "Binary": { + "IsMetered": { "type": "object", "properties": { - "Arch": { - "type": "string" - }, - "Number": { - "$ref": "#/definitions/Number" + "Params": { + "$ref": "#/definitions/CharmURL" }, - "Series": { - "type": "string" + "Result": { + "$ref": "#/definitions/IsMeteredResult" } - }, - "additionalProperties": false, - "required": [ - "Number", - "Series", - "Arch" - ] + } }, - "BundleChangesChange": { + "List": { "type": "object", "properties": { - "args": { - "type": "array", - "items": { - "type": "object", - "additionalProperties": true - } - }, - "id": { - "type": "string" + "Params": { + "$ref": "#/definitions/CharmsList" }, - "method": { + "Result": { + "$ref": "#/definitions/CharmsListResult" + } + } + } + }, + "definitions": { + "CharmActionSpec": { + "type": "object", + "properties": { + "description": { "type": "string" }, - "requires": { - "type": "array", - "items": { - "type": "string" + "params": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } } }, "additionalProperties": false, "required": [ - "id", - "method", - "args", - "requires" + "description", + "params" ] }, - "CharmInfo": { + "CharmActions": { "type": "object", "properties": { - "CharmURL": { - "type": "string" + "specs": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmActionSpec" + } + } } }, - "additionalProperties": false, - "required": [ - "CharmURL" - ] + "additionalProperties": false }, - "Constraints": { + "CharmInfo": { "type": "object", "properties": { - "Count": { - "type": "integer" + "actions": { + "$ref": "#/definitions/CharmActions" }, - "Pool": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmOption" + } + } }, - "Size": { + "meta": { + "$ref": "#/definitions/CharmMeta" + }, + "metrics": { + "$ref": "#/definitions/CharmMetrics" + }, + "revision": { "type": "integer" + }, + "url": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Pool", - "Size", - "Count" + "revision", + "url", + "config" ] }, - "DestroyMachines": { + "CharmMeta": { "type": "object", "properties": { - "Force": { - "type": "boolean" - }, - "MachineNames": { + "categories": { "type": "array", "items": { "type": "string" } - } - }, - "additionalProperties": false, - "required": [ - "MachineNames", - "Force" - ] - }, - "DetailedStatus": { - "type": "object", - "properties": { - "Data": { + }, + "description": { + "type": "string" + }, + "extra-bindings": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "type": "string" } } }, - "Err": { - "type": "object", - "additionalProperties": true - }, - "Info": { + "min-juju-version": { "type": "string" }, - "Kind": { + "name": { "type": "string" }, - "Life": { - "type": "string" + "payload-classes": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmPayloadClass" + } + } }, - "Since": { - "type": "string", - "format": "date-time" + "peers": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } }, - "Status": { - "type": "string" + "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" }, - "Version": { + "summary": { "type": "string" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "terms": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since", - "Kind", - "Version", - "Life", - "Err" + "name", + "summary", + "description", + "subordinate" ] }, - "EndpointStatus": { + "CharmMetric": { "type": "object", "properties": { - "Name": { - "type": "string" - }, - "Role": { + "description": { "type": "string" }, - "ServiceName": { + "type": { "type": "string" - }, - "Subordinate": { - "type": "boolean" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Name", - "Role", - "Subordinate" + "type", + "description" ] }, - "Entities": { + "CharmMetrics": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" + "metrics": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmMetric" + } } } }, "additionalProperties": false, "required": [ - "Entities" + "metrics" ] }, - "Entity": { + "CharmOption": { "type": "object", "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, - "EntityStatus": { - "type": "object", - "properties": { - "Data": { + "default": { "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "additionalProperties": true }, - "Info": { + "description": { "type": "string" }, - "Since": { - "type": "string", - "format": "date-time" - }, - "Status": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since" + "type" ] }, - "Error": { + "CharmPayloadClass": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { + "name": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] - }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "type": { "type": "string" } }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "Error" - ] - }, - "ErrorResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } - } - }, "additionalProperties": false, "required": [ - "Results" + "name", + "type" ] }, - "FindToolsParams": { + "CharmRelation": { "type": "object", "properties": { - "Arch": { + "interface": { "type": "string" }, - "MajorVersion": { + "limit": { "type": "integer" }, - "MinorVersion": { - "type": "integer" + "name": { + "type": "string" }, - "Number": { - "$ref": "#/definitions/Number" + "optional": { + "type": "boolean" }, - "Series": { + "role": { + "type": "string" + }, + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Number", - "MajorVersion", - "MinorVersion", - "Arch", - "Series" + "name", + "role", + "interface", + "optional", + "limit", + "scope" ] }, - "FindToolsResult": { + "CharmResourceMeta": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "description": { + "type": "string" }, - "List": { - "type": "array", - "items": { - "$ref": "#/definitions/Tools" - } + "name": { + "type": "string" + }, + "path": { + "type": "string" + }, + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "List", - "Error" + "name", + "type", + "path", + "description" ] }, - "FullStatus": { + "CharmStorage": { "type": "object", "properties": { - "AvailableVersion": { + "count-max": { + "type": "integer" + }, + "count-min": { + "type": "integer" + }, + "description": { "type": "string" }, - "Machines": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/MachineStatus" - } - } + "location": { + "type": "string" + }, + "minimum-size": { + "type": "integer" }, - "ModelName": { + "name": { "type": "string" }, - "Relations": { + "properties": { "type": "array", "items": { - "$ref": "#/definitions/RelationStatus" + "type": "string" } }, - "Services": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/ServiceStatus" - } - } + "read-only": { + "type": "boolean" + }, + "shared": { + "type": "boolean" + }, + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "ModelName", - "AvailableVersion", - "Machines", - "Services", - "Relations" + "name", + "description", + "type", + "shared", + "read-only", + "count-min", + "count-max", + "minimum-size" ] }, - "GetBundleChangesParams": { + "CharmURL": { "type": "object", "properties": { - "yaml": { + "url": { "type": "string" } }, "additionalProperties": false, "required": [ - "yaml" + "url" ] }, - "GetBundleChangesResults": { + "CharmsList": { "type": "object", "properties": { - "changes": { - "type": "array", - "items": { - "$ref": "#/definitions/BundleChangesChange" - } - }, - "errors": { + "names": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false - }, - "GetConstraintsResults": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" - } - }, "additionalProperties": false, "required": [ - "Constraints" + "names" ] }, - "HardwareCharacteristics": { + "CharmsListResult": { "type": "object", "properties": { - "Arch": { - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "CpuCores": { - "type": "integer" - }, - "CpuPower": { - "type": "integer" - }, - "Mem": { - "type": "integer" - }, - "RootDisk": { - "type": "integer" - }, - "Tags": { + "charm-urls": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false - }, - "HostPort": { - "type": "object", - "properties": { - "Address": { - "$ref": "#/definitions/Address" - }, - "Port": { - "type": "integer" - } - }, "additionalProperties": false, "required": [ - "Address", - "Port" + "charm-urls" ] }, - "Macaroon": { + "IsMeteredResult": { "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" - } + "metered": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "metered" ] + } + } + } + }, + { + "Name": "Cleaner", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "Cleanup": { + "type": "object" }, - "MachineStatus": { + "WatchCleanups": { "type": "object", "properties": { - "AgentStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Containers": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/MachineStatus" - } - } - }, - "DNSName": { - "type": "string" - }, - "Hardware": { - "type": "string" - }, - "HasVote": { - "type": "boolean" - }, - "Id": { - "type": "string" - }, - "InstanceId": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + } + }, + "definitions": { + "Error": { + "type": "object", + "properties": { + "code": { "type": "string" }, - "InstanceStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "Series": { + "message": { "type": "string" - }, - "WantsVote": { - "type": "boolean" } }, "additionalProperties": false, "required": [ - "AgentStatus", - "InstanceStatus", - "DNSName", - "InstanceId", - "Series", - "Id", - "Containers", - "Hardware", - "Jobs", - "HasVote", - "WantsVote" + "message", + "code" ] }, - "MeterStatus": { + "ErrorInfo": { "type": "object", "properties": { - "Color": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Message": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Color", - "Message" - ] + "additionalProperties": false }, - "ModelConfigResults": { + "Macaroon": { "type": "object", - "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - } - }, - "additionalProperties": false, - "required": [ - "Config" - ] + "additionalProperties": false }, - "ModelInfo": { + "NotifyWatchResult": { "type": "object", "properties": { - "DefaultSeries": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "OwnerTag": { - "type": "string" - }, - "ProviderType": { - "type": "string" - }, - "ServerUUID": { - "type": "string" - }, - "Status": { - "$ref": "#/definitions/EntityStatus" - }, - "UUID": { + "NotifyWatcherId": { "type": "string" }, - "Users": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelUserInfo" - } + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "ServerUUID", - "ProviderType", - "DefaultSeries", - "OwnerTag", - "Life", - "Status", - "Users" + "NotifyWatcherId" ] + } + } + } + }, + { + "Name": "Client", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "APIHostPorts": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/APIHostPortsResult" + } + } }, - "ModelSet": { + "AbortCurrentUpgrade": { + "type": "object" + }, + "AddCharm": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "Params": { + "$ref": "#/definitions/AddCharm" } - }, - "additionalProperties": false, - "required": [ - "Config" - ] + } }, - "ModelUnset": { + "AddCharmWithAuthorization": { "type": "object", "properties": { - "Keys": { - "type": "array", - "items": { - "type": "string" - } + "Params": { + "$ref": "#/definitions/AddCharmWithAuthorization" } - }, - "additionalProperties": false, - "required": [ - "Keys" - ] + } }, - "ModelUserInfo": { + "AddMachines": { "type": "object", "properties": { - "access": { - "type": "string" - }, - "displayname": { - "type": "string" - }, - "lastconnection": { - "type": "string", - "format": "date-time" + "Params": { + "$ref": "#/definitions/AddMachines" }, - "user": { - "type": "string" + "Result": { + "$ref": "#/definitions/AddMachinesResults" } - }, - "additionalProperties": false, - "required": [ - "user", - "displayname", - "lastconnection", - "access" - ] + } }, - "ModelUserInfoResult": { + "AddMachinesV2": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/AddMachines" }, - "result": { - "$ref": "#/definitions/ModelUserInfo" + "Result": { + "$ref": "#/definitions/AddMachinesResults" } - }, - "additionalProperties": false + } }, - "ModelUserInfoResults": { + "AgentVersion": { "type": "object", "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelUserInfoResult" - } + "Result": { + "$ref": "#/definitions/AgentVersionResult" } - }, - "additionalProperties": false, - "required": [ - "results" - ] + } }, - "Number": { + "DestroyMachines": { "type": "object", "properties": { - "Build": { - "type": "integer" - }, - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "integer" - }, - "Tag": { - "type": "string" + "Params": { + "$ref": "#/definitions/DestroyMachines" } - }, - "additionalProperties": false, - "required": [ - "Major", - "Minor", - "Tag", - "Patch", - "Build" - ] + } }, - "Placement": { + "FindTools": { "type": "object", "properties": { - "Directive": { - "type": "string" + "Params": { + "$ref": "#/definitions/FindToolsParams" }, - "Scope": { - "type": "string" + "Result": { + "$ref": "#/definitions/FindToolsResult" } - }, - "additionalProperties": false, - "required": [ - "Scope", - "Directive" - ] + } }, - "PrivateAddress": { + "FullStatus": { "type": "object", "properties": { - "Target": { - "type": "string" + "Params": { + "$ref": "#/definitions/StatusParams" + }, + "Result": { + "$ref": "#/definitions/FullStatus" } - }, - "additionalProperties": false, - "required": [ - "Target" - ] + } }, - "PrivateAddressResults": { + "GetBundleChanges": { "type": "object", "properties": { - "PrivateAddress": { - "type": "string" + "Params": { + "$ref": "#/definitions/GetBundleChangesParams" + }, + "Result": { + "$ref": "#/definitions/GetBundleChangesResults" } - }, - "additionalProperties": false, - "required": [ - "PrivateAddress" - ] + } }, - "ProvisioningScriptParams": { + "GetModelConstraints": { "type": "object", "properties": { - "DataDir": { - "type": "string" - }, - "DisablePackageCommands": { - "type": "boolean" - }, - "MachineId": { - "type": "string" - }, - "Nonce": { - "type": "string" + "Result": { + "$ref": "#/definitions/GetConstraintsResults" } - }, - "additionalProperties": false, - "required": [ - "MachineId", - "Nonce", - "DataDir", - "DisablePackageCommands" - ] + } }, - "ProvisioningScriptResult": { + "InjectMachines": { "type": "object", "properties": { - "Script": { - "type": "string" + "Params": { + "$ref": "#/definitions/AddMachines" + }, + "Result": { + "$ref": "#/definitions/AddMachinesResults" } - }, - "additionalProperties": false, - "required": [ - "Script" - ] + } }, - "PublicAddress": { + "ModelGet": { "type": "object", "properties": { - "Target": { - "type": "string" + "Result": { + "$ref": "#/definitions/ModelConfigResults" } - }, - "additionalProperties": false, - "required": [ - "Target" - ] + } }, - "PublicAddressResults": { + "ModelInfo": { "type": "object", "properties": { - "PublicAddress": { - "type": "string" + "Result": { + "$ref": "#/definitions/ModelInfo" } - }, - "additionalProperties": false, - "required": [ - "PublicAddress" - ] + } }, - "RelationStatus": { + "ModelSet": { "type": "object", "properties": { - "Endpoints": { - "type": "array", - "items": { - "$ref": "#/definitions/EndpointStatus" - } + "Params": { + "$ref": "#/definitions/ModelSet" + } + } + }, + "ModelUnset": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelUnset" + } + } + }, + "ModelUserInfo": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelUserInfoResults" + } + } + }, + "PrivateAddress": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/PrivateAddress" }, - "Id": { - "type": "integer" + "Result": { + "$ref": "#/definitions/PrivateAddressResults" + } + } + }, + "ProvisioningScript": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ProvisioningScriptParams" }, - "Interface": { - "type": "string" + "Result": { + "$ref": "#/definitions/ProvisioningScriptResult" + } + } + }, + "PublicAddress": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/PublicAddress" }, - "Key": { - "type": "string" + "Result": { + "$ref": "#/definitions/PublicAddressResults" + } + } + }, + "ResolveCharms": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ResolveCharms" }, - "Scope": { - "type": "string" + "Result": { + "$ref": "#/definitions/ResolveCharmResults" } - }, - "additionalProperties": false, - "required": [ - "Id", - "Key", - "Interface", - "Scope", - "Endpoints" - ] + } }, - "ResolveCharmResult": { + "Resolved": { "type": "object", "properties": { - "Error": { - "type": "string" + "Params": { + "$ref": "#/definitions/Resolved" + } + } + }, + "RetryProvisioning": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "URL": { - "$ref": "#/definitions/URL" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false + } }, - "ResolveCharmResults": { + "SetModelAgentVersion": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetModelAgentVersion" + } + } + }, + "SetModelConstraints": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetConstraints" + } + } + }, + "StatusHistory": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/StatusHistoryRequests" + }, + "Result": { + "$ref": "#/definitions/StatusHistoryResults" + } + } + }, + "WatchAll": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/AllWatcherId" + } + } + } + }, + "definitions": { + "APIHostPortsResult": { "type": "object", "properties": { - "URLs": { + "servers": { "type": "array", "items": { - "$ref": "#/definitions/ResolveCharmResult" + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } } } }, "additionalProperties": false, "required": [ - "URLs" + "servers" ] }, - "ResolveCharms": { + "AddCharm": { "type": "object", "properties": { - "References": { - "type": "array", - "items": { - "$ref": "#/definitions/URL" - } + "channel": { + "type": "string" + }, + "url": { + "type": "string" } }, "additionalProperties": false, "required": [ - "References" + "url", + "channel" ] }, - "Resolved": { + "AddCharmWithAuthorization": { "type": "object", "properties": { - "Retry": { - "type": "boolean" + "channel": { + "type": "string" + }, + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "UnitName": { + "url": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitName", - "Retry" + "url", + "channel", + "macaroon" ] }, - "ServiceStatus": { + "AddMachineParams": { "type": "object", "properties": { - "CanUpgradeTo": { - "type": "string" - }, - "Charm": { - "type": "string" - }, - "Err": { - "type": "object", - "additionalProperties": true + "addresses": { + "type": "array", + "items": { + "$ref": "#/definitions/Address" + } }, - "Exposed": { - "type": "boolean" + "constraints": { + "$ref": "#/definitions/Value" }, - "Life": { + "container-type": { "type": "string" }, - "MeterStatuses": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/MeterStatus" - } + "disks": { + "type": "array", + "items": { + "$ref": "#/definitions/Constraints" } }, - "Relations": { - "type": "object", - "patternProperties": { - ".*": { - "type": "array", - "items": { - "type": "string" - } - } - } + "hardware-characteristics": { + "$ref": "#/definitions/HardwareCharacteristics" }, - "Status": { - "$ref": "#/definitions/DetailedStatus" + "instance-id": { + "type": "string" }, - "SubordinateTo": { + "jobs": { "type": "array", "items": { "type": "string" } }, - "Units": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/UnitStatus" - } - } - } - }, - "additionalProperties": false, - "required": [ - "Err", - "Charm", - "Exposed", - "Life", - "Relations", - "CanUpgradeTo", - "SubordinateTo", - "Units", - "MeterStatuses", - "Status" - ] - }, - "SetConstraints": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" + "nonce": { + "type": "string" + }, + "parent-id": { + "type": "string" }, - "ServiceName": { + "placement": { + "$ref": "#/definitions/Placement" + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Constraints" + "series", + "constraints", + "jobs", + "parent-id", + "container-type", + "instance-id", + "nonce", + "hardware-characteristics", + "addresses" ] }, - "SetModelAgentVersion": { + "AddMachines": { "type": "object", "properties": { - "Version": { - "$ref": "#/definitions/Number" + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/AddMachineParams" + } } }, "additionalProperties": false, "required": [ - "Version" + "params" ] }, - "StatusHistoryArgs": { + "AddMachinesResult": { "type": "object", "properties": { - "Kind": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "Name": { + "machine": { "type": "string" - }, - "Size": { - "type": "integer" } }, "additionalProperties": false, "required": [ - "Kind", - "Size", - "Name" + "machine" ] }, - "StatusHistoryResults": { + "AddMachinesResults": { "type": "object", "properties": { - "Statuses": { + "machines": { "type": "array", "items": { - "$ref": "#/definitions/DetailedStatus" + "$ref": "#/definitions/AddMachinesResult" } } }, "additionalProperties": false, "required": [ - "Statuses" + "machines" ] }, - "StatusParams": { + "Address": { "type": "object", "properties": { - "Patterns": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false, - "required": [ - "Patterns" - ] - }, - "Tools": { - "type": "object", - "properties": { - "sha256": { + "scope": { "type": "string" }, - "size": { - "type": "integer" + "space-name": { + "type": "string" }, - "url": { + "type": { "type": "string" }, - "version": { - "$ref": "#/definitions/Binary" + "value": { + "type": "string" } }, "additionalProperties": false, "required": [ - "version", - "url", - "size" + "value", + "type", + "scope" ] }, - "URL": { + "AgentVersionResult": { "type": "object", "properties": { - "Channel": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "Revision": { - "type": "integer" - }, - "Schema": { - "type": "string" - }, - "Series": { - "type": "string" - }, - "User": { - "type": "string" + "version": { + "$ref": "#/definitions/Number" } }, "additionalProperties": false, "required": [ - "Schema", - "User", - "Name", - "Revision", - "Series", - "Channel" + "version" ] }, - "UnitStatus": { + "AllWatcherId": { "type": "object", "properties": { - "AgentStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Charm": { - "type": "string" - }, - "Machine": { + "watcher-id": { "type": "string" - }, - "OpenedPorts": { - "type": "array", - "items": { - "type": "string" - } - }, - "PublicAddress": { - "type": "string" - }, - "Subordinates": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/UnitStatus" - } - } - }, - "WorkloadStatus": { - "$ref": "#/definitions/DetailedStatus" } }, "additionalProperties": false, "required": [ - "AgentStatus", - "WorkloadStatus", - "Machine", - "OpenedPorts", - "PublicAddress", - "Charm", - "Subordinates" + "watcher-id" ] }, - "Value": { + "ApplicationStatus": { "type": "object", "properties": { - "arch": { + "can-upgrade-to": { "type": "string" }, - "container": { + "charm": { "type": "string" }, - "cpu-cores": { - "type": "integer" + "err": { + "type": "object", + "additionalProperties": true }, - "cpu-power": { - "type": "integer" + "exposed": { + "type": "boolean" }, - "instance-type": { + "life": { "type": "string" }, - "mem": { - "type": "integer" + "meter-statuses": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MeterStatus" + } + } }, - "root-disk": { - "type": "integer" + "relations": { + "type": "object", + "patternProperties": { + ".*": { + "type": "array", + "items": { + "type": "string" + } + } + } }, - "spaces": { + "series": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/DetailedStatus" + }, + "subordinate-to": { "type": "array", "items": { "type": "string" } }, - "tags": { - "type": "array", - "items": { - "type": "string" + "units": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/UnitStatus" + } } }, - "virt-type": { + "workload-version": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "charm", + "series", + "exposed", + "life", + "relations", + "can-upgrade-to", + "subordinate-to", + "units", + "meter-statuses", + "status", + "workload-version" + ] }, - "caveat": { + "Binary": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "Arch": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "Number": { + "$ref": "#/definitions/Number" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Series": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "Number", + "Series", + "Arch" ] }, - "packet": { + "BundleChangesChange": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "args": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } }, - "start": { - "type": "integer" + "id": { + "type": "string" }, - "totalLen": { - "type": "integer" + "method": { + "type": "string" + }, + "requires": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "id", + "method", + "args", + "requires" ] - } - } - } - }, - { - "Name": "Controller", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "AllModels": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/UserModelList" - } - } - }, - "DestroyController": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/DestroyControllerArgs" - } - } - }, - "InitiateModelMigration": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/InitiateModelMigrationArgs" - }, - "Result": { - "$ref": "#/definitions/InitiateModelMigrationResults" - } - } - }, - "ListBlockedModels": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelBlockInfoList" - } - } - }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResults" - } - } - }, - "ModelStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ModelStatusResults" - } - } - }, - "RemoveBlocks": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/RemoveBlocksArgs" - } - } }, - "WatchAllModels": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/AllWatcherId" - } - } - } - }, - "definitions": { - "AllWatcherId": { + "ConfigValue": { "type": "object", "properties": { - "AllWatcherId": { + "source": { "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true } }, "additionalProperties": false, "required": [ - "AllWatcherId" + "value", + "source" ] }, - "DestroyControllerArgs": { + "Constraints": { "type": "object", "properties": { - "destroy-models": { - "type": "boolean" + "Count": { + "type": "integer" + }, + "Pool": { + "type": "string" + }, + "Size": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "destroy-models" + "Pool", + "Size", + "Count" ] }, - "Entities": { + "DestroyMachines": { "type": "object", "properties": { - "Entities": { + "force": { + "type": "boolean" + }, + "machine-names": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "type": "string" } } }, "additionalProperties": false, "required": [ - "Entities" + "machine-names", + "force" ] }, - "Entity": { + "DetailedStatus": { "type": "object", "properties": { - "Tag": { + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "err": { + "type": "object", + "additionalProperties": true + }, + "info": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "life": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" + }, + "version": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "status", + "info", + "data", + "since", + "kind", + "version", + "life" ] }, - "Error": { + "EndpointStatus": { "type": "object", "properties": { - "Code": { + "application": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "name": { + "type": "string" }, - "Message": { + "role": { "type": "string" + }, + "subordinate": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "application", + "name", + "role", + "subordinate" ] }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" - } - }, - "additionalProperties": false - }, - "InitiateModelMigrationArgs": { + "Entities": { "type": "object", "properties": { - "specs": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/ModelMigrationSpec" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "specs" + "entities" ] }, - "InitiateModelMigrationResult": { + "Entity": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" - }, - "id": { - "type": "string" - }, - "model-tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "model-tag", - "error", - "id" + "tag" ] }, - "InitiateModelMigrationResults": { + "EntityStatus": { "type": "object", "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/InitiateModelMigrationResult" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } + }, + "info": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" } }, "additionalProperties": false, "required": [ - "results" + "status", + "info", + "since" ] }, - "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" ] }, - "Model": { + "ErrorInfo": { "type": "object", "properties": { - "Name": { - "type": "string" - }, - "OwnerTag": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "UUID": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Name", - "UUID", - "OwnerTag" - ] + "additionalProperties": false }, - "ModelBlockInfo": { + "ErrorResult": { "type": "object", "properties": { - "blocks": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/ErrorResult" } - }, - "model-uuid": { + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "FindToolsParams": { + "type": "object", + "properties": { + "arch": { "type": "string" }, - "name": { - "type": "string" + "major": { + "type": "integer" }, - "owner-tag": { + "minor": { + "type": "integer" + }, + "number": { + "$ref": "#/definitions/Number" + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "name", - "model-uuid", - "owner-tag", - "blocks" + "number", + "major", + "minor", + "arch", + "series" ] }, - "ModelBlockInfoList": { + "FindToolsResult": { "type": "object", "properties": { - "models": { + "error": { + "$ref": "#/definitions/Error" + }, + "list": { "type": "array", "items": { - "$ref": "#/definitions/ModelBlockInfo" + "$ref": "#/definitions/Tools" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "list" + ] }, - "ModelConfigResults": { + "FullStatus": { "type": "object", "properties": { - "Config": { + "applications": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/ApplicationStatus" + } + } + }, + "machines": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MachineStatus" } } + }, + "model": { + "$ref": "#/definitions/ModelStatusInfo" + }, + "relations": { + "type": "array", + "items": { + "$ref": "#/definitions/RelationStatus" + } } }, "additionalProperties": false, "required": [ - "Config" + "model", + "machines", + "applications", + "relations" ] }, - "ModelMigrationSpec": { + "GetBundleChangesParams": { "type": "object", "properties": { - "model-tag": { + "yaml": { "type": "string" - }, - "target-info": { - "$ref": "#/definitions/ModelMigrationTargetInfo" } }, "additionalProperties": false, "required": [ - "model-tag", - "target-info" + "yaml" ] }, - "ModelMigrationTargetInfo": { + "GetBundleChangesResults": { "type": "object", "properties": { - "addrs": { + "changes": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/BundleChangesChange" } }, - "auth-tag": { - "type": "string" - }, - "ca-cert": { - "type": "string" - }, - "controller-tag": { - "type": "string" - }, - "password": { - "type": "string" + "errors": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "controller-tag", - "addrs", - "ca-cert", - "auth-tag", - "password" - ] + "additionalProperties": false }, - "ModelStatus": { + "GetConstraintsResults": { "type": "object", "properties": { - "hosted-machine-count": { - "type": "integer" - }, - "life": { + "constraints": { + "$ref": "#/definitions/Value" + } + }, + "additionalProperties": false, + "required": [ + "constraints" + ] + }, + "HardwareCharacteristics": { + "type": "object", + "properties": { + "arch": { "type": "string" }, - "model-tag": { + "availability-zone": { "type": "string" }, - "owner-tag": { - "type": "string" + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" }, - "service-count": { + "root-disk": { "type": "integer" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "model-tag", - "life", - "hosted-machine-count", - "service-count", - "owner-tag" - ] + "additionalProperties": false }, - "ModelStatusResults": { + "History": { "type": "object", "properties": { - "models": { + "error": { + "$ref": "#/definitions/Error" + }, + "statuses": { "type": "array", "items": { - "$ref": "#/definitions/ModelStatus" + "$ref": "#/definitions/DetailedStatus" } } }, "additionalProperties": false, "required": [ - "models" + "statuses" ] }, - "RemoveBlocksArgs": { + "HostPort": { "type": "object", "properties": { - "all": { - "type": "boolean" + "Address": { + "$ref": "#/definitions/Address" + }, + "port": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "all" + "Address", + "port" ] }, - "UserModel": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineStatus": { "type": "object", "properties": { - "LastConnection": { - "type": "string", - "format": "date-time" + "agent-status": { + "$ref": "#/definitions/DetailedStatus" }, - "Model": { - "$ref": "#/definitions/Model" + "containers": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MachineStatus" + } + } + }, + "dns-name": { + "type": "string" + }, + "hardware": { + "type": "string" + }, + "has-vote": { + "type": "boolean" + }, + "id": { + "type": "string" + }, + "instance-id": { + "type": "string" + }, + "instance-status": { + "$ref": "#/definitions/DetailedStatus" + }, + "jobs": { + "type": "array", + "items": { + "type": "string" + } + }, + "series": { + "type": "string" + }, + "wants-vote": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Model", - "LastConnection" + "agent-status", + "instance-status", + "dns-name", + "instance-id", + "series", + "id", + "containers", + "hardware", + "jobs", + "has-vote", + "wants-vote" ] }, - "UserModelList": { + "MeterStatus": { "type": "object", "properties": { - "UserModels": { - "type": "array", - "items": { - "$ref": "#/definitions/UserModel" - } + "color": { + "type": "string" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "UserModels" + "color", + "message" ] }, - "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": { + "ModelInfo": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "cloud": { + "type": "string" }, - "start": { - "type": "integer" + "cloud-credential": { + "type": "string" }, - "totalLen": { - "type": "integer" + "cloud-region": { + "type": "string" + }, + "controller-uuid": { + "type": "string" + }, + "default-series": { + "type": "string" + }, + "life": { + "type": "string" + }, + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "provider-type": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/EntityStatus" + }, + "users": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelUserInfo" + } + }, + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "name", + "uuid", + "controller-uuid", + "provider-type", + "default-series", + "cloud", + "owner-tag", + "life", + "status", + "users" ] - } - } - } - }, - { - "Name": "Deployer", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "APIAddresses": { + }, + "ModelSet": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } - } + }, + "additionalProperties": false, + "required": [ + "config" + ] }, - "APIHostPorts": { + "ModelStatusInfo": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/APIHostPortsResult" + "available-version": { + "type": "string" + }, + "cloud": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "version": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "name", + "cloud", + "version", + "available-version" + ] }, - "CACert": { + "ModelUnset": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/BytesResult" + "keys": { + "type": "array", + "items": { + "type": "string" + } } - } + }, + "additionalProperties": false, + "required": [ + "keys" + ] }, - "ConnectionInfo": { + "ModelUserInfo": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/DeployerConnectionValues" + "access": { + "type": "string" + }, + "display-name": { + "type": "string" + }, + "last-connection": { + "type": "string", + "format": "date-time" + }, + "user": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "user", + "display-name", + "last-connection", + "access" + ] }, - "Life": { + "ModelUserInfoResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/LifeResults" + "result": { + "$ref": "#/definitions/ModelUserInfo" } - } + }, + "additionalProperties": false }, - "ModelUUID": { + "ModelUserInfoResults": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/StringResult" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelUserInfoResult" + } } - } + }, + "additionalProperties": false, + "required": [ + "results" + ] }, - "Remove": { + "Number": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "Build": { + "type": "integer" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetPasswords": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/EntityPasswords" + "Major": { + "type": "integer" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "StateAddresses": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" - } - } - }, - "WatchAPIHostPorts": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchUnits": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "Minor": { + "type": "integer" }, - "Result": { - "$ref": "#/definitions/StringsWatchResults" - } - } - } - }, - "definitions": { - "APIHostPortsResult": { - "type": "object", - "properties": { - "Servers": { - "type": "array", - "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } - } + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Servers" + "Major", + "Minor", + "Tag", + "Patch", + "Build" ] }, - "Address": { + "Placement": { "type": "object", "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "Type": { + "directive": { "type": "string" }, - "Value": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "scope", + "directive" ] }, - "BytesResult": { + "PrivateAddress": { "type": "object", "properties": { - "Result": { - "type": "array", - "items": { - "type": "integer" - } + "target": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Result" + "target" ] }, - "DeployerConnectionValues": { + "PrivateAddressResults": { "type": "object", "properties": { - "APIAddresses": { - "type": "array", - "items": { - "type": "string" - } - }, - "StateAddresses": { - "type": "array", - "items": { - "type": "string" - } + "private-address": { + "type": "string" } }, "additionalProperties": false, "required": [ - "StateAddresses", - "APIAddresses" + "private-address" ] }, - "Entities": { + "ProvisioningScriptParams": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } + "data-dir": { + "type": "string" + }, + "disable-package-commands": { + "type": "boolean" + }, + "machine-id": { + "type": "string" + }, + "nonce": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Entities" + "machine-id", + "nonce", + "data-dir", + "disable-package-commands" ] }, - "Entity": { + "ProvisioningScriptResult": { "type": "object", "properties": { - "Tag": { + "script": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "script" ] }, - "EntityPassword": { + "PublicAddress": { "type": "object", "properties": { - "Password": { - "type": "string" - }, - "Tag": { + "target": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Password" + "target" ] }, - "EntityPasswords": { + "PublicAddressResults": { "type": "object", "properties": { - "Changes": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityPassword" - } + "public-address": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Changes" + "public-address" ] }, - "Error": { + "RelationStatus": { "type": "object", "properties": { - "Code": { + "endpoints": { + "type": "array", + "items": { + "$ref": "#/definitions/EndpointStatus" + } + }, + "id": { + "type": "integer" + }, + "interface": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "key": { + "type": "string" }, - "Message": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "id", + "key", + "interface", + "scope", + "endpoints" ] }, - "ErrorInfo": { + "ResolveCharmResult": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "error": { + "type": "string" }, - "MacaroonPath": { + "url": { "type": "string" } }, "additionalProperties": false }, - "ErrorResult": { + "ResolveCharmResults": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "urls": { + "type": "array", + "items": { + "$ref": "#/definitions/ResolveCharmResult" + } } }, "additionalProperties": false, "required": [ - "Error" + "urls" ] }, - "ErrorResults": { + "ResolveCharms": { "type": "object", "properties": { - "Results": { + "references": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "type": "string" } } }, "additionalProperties": false, "required": [ - "Results" + "references" ] }, - "HostPort": { + "Resolved": { "type": "object", "properties": { - "Address": { - "$ref": "#/definitions/Address" + "retry": { + "type": "boolean" }, - "Port": { - "type": "integer" + "unit-name": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Address", - "Port" + "unit-name", + "retry" ] }, - "LifeResult": { + "SetConstraints": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Life": { + "application": { "type": "string" + }, + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "application", + "constraints" ] }, - "LifeResults": { + "SetModelAgentVersion": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } + "version": { + "$ref": "#/definitions/Number" } }, "additionalProperties": false, "required": [ - "Results" + "version" ] }, - "Macaroon": { + "StatusHistoryFilter": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "date": { + "type": "string", + "format": "date-time" }, - "location": { - "$ref": "#/definitions/packet" + "delta": { + "type": "integer" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "size": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "size", + "date", + "delta" ] }, - "NotifyWatchResult": { + "StatusHistoryRequest": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "filter": { + "$ref": "#/definitions/StatusHistoryFilter" }, - "NotifyWatcherId": { + "historyKind": { + "type": "string" + }, + "size": { + "type": "integer" + }, + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "historyKind", + "size", + "filter", + "tag" ] }, - "StringResult": { + "StatusHistoryRequests": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "string" + "requests": { + "type": "array", + "items": { + "$ref": "#/definitions/StatusHistoryRequest" + } } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "requests" ] }, - "StringsResult": { + "StatusHistoryResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { - "type": "array", - "items": { - "type": "string" - } + "history": { + "$ref": "#/definitions/History" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "history" ] }, - "StringsWatchResult": { + "StatusHistoryResults": { "type": "object", "properties": { - "Changes": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/StatusHistoryResult" } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { - "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "results" ] }, - "StringsWatchResults": { + "StatusParams": { "type": "object", "properties": { - "Results": { + "patterns": { "type": "array", "items": { - "$ref": "#/definitions/StringsWatchResult" + "type": "string" } } }, "additionalProperties": false, "required": [ - "Results" + "patterns" ] }, - "caveat": { + "Tools": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "sha256": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "size": { + "type": "integer" + }, + "url": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "version": { + "$ref": "#/definitions/Binary" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "version", + "url", + "size" ] }, - "packet": { + "UnitStatus": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "agent-status": { + "$ref": "#/definitions/DetailedStatus" }, - "start": { - "type": "integer" + "charm": { + "type": "string" }, - "totalLen": { - "type": "integer" + "machine": { + "type": "string" + }, + "opened-ports": { + "type": "array", + "items": { + "type": "string" + } + }, + "public-address": { + "type": "string" + }, + "subordinates": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/UnitStatus" + } + } + }, + "workload-status": { + "$ref": "#/definitions/DetailedStatus" + }, + "workload-version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "agent-status", + "workload-status", + "workload-version", + "machine", + "opened-ports", + "public-address", + "charm", + "subordinates" ] + }, + "Value": { + "type": "object", + "properties": { + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { + "type": "string" + } + }, + "additionalProperties": false } } } }, { - "Name": "DiscoverSpaces", - "Version": 2, + "Name": "Cloud", + "Version": 1, "Schema": { "type": "object", "properties": { - "AddSubnets": { + "Cloud": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddSubnetsParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/CloudResults" } } }, - "CreateSpaces": { + "CloudDefaults": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/CreateSpacesParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "ListSpaces": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/DiscoverSpacesResults" + "$ref": "#/definitions/CloudDefaultsResults" } } }, - "ListSubnets": { + "Credentials": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SubnetsFilters" + "$ref": "#/definitions/UserClouds" }, "Result": { - "$ref": "#/definitions/ListSubnetsResults" + "$ref": "#/definitions/CloudCredentialsResults" } } }, - "ModelConfig": { + "UpdateCredentials": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/UsersCloudCredentials" + }, "Result": { - "$ref": "#/definitions/ModelConfigResult" + "$ref": "#/definitions/ErrorResults" } } } }, "definitions": { - "AddSubnetParams": { + "Cloud": { "type": "object", "properties": { - "SpaceTag": { - "type": "string" - }, - "SubnetProviderId": { - "type": "string" + "auth-types": { + "type": "array", + "items": { + "type": "string" + } }, - "SubnetTag": { + "endpoint": { "type": "string" }, - "Zones": { + "regions": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/CloudRegion" } + }, + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "SpaceTag" + "type" ] }, - "AddSubnetsParams": { + "CloudCredential": { "type": "object", "properties": { - "Subnets": { - "type": "array", - "items": { - "$ref": "#/definitions/AddSubnetParams" + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } } + }, + "auth-type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Subnets" + "auth-type" ] }, - "CreateSpaceParams": { + "CloudCredentialsResult": { + "type": "object", + "properties": { + "credentials": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CloudCredential" + } + } + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "CloudCredentialsResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudCredentialsResult" + } + } + }, + "additionalProperties": false + }, + "CloudDefaults": { "type": "object", "properties": { - "ProviderId": { + "cloud-tag": { "type": "string" }, - "Public": { - "type": "boolean" + "credential": { + "type": "string" }, - "SpaceTag": { + "region": { "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "cloud-tag" + ] + }, + "CloudDefaultsResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "SubnetTags": { - "type": "array", - "items": { - "type": "string" - } + "result": { + "$ref": "#/definitions/CloudDefaults" } }, "additionalProperties": false, "required": [ - "SubnetTags", - "SpaceTag", - "Public" + "error" ] }, - "CreateSpacesParams": { + "CloudDefaultsResults": { "type": "object", "properties": { - "Spaces": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/CreateSpaceParams" + "$ref": "#/definitions/CloudDefaultsResult" } } }, + "additionalProperties": false + }, + "CloudRegion": { + "type": "object", + "properties": { + "endpoint": { + "type": "string" + }, + "name": { + "type": "string" + } + }, "additionalProperties": false, "required": [ - "Spaces" + "name" ] }, - "DiscoverSpacesResults": { + "CloudResult": { + "type": "object", + "properties": { + "cloud": { + "$ref": "#/definitions/Cloud" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "CloudResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ProviderSpace" + "$ref": "#/definitions/CloudResult" + } + } + }, + "additionalProperties": false + }, + "Entities": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "Results" + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -5323,19 +5126,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" @@ -5344,830 +5144,588 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "ListSubnetsResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "UserCloud": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/Subnet" - } - } - }, - "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" + "cloud-tag": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "user-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "user-tag", + "cloud-tag" ] }, - "ModelConfigResult": { + "UserCloudCredentials": { "type": "object", "properties": { - "Config": { + "cloud-tag": { + "type": "string" + }, + "credentials": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/CloudCredential" } } + }, + "user-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Config" + "user-tag", + "cloud-tag", + "credentials" ] }, - "ProviderSpace": { + "UserClouds": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Name": { - "type": "string" - }, - "ProviderId": { - "type": "string" - }, - "Subnets": { + "user-clouds": { "type": "array", "items": { - "$ref": "#/definitions/Subnet" + "$ref": "#/definitions/UserCloud" } } }, - "additionalProperties": false, - "required": [ - "Name", - "ProviderId", - "Subnets" - ] + "additionalProperties": false }, - "Subnet": { + "UsersCloudCredentials": { "type": "object", "properties": { - "CIDR": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "ProviderId": { - "type": "string" - }, - "SpaceTag": { - "type": "string" - }, - "StaticRangeHighIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "StaticRangeLowIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "Status": { - "type": "string" - }, - "VLANTag": { - "type": "integer" - }, - "Zones": { + "users": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/UserCloudCredentials" } } }, "additionalProperties": false, "required": [ - "CIDR", - "VLANTag", - "Life", - "SpaceTag", - "Zones" + "users" ] + } + } + } + }, + { + "Name": "Controller", + "Version": 3, + "Schema": { + "type": "object", + "properties": { + "AllModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/UserModelList" + } + } }, - "SubnetsFilters": { + "ControllerConfig": { "type": "object", "properties": { - "SpaceTag": { - "type": "string" - }, - "Zone": { - "type": "string" + "Result": { + "$ref": "#/definitions/ControllerConfigResult" } - }, - "additionalProperties": false + } }, - "caveat": { + "DestroyController": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/DestroyControllerArgs" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "InitiateModelMigration": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "Params": { + "$ref": "#/definitions/InitiateModelMigrationArgs" }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/InitiateModelMigrationResults" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "DiskManager", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "SetMachineBlockDevices": { + } + }, + "ListBlockedModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelBlockInfoList" + } + } + }, + "ModelConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResults" + } + } + }, + "ModelStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SetMachineBlockDevices" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/ModelStatusResults" + } + } + }, + "RemoveBlocks": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/RemoveBlocksArgs" + } + } + }, + "WatchAllModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/AllWatcherId" } } } }, "definitions": { - "BlockDevice": { + "AllWatcherId": { "type": "object", "properties": { - "BusAddress": { - "type": "string" - }, - "DeviceLinks": { - "type": "array", - "items": { - "type": "string" - } - }, - "DeviceName": { - "type": "string" - }, - "FilesystemType": { - "type": "string" - }, - "HardwareId": { - "type": "string" - }, - "InUse": { - "type": "boolean" - }, - "Label": { - "type": "string" - }, - "MountPoint": { - "type": "string" - }, - "Size": { - "type": "integer" - }, - "UUID": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "DeviceName", - "DeviceLinks", - "Label", - "UUID", - "HardwareId", - "BusAddress", - "Size", - "FilesystemType", - "InUse", - "MountPoint" + "watcher-id" ] }, - "Error": { + "ConfigValue": { "type": "object", "properties": { - "Code": { + "source": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "value": { + "type": "object", + "additionalProperties": true } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "value", + "source" ] }, - "ErrorInfo": { + "ControllerConfigResult": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "config" + ] }, - "ErrorResult": { + "DestroyControllerArgs": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "destroy-models": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error" + "destroy-models" ] }, - "ErrorResults": { + "Entities": { "type": "object", "properties": { - "Results": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "Results" + "entities" ] }, - "Macaroon": { + "Entity": { "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" - } + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "tag" ] }, - "MachineBlockDevices": { + "Error": { "type": "object", "properties": { - "blockdevices": { - "type": "array", - "items": { - "$ref": "#/definitions/BlockDevice" - } + "code": { + "type": "string" }, - "machine": { + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "machine" + "message", + "code" ] }, - "SetMachineBlockDevices": { + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "InitiateModelMigrationArgs": { "type": "object", "properties": { - "machineblockdevices": { + "specs": { "type": "array", "items": { - "$ref": "#/definitions/MachineBlockDevices" + "$ref": "#/definitions/ModelMigrationSpec" } } }, "additionalProperties": false, "required": [ - "machineblockdevices" + "specs" ] }, - "caveat": { + "InitiateModelMigrationResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "location": { - "$ref": "#/definitions/packet" + "id": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "model-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "model-tag", + "id" ] }, - "packet": { + "InitiateModelMigrationResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/InitiateModelMigrationResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] - } - } - } - }, - { - "Name": "EntityWatcher", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "Next": { + }, + "Macaroon": { "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/EntitiesWatchResult" - } - } + "additionalProperties": false }, - "Stop": { - "type": "object" - } - }, - "definitions": { - "EntitiesWatchResult": { + "Model": { "type": "object", "properties": { - "Changes": { - "type": "array", - "items": { - "type": "string" - } + "name": { + "type": "string" }, - "EntityWatcherId": { + "owner-tag": { "type": "string" }, - "Error": { - "$ref": "#/definitions/Error" + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "EntityWatcherId", - "Changes", - "Error" + "name", + "uuid", + "owner-tag" ] }, - "Error": { + "ModelBlockInfo": { "type": "object", "properties": { - "Code": { + "blocks": { + "type": "array", + "items": { + "type": "string" + } + }, + "model-uuid": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "name": { + "type": "string" }, - "Message": { + "owner-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "name", + "model-uuid", + "owner-tag", + "blocks" ] }, - "ErrorInfo": { + "ModelBlockInfoList": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelBlockInfo" + } } }, "additionalProperties": false }, - "Macaroon": { + "ModelConfigResults": { "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" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ConfigValue" + } } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "config" ] }, - "caveat": { + "ModelMigrationSpec": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "model-tag": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "target-info": { + "$ref": "#/definitions/ModelMigrationTargetInfo" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "model-tag", + "target-info" ] }, - "packet": { + "ModelMigrationTargetInfo": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "addrs": { + "type": "array", + "items": { + "type": "string" + } }, - "start": { - "type": "integer" + "auth-tag": { + "type": "string" }, - "totalLen": { - "type": "integer" + "ca-cert": { + "type": "string" + }, + "controller-tag": { + "type": "string" + }, + "password": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "controller-tag", + "addrs", + "ca-cert", + "auth-tag", + "password" ] - } - } - } - }, - { - "Name": "FilesystemAttachmentsWatcher", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "Next": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/MachineStorageIdsWatchResult" - } - } }, - "Stop": { - "type": "object" - } - }, - "definitions": { - "Error": { + "ModelStatus": { "type": "object", "properties": { - "Code": { + "application-count": { + "type": "integer" + }, + "hosted-machine-count": { + "type": "integer" + }, + "life": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "model-tag": { + "type": "string" }, - "Message": { + "owner-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "model-tag", + "life", + "hosted-machine-count", + "application-count", + "owner-tag" ] }, - "ErrorInfo": { + "ModelStatusResults": { "type": "object", "properties": { - "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" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "MachineStorageId": { - "type": "object", - "properties": { - "attachmenttag": { - "type": "string" - }, - "machinetag": { - "type": "string" + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelStatus" + } } }, "additionalProperties": false, "required": [ - "machinetag", - "attachmenttag" + "models" ] }, - "MachineStorageIdsWatchResult": { + "RemoveBlocksArgs": { "type": "object", "properties": { - "Changes": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineStorageId" - } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "MachineStorageIdsWatcherId": { - "type": "string" + "all": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" + "all" ] }, - "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" ] } } } }, { - "Name": "Firewaller", - "Version": 2, + "Name": "Deployer", + "Version": 1, "Schema": { "type": "object", "properties": { - "GetAssignedMachine": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, - "GetExposed": { + "APIAddresses": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/BoolResults" + "$ref": "#/definitions/StringsResult" } } }, - "GetMachineActiveSubnets": { + "APIHostPorts": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/StringsResults" + "$ref": "#/definitions/APIHostPortsResult" } } }, - "GetMachinePorts": { + "CACert": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/MachinePortsParams" - }, "Result": { - "$ref": "#/definitions/MachinePortsResults" + "$ref": "#/definitions/BytesResult" } } }, - "InstanceId": { + "ConnectionInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/StringResults" + "$ref": "#/definitions/DeployerConnectionValues" } } }, @@ -6182,49 +5740,49 @@ } } }, - "ModelConfig": { + "ModelUUID": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/ModelConfigResult" + "$ref": "#/definitions/StringResult" } } }, - "Watch": { + "Remove": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchForModelConfigChanges": { + "SetPasswords": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/EntityPasswords" + }, "Result": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchModelMachines": { + "StateAddresses": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/StringsResult" } } }, - "WatchOpenedPorts": { + "WatchAPIHostPorts": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/StringsWatchResults" + "$ref": "#/definitions/NotifyWatchResult" } } }, @@ -6241,41 +5799,88 @@ } }, "definitions": { - "BoolResult": { + "APIHostPortsResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "servers": { + "type": "array", + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } + } + } + }, + "additionalProperties": false, + "required": [ + "servers" + ] + }, + "Address": { + "type": "object", + "properties": { + "scope": { + "type": "string" }, - "Result": { - "type": "boolean" + "space-name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "value": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "value", + "type", + "scope" ] }, - "BoolResults": { + "BytesResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/BoolResult" + "type": "integer" + } + } + }, + "additionalProperties": false, + "required": [ + "result" + ] + }, + "DeployerConnectionValues": { + "type": "object", + "properties": { + "api-addresses": { + "type": "array", + "items": { + "type": "string" + } + }, + "state-addresses": { + "type": "array", + "items": { + "type": "string" } } }, "additionalProperties": false, "required": [ - "Results" + "state-addresses", + "api-addresses" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -6284,312 +5889,311 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "EntityPassword": { + "type": "object", + "properties": { + "password": { + "type": "string" + }, + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag", + "password" + ] + }, + "EntityPasswords": { + "type": "object", + "properties": { + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityPassword" + } + } + }, + "additionalProperties": false, + "required": [ + "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" } }, "additionalProperties": false }, - "LifeResult": { + "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "Life": { - "type": "string" } }, - "additionalProperties": false, - "required": [ - "Life", - "Error" - ] + "additionalProperties": false }, - "LifeResults": { + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/LifeResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "HostPort": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Address": { + "$ref": "#/definitions/Address" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "port": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "Address", + "port" ] }, - "MachinePortRange": { + "LifeResult": { "type": "object", "properties": { - "PortRange": { - "$ref": "#/definitions/PortRange" - }, - "RelationTag": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "UnitTag": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitTag", - "RelationTag", - "PortRange" + "life" ] }, - "MachinePorts": { + "LifeResults": { "type": "object", "properties": { - "MachineTag": { - "type": "string" - }, - "SubnetTag": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/LifeResult" + } } }, "additionalProperties": false, "required": [ - "MachineTag", - "SubnetTag" + "results" ] }, - "MachinePortsParams": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Params": { - "type": "array", - "items": { - "$ref": "#/definitions/MachinePorts" - } + "NotifyWatcherId": { + "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Params" + "NotifyWatcherId" ] }, - "MachinePortsResult": { + "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Ports": { - "type": "array", - "items": { - "$ref": "#/definitions/MachinePortRange" - } + "result": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Ports" + "result" ] }, - "MachinePortsResults": { + "StringsResult": { "type": "object", "properties": { - "Results": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { "type": "array", "items": { - "$ref": "#/definitions/MachinePortsResult" + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false }, - "ModelConfigResult": { + "StringsWatchResult": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "changes": { + "type": "array", + "items": { + "type": "string" } - } - }, - "additionalProperties": false, - "required": [ - "Config" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { + }, + "error": { "$ref": "#/definitions/Error" }, - "NotifyWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "watcher-id" ] }, - "NotifyWatchResults": { + "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/StringsWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] - }, - "PortRange": { + } + } + } + }, + { + "Name": "DiscoverSpaces", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "AddSubnets": { "type": "object", "properties": { - "FromPort": { - "type": "integer" - }, - "Protocol": { - "type": "string" + "Params": { + "$ref": "#/definitions/AddSubnetsParams" }, - "ToPort": { - "type": "integer" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "FromPort", - "ToPort", - "Protocol" - ] + } }, - "StringResult": { + "CreateSpaces": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/CreateSpacesParams" }, "Result": { - "type": "string" + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + } }, - "StringResults": { + "ListSpaces": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/StringResult" - } + "Result": { + "$ref": "#/definitions/DiscoverSpacesResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "StringsResult": { + "ListSubnets": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/SubnetsFilters" }, "Result": { + "$ref": "#/definitions/ListSubnetsResults" + } + } + }, + "ModelConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResult" + } + } + } + }, + "definitions": { + "AddSubnetParams": { + "type": "object", + "properties": { + "space-tag": { + "type": "string" + }, + "subnet-provider-id": { + "type": "string" + }, + "subnet-tag": { + "type": "string" + }, + "zones": { "type": "array", "items": { "type": "string" @@ -6598,1225 +6202,1001 @@ }, "additionalProperties": false, "required": [ - "Error", - "Result" + "space-tag" ] }, - "StringsResults": { + "AddSubnetsParams": { "type": "object", "properties": { - "Results": { + "subnets": { "type": "array", "items": { - "$ref": "#/definitions/StringsResult" + "$ref": "#/definitions/AddSubnetParams" } } }, "additionalProperties": false, "required": [ - "Results" + "subnets" ] }, - "StringsWatchResult": { + "CreateSpaceParams": { "type": "object", "properties": { - "Changes": { + "provider-id": { + "type": "string" + }, + "public": { + "type": "boolean" + }, + "space-tag": { + "type": "string" + }, + "subnet-tags": { "type": "array", "items": { "type": "string" } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { - "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "subnet-tags", + "space-tag", + "public" ] }, - "StringsWatchResults": { + "CreateSpacesParams": { "type": "object", "properties": { - "Results": { + "spaces": { "type": "array", "items": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/CreateSpaceParams" } } }, "additionalProperties": false, "required": [ - "Results" + "spaces" ] }, - "caveat": { + "DiscoverSpacesResults": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ProviderSpace" + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "results" ] }, - "packet": { + "Error": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "code": { + "type": "string" }, - "start": { - "type": "integer" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "totalLen": { - "type": "integer" + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "message", + "code" ] - } - } - } - }, - { - "Name": "HighAvailability", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "EnableHA": { + }, + "ErrorInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ControllersSpecs" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Result": { - "$ref": "#/definitions/ControllersChangeResults" + "macaroon-path": { + "type": "string" } - } + }, + "additionalProperties": false }, - "ResumeHAReplicationAfterUpgrade": { + "ErrorResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ResumeReplicationParams" + "error": { + "$ref": "#/definitions/Error" } - } + }, + "additionalProperties": false }, - "StopHAReplicationForUpgrade": { + "ErrorResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/UpgradeMongoParams" - }, - "Result": { - "$ref": "#/definitions/MongoUpgradeResults" - } - } - } - }, - "definitions": { - "Address": { - "type": "object", - "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "SpaceProviderId": { - "type": "string" - }, - "Type": { - "type": "string" - }, - "Value": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResult" + } } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope", - "SpaceName", - "SpaceProviderId" + "results" ] }, - "ControllersChangeResult": { + "ListSubnetsResults": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "$ref": "#/definitions/ControllersChanges" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/Subnet" + } } }, "additionalProperties": false, "required": [ - "Result", - "Error" + "results" ] }, - "ControllersChangeResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "ModelConfigResult": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ControllersChangeResult" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } } }, "additionalProperties": false, "required": [ - "Results" + "config" ] }, - "ControllersChanges": { + "ProviderSpace": { "type": "object", "properties": { - "added": { - "type": "array", - "items": { - "type": "string" - } - }, - "converted": { - "type": "array", - "items": { - "type": "string" - } - }, - "demoted": { - "type": "array", - "items": { - "type": "string" - } + "error": { + "$ref": "#/definitions/Error" }, - "maintained": { - "type": "array", - "items": { - "type": "string" - } + "name": { + "type": "string" }, - "promoted": { - "type": "array", - "items": { - "type": "string" - } + "provider-id": { + "type": "string" }, - "removed": { + "subnets": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/Subnet" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "name", + "provider-id", + "subnets" + ] }, - "ControllersSpec": { + "Subnet": { "type": "object", "properties": { - "ModelTag": { + "cidr": { "type": "string" }, - "constraints": { - "$ref": "#/definitions/Value" + "life": { + "type": "string" }, - "num-controllers": { + "provider-id": { + "type": "string" + }, + "space-tag": { + "type": "string" + }, + "status": { + "type": "string" + }, + "vlan-tag": { "type": "integer" }, - "placement": { + "zones": { "type": "array", "items": { "type": "string" } - }, - "series": { - "type": "string" } }, "additionalProperties": false, "required": [ - "ModelTag", - "num-controllers" + "cidr", + "vlan-tag", + "life", + "space-tag", + "zones" ] }, - "ControllersSpecs": { + "SubnetsFilters": { "type": "object", "properties": { - "Specs": { + "space-tag": { + "type": "string" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": false + } + } + } + }, + { + "Name": "DiskManager", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "SetMachineBlockDevices": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMachineBlockDevices" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + } + }, + "definitions": { + "BlockDevice": { + "type": "object", + "properties": { + "BusAddress": { + "type": "string" + }, + "DeviceLinks": { "type": "array", "items": { - "$ref": "#/definitions/ControllersSpec" + "type": "string" } + }, + "DeviceName": { + "type": "string" + }, + "FilesystemType": { + "type": "string" + }, + "HardwareId": { + "type": "string" + }, + "InUse": { + "type": "boolean" + }, + "Label": { + "type": "string" + }, + "MountPoint": { + "type": "string" + }, + "Size": { + "type": "integer" + }, + "UUID": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Specs" + "DeviceName", + "DeviceLinks", + "Label", + "UUID", + "HardwareId", + "BusAddress", + "Size", + "FilesystemType", + "InUse", + "MountPoint" ] }, "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 }, - "HAMember": { + "ErrorResult": { "type": "object", "properties": { - "PublicAddress": { - "$ref": "#/definitions/Address" - }, - "Series": { - "type": "string" - }, - "Tag": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResult" + } } }, "additionalProperties": false, "required": [ - "Tag", - "PublicAddress", - "Series" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineBlockDevices": { "type": "object", "properties": { - "caveats": { + "block-devices": { "type": "array", "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" + "$ref": "#/definitions/BlockDevice" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "machine": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "machine" ] }, - "Member": { + "SetMachineBlockDevices": { "type": "object", "properties": { - "Address": { - "type": "string" - }, - "Arbiter": { - "type": "boolean" - }, - "BuildIndexes": { - "type": "boolean" - }, - "Hidden": { - "type": "boolean" - }, - "Id": { - "type": "integer" - }, - "Priority": { - "type": "number" - }, - "SlaveDelay": { - "type": "integer" - }, - "Tags": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "Votes": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "Id", - "Address", - "Arbiter", - "BuildIndexes", - "Hidden", - "Priority", - "Tags", - "SlaveDelay", - "Votes" - ] - }, - "MongoUpgradeResults": { - "type": "object", - "properties": { - "Master": { - "$ref": "#/definitions/HAMember" - }, - "Members": { - "type": "array", - "items": { - "$ref": "#/definitions/HAMember" - } - }, - "RsMembers": { - "type": "array", - "items": { - "$ref": "#/definitions/Member" - } - } - }, - "additionalProperties": false, - "required": [ - "RsMembers", - "Master", - "Members" - ] - }, - "ResumeReplicationParams": { - "type": "object", - "properties": { - "Members": { + "machine-block-devices": { "type": "array", "items": { - "$ref": "#/definitions/Member" + "$ref": "#/definitions/MachineBlockDevices" } } }, "additionalProperties": false, "required": [ - "Members" + "machine-block-devices" ] - }, - "UpgradeMongoParams": { + } + } + } + }, + { + "Name": "EntityWatcher", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "Next": { "type": "object", "properties": { - "Target": { - "$ref": "#/definitions/Version" + "Result": { + "$ref": "#/definitions/EntitiesWatchResult" } - }, - "additionalProperties": false, - "required": [ - "Target" - ] + } }, - "Value": { + "Stop": { + "type": "object" + } + }, + "definitions": { + "EntitiesWatchResult": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "container": { - "type": "string" - }, - "cpu-cores": { - "type": "integer" - }, - "cpu-power": { - "type": "integer" - }, - "instance-type": { - "type": "string" - }, - "mem": { - "type": "integer" - }, - "root-disk": { - "type": "integer" - }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } - }, - "tags": { + "changes": { "type": "array", "items": { "type": "string" } }, - "virt-type": { - "type": "string" - } - }, - "additionalProperties": false - }, - "Version": { - "type": "object", - "properties": { - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "StorageEngine": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "Major", - "Minor", - "Patch", - "StorageEngine" + "watcher-id" ] }, - "caveat": { + "Error": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "code": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "verificationId": { - "$ref": "#/definitions/packet" + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "message", + "code" ] }, - "packet": { + "ErrorInfo": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "totalLen": { - "type": "integer" + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false } } } }, { - "Name": "HostKeyReporter", - "Version": 1, + "Name": "FilesystemAttachmentsWatcher", + "Version": 2, "Schema": { "type": "object", "properties": { - "ReportKeys": { + "Next": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SSHHostKeySet" - }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/MachineStorageIdsWatchResult" } } + }, + "Stop": { + "type": "object" } }, "definitions": { "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "ErrorResult": { + "Macaroon": { "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, - "ErrorResults": { + "MachineStorageId": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } + "attachment-tag": { + "type": "string" + }, + "machine-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "machine-tag", + "attachment-tag" ] }, - "Macaroon": { + "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { + "changes": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/MachineStorageId" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "watcher-id", + "changes" ] - }, - "SSHHostKeySet": { + } + } + } + }, + { + "Name": "Firewaller", + "Version": 3, + "Schema": { + "type": "object", + "properties": { + "GetAssignedMachine": { "type": "object", "properties": { - "entity-keys": { - "type": "array", - "items": { - "$ref": "#/definitions/SSHHostKeys" - } - } - }, - "additionalProperties": false, - "required": [ - "entity-keys" - ] + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StringResults" + } + } }, - "SSHHostKeys": { + "GetExposed": { "type": "object", "properties": { - "public-keys": { - "type": "array", - "items": { - "type": "string" - } + "Params": { + "$ref": "#/definitions/Entities" }, - "tag": { - "type": "string" + "Result": { + "$ref": "#/definitions/BoolResults" } - }, - "additionalProperties": false, - "required": [ - "tag", - "public-keys" - ] + } }, - "caveat": { + "GetMachineActiveSubnets": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/StringsResults" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "GetMachinePorts": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "Params": { + "$ref": "#/definitions/MachinePortsParams" }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/MachinePortsResults" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "ImageManager", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "DeleteImages": { + } + }, + "InstanceId": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ImageFilterParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/StringResults" } } }, - "ListImages": { + "Life": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ImageFilterParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ListImageResult" + "$ref": "#/definitions/LifeResults" } } - } - }, - "definitions": { - "Error": { + }, + "ModelConfig": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Result": { + "$ref": "#/definitions/ModelConfigResult" + } + } + }, + "Watch": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/NotifyWatchResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "WatchForModelConfigChanges": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "WatchModelMachines": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringsWatchResult" + } + } + }, + "WatchOpenedPorts": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/StringsWatchResults" } - }, - "additionalProperties": false + } }, - "ErrorResult": { + "WatchUnits": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StringsWatchResults" + } + } + } + }, + "definitions": { + "BoolResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" + }, + "result": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error" + "result" ] }, - "ErrorResults": { + "BoolResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/BoolResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "ImageFilterParams": { + "Entities": { "type": "object", "properties": { - "images": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/ImageSpec" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "images" + "entities" ] }, - "ImageMetadata": { + "Entity": { "type": "object", "properties": { - "arch": { + "tag": { "type": "string" - }, - "created": { - "type": "string", - "format": "date-time" - }, - "kind": { + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { + "type": "object", + "properties": { + "code": { "type": "string" }, - "series": { - "type": "string" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "url": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "kind", - "arch", - "series", - "url", - "created" + "message", + "code" ] }, - "ImageSpec": { + "ErrorInfo": { "type": "object", "properties": { - "arch": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "kind": { + "macaroon-path": { "type": "string" + } + }, + "additionalProperties": false + }, + "LifeResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "series": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "kind", - "arch", - "series" + "life" ] }, - "ListImageResult": { + "LifeResults": { "type": "object", "properties": { - "result": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ImageMetadata" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "result" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachinePortRange": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "port-range": { + "$ref": "#/definitions/PortRange" }, - "location": { - "$ref": "#/definitions/packet" + "relation-tag": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "unit-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "unit-tag", + "relation-tag", + "port-range" ] }, - "caveat": { + "MachinePorts": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "machine-tag": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "subnet-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "machine-tag", + "subnet-tag" ] }, - "packet": { + "MachinePortsParams": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/MachinePorts" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "params" ] - } - } - } - }, - { - "Name": "ImageMetadata", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "Delete": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/MetadataImageIds" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } }, - "List": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ImageMetadataFilter" - }, - "Result": { - "$ref": "#/definitions/ListCloudImageMetadataResult" - } - } - }, - "Save": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/MetadataSaveParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "UpdateFromPublishedImages": { - "type": "object" - } - }, - "definitions": { - "CloudImageMetadata": { + "MachinePortsResult": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "image_id": { - "type": "string" - }, - "priority": { - "type": "integer" - }, - "region": { - "type": "string" - }, - "root_storage_size": { - "type": "integer" - }, - "root_storage_type": { - "type": "string" - }, - "series": { - "type": "string" - }, - "source": { - "type": "string" - }, - "stream": { - "type": "string" - }, - "version": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "virt_type": { - "type": "string" + "ports": { + "type": "array", + "items": { + "$ref": "#/definitions/MachinePortRange" + } } }, "additionalProperties": false, "required": [ - "image_id", - "region", - "version", - "series", - "arch", - "source", - "priority" + "ports" ] }, - "CloudImageMetadataList": { + "MachinePortsResults": { "type": "object", "properties": { - "metadata": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/CloudImageMetadata" + "$ref": "#/definitions/MachinePortsResult" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "Error": { + "ModelConfigResult": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "config" ] }, - "ErrorInfo": { + "NotifyWatchResult": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { + "NotifyWatcherId": { "type": "string" - } - }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { + }, + "error": { "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Error" + "NotifyWatcherId" ] }, - "ErrorResults": { + "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/NotifyWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "ImageMetadataFilter": { + "PortRange": { "type": "object", "properties": { - "arches": { - "type": "array", - "items": { - "type": "string" - } - }, - "region": { - "type": "string" - }, - "root-storage-type": { - "type": "string" - }, - "series": { - "type": "array", - "items": { - "type": "string" - } + "from-port": { + "type": "integer" }, - "stream": { + "protocol": { "type": "string" }, - "virt_type": { - "type": "string" + "to-port": { + "type": "integer" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "from-port", + "to-port", + "protocol" + ] }, - "ListCloudImageMetadataResult": { + "StringResult": { "type": "object", "properties": { + "error": { + "$ref": "#/definitions/Error" + }, "result": { - "type": "array", - "items": { - "$ref": "#/definitions/CloudImageMetadata" - } + "type": "string" } }, "additionalProperties": false, @@ -7824,228 +7204,123 @@ "result" ] }, - "Macaroon": { + "StringResults": { "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/StringResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, - "MetadataImageIds": { + "StringsResult": { "type": "object", "properties": { - "image_ids": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "image_ids" - ] + "additionalProperties": false }, - "MetadataSaveParams": { + "StringsResults": { "type": "object", "properties": { - "metadata": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/CloudImageMetadataList" + "$ref": "#/definitions/StringsResult" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "caveat": { + "StringsWatchResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "changes": { + "type": "array", + "items": { + "type": "string" + } }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "watcher-id" ] }, - "packet": { + "StringsWatchResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringsWatchResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "InstancePoller", + "Name": "HighAvailability", "Version": 2, "Schema": { "type": "object", "properties": { - "AreManuallyProvisioned": { + "EnableHA": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ControllersSpecs" }, "Result": { - "$ref": "#/definitions/BoolResults" - } - } - }, - "InstanceId": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, - "InstanceStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StatusResults" - } - } - }, - "Life": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/LifeResults" - } - } - }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, - "ProviderAddresses": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/MachineAddressesResults" - } - } - }, - "SetInstanceStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/ControllersChangeResults" } } }, - "SetProviderAddresses": { + "ResumeHAReplicationAfterUpgrade": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SetMachinesAddresses" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/ResumeReplicationParams" } } }, - "Status": { + "StopHAReplicationForUpgrade": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/UpgradeMongoParams" }, "Result": { - "$ref": "#/definitions/StatusResults" - } - } - }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchModelMachines": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/MongoUpgradeResults" } } } @@ -8060,6 +7335,9 @@ "SpaceName": { "type": "string" }, + "SpaceProviderId": { + "type": "string" + }, "Type": { "type": "string" }, @@ -8071,600 +7349,523 @@ "required": [ "Value", "Type", - "Scope" + "Scope", + "SpaceName", + "SpaceProviderId" ] }, - "BoolResult": { + "ControllersChangeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { - "type": "boolean" + "result": { + "$ref": "#/definitions/ControllersChanges" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, - "BoolResults": { + "ControllersChangeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/BoolResult" + "$ref": "#/definitions/ControllersChangeResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Entities": { + "ControllersChanges": { "type": "object", "properties": { - "Entities": { + "added": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "type": "string" + } + }, + "converted": { + "type": "array", + "items": { + "type": "string" + } + }, + "demoted": { + "type": "array", + "items": { + "type": "string" + } + }, + "maintained": { + "type": "array", + "items": { + "type": "string" + } + }, + "promoted": { + "type": "array", + "items": { + "type": "string" + } + }, + "removed": { + "type": "array", + "items": { + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Entities" - ] + "additionalProperties": false }, - "Entity": { + "ControllersSpec": { "type": "object", "properties": { - "Tag": { + "constraints": { + "$ref": "#/definitions/Value" + }, + "model-tag": { + "type": "string" + }, + "num-controllers": { + "type": "integer" + }, + "placement": { + "type": "array", + "items": { + "type": "string" + } + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "model-tag", + "num-controllers" ] }, - "EntityStatusArgs": { + "ControllersSpecs": { "type": "object", "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "specs": { + "type": "array", + "items": { + "$ref": "#/definitions/ControllersSpec" } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "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" } }, "additionalProperties": false }, - "ErrorResult": { + "HAMember": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "public-address": { + "$ref": "#/definitions/Address" + }, + "series": { + "type": "string" + }, + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error" + "tag", + "public-address", + "series" ] }, - "ErrorResults": { + "Macaroon": { "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false }, - "LifeResult": { + "Member": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Life": { + "Address": { "type": "string" + }, + "Arbiter": { + "type": "boolean" + }, + "BuildIndexes": { + "type": "boolean" + }, + "Hidden": { + "type": "boolean" + }, + "Id": { + "type": "integer" + }, + "Priority": { + "type": "number" + }, + "SlaveDelay": { + "type": "integer" + }, + "Tags": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "Votes": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Life", - "Error" - ] - }, - "LifeResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" + "Id", + "Address", + "Arbiter", + "BuildIndexes", + "Hidden", + "Priority", + "Tags", + "SlaveDelay", + "Votes" ] }, - "Macaroon": { + "MongoUpgradeResults": { "type": "object", "properties": { - "caveats": { + "ha-members": { "type": "array", "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" + "$ref": "#/definitions/HAMember" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "master": { + "$ref": "#/definitions/HAMember" }, - "sig": { + "rs-members": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Member" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "rs-members", + "master", + "ha-members" ] }, - "MachineAddresses": { + "ResumeReplicationParams": { "type": "object", "properties": { - "Addresses": { + "members": { "type": "array", "items": { - "$ref": "#/definitions/Address" + "$ref": "#/definitions/Member" } - }, - "Tag": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Addresses" + "members" ] }, - "MachineAddressesResult": { + "UpgradeMongoParams": { "type": "object", "properties": { - "Addresses": { - "type": "array", - "items": { - "$ref": "#/definitions/Address" - } - }, - "Error": { - "$ref": "#/definitions/Error" + "target": { + "$ref": "#/definitions/Version" } }, "additionalProperties": false, "required": [ - "Error", - "Addresses" + "target" ] }, - "MachineAddressesResults": { + "Value": { "type": "object", "properties": { - "Results": { + "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": { - "$ref": "#/definitions/MachineAddressesResult" + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" } + }, + "virt-type": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false }, - "ModelConfigResult": { + "Version": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "string" + }, + "StorageEngine": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Config" + "Major", + "Minor", + "Patch", + "StorageEngine" ] - }, - "NotifyWatchResult": { + } + } + } + }, + { + "Name": "HostKeyReporter", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "ReportKeys": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/SSHHostKeySet" }, - "NotifyWatcherId": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] - }, - "SetMachinesAddresses": { + } + } + }, + "definitions": { + "Error": { "type": "object", "properties": { - "MachineAddresses": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineAddresses" - } + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "MachineAddresses" + "message", + "code" ] }, - "SetStatus": { + "ErrorInfo": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityStatusArgs" - } + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Entities" - ] + "additionalProperties": false }, - "StatusResult": { + "ErrorResult": { "type": "object", "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "Id": { - "type": "string" - }, - "Info": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "Since": { - "type": "string", - "format": "date-time" - }, - "Status": { - "type": "string" } }, - "additionalProperties": false, - "required": [ - "Error", - "Id", - "Life", - "Status", - "Info", - "Data", - "Since" - ] + "additionalProperties": false }, - "StatusResults": { + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/StatusResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "StringResult": { + "Macaroon": { "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, - "StringResults": { + "SSHHostKeySet": { "type": "object", "properties": { - "Results": { + "entity-keys": { "type": "array", "items": { - "$ref": "#/definitions/StringResult" + "$ref": "#/definitions/SSHHostKeys" } } }, "additionalProperties": false, "required": [ - "Results" + "entity-keys" ] }, - "StringsWatchResult": { + "SSHHostKeys": { "type": "object", "properties": { - "Changes": { + "public-keys": { "type": "array", "items": { "type": "string" } }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "tag", + "public-keys" ] - }, - "caveat": { + } + } + } + }, + { + "Name": "ImageManager", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "DeleteImages": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/ImageFilterParams" }, - "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": "KeyManager", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "AddKeys": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModifyUserSSHKeys" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "DeleteKeys": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModifyUserSSHKeys" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "ImportKeys": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModifyUserSSHKeys" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "Result": { + "$ref": "#/definitions/ErrorResults" } } }, - "ListKeys": { + "ListImages": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ListSSHKeys" + "$ref": "#/definitions/ImageFilterParams" }, "Result": { - "$ref": "#/definitions/StringsResults" + "$ref": "#/definitions/ListImageResult" } } } }, "definitions": { - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "Entity": { - "type": "object", - "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -8673,19 +7874,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" @@ -8694,640 +7892,510 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "ListSSHKeys": { + "ImageFilterParams": { "type": "object", "properties": { - "Entities": { - "$ref": "#/definitions/Entities" - }, - "Mode": { - "type": "boolean" + "images": { + "type": "array", + "items": { + "$ref": "#/definitions/ImageSpec" + } } }, "additionalProperties": false, "required": [ - "Entities", - "Mode" + "images" ] }, - "Macaroon": { + "ImageMetadata": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "arch": { + "type": "string" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "created": { + "type": "string", + "format": "date-time" }, - "id": { - "$ref": "#/definitions/packet" + "kind": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "series": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "url": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "kind", + "arch", + "series", + "url", + "created" ] }, - "ModifyUserSSHKeys": { + "ImageSpec": { "type": "object", "properties": { - "Keys": { - "type": "array", - "items": { - "type": "string" - } + "arch": { + "type": "string" }, - "User": { + "kind": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "User", - "Keys" - ] - }, - "StringsResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" }, - "Result": { - "type": "array", - "items": { - "type": "string" - } + "series": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "kind", + "arch", + "series" ] }, - "StringsResults": { + "ListImageResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/StringsResult" + "$ref": "#/definitions/ImageMetadata" } } }, "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" + "result" ] }, - "packet": { + "Macaroon": { "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } }, { - "Name": "KeyUpdater", - "Version": 1, + "Name": "ImageMetadata", + "Version": 2, "Schema": { "type": "object", "properties": { - "AuthorisedKeys": { + "Delete": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/MetadataImageIds" }, "Result": { - "$ref": "#/definitions/StringsResults" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchAuthorisedKeys": { + "List": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ImageMetadataFilter" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ListCloudImageMetadataResult" } } - } - }, - "definitions": { - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] }, - "Entity": { + "Save": { "type": "object", "properties": { - "Tag": { - "type": "string" + "Params": { + "$ref": "#/definitions/MetadataSaveParams" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] + } }, - "Error": { + "UpdateFromPublishedImages": { + "type": "object" + } + }, + "definitions": { + "CloudImageMetadata": { "type": "object", "properties": { - "Code": { + "arch": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "image-id": { + "type": "string" + }, + "priority": { + "type": "integer" + }, + "region": { + "type": "string" + }, + "root-storage-size": { + "type": "integer" + }, + "root-storage-type": { + "type": "string" + }, + "series": { + "type": "string" + }, + "source": { + "type": "string" + }, + "stream": { + "type": "string" + }, + "version": { + "type": "string" }, - "Message": { + "virt-type": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "image-id", + "region", + "version", + "series", + "arch", + "source", + "priority" ] }, - "ErrorInfo": { + "CloudImageMetadataList": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "metadata": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudImageMetadata" + } } }, "additionalProperties": false }, - "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" ] }, - "NotifyWatchResult": { + "ErrorInfo": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "NotifyWatcherId": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + "additionalProperties": false }, - "NotifyWatchResults": { + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "StringsResult": { + "ImageMetadataFilter": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "arches": { + "type": "array", + "items": { + "type": "string" + } }, - "Result": { + "region": { + "type": "string" + }, + "root-storage-type": { + "type": "string" + }, + "series": { "type": "array", "items": { "type": "string" } + }, + "stream": { + "type": "string" + }, + "virt-type": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, - "StringsResults": { + "ListCloudImageMetadataResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/StringsResult" + "$ref": "#/definitions/CloudImageMetadata" } } }, "additionalProperties": false, "required": [ - "Results" + "result" ] }, - "caveat": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MetadataImageIds": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "image-ids": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "image-ids" ] }, - "packet": { + "MetadataSaveParams": { "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 } } } }, { - "Name": "LeadershipService", - "Version": 2, + "Name": "InstancePoller", + "Version": 3, "Schema": { "type": "object", "properties": { - "BlockUntilLeadershipReleased": { + "AreManuallyProvisioned": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ServiceTag" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/BoolResults" } } }, - "ClaimLeadership": { + "InstanceId": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ClaimLeadershipBulkParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ClaimLeadershipBulkResults" + "$ref": "#/definitions/StringResults" } } - } - }, - "definitions": { - "ClaimLeadershipBulkParams": { + }, + "InstanceStatus": { "type": "object", "properties": { "Params": { - "type": "array", - "items": { - "$ref": "#/definitions/ClaimLeadershipParams" - } + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StatusResults" } - }, - "additionalProperties": false, - "required": [ - "Params" - ] + } }, - "ClaimLeadershipBulkResults": { + "Life": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/LifeResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "ClaimLeadershipParams": { + "ModelConfig": { "type": "object", "properties": { - "DurationSeconds": { - "type": "number" - }, - "ServiceTag": { - "type": "string" - }, - "UnitTag": { - "type": "string" + "Result": { + "$ref": "#/definitions/ModelConfigResult" } - }, - "additionalProperties": false, - "required": [ - "ServiceTag", - "UnitTag", - "DurationSeconds" - ] + } }, - "Error": { + "ProviderAddresses": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Params": { + "$ref": "#/definitions/Entities" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/MachineAddressesResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "SetInstanceStatus": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/SetStatus" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false + } }, - "ErrorResult": { + "SetProviderAddresses": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/SetMachinesAddresses" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Error" - ] + } }, - "Macaroon": { + "Status": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "Result": { + "$ref": "#/definitions/StatusResults" } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + } }, - "ServiceTag": { + "WatchForModelConfigChanges": { "type": "object", "properties": { - "Name": { - "type": "string" + "Result": { + "$ref": "#/definitions/NotifyWatchResult" } - }, - "additionalProperties": false, - "required": [ - "Name" - ] + } }, - "caveat": { + "WatchModelMachines": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringsWatchResult" + } + } + } + }, + "definitions": { + "Address": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "scope": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "space-name": { + "type": "string" + }, + "type": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "value": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "value", + "type", + "scope" ] }, - "packet": { + "BoolResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "result": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "result" ] - } - } - } - }, - { - "Name": "LifeFlag", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Life": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/LifeResults" - } - } }, - "Watch": { + "BoolResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/BoolResult" + } } - } - } - }, - "definitions": { + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -9336,72 +8404,125 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "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" + "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" } }, "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" + ] + }, "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" @@ -9410,145 +8531,286 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineAddresses": { "type": "object", "properties": { - "caveats": { + "addresses": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "$ref": "#/definitions/Address" } }, - "data": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "addresses" + ] + }, + "MachineAddressesResult": { + "type": "object", + "properties": { + "addresses": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Address" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "addresses" + ] + }, + "MachineAddressesResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/MachineAddressesResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" + ] + }, + "ModelConfigResult": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, - "NotifyWatchResults": { + "SetMachinesAddresses": { "type": "object", "properties": { - "Results": { + "machine-addresses": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/MachineAddresses" } } }, "additionalProperties": false, "required": [ - "Results" + "machine-addresses" ] }, - "caveat": { + "SetStatus": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityStatusArgs" + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "entities" ] }, - "packet": { + "StatusResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "id": { + "type": "string" + }, + "info": { + "type": "string" + }, + "life": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "id", + "life", + "status", + "info", + "data", + "since" + ] + }, + "StatusResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StatusResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "StringResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "result" + ] + }, + "StringResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "StringsWatchResult": { + "type": "object", + "properties": { + "changes": { + "type": "array", + "items": { + "type": "string" + } + }, + "error": { + "$ref": "#/definitions/Error" + }, + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } } }, { - "Name": "Logger", + "Name": "KeyManager", "Version": 1, "Schema": { "type": "object", "properties": { - "LoggingConfig": { + "AddKeys": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ModifyUserSSHKeys" }, "Result": { - "$ref": "#/definitions/StringResults" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchLoggingConfig": { + "DeleteKeys": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ModifyUserSSHKeys" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ErrorResults" + } + } + }, + "ImportKeys": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModifyUserSSHKeys" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "ListKeys": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ListSSHKeys" + }, + "Result": { + "$ref": "#/definitions/StringsResults" } } } @@ -9557,7 +8819,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -9566,460 +8828,421 @@ }, "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" - ] - }, - "NotifyWatchResult": { + "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" } }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + "additionalProperties": false }, - "NotifyWatchResults": { + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "StringResult": { + "ListSSHKeys": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "entities": { + "$ref": "#/definitions/Entities" }, - "Result": { - "type": "string" + "mode": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "entities", + "mode" ] }, - "StringResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "ModifyUserSSHKeys": { "type": "object", "properties": { - "Results": { + "ssh-keys": { "type": "array", "items": { - "$ref": "#/definitions/StringResult" + "type": "string" } + }, + "user": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "user", + "ssh-keys" ] }, - "caveat": { + "StringsResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "result": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "StringsResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringsResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "MachineActions", + "Name": "KeyUpdater", "Version": 1, "Schema": { "type": "object", "properties": { - "Actions": { + "AuthorisedKeys": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ActionResults" + "$ref": "#/definitions/StringsResults" } } }, - "BeginActions": { + "WatchAuthorisedKeys": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/NotifyWatchResults" } } - }, - "FinishActions": { + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ActionExecutionResults" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "RunningActions": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ActionsByReceivers" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } } - } + }, + "additionalProperties": false, + "required": [ + "entities" + ] }, - "WatchActionNotifications": { + "Entity": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringsWatchResults" + "tag": { + "type": "string" } - } - } - }, - "definitions": { - "Action": { + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { "type": "object", "properties": { - "name": { + "code": { "type": "string" }, - "parameters": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "receiver": { - "type": "string" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "tag": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "tag", - "receiver", - "name" + "message", + "code" ] }, - "ActionExecutionResult": { + "ErrorInfo": { "type": "object", "properties": { - "actiontag": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "message": { + "macaroon-path": { "type": "string" - }, - "results": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "status": { + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "actiontag", - "status" + "NotifyWatcherId" ] }, - "ActionExecutionResults": { + "NotifyWatchResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/ActionExecutionResult" + "$ref": "#/definitions/NotifyWatchResult" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "ActionResult": { + "StringsResult": { "type": "object", "properties": { - "action": { - "$ref": "#/definitions/Action" - }, - "completed": { - "type": "string", - "format": "date-time" - }, - "enqueued": { - "type": "string", - "format": "date-time" - }, "error": { "$ref": "#/definitions/Error" }, - "message": { - "type": "string" - }, - "output": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "result": { + "type": "array", + "items": { + "type": "string" } - }, - "started": { - "type": "string", - "format": "date-time" - }, - "status": { - "type": "string" } }, "additionalProperties": false }, - "ActionResults": { + "StringsResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/ActionResult" + "$ref": "#/definitions/StringsResult" } } }, - "additionalProperties": false - }, - "ActionsByReceiver": { + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "Name": "LeadershipService", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "BlockUntilLeadershipReleased": { "type": "object", "properties": { - "actions": { - "type": "array", - "items": { - "$ref": "#/definitions/ActionResult" - } + "Params": { + "$ref": "#/definitions/ApplicationTag" }, - "error": { - "$ref": "#/definitions/Error" + "Result": { + "$ref": "#/definitions/ErrorResult" + } + } + }, + "ClaimLeadership": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ClaimLeadershipBulkParams" }, - "receiver": { + "Result": { + "$ref": "#/definitions/ClaimLeadershipBulkResults" + } + } + } + }, + "definitions": { + "ApplicationTag": { + "type": "object", + "properties": { + "Name": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "Name" + ] }, - "ActionsByReceivers": { + "ClaimLeadershipBulkParams": { "type": "object", "properties": { - "actions": { + "params": { "type": "array", "items": { - "$ref": "#/definitions/ActionsByReceiver" + "$ref": "#/definitions/ClaimLeadershipParams" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "params" + ] }, - "Entities": { + "ClaimLeadershipBulkResults": { "type": "object", "properties": { - "Entities": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Entities" + "results" ] }, - "Entity": { + "ClaimLeadershipParams": { "type": "object", "properties": { - "Tag": { + "application-tag": { + "type": "string" + }, + "duration": { + "type": "number" + }, + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "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" } }, @@ -10028,720 +9251,731 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, - "ErrorResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "LifeFlag", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Life": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/LifeResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "Macaroon": { + "Watch": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Params": { + "$ref": "#/definitions/Entities" }, - "data": { + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + } + }, + "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" - }, - "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" - } + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Error": { + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "LifeResult": { + "type": "object", + "properties": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "life" ] }, - "StringsWatchResults": { + "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "caveat": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "NotifyWatcherId": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "NotifyWatcherId" ] }, - "packet": { + "NotifyWatchResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "MachineManager", - "Version": 2, + "Name": "LogForwarding", + "Version": 1, "Schema": { "type": "object", "properties": { - "AddMachines": { + "GetLastSent": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddMachines" + "$ref": "#/definitions/LogForwardingGetLastSentParams" }, "Result": { - "$ref": "#/definitions/AddMachinesResults" + "$ref": "#/definitions/LogForwardingGetLastSentResults" + } + } + }, + "SetLastSent": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/LogForwardingSetLastSentParams" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } } } }, "definitions": { - "AddMachineParams": { + "Error": { "type": "object", "properties": { - "Addrs": { - "type": "array", - "items": { - "$ref": "#/definitions/Address" - } - }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "ContainerType": { + "code": { "type": "string" }, - "Disks": { - "type": "array", - "items": { - "$ref": "#/definitions/Constraints" - } - }, - "HardwareCharacteristics": { - "$ref": "#/definitions/HardwareCharacteristics" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "InstanceId": { + "message": { "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Jobs": { + "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": "string" + "$ref": "#/definitions/ErrorResult" } - }, - "Nonce": { - "type": "string" - }, - "ParentId": { - "type": "string" - }, - "Placement": { - "$ref": "#/definitions/Placement" - }, - "Series": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Series", - "Constraints", - "Jobs", - "Disks", - "Placement", - "ParentId", - "ContainerType", - "InstanceId", - "Nonce", - "HardwareCharacteristics", - "Addrs" + "results" ] }, - "AddMachines": { + "LogForwardingGetLastSentParams": { "type": "object", "properties": { - "MachineParams": { + "ids": { "type": "array", "items": { - "$ref": "#/definitions/AddMachineParams" + "$ref": "#/definitions/LogForwardingID" } } }, "additionalProperties": false, "required": [ - "MachineParams" + "ids" ] }, - "AddMachinesResult": { + "LogForwardingGetLastSentResult": { "type": "object", "properties": { - "Error": { + "err": { "$ref": "#/definitions/Error" }, - "Machine": { - "type": "string" + "record-id": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Machine", - "Error" + "record-id", + "err" ] }, - "AddMachinesResults": { + "LogForwardingGetLastSentResults": { "type": "object", "properties": { - "Machines": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/AddMachinesResult" + "$ref": "#/definitions/LogForwardingGetLastSentResult" } } }, "additionalProperties": false, "required": [ - "Machines" + "results" ] }, - "Address": { + "LogForwardingID": { "type": "object", "properties": { - "Scope": { + "model": { "type": "string" }, - "SpaceName": { - "type": "string" - }, - "Type": { - "type": "string" - }, - "Value": { + "sink": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "model", + "sink" ] }, - "Constraints": { + "LogForwardingSetLastSentParam": { "type": "object", "properties": { - "Count": { - "type": "integer" + "LogForwardingID": { + "$ref": "#/definitions/LogForwardingID" }, - "Pool": { - "type": "string" - }, - "Size": { + "record-id": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Pool", - "Size", - "Count" + "LogForwardingID", + "record-id" ] }, - "Error": { + "LogForwardingSetLastSentParams": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/LogForwardingSetLastSentParam" + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "params" ] }, - "ErrorInfo": { + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "Logger", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "LoggingConfig": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/Entities" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/StringResults" } - }, - "additionalProperties": false + } }, - "HardwareCharacteristics": { + "WatchLoggingConfig": { "type": "object", "properties": { - "Arch": { - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "CpuCores": { - "type": "integer" - }, - "CpuPower": { - "type": "integer" - }, - "Mem": { - "type": "integer" - }, - "RootDisk": { - "type": "integer" + "Params": { + "$ref": "#/definitions/Entities" }, - "Tags": { - "type": "array", - "items": { - "type": "string" - } + "Result": { + "$ref": "#/definitions/NotifyWatchResults" } - }, - "additionalProperties": false - }, - "Macaroon": { + } + } + }, + "definitions": { + "Entities": { "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": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "entities" ] }, - "Placement": { + "Entity": { "type": "object", "properties": { - "Directive": { - "type": "string" - }, - "Scope": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Scope", - "Directive" + "tag" ] }, - "Value": { + "Error": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "container": { + "code": { "type": "string" }, - "cpu-cores": { - "type": "integer" - }, - "cpu-power": { - "type": "integer" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "instance-type": { + "message": { "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "mem": { - "type": "integer" - }, - "root-disk": { - "type": "integer" - }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { + "type": "string" }, - "tags": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/NotifyWatchResult" } - }, - "virt-type": { - "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "caveat": { + "StringResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "result": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "result" ] }, - "packet": { + "StringResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "Machiner", + "Name": "MachineActions", "Version": 1, "Schema": { "type": "object", "properties": { - "APIAddresses": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" - } - } - }, - "APIHostPorts": { + "Actions": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/APIHostPortsResult" + "$ref": "#/definitions/ActionResults" } } }, - "CACert": { + "BeginActions": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/BytesResult" + "$ref": "#/definitions/ErrorResults" } } }, - "EnsureDead": { + "FinishActions": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ActionExecutionResults" }, "Result": { "$ref": "#/definitions/ErrorResults" } } }, - "Jobs": { + "RunningActions": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/JobsResults" + "$ref": "#/definitions/ActionsByReceivers" } } }, - "Life": { + "WatchActionNotifications": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/LifeResults" + "$ref": "#/definitions/StringsWatchResults" } } - }, - "ModelUUID": { + } + }, + "definitions": { + "Action": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/StringResult" + "name": { + "type": "string" + }, + "parameters": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "receiver": { + "type": "string" + }, + "tag": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "tag", + "receiver", + "name" + ] }, - "SetMachineAddresses": { + "ActionExecutionResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetMachinesAddresses" + "action-tag": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "message": { + "type": "string" + }, + "results": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "status": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "action-tag", + "status" + ] }, - "SetObservedNetworkConfig": { + "ActionExecutionResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetMachineNetworkConfig" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ActionExecutionResult" + } } - } + }, + "additionalProperties": false }, - "SetProviderNetworkConfig": { + "ActionResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "action": { + "$ref": "#/definitions/Action" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" + "completed": { + "type": "string", + "format": "date-time" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "UpdateStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" + "enqueued": { + "type": "string", + "format": "date-time" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "Watch": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "message": { + "type": "string" + }, + "output": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "started": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" } - } + }, + "additionalProperties": false }, - "WatchAPIHostPorts": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - } - }, - "definitions": { - "APIHostPortsResult": { + "ActionResults": { "type": "object", "properties": { - "Servers": { + "results": { "type": "array", "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } + "$ref": "#/definitions/ActionResult" } } }, - "additionalProperties": false, - "required": [ - "Servers" - ] + "additionalProperties": false }, - "Address": { + "ActionsByReceiver": { "type": "object", "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" + "actions": { + "type": "array", + "items": { + "$ref": "#/definitions/ActionResult" + } }, - "Type": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "Value": { + "receiver": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Value", - "Type", - "Scope" - ] + "additionalProperties": false }, - "BytesResult": { + "ActionsByReceivers": { "type": "object", "properties": { - "Result": { + "actions": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ActionsByReceiver" } } }, - "additionalProperties": false, - "required": [ - "Result" - ] + "additionalProperties": false }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -10750,77 +9984,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, - "EntityStatusArgs": { - "type": "object", - "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "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" } }, @@ -10829,19 +10033,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" @@ -10850,671 +10051,627 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "HostPort": { + "Macaroon": { "type": "object", - "properties": { - "Address": { - "$ref": "#/definitions/Address" - }, - "Port": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "Address", - "Port" - ] + "additionalProperties": false }, - "JobsResult": { + "StringsWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Jobs": { + "changes": { "type": "array", "items": { "type": "string" } + }, + "error": { + "$ref": "#/definitions/Error" + }, + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Jobs", - "Error" + "watcher-id" ] }, - "JobsResults": { + "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/JobsResult" + "$ref": "#/definitions/StringsWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] - }, - "LifeResult": { + } + } + } + }, + { + "Name": "MachineManager", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "AddMachines": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/AddMachines" }, - "Life": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Life", - "Error" - ] - }, - "LifeResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } + "Result": { + "$ref": "#/definitions/AddMachinesResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { + } + } + }, + "definitions": { + "AddMachineParams": { "type": "object", "properties": { - "caveats": { + "addresses": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "$ref": "#/definitions/Address" } }, - "data": { + "constraints": { + "$ref": "#/definitions/Value" + }, + "container-type": { + "type": "string" + }, + "disks": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Constraints" } }, - "id": { - "$ref": "#/definitions/packet" + "hardware-characteristics": { + "$ref": "#/definitions/HardwareCharacteristics" }, - "location": { - "$ref": "#/definitions/packet" + "instance-id": { + "type": "string" }, - "sig": { + "jobs": { "type": "array", "items": { - "type": "integer" + "type": "string" } + }, + "nonce": { + "type": "string" + }, + "parent-id": { + "type": "string" + }, + "placement": { + "$ref": "#/definitions/Placement" + }, + "series": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "series", + "constraints", + "jobs", + "parent-id", + "container-type", + "instance-id", + "nonce", + "hardware-characteristics", + "addresses" ] }, - "MachineAddresses": { + "AddMachines": { "type": "object", "properties": { - "Addresses": { + "params": { "type": "array", "items": { - "$ref": "#/definitions/Address" + "$ref": "#/definitions/AddMachineParams" } - }, - "Tag": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Addresses" + "params" ] }, - "NetworkConfig": { - "type": "object", - "properties": { - "Address": { - "type": "string" - }, - "CIDR": { - "type": "string" - }, - "ConfigType": { - "type": "string" - }, - "DNSSearchDomains": { - "type": "array", - "items": { - "type": "string" - } - }, - "DNSServers": { - "type": "array", - "items": { - "type": "string" - } - }, - "DeviceIndex": { - "type": "integer" - }, - "Disabled": { - "type": "boolean" - }, - "GatewayAddress": { - "type": "string" - }, - "InterfaceName": { - "type": "string" - }, - "InterfaceType": { - "type": "string" - }, - "MACAddress": { - "type": "string" - }, - "MTU": { - "type": "integer" - }, - "NoAutoStart": { - "type": "boolean" - }, - "ParentInterfaceName": { - "type": "string" - }, - "ProviderAddressId": { - "type": "string" - }, - "ProviderId": { - "type": "string" - }, - "ProviderSpaceId": { - "type": "string" - }, - "ProviderSubnetId": { - "type": "string" - }, - "ProviderVLANId": { - "type": "string" - }, - "VLANTag": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "DeviceIndex", - "MACAddress", - "CIDR", - "MTU", - "ProviderId", - "ProviderSubnetId", - "ProviderSpaceId", - "ProviderAddressId", - "ProviderVLANId", - "VLANTag", - "InterfaceName", - "ParentInterfaceName", - "InterfaceType", - "Disabled" - ] - }, - "NotifyWatchResult": { + "AddMachinesResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "NotifyWatcherId": { + "machine": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "machine" ] }, - "NotifyWatchResults": { + "AddMachinesResults": { "type": "object", "properties": { - "Results": { + "machines": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/AddMachinesResult" } } }, "additionalProperties": false, "required": [ - "Results" + "machines" ] }, - "SetMachineNetworkConfig": { + "Address": { "type": "object", "properties": { - "Config": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkConfig" - } + "scope": { + "type": "string" }, - "Tag": { + "space-name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Config" + "value", + "type", + "scope" ] }, - "SetMachinesAddresses": { + "Constraints": { "type": "object", "properties": { - "MachineAddresses": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineAddresses" - } + "Count": { + "type": "integer" + }, + "Pool": { + "type": "string" + }, + "Size": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "MachineAddresses" + "Pool", + "Size", + "Count" ] }, - "SetStatus": { + "Error": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityStatusArgs" - } + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Entities" + "message", + "code" ] }, - "StringResult": { + "ErrorInfo": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Result": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, - "StringsResult": { + "HardwareCharacteristics": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "arch": { + "type": "string" }, - "Result": { + "availability-zone": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "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" }, - "start": { + "cpu-power": { + "type": "integer" + }, + "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": "MeterStatus", + "Name": "Machiner", "Version": 1, "Schema": { "type": "object", "properties": { - "GetMeterStatus": { + "APIAddresses": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/MeterStatusResults" + "$ref": "#/definitions/StringsResult" } } }, - "WatchMeterStatus": { + "APIHostPorts": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/APIHostPortsResult" } } - } - }, - "definitions": { - "Entities": { + }, + "CACert": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } + "Result": { + "$ref": "#/definitions/BytesResult" } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] + } }, - "Entity": { + "EnsureDead": { "type": "object", "properties": { - "Tag": { - "type": "string" + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] + } }, - "Error": { + "Jobs": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Params": { + "$ref": "#/definitions/Entities" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/JobsResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "Life": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/Entities" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/LifeResults" } - }, - "additionalProperties": false + } }, - "Macaroon": { + "ModelUUID": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Result": { + "$ref": "#/definitions/StringResult" + } + } + }, + "SetMachineAddresses": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMachinesAddresses" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "SetObservedNetworkConfig": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMachineNetworkConfig" + } + } + }, + "SetProviderNetworkConfig": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "id": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "SetStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetStatus" }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "UpdateStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetStatus" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "Watch": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + }, + "WatchAPIHostPorts": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + } + }, + "definitions": { + "APIHostPortsResult": { + "type": "object", + "properties": { + "servers": { "type": "array", "items": { - "type": "integer" + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "servers" ] }, - "MeterStatusResult": { + "Address": { "type": "object", "properties": { - "Code": { + "scope": { "type": "string" }, - "Error": { - "$ref": "#/definitions/Error" + "space-name": { + "type": "string" + }, + "type": { + "type": "string" }, - "Info": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Code", - "Info", - "Error" + "value", + "type", + "scope" ] }, - "MeterStatusResults": { + "BytesResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/MeterStatusResult" + "type": "integer" } } }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" + "result" ] }, - "NotifyWatchResults": { + "Entities": { "type": "object", "properties": { - "Results": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "Results" + "entities" ] }, - "caveat": { + "Entity": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "tag" ] }, - "packet": { + "EntityStatusArgs": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } }, - "start": { - "type": "integer" + "info": { + "type": "string" }, - "totalLen": { - "type": "integer" + "status": { + "type": "string" + }, + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "tag", + "status", + "info", + "data" ] - } - } - } - }, - { - "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" }, - "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" } }, @@ -11523,19 +10680,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" @@ -11544,194 +10698,336 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "HostPort": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Address": { + "$ref": "#/definitions/Address" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "port": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "Address", + "port" ] }, - "Metric": { + "JobsResult": { "type": "object", "properties": { - "Key": { - "type": "string" - }, - "Time": { - "type": "string", - "format": "date-time" + "error": { + "$ref": "#/definitions/Error" }, - "Value": { - "type": "string" + "jobs": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Key", - "Value", - "Time" + "jobs" ] }, - "MetricBatch": { + "JobsResults": { "type": "object", "properties": { - "CharmURL": { - "type": "string" - }, - "Created": { - "type": "string", - "format": "date-time" - }, - "Metrics": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Metric" + "$ref": "#/definitions/JobsResult" } - }, - "UUID": { - "type": "string" } }, "additionalProperties": false, "required": [ - "UUID", - "CharmURL", - "Created", - "Metrics" + "results" ] }, - "MetricBatchParam": { + "LifeResult": { "type": "object", "properties": { - "Batch": { - "$ref": "#/definitions/MetricBatch" + "error": { + "$ref": "#/definitions/Error" }, - "Tag": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Batch" + "life" ] }, - "MetricBatchParams": { + "LifeResults": { "type": "object", "properties": { - "Batches": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/MetricBatchParam" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "Batches" + "results" ] }, - "caveat": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineAddresses": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "addresses": { + "type": "array", + "items": { + "$ref": "#/definitions/Address" + } }, - "verificationId": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "tag", + "addresses" ] }, - "packet": { + "NetworkConfig": { "type": "object", "properties": { - "headerLen": { + "address": { + "type": "string" + }, + "cidr": { + "type": "string" + }, + "config-type": { + "type": "string" + }, + "device-index": { "type": "integer" }, - "start": { + "disabled": { + "type": "boolean" + }, + "dns-search-domains": { + "type": "array", + "items": { + "type": "string" + } + }, + "dns-servers": { + "type": "array", + "items": { + "type": "string" + } + }, + "gateway-address": { + "type": "string" + }, + "interface-name": { + "type": "string" + }, + "interface-type": { + "type": "string" + }, + "mac-address": { + "type": "string" + }, + "mtu": { "type": "integer" }, - "totalLen": { + "no-auto-start": { + "type": "boolean" + }, + "parent-interface-name": { + "type": "string" + }, + "provider-address-id": { + "type": "string" + }, + "provider-id": { + "type": "string" + }, + "provider-space-id": { + "type": "string" + }, + "provider-subnet-id": { + "type": "string" + }, + "provider-vlan-id": { + "type": "string" + }, + "vlan-tag": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "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": { + "NotifyWatcherId": { + "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "SetMachineNetworkConfig": { + "type": "object", + "properties": { + "config": { + "type": "array", + "items": { + "$ref": "#/definitions/NetworkConfig" + } + }, + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "config" + ] + }, + "SetMachinesAddresses": { + "type": "object", + "properties": { + "machine-addresses": { + "type": "array", + "items": { + "$ref": "#/definitions/MachineAddresses" + } + } + }, + "additionalProperties": false, + "required": [ + "machine-addresses" + ] + }, + "SetStatus": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityStatusArgs" + } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "StringResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "result" ] + }, + "StringsResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false } } } }, { - "Name": "MetricsDebug", + "Name": "MeterStatus", "Version": 1, "Schema": { "type": "object", "properties": { - "GetMetrics": { + "GetMeterStatus": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/MetricResults" + "$ref": "#/definitions/MeterStatusResults" } } }, - "SetMeterStatus": { + "WatchMeterStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/MeterStatusParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/NotifyWatchResults" } } } @@ -11740,7 +11036,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -11749,167 +11045,202 @@ }, "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" } }, "additionalProperties": false }, - "ErrorResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MeterStatusResult": { "type": "object", "properties": { - "Error": { + "code": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" + }, + "info": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error" + "code", + "info" ] }, - "ErrorResults": { + "MeterStatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/MeterStatusResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "NotifyWatchResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "NotifyWatcherId": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "NotifyWatcherId" ] }, - "MeterStatusParam": { + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "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": { "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": { + "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/MeterStatusParam" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "statues" + "results" ] }, - "MetricResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "Metric": { "type": "object", "properties": { "key": { @@ -11925,91 +11256,95 @@ }, "additionalProperties": false, "required": [ - "time", "key", - "value" + "value", + "time" ] }, - "MetricResults": { + "MetricBatch": { "type": "object", "properties": { - "results": { + "charm-url": { + "type": "string" + }, + "created": { + "type": "string", + "format": "date-time" + }, + "metrics": { "type": "array", "items": { - "$ref": "#/definitions/EntityMetrics" + "$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": "MetricsManager", - "Version": 1, + "Name": "MetricsDebug", + "Version": 2, "Schema": { "type": "object", "properties": { - "CleanupOldMetrics": { + "GetMetrics": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/MetricResults" } } }, - "SendMetrics": { + "SetMeterStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/MeterStatusParams" }, "Result": { "$ref": "#/definitions/ErrorResults" @@ -12021,7 +11356,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -12030,47 +11365,62 @@ }, "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" } }, @@ -12079,19 +11429,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" @@ -12100,114 +11447,112 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MeterStatusParam": { "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": { + "type": "string" }, - "sig": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "code", + "info" + ] + }, + "MeterStatusParams": { + "type": "object", + "properties": { + "statues": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/MeterStatusParam" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "statues" ] }, - "caveat": { + "MetricResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "key": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "time": { + "type": "string", + "format": "date-time" }, - "verificationId": { - "$ref": "#/definitions/packet" + "value": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "time", + "key", + "value" ] }, - "packet": { + "MetricResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityMetrics" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "MigrationFlag", + "Name": "MetricsManager", "Version": 1, "Schema": { "type": "object", "properties": { - "Phase": { + "CleanupOldMetrics": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/PhaseResults" + "$ref": "#/definitions/ErrorResults" } } }, - "Watch": { + "SendMetrics": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ErrorResults" } } } @@ -12216,7 +11561,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -12225,189 +11570,233 @@ }, "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": { + "ErrorResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ErrorResult" } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "MigrationFlag", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Phase": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "id": { - "$ref": "#/definitions/packet" - }, - "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" ] }, - "NotifyWatchResult": { + "Entity": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "tag" ] }, - "NotifyWatchResults": { + "Error": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/NotifyWatchResult" - } + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "message", + "code" ] }, - "PhaseResult": { + "ErrorInfo": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "phase": { + "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": [ - "phase", - "Error" + "NotifyWatcherId" ] }, - "PhaseResults": { + "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/PhaseResult" + "$ref": "#/definitions/NotifyWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "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" + "phase" ] }, - "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" ] } } @@ -12456,29 +11845,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" } }, @@ -12506,40 +11895,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 }, "ModelMigrationSpec": { "type": "object", @@ -12591,17 +11947,16 @@ "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "SerializedModel": { @@ -12630,46 +11985,6 @@ "required": [ "phase" ] - }, - "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" - ] } } } @@ -12693,29 +12008,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" } }, @@ -12723,95 +12038,21 @@ }, "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" - } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "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" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "NotifyWatcherId" ] } } @@ -12945,17 +12186,6 @@ "Schema": { "type": "object", "properties": { - "ConfigSkeleton": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModelSkeletonConfigArgs" - }, - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, "CreateModel": { "type": "object", "properties": { @@ -12963,10 +12193,13 @@ "$ref": "#/definitions/ModelCreateArgs" }, "Result": { - "$ref": "#/definitions/Model" + "$ref": "#/definitions/ModelInfo" } } }, + "DestroyModel": { + "type": "object" + }, "ListModels": { "type": "object", "properties": { @@ -13005,7 +12238,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -13014,25 +12247,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": { ".*": { @@ -13041,51 +12274,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" } }, @@ -13094,19 +12326,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" @@ -13115,88 +12344,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 }, "Model": { "type": "object", "properties": { - "Name": { + "name": { "type": "string" }, - "OwnerTag": { + "owner-tag": { "type": "string" }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "OwnerTag" - ] - }, - "ModelConfigResult": { - "type": "object", - "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - } - }, - "additionalProperties": false, - "required": [ - "Config" + "name", + "uuid", + "owner-tag" ] }, "ModelCreateArgs": { "type": "object", "properties": { - "Account": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -13205,71 +12383,80 @@ } } }, - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "credential": { + "type": "string" + }, + "name": { + "type": "string" }, - "OwnerTag": { + "owner-tag": { + "type": "string" + }, + "region": { "type": "string" } }, "additionalProperties": false, "required": [ - "OwnerTag", - "Account", - "Config" + "name", + "owner-tag" ] }, "ModelInfo": { "type": "object", "properties": { - "DefaultSeries": { + "cloud": { "type": "string" }, - "Life": { + "cloud-credential": { "type": "string" }, - "Name": { + "cloud-region": { + "type": "string" + }, + "controller-uuid": { "type": "string" }, - "OwnerTag": { + "default-series": { "type": "string" }, - "ProviderType": { + "life": { "type": "string" }, - "ServerUUID": { + "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", - "OwnerTag", - "Life", - "Status", - "Users" + "name", + "uuid", + "controller-uuid", + "provider-type", + "default-series", + "cloud", + "owner-tag", + "life", + "status", + "users" ] }, "ModelInfoResult": { @@ -13299,32 +12486,16 @@ "results" ] }, - "ModelSkeletonConfigArgs": { - "type": "object", - "properties": { - "Provider": { - "type": "string" - }, - "Region": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Provider", - "Region" - ] - }, "ModelUserInfo": { "type": "object", "properties": { "access": { "type": "string" }, - "displayname": { + "display-name": { "type": "string" }, - "lastconnection": { + "last-connection": { "type": "string", "format": "date-time" }, @@ -13335,8 +12506,8 @@ "additionalProperties": false, "required": [ "user", - "displayname", - "lastconnection", + "display-name", + "last-connection", "access" ] }, @@ -13382,24 +12553,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" @@ -13408,47 +12579,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" ] } } @@ -13486,7 +12617,7 @@ }, { "Name": "Provisioner", - "Version": 2, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -13544,6 +12675,14 @@ } } }, + "ControllerConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ControllerConfigResult" + } + } + }, "DistributionGroup": { "type": "object", "properties": { @@ -13620,2823 +12759,1248 @@ "$ref": "#/definitions/LifeResults" } } - }, - "MachinesWithTransientErrors": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StatusResults" - } - } - }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, - "ModelUUID": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringResult" - } - } - }, - "PrepareContainerInterfaceInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/MachineNetworkConfigResults" - } - } - }, - "ProvisioningInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ProvisioningInfoResults" - } - } - }, - "ReleaseContainerAddresses": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "Remove": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "Series": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, - "SetInstanceInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/InstancesInfo" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetInstanceStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetPasswords": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/EntityPasswords" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetSupportedContainers": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/MachineContainersParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "StateAddresses": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" - } - } - }, - "Status": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StatusResults" - } - } - }, - "Tools": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ToolsResults" - } - } - }, - "UpdateStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "WatchAPIHostPorts": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchAllContainers": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/WatchContainers" - }, - "Result": { - "$ref": "#/definitions/StringsWatchResults" - } - } - }, - "WatchContainers": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/WatchContainers" - }, - "Result": { - "$ref": "#/definitions/StringsWatchResults" - } - } - }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchMachineErrorRetry": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchModelMachines": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsWatchResult" - } - } - } - }, - "definitions": { - "APIHostPortsResult": { - "type": "object", - "properties": { - "Servers": { - "type": "array", - "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } - } - } - }, - "additionalProperties": false, - "required": [ - "Servers" - ] - }, - "Address": { - "type": "object", - "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "Type": { - "type": "string" - }, - "Value": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Value", - "Type", - "Scope" - ] - }, - "Binary": { - "type": "object", - "properties": { - "Arch": { - "type": "string" - }, - "Number": { - "$ref": "#/definitions/Number" - }, - "Series": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Number", - "Series", - "Arch" - ] - }, - "BytesResult": { - "type": "object", - "properties": { - "Result": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "Result" - ] - }, - "CloudImageMetadata": { - "type": "object", - "properties": { - "arch": { - "type": "string" - }, - "image_id": { - "type": "string" - }, - "priority": { - "type": "integer" - }, - "region": { - "type": "string" - }, - "root_storage_size": { - "type": "integer" - }, - "root_storage_type": { - "type": "string" - }, - "series": { - "type": "string" - }, - "source": { - "type": "string" - }, - "stream": { - "type": "string" - }, - "version": { - "type": "string" - }, - "virt_type": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "image_id", - "region", - "version", - "series", - "arch", - "source", - "priority" - ] - }, - "ConstraintsResult": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" - }, - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Constraints" - ] - }, - "ConstraintsResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ConstraintsResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "ContainerConfig": { - "type": "object", - "properties": { - "AllowLXCLoopMounts": { - "type": "boolean" - }, - "AptMirror": { - "type": "string" - }, - "AptProxy": { - "$ref": "#/definitions/Settings" - }, - "AuthorizedKeys": { - "type": "string" - }, - "PreferIPv6": { - "type": "boolean" - }, - "ProviderType": { - "type": "string" - }, - "Proxy": { - "$ref": "#/definitions/Settings" - }, - "SSLHostnameVerification": { - "type": "boolean" - }, - "UpdateBehavior": { - "$ref": "#/definitions/UpdateBehavior" - } - }, - "additionalProperties": false, - "required": [ - "ProviderType", - "AuthorizedKeys", - "SSLHostnameVerification", - "Proxy", - "AptProxy", - "AptMirror", - "PreferIPv6", - "AllowLXCLoopMounts", - "UpdateBehavior" - ] - }, - "ContainerManagerConfig": { - "type": "object", - "properties": { - "ManagerConfig": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - } - }, - "additionalProperties": false, - "required": [ - "ManagerConfig" - ] - }, - "ContainerManagerConfigParams": { - "type": "object", - "properties": { - "Type": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Type" - ] - }, - "DistributionGroupResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "DistributionGroupResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/DistributionGroupResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "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" - ] - }, - "EntityPassword": { - "type": "object", - "properties": { - "Password": { - "type": "string" - }, - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag", - "Password" - ] - }, - "EntityPasswords": { - "type": "object", - "properties": { - "Changes": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityPassword" - } - } - }, - "additionalProperties": false, - "required": [ - "Changes" - ] - }, - "EntityStatusArgs": { - "type": "object", - "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag", - "Status", - "Info", - "Data" - ] - }, - "Error": { - "type": "object", - "properties": { - "Code": { - "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" - ] - }, - "ErrorResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "FindToolsParams": { - "type": "object", - "properties": { - "Arch": { - "type": "string" - }, - "MajorVersion": { - "type": "integer" - }, - "MinorVersion": { - "type": "integer" - }, - "Number": { - "$ref": "#/definitions/Number" - }, - "Series": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Number", - "MajorVersion", - "MinorVersion", - "Arch", - "Series" - ] - }, - "FindToolsResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "List": { - "type": "array", - "items": { - "$ref": "#/definitions/Tools" - } - } - }, - "additionalProperties": false, - "required": [ - "List", - "Error" - ] - }, - "HardwareCharacteristics": { - "type": "object", - "properties": { - "Arch": { - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "CpuCores": { - "type": "integer" - }, - "CpuPower": { - "type": "integer" - }, - "Mem": { - "type": "integer" - }, - "RootDisk": { - "type": "integer" - }, - "Tags": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false - }, - "HostPort": { - "type": "object", - "properties": { - "Address": { - "$ref": "#/definitions/Address" - }, - "Port": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "Address", - "Port" - ] - }, - "InstanceInfo": { - "type": "object", - "properties": { - "Characteristics": { - "$ref": "#/definitions/HardwareCharacteristics" - }, - "InstanceId": { - "type": "string" - }, - "NetworkConfig": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkConfig" - } - }, - "Nonce": { - "type": "string" - }, - "Tag": { - "type": "string" - }, - "VolumeAttachments": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/VolumeAttachmentInfo" - } - } - }, - "Volumes": { - "type": "array", - "items": { - "$ref": "#/definitions/Volume" - } - } - }, - "additionalProperties": false, - "required": [ - "Tag", - "InstanceId", - "Nonce", - "Characteristics", - "Volumes", - "VolumeAttachments", - "NetworkConfig" - ] - }, - "InstancesInfo": { - "type": "object", - "properties": { - "Machines": { - "type": "array", - "items": { - "$ref": "#/definitions/InstanceInfo" - } - } - }, - "additionalProperties": false, - "required": [ - "Machines" - ] - }, - "LifeResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Life": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Life", - "Error" - ] - }, - "LifeResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "MachineContainers": { - "type": "object", - "properties": { - "ContainerTypes": { - "type": "array", - "items": { - "type": "string" - } - }, - "MachineTag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "MachineTag", - "ContainerTypes" - ] - }, - "MachineContainersParams": { - "type": "object", - "properties": { - "Params": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineContainers" - } - } - }, - "additionalProperties": false, - "required": [ - "Params" - ] - }, - "MachineNetworkConfigResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Info": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkConfig" - } - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Info" - ] - }, - "MachineNetworkConfigResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineNetworkConfigResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "ModelConfigResult": { - "type": "object", - "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - } - }, - "additionalProperties": false, - "required": [ - "Config" - ] - }, - "NetworkConfig": { - "type": "object", - "properties": { - "Address": { - "type": "string" - }, - "CIDR": { - "type": "string" - }, - "ConfigType": { - "type": "string" - }, - "DNSSearchDomains": { - "type": "array", - "items": { - "type": "string" - } - }, - "DNSServers": { - "type": "array", - "items": { - "type": "string" - } - }, - "DeviceIndex": { - "type": "integer" - }, - "Disabled": { - "type": "boolean" - }, - "GatewayAddress": { - "type": "string" - }, - "InterfaceName": { - "type": "string" - }, - "InterfaceType": { - "type": "string" - }, - "MACAddress": { - "type": "string" - }, - "MTU": { - "type": "integer" - }, - "NoAutoStart": { - "type": "boolean" - }, - "ParentInterfaceName": { - "type": "string" - }, - "ProviderAddressId": { - "type": "string" - }, - "ProviderId": { - "type": "string" - }, - "ProviderSpaceId": { - "type": "string" - }, - "ProviderSubnetId": { - "type": "string" - }, - "ProviderVLANId": { - "type": "string" - }, - "VLANTag": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "DeviceIndex", - "MACAddress", - "CIDR", - "MTU", - "ProviderId", - "ProviderSubnetId", - "ProviderSpaceId", - "ProviderAddressId", - "ProviderVLANId", - "VLANTag", - "InterfaceName", - "ParentInterfaceName", - "InterfaceType", - "Disabled" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] - }, - "Number": { - "type": "object", - "properties": { - "Build": { - "type": "integer" - }, - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "integer" - }, - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Major", - "Minor", - "Tag", - "Patch", - "Build" - ] - }, - "ProvisioningInfo": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" - }, - "EndpointBindings": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "ImageMetadata": { - "type": "array", - "items": { - "$ref": "#/definitions/CloudImageMetadata" - } - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } - }, - "Placement": { - "type": "string" - }, - "Series": { - "type": "string" - }, - "SubnetsToZones": { - "type": "object", - "patternProperties": { - ".*": { - "type": "array", - "items": { - "type": "string" - } - } - } - }, - "Tags": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "Volumes": { - "type": "array", - "items": { - "$ref": "#/definitions/VolumeParams" - } - } - }, - "additionalProperties": false, - "required": [ - "Constraints", - "Series", - "Placement", - "Jobs", - "Volumes", - "Tags", - "SubnetsToZones", - "ImageMetadata", - "EndpointBindings" - ] - }, - "ProvisioningInfoResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "$ref": "#/definitions/ProvisioningInfo" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "ProvisioningInfoResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ProvisioningInfoResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "SetStatus": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityStatusArgs" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "Settings": { - "type": "object", - "properties": { - "Ftp": { - "type": "string" - }, - "Http": { - "type": "string" - }, - "Https": { - "type": "string" - }, - "NoProxy": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Http", - "Https", - "Ftp", - "NoProxy" - ] - }, - "StatusResult": { - "type": "object", - "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "Id": { - "type": "string" - }, - "Info": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "Since": { - "type": "string", - "format": "date-time" - }, - "Status": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Id", - "Life", - "Status", - "Info", - "Data", - "Since" - ] - }, - "StatusResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/StatusResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "StringResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "StringResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/StringResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "StringsResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "StringsWatchResult": { - "type": "object", - "properties": { - "Changes": { - "type": "array", - "items": { - "type": "string" - } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "StringsWatchResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/StringsWatchResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Tools": { - "type": "object", - "properties": { - "sha256": { - "type": "string" - }, - "size": { - "type": "integer" - }, - "url": { - "type": "string" - }, - "version": { - "$ref": "#/definitions/Binary" - } - }, - "additionalProperties": false, - "required": [ - "version", - "url", - "size" - ] - }, - "ToolsResult": { - "type": "object", - "properties": { - "DisableSSLHostnameVerification": { - "type": "boolean" - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "ToolsList": { - "type": "array", - "items": { - "$ref": "#/definitions/Tools" - } - } - }, - "additionalProperties": false, - "required": [ - "ToolsList", - "DisableSSLHostnameVerification", - "Error" - ] - }, - "ToolsResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ToolsResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "UpdateBehavior": { - "type": "object", - "properties": { - "EnableOSRefreshUpdate": { - "type": "boolean" - }, - "EnableOSUpgrade": { - "type": "boolean" - } - }, - "additionalProperties": false, - "required": [ - "EnableOSRefreshUpdate", - "EnableOSUpgrade" - ] - }, - "Value": { - "type": "object", - "properties": { - "arch": { - "type": "string" - }, - "container": { - "type": "string" - }, - "cpu-cores": { - "type": "integer" - }, - "cpu-power": { - "type": "integer" - }, - "instance-type": { - "type": "string" - }, - "mem": { - "type": "integer" - }, - "root-disk": { - "type": "integer" - }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } - }, - "tags": { - "type": "array", - "items": { - "type": "string" - } - }, - "virt-type": { - "type": "string" - } - }, - "additionalProperties": false - }, - "Volume": { - "type": "object", - "properties": { - "info": { - "$ref": "#/definitions/VolumeInfo" - }, - "volumetag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "volumetag", - "info" - ] - }, - "VolumeAttachmentInfo": { - "type": "object", - "properties": { - "busaddress": { - "type": "string" - }, - "devicelink": { - "type": "string" - }, - "devicename": { - "type": "string" - }, - "read-only": { - "type": "boolean" - } - }, - "additionalProperties": false - }, - "VolumeAttachmentParams": { - "type": "object", - "properties": { - "instanceid": { - "type": "string" - }, - "machinetag": { - "type": "string" - }, - "provider": { - "type": "string" - }, - "read-only": { - "type": "boolean" - }, - "volumeid": { - "type": "string" - }, - "volumetag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "volumetag", - "machinetag", - "provider" - ] - }, - "VolumeInfo": { - "type": "object", - "properties": { - "hardwareid": { - "type": "string" - }, - "persistent": { - "type": "boolean" - }, - "size": { - "type": "integer" - }, - "volumeid": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "volumeid", - "size", - "persistent" - ] - }, - "VolumeParams": { - "type": "object", - "properties": { - "attachment": { - "$ref": "#/definitions/VolumeAttachmentParams" - }, - "attributes": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "provider": { - "type": "string" - }, - "size": { - "type": "integer" - }, - "tags": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "volumetag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "volumetag", - "size", - "provider" - ] - }, - "WatchContainer": { - "type": "object", - "properties": { - "ContainerType": { - "type": "string" - }, - "MachineTag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "MachineTag", - "ContainerType" - ] - }, - "WatchContainers": { - "type": "object", - "properties": { - "Params": { - "type": "array", - "items": { - "$ref": "#/definitions/WatchContainer" - } + }, + "MachinesWithTransientErrors": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StatusResults" } - }, - "additionalProperties": false, - "required": [ - "Params" - ] + } }, - "caveat": { + "ModelConfig": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ModelConfigResult" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "ModelUUID": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/StringResult" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "ProxyUpdater", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "ProxyConfig": { + } + }, + "PrepareContainerInterfaceInfo": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ProxyConfigResults" + "$ref": "#/definitions/MachineNetworkConfigResults" } } }, - "WatchForProxyConfigAndAPIHostPortChanges": { + "ProvisioningInfo": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ProvisioningInfoResults" } } - } - }, - "definitions": { - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] }, - "Entity": { + "ReleaseContainerAddresses": { "type": "object", "properties": { - "Tag": { - "type": "string" + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] + } }, - "Error": { + "Remove": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Params": { + "$ref": "#/definitions/Entities" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "Series": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/Entities" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/StringResults" } - }, - "additionalProperties": false + } }, - "Macaroon": { + "SetInstanceInfo": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/InstancesInfo" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + } }, - "NotifyWatchResult": { + "SetInstanceStatus": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/SetStatus" }, - "NotifyWatcherId": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + } }, - "NotifyWatchResults": { + "SetPasswords": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/NotifyWatchResult" - } + "Params": { + "$ref": "#/definitions/EntityPasswords" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "ProxyConfig": { + "SetStatus": { "type": "object", "properties": { - "FTP": { - "type": "string" - }, - "HTTP": { - "type": "string" - }, - "HTTPS": { - "type": "string" + "Params": { + "$ref": "#/definitions/SetStatus" }, - "NoProxy": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "HTTP", - "HTTPS", - "FTP", - "NoProxy" - ] + } }, - "ProxyConfigResult": { + "SetSupportedContainers": { "type": "object", "properties": { - "APTProxySettings": { - "$ref": "#/definitions/ProxyConfig" - }, - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/MachineContainersParams" }, - "ProxySettings": { - "$ref": "#/definitions/ProxyConfig" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "ProxySettings", - "APTProxySettings" - ] + } }, - "ProxyConfigResults": { + "StateAddresses": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ProxyConfigResult" - } + "Result": { + "$ref": "#/definitions/StringsResult" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "caveat": { + "Status": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/StatusResults" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "Tools": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "Params": { + "$ref": "#/definitions/Entities" }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "Reboot", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "ClearReboot": { + "Result": { + "$ref": "#/definitions/ToolsResults" + } + } + }, + "UpdateStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/SetStatus" }, "Result": { "$ref": "#/definitions/ErrorResults" } } }, - "GetRebootAction": { + "WatchAPIHostPorts": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "WatchAllContainers": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/WatchContainers" }, "Result": { - "$ref": "#/definitions/RebootActionResults" + "$ref": "#/definitions/StringsWatchResults" } } }, - "RequestReboot": { + "WatchContainers": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/WatchContainers" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/StringsWatchResults" } } }, - "WatchForRebootEvent": { + "WatchForModelConfigChanges": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "WatchMachineErrorRetry": { "type": "object", "properties": { "Result": { "$ref": "#/definitions/NotifyWatchResult" } } + }, + "WatchModelMachines": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringsWatchResult" + } + } } }, "definitions": { - "Entities": { + "APIHostPortsResult": { "type": "object", "properties": { - "Entities": { + "servers": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } } } }, "additionalProperties": false, "required": [ - "Entities" + "servers" ] }, - "Entity": { + "Address": { "type": "object", "properties": { - "Tag": { + "scope": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, - "Error": { - "type": "object", - "properties": { - "Code": { + }, + "space-name": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "type": { + "type": "string" }, - "Message": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "value", + "type", + "scope" ] }, - "ErrorInfo": { + "Binary": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Arch": { + "type": "string" + }, + "Number": { + "$ref": "#/definitions/Number" }, - "MacaroonPath": { + "Series": { "type": "string" } }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - } - }, "additionalProperties": false, "required": [ - "Error" + "Number", + "Series", + "Arch" ] }, - "ErrorResults": { + "BytesResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "type": "integer" } } }, "additionalProperties": false, "required": [ - "Results" + "result" ] }, - "Macaroon": { + "CloudImageMetadata": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "arch": { + "type": "string" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "image-id": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" + "priority": { + "type": "integer" }, - "location": { - "$ref": "#/definitions/packet" + "region": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" + "root-storage-size": { + "type": "integer" }, - "NotifyWatcherId": { + "root-storage-type": { + "type": "string" + }, + "series": { + "type": "string" + }, + "source": { + "type": "string" + }, + "stream": { + "type": "string" + }, + "version": { + "type": "string" + }, + "virt-type": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "image-id", + "region", + "version", + "series", + "arch", + "source", + "priority" ] }, - "RebootActionResult": { + "ConstraintsResult": { "type": "object", "properties": { + "constraints": { + "$ref": "#/definitions/Value" + }, "error": { "$ref": "#/definitions/Error" - }, - "result": { - "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "constraints" + ] }, - "RebootActionResults": { + "ConstraintsResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/RebootActionResult" + "$ref": "#/definitions/ConstraintsResult" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "caveat": { + "ContainerConfig": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "UpdateBehavior": { + "$ref": "#/definitions/UpdateBehavior" }, - "location": { - "$ref": "#/definitions/packet" + "apt-mirror": { + "type": "string" + }, + "apt-proxy": { + "$ref": "#/definitions/Settings" + }, + "authorized-keys": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "provider-type": { + "type": "string" + }, + "proxy": { + "$ref": "#/definitions/Settings" + }, + "ssl-hostname-verification": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "provider-type", + "authorized-keys", + "ssl-hostname-verification", + "proxy", + "apt-proxy", + "apt-mirror", + "UpdateBehavior" + ] + }, + "ContainerManagerConfig": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" ] }, - "packet": { + "ContainerManagerConfigParams": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "type" ] - } - } - } - }, - { - "Name": "RelationUnitsWatcher", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Next": { + }, + "ControllerConfigResult": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/RelationUnitsWatchResult" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } - } + }, + "additionalProperties": false, + "required": [ + "config" + ] }, - "Stop": { - "type": "object" - } - }, - "definitions": { - "Error": { + "DistributionGroupResult": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "error": { + "$ref": "#/definitions/Error" }, - "Message": { - "type": "string" + "result": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "result" ] }, - "ErrorInfo": { + "DistributionGroupResults": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/DistributionGroupResult" + } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "Macaroon": { + "Entities": { "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": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "entities" ] }, - "RelationUnitsChange": { + "Entity": { "type": "object", "properties": { - "Changed": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/UnitSettings" - } - } - }, - "Departed": { - "type": "array", - "items": { - "type": "string" - } + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Changed", - "Departed" + "tag" ] }, - "RelationUnitsWatchResult": { + "EntityPassword": { "type": "object", "properties": { - "Changes": { - "$ref": "#/definitions/RelationUnitsChange" - }, - "Error": { - "$ref": "#/definitions/Error" + "password": { + "type": "string" }, - "RelationUnitsWatcherId": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "RelationUnitsWatcherId", - "Changes", - "Error" + "tag", + "password" ] }, - "UnitSettings": { + "EntityPasswords": { "type": "object", "properties": { - "Version": { - "type": "integer" + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityPassword" + } } }, "additionalProperties": false, "required": [ - "Version" + "changes" ] }, - "caveat": { + "EntityStatusArgs": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "type": "string" + }, + "status": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "tag", + "status", + "info", + "data" ] }, - "packet": { + "Error": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "code": { + "type": "string" }, - "start": { - "type": "integer" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "totalLen": { - "type": "integer" + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "message", + "code" ] - } - } - } - }, - { - "Name": "Resumer", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "ResumeTransactions": { - "type": "object" - } - } - } - }, - { - "Name": "RetryStrategy", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "RetryStrategy": { + }, + "ErrorInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Result": { - "$ref": "#/definitions/RetryStrategyResults" + "macaroon-path": { + "type": "string" } - } + }, + "additionalProperties": false }, - "WatchRetryStrategy": { + "ErrorResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "error": { + "$ref": "#/definitions/Error" } - } - } - }, - "definitions": { - "Entities": { + }, + "additionalProperties": false + }, + "ErrorResults": { "type": "object", "properties": { - "Entities": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Entities" + "results" ] }, - "Entity": { + "FindToolsParams": { "type": "object", "properties": { - "Tag": { + "arch": { + "type": "string" + }, + "major": { + "type": "integer" + }, + "minor": { + "type": "integer" + }, + "number": { + "$ref": "#/definitions/Number" + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "number", + "major", + "minor", + "arch", + "series" ] }, - "Error": { + "FindToolsResult": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "error": { + "$ref": "#/definitions/Error" }, - "Message": { - "type": "string" + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/Tools" + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "list" ] }, - "ErrorInfo": { + "HardwareCharacteristics": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "arch": { + "type": "string" }, - "MacaroonPath": { + "availability-zone": { "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false }, - "Macaroon": { + "HostPort": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Address": { + "$ref": "#/definitions/Address" }, - "data": { + "port": { + "type": "integer" + } + }, + "additionalProperties": false, + "required": [ + "Address", + "port" + ] + }, + "InstanceInfo": { + "type": "object", + "properties": { + "characteristics": { + "$ref": "#/definitions/HardwareCharacteristics" + }, + "instance-id": { + "type": "string" + }, + "network-config": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/NetworkConfig" } }, - "id": { - "$ref": "#/definitions/packet" + "nonce": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" + }, + "volume-attachments": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/VolumeAttachmentInfo" + } + } }, - "sig": { + "volumes": { + "type": "array", + "items": { + "$ref": "#/definitions/Volume" + } + } + }, + "additionalProperties": false, + "required": [ + "tag", + "instance-id", + "nonce", + "characteristics", + "volumes", + "volume-attachments", + "network-config" + ] + }, + "InstancesInfo": { + "type": "object", + "properties": { + "machines": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/InstanceInfo" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "machines" ] }, - "NotifyWatchResult": { + "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "NotifyWatcherId": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "life" ] }, - "NotifyWatchResults": { + "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "RetryStrategy": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineContainers": { "type": "object", "properties": { - "JitterRetryTime": { - "type": "boolean" - }, - "MaxRetryTime": { - "type": "integer" - }, - "MinRetryTime": { - "type": "integer" - }, - "RetryTimeFactor": { - "type": "integer" + "container-types": { + "type": "array", + "items": { + "type": "string" + } }, - "ShouldRetry": { - "type": "boolean" + "machine-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "ShouldRetry", - "MinRetryTime", - "MaxRetryTime", - "JitterRetryTime", - "RetryTimeFactor" + "machine-tag", + "container-types" ] }, - "RetryStrategyResult": { + "MachineContainersParams": { + "type": "object", + "properties": { + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/MachineContainers" + } + } + }, + "additionalProperties": false, + "required": [ + "params" + ] + }, + "MachineNetworkConfigResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/RetryStrategy" + "info": { + "type": "array", + "items": { + "$ref": "#/definitions/NetworkConfig" + } } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "info" ] }, - "RetryStrategyResults": { + "MachineNetworkConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/RetryStrategyResult" + "$ref": "#/definitions/MachineNetworkConfigResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "caveat": { + "ModelConfigResult": { "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": { + "NetworkConfig": { "type": "object", "properties": { - "headerLen": { + "address": { + "type": "string" + }, + "cidr": { + "type": "string" + }, + "config-type": { + "type": "string" + }, + "device-index": { "type": "integer" }, - "start": { + "disabled": { + "type": "boolean" + }, + "dns-search-domains": { + "type": "array", + "items": { + "type": "string" + } + }, + "dns-servers": { + "type": "array", + "items": { + "type": "string" + } + }, + "gateway-address": { + "type": "string" + }, + "interface-name": { + "type": "string" + }, + "interface-type": { + "type": "string" + }, + "mac-address": { + "type": "string" + }, + "mtu": { "type": "integer" }, - "totalLen": { + "no-auto-start": { + "type": "boolean" + }, + "parent-interface-name": { + "type": "string" + }, + "provider-address-id": { + "type": "string" + }, + "provider-id": { + "type": "string" + }, + "provider-space-id": { + "type": "string" + }, + "provider-subnet-id": { + "type": "string" + }, + "provider-vlan-id": { + "type": "string" + }, + "vlan-tag": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "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" ] - } - } - } - }, - { - "Name": "SSHClient", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "PrivateAddress": { + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "NotifyWatcherId": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/SSHAddressResults" + "error": { + "$ref": "#/definitions/Error" } - } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] }, - "Proxy": { + "Number": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/SSHProxyResult" + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "Major", + "Minor", + "Tag", + "Patch", + "Build" + ] }, - "PublicAddress": { + "ProvisioningInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "constraints": { + "$ref": "#/definitions/Value" }, - "Result": { - "$ref": "#/definitions/SSHAddressResults" + "controller-config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "endpoint-bindings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "image-metadata": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudImageMetadata" + } + }, + "jobs": { + "type": "array", + "items": { + "type": "string" + } + }, + "placement": { + "type": "string" + }, + "series": { + "type": "string" + }, + "subnets-to-zones": { + "type": "object", + "patternProperties": { + ".*": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "tags": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "volumes": { + "type": "array", + "items": { + "$ref": "#/definitions/VolumeParams" + } } - } + }, + "additionalProperties": false, + "required": [ + "constraints", + "series", + "placement", + "jobs" + ] }, - "PublicKeys": { + "ProvisioningInfoResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/SSHPublicKeysResults" + "result": { + "$ref": "#/definitions/ProvisioningInfo" } - } - } - }, - "definitions": { - "Entities": { + }, + "additionalProperties": false, + "required": [ + "result" + ] + }, + "ProvisioningInfoResults": { "type": "object", "properties": { - "Entities": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/ProvisioningInfoResult" } } }, "additionalProperties": false, "required": [ - "Entities" + "results" ] }, - "Entity": { + "SetStatus": { "type": "object", "properties": { - "Tag": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityStatusArgs" + } } }, "additionalProperties": false, "required": [ - "Tag" + "entities" ] }, - "Error": { + "Settings": { "type": "object", "properties": { - "Code": { + "Ftp": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Http": { + "type": "string" + }, + "Https": { + "type": "string" }, - "Message": { + "NoProxy": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "Http", + "Https", + "Ftp", + "NoProxy" ] }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" - } - }, - "additionalProperties": false - }, - "Macaroon": { + "StatusResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, "data": { - "type": "array", - "items": { - "type": "integer" + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } }, + "error": { + "$ref": "#/definitions/Error" + }, "id": { - "$ref": "#/definitions/packet" + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "life": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", "id", - "caveats", - "sig" + "life", + "status", + "info", + "data", + "since" ] }, - "SSHAddressResult": { - "type": "object", - "properties": { - "address": { - "type": "string" - }, - "error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false - }, - "SSHAddressResults": { + "StatusResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/SSHAddressResult" + "$ref": "#/definitions/StatusResult" } } }, @@ -16445,40 +14009,28 @@ "results" ] }, - "SSHProxyResult": { - "type": "object", - "properties": { - "use-proxy": { - "type": "boolean" - } - }, - "additionalProperties": false, - "required": [ - "use-proxy" - ] - }, - "SSHPublicKeysResult": { + "StringResult": { "type": "object", "properties": { "error": { "$ref": "#/definitions/Error" }, - "public-keys": { - "type": "array", - "items": { - "type": "string" - } + "result": { + "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "result" + ] }, - "SSHPublicKeysResults": { + "StringResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/SSHPublicKeysResult" + "$ref": "#/definitions/StringResult" } } }, @@ -16487,1006 +14039,1042 @@ "results" ] }, - "caveat": { + "StringsResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "result": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "StringsWatchResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "changes": { + "type": "array", + "items": { + "type": "string" + } }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] - } - } - } - }, - { - "Name": "Service", - "Version": 3, - "Schema": { - "type": "object", - "properties": { - "AddRelation": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/AddRelation" - }, - "Result": { - "$ref": "#/definitions/AddRelationResults" - } - } - }, - "AddUnits": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/AddServiceUnits" - }, - "Result": { - "$ref": "#/definitions/AddServiceUnitsResults" - } - } - }, - "CharmRelations": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServiceCharmRelations" - }, - "Result": { - "$ref": "#/definitions/ServiceCharmRelationsResults" - } - } - }, - "Deploy": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServicesDeploy" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "Destroy": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServiceDestroy" - } - } - }, - "DestroyRelation": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/DestroyRelation" - } - } - }, - "DestroyUnits": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/DestroyServiceUnits" - } - } - }, - "Expose": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServiceExpose" - } - } }, - "Get": { + "StringsWatchResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceGet" - }, - "Result": { - "$ref": "#/definitions/ServiceGetResults" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringsWatchResult" + } } - } + }, + "additionalProperties": false, + "required": [ + "results" + ] }, - "GetCharmURL": { + "Tools": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceGet" + "sha256": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/StringResult" + "size": { + "type": "integer" + }, + "url": { + "type": "string" + }, + "version": { + "$ref": "#/definitions/Binary" } - } + }, + "additionalProperties": false, + "required": [ + "version", + "url", + "size" + ] }, - "GetConstraints": { + "ToolsResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/GetServiceConstraints" + "disable-ssl-hostname-verification": { + "type": "boolean" }, - "Result": { - "$ref": "#/definitions/GetConstraintsResults" + "error": { + "$ref": "#/definitions/Error" + }, + "tools": { + "type": "array", + "items": { + "$ref": "#/definitions/Tools" + } } - } + }, + "additionalProperties": false, + "required": [ + "tools", + "disable-ssl-hostname-verification" + ] }, - "Set": { + "ToolsResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceSet" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ToolsResult" + } } - } + }, + "additionalProperties": false, + "required": [ + "results" + ] }, - "SetCharm": { + "UpdateBehavior": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceSetCharm" + "enable-os-refresh-update": { + "type": "boolean" + }, + "enable-os-upgrade": { + "type": "boolean" } - } + }, + "additionalProperties": false, + "required": [ + "enable-os-refresh-update", + "enable-os-upgrade" + ] }, - "SetConstraints": { + "Value": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetConstraints" + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { + "type": "string" } - } + }, + "additionalProperties": false }, - "SetMetricCredentials": { + "Volume": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceMetricCredentials" + "info": { + "$ref": "#/definitions/VolumeInfo" }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "volume-tag": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "volume-tag", + "info" + ] }, - "Unexpose": { + "VolumeAttachmentInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceUnexpose" + "bus-address": { + "type": "string" + }, + "device-link": { + "type": "string" + }, + "device-name": { + "type": "string" + }, + "read-only": { + "type": "boolean" } - } + }, + "additionalProperties": false }, - "Unset": { + "VolumeAttachmentParams": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceUnset" + "instance-id": { + "type": "string" + }, + "machine-tag": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "read-only": { + "type": "boolean" + }, + "volume-id": { + "type": "string" + }, + "volume-tag": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "volume-tag", + "machine-tag", + "provider" + ] }, - "Update": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServiceUpdate" - } - } - } - }, - "definitions": { - "AddRelation": { + "VolumeInfo": { "type": "object", "properties": { - "Endpoints": { - "type": "array", - "items": { - "type": "string" - } + "hardware-id": { + "type": "string" + }, + "persistent": { + "type": "boolean" + }, + "size": { + "type": "integer" + }, + "volume-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Endpoints" + "volume-id", + "size", + "persistent" ] }, - "AddRelationResults": { + "VolumeParams": { "type": "object", "properties": { - "Endpoints": { + "attachment": { + "$ref": "#/definitions/VolumeAttachmentParams" + }, + "attributes": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "provider": { + "type": "string" + }, + "size": { + "type": "integer" + }, + "tags": { "type": "object", "patternProperties": { ".*": { - "$ref": "#/definitions/Relation" + "type": "string" } } + }, + "volume-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Endpoints" + "volume-tag", + "size", + "provider" ] }, - "AddServiceUnits": { + "WatchContainer": { "type": "object", "properties": { - "NumUnits": { - "type": "integer" - }, - "Placement": { - "type": "array", - "items": { - "$ref": "#/definitions/Placement" - } + "container-type": { + "type": "string" }, - "ServiceName": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "NumUnits", - "Placement" + "machine-tag", + "container-type" ] }, - "AddServiceUnitsResults": { + "WatchContainers": { "type": "object", "properties": { - "Units": { + "params": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/WatchContainer" } } }, "additionalProperties": false, "required": [ - "Units" + "params" ] - }, - "Constraints": { + } + } + } + }, + { + "Name": "ProxyUpdater", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "ProxyConfig": { "type": "object", "properties": { - "Count": { - "type": "integer" - }, - "Pool": { - "type": "string" + "Params": { + "$ref": "#/definitions/Entities" }, - "Size": { - "type": "integer" + "Result": { + "$ref": "#/definitions/ProxyConfigResults" } - }, - "additionalProperties": false, - "required": [ - "Pool", - "Size", - "Count" - ] + } }, - "DestroyRelation": { + "WatchForProxyConfigAndAPIHostPortChanges": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "Endpoints": { + "entities": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "Endpoints" + "entities" ] }, - "DestroyServiceUnits": { + "Entity": { "type": "object", "properties": { - "UnitNames": { - "type": "array", - "items": { - "type": "string" - } + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "UnitNames" + "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 }, - "ErrorResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Error": { + "NotifyWatcherId": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Error" + "NotifyWatcherId" ] }, - "ErrorResults": { + "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/NotifyWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "GetConstraintsResults": { + "ProxyConfig": { "type": "object", "properties": { - "Constraints": { - "$ref": "#/definitions/Value" + "ftp": { + "type": "string" + }, + "http": { + "type": "string" + }, + "https": { + "type": "string" + }, + "no-proxy": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Constraints" + "http", + "https", + "ftp", + "no-proxy" ] }, - "GetServiceConstraints": { + "ProxyConfigResult": { "type": "object", "properties": { - "ServiceName": { - "type": "string" + "apt-proxy-settings": { + "$ref": "#/definitions/ProxyConfig" + }, + "error": { + "$ref": "#/definitions/Error" + }, + "proxy-settings": { + "$ref": "#/definitions/ProxyConfig" } }, "additionalProperties": false, "required": [ - "ServiceName" + "proxy-settings", + "apt-proxy-settings" ] }, - "Macaroon": { + "ProxyConfigResults": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ProxyConfigResult" } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "Name": "Reboot", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "ClearReboot": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "id": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "GetRebootAction": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/RebootActionResults" + } + } + }, + "RequestReboot": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "WatchForRebootEvent": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + } + }, + "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "entities" ] }, - "Placement": { + "Entity": { "type": "object", "properties": { - "Directive": { - "type": "string" - }, - "Scope": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Scope", - "Directive" + "tag" ] }, - "Relation": { + "Error": { "type": "object", "properties": { - "Interface": { - "type": "string" - }, - "Limit": { - "type": "integer" - }, - "Name": { + "code": { "type": "string" }, - "Optional": { - "type": "boolean" - }, - "Role": { - "type": "string" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "Scope": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "Role", - "Interface", - "Optional", - "Limit", - "Scope" + "message", + "code" ] }, - "ServiceCharmRelations": { + "ErrorInfo": { "type": "object", "properties": { - "ServiceName": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "ServiceName" - ] + "additionalProperties": false + }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false }, - "ServiceCharmRelationsResults": { + "ErrorResults": { "type": "object", "properties": { - "CharmRelations": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "CharmRelations" + "results" ] }, - "ServiceDeploy": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Channel": { - "type": "string" - }, - "CharmUrl": { - "type": "string" - }, - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "ConfigYAML": { - "type": "string" - }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "EndpointBindings": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "NumUnits": { - "type": "integer" - }, - "Placement": { - "type": "array", - "items": { - "$ref": "#/definitions/Placement" - } - }, - "Resources": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "Series": { - "type": "string" - }, - "ServiceName": { + "NotifyWatcherId": { "type": "string" }, - "Storage": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/Constraints" - } - } + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Series", - "CharmUrl", - "Channel", - "NumUnits", - "Config", - "ConfigYAML", - "Constraints", - "Placement", - "Storage", - "EndpointBindings", - "Resources" + "NotifyWatcherId" ] }, - "ServiceDestroy": { + "RebootActionResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "string" + } + }, + "additionalProperties": false + }, + "RebootActionResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/RebootActionResult" + } + } + }, + "additionalProperties": false + } + } + } + }, + { + "Name": "RelationUnitsWatcher", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Next": { "type": "object", "properties": { - "ServiceName": { - "type": "string" + "Result": { + "$ref": "#/definitions/RelationUnitsWatchResult" } - }, - "additionalProperties": false, - "required": [ - "ServiceName" - ] + } }, - "ServiceExpose": { + "Stop": { + "type": "object" + } + }, + "definitions": { + "Error": { "type": "object", "properties": { - "ServiceName": { + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName" + "message", + "code" ] }, - "ServiceGet": { + "ErrorInfo": { "type": "object", "properties": { - "ServiceName": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "ServiceName" - ] + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false }, - "ServiceGetResults": { + "RelationUnitsChange": { "type": "object", "properties": { - "Charm": { - "type": "string" - }, - "Config": { + "changed": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/UnitSettings" } } }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "Service": { - "type": "string" + "departed": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Service", - "Charm", - "Config", - "Constraints" + "changed" ] }, - "ServiceMetricCredential": { + "RelationUnitsWatchResult": { "type": "object", "properties": { - "MetricCredentials": { - "type": "array", - "items": { - "type": "integer" - } + "changes": { + "$ref": "#/definitions/RelationUnitsChange" + }, + "error": { + "$ref": "#/definitions/Error" }, - "ServiceName": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "MetricCredentials" + "watcher-id", + "changes" ] }, - "ServiceMetricCredentials": { + "UnitSettings": { "type": "object", "properties": { - "Creds": { - "type": "array", - "items": { - "$ref": "#/definitions/ServiceMetricCredential" - } + "version": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Creds" + "version" ] - }, - "ServiceSet": { + } + } + } + }, + { + "Name": "Resumer", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "ResumeTransactions": { + "type": "object" + } + } + } + }, + { + "Name": "RetryStrategy", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "RetryStrategy": { "type": "object", "properties": { - "Options": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } + "Params": { + "$ref": "#/definitions/Entities" }, - "ServiceName": { - "type": "string" + "Result": { + "$ref": "#/definitions/RetryStrategyResults" } - }, - "additionalProperties": false, - "required": [ - "ServiceName", - "Options" - ] + } }, - "ServiceSetCharm": { + "WatchRetryStrategy": { "type": "object", "properties": { - "charmurl": { - "type": "string" - }, - "cs-channel": { - "type": "string" - }, - "forceseries": { - "type": "boolean" - }, - "forceunits": { - "type": "boolean" - }, - "resourceids": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } + "Params": { + "$ref": "#/definitions/Entities" }, - "servicename": { - "type": "string" + "Result": { + "$ref": "#/definitions/NotifyWatchResults" } - }, - "additionalProperties": false, - "required": [ - "servicename", - "charmurl", - "cs-channel", - "forceunits", - "forceseries", - "resourceids" - ] - }, - "ServiceUnexpose": { + } + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "ServiceName": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } } }, "additionalProperties": false, "required": [ - "ServiceName" + "entities" ] }, - "ServiceUnset": { + "Entity": { "type": "object", "properties": { - "Options": { - "type": "array", - "items": { - "type": "string" - } - }, - "ServiceName": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Options" + "tag" ] }, - "ServiceUpdate": { + "Error": { "type": "object", "properties": { - "CharmUrl": { - "type": "string" - }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "ForceCharmUrl": { - "type": "boolean" - }, - "ForceSeries": { - "type": "boolean" - }, - "MinUnits": { - "type": "integer" - }, - "ServiceName": { + "code": { "type": "string" }, - "SettingsStrings": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "SettingsYAML": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "CharmUrl", - "ForceCharmUrl", - "ForceSeries", - "MinUnits", - "SettingsStrings", - "SettingsYAML", - "Constraints" + "message", + "code" ] }, - "ServicesDeploy": { + "ErrorInfo": { "type": "object", "properties": { - "Services": { - "type": "array", - "items": { - "$ref": "#/definitions/ServiceDeploy" - } + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Services" - ] + "additionalProperties": false }, - "SetConstraints": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Constraints": { - "$ref": "#/definitions/Value" - }, - "ServiceName": { + "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Constraints" + "NotifyWatcherId" ] }, - "StringResult": { + "NotifyWatchResults": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "results" ] }, - "Value": { + "RetryStrategy": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "container": { - "type": "string" - }, - "cpu-cores": { - "type": "integer" + "jitter-retry-time": { + "type": "boolean" }, - "cpu-power": { + "max-retry-time": { "type": "integer" }, - "instance-type": { - "type": "string" - }, - "mem": { + "min-retry-time": { "type": "integer" }, - "root-disk": { + "retry-time-factor": { "type": "integer" }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } - }, - "tags": { - "type": "array", - "items": { - "type": "string" - } - }, - "virt-type": { - "type": "string" + "should-retry": { + "type": "boolean" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "should-retry", + "min-retry-time", + "max-retry-time", + "jitter-retry-time", + "retry-time-factor" + ] }, - "caveat": { + "RetryStrategyResult": { "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "result": { + "$ref": "#/definitions/RetryStrategy" } }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "RetryStrategyResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/RetryStrategyResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "ServiceScaler", + "Name": "SSHClient", "Version": 1, "Schema": { "type": "object", "properties": { - "Rescale": { + "PrivateAddress": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/SSHAddressResults" } } }, - "Watch": { + "Proxy": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/SSHProxyResult" + } + } + }, + "PublicAddress": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/SSHAddressResults" + } + } + }, + "PublicKeys": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/SSHPublicKeysResults" } } } @@ -17495,7 +15083,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17504,177 +15092,123 @@ }, "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 }, - "ErrorResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "SSHAddressResult": { "type": "object", "properties": { - "Error": { + "address": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, - "ErrorResults": { + "SSHAddressResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/SSHAddressResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "SSHProxyResult": { "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" - } + "use-proxy": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "use-proxy" ] }, - "StringsWatchResult": { + "SSHPublicKeysResult": { "type": "object", "properties": { - "Changes": { + "error": { + "$ref": "#/definitions/Error" + }, + "public-keys": { "type": "array", "items": { "type": "string" } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { - "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" - ] + "additionalProperties": false }, - "packet": { + "SSHPublicKeysResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/SSHPublicKeysResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -17713,7 +15247,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17722,47 +15256,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" } }, @@ -17771,19 +15305,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" @@ -17792,70 +15323,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" @@ -17864,47 +15362,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" ] } } @@ -17940,16 +15398,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" @@ -17958,15 +15416,15 @@ }, "additionalProperties": false, "required": [ - "SubnetTags", - "SpaceTag", - "Public" + "subnet-tags", + "space-tag", + "public" ] }, "CreateSpacesParams": { "type": "object", "properties": { - "Spaces": { + "spaces": { "type": "array", "items": { "$ref": "#/definitions/CreateSpaceParams" @@ -17975,35 +15433,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" } }, @@ -18012,19 +15470,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" @@ -18033,71 +15488,38 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "ListSpacesResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/Space" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "results" + ] + }, + "ListSpacesResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Space" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, "Space": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Name": { + "name": { "type": "string" }, - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -18106,44 +15528,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" @@ -18152,51 +15562,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" ] } } @@ -18221,13 +15591,17 @@ "StatusHistoryPruneArgs": { "type": "object", "properties": { - "MaxLogsPerEntity": { + "max-history-mb": { + "type": "integer" + }, + "max-history-time": { "type": "integer" } }, "additionalProperties": false, "required": [ - "MaxLogsPerEntity" + "max-history-time", + "max-history-mb" ] } } @@ -18318,7 +15692,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -18327,25 +15701,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": { ".*": { @@ -18354,51 +15728,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" } }, @@ -18407,19 +15780,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" @@ -18428,13 +15798,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "FilesystemAttachmentInfo": { "type": "object", "properties": { - "mountpoint": { + "mount-point": { "type": "string" }, "read-only": { @@ -18446,13 +15816,13 @@ "FilesystemDetails": { "type": "object", "properties": { - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "info": { "$ref": "#/definitions/FilesystemInfo" }, - "machineattachments": { + "machine-attachments": { "type": "object", "patternProperties": { ".*": { @@ -18466,13 +15836,13 @@ "storage": { "$ref": "#/definitions/StorageDetails" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "info", "status" ] @@ -18531,7 +15901,7 @@ "FilesystemInfo": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, "size": { @@ -18540,51 +15910,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": { @@ -18597,7 +15934,7 @@ "additionalProperties": false, "required": [ "unit", - "StorageName", + "name", "storage" ] }, @@ -18607,49 +15944,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": { @@ -18661,23 +15990,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": { @@ -18809,7 +16141,7 @@ "error": { "$ref": "#/definitions/Error" }, - "storagepools": { + "storage-pools": { "type": "array", "items": { "$ref": "#/definitions/StoragePool" @@ -18848,13 +16180,13 @@ "VolumeAttachmentInfo": { "type": "object", "properties": { - "busaddress": { + "bus-address": { "type": "string" }, - "devicelink": { + "device-link": { "type": "string" }, - "devicename": { + "device-name": { "type": "string" }, "read-only": { @@ -18869,7 +16201,7 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "machineattachments": { + "machine-attachments": { "type": "object", "patternProperties": { ".*": { @@ -18883,13 +16215,13 @@ "storage": { "$ref": "#/definitions/StorageDetails" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info", "status" ] @@ -18948,7 +16280,7 @@ "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -18957,56 +16289,16 @@ "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" - ] } } } @@ -19413,7 +16705,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -19422,25 +16714,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": { ".*": { @@ -19449,50 +16741,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" } }, @@ -19501,19 +16793,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" @@ -19522,52 +16811,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": { @@ -19579,19 +16868,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": { @@ -19603,8 +16892,8 @@ }, "additionalProperties": false, "required": [ - "filesystemtag", - "machinetag", + "filesystem-tag", + "machine-tag", "provider" ] }, @@ -19665,7 +16954,7 @@ "FilesystemAttachments": { "type": "object", "properties": { - "filesystemattachments": { + "filesystem-attachments": { "type": "array", "items": { "$ref": "#/definitions/FilesystemAttachment" @@ -19674,13 +16963,13 @@ }, "additionalProperties": false, "required": [ - "filesystemattachments" + "filesystem-attachments" ] }, "FilesystemInfo": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, "size": { @@ -19689,7 +16978,7 @@ }, "additionalProperties": false, "required": [ - "filesystemid", + "filesystem-id", "size" ] }, @@ -19708,7 +16997,7 @@ } } }, - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "provider": { @@ -19725,13 +17014,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "size", "provider" ] @@ -19808,23 +17097,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" @@ -19833,60 +17121,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": { @@ -19907,30 +17162,29 @@ "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageId" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "MachineStorageIdsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" + "watcher-id", + "changes" ] }, "MachineStorageIdsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageIdsWatchResult" @@ -19939,13 +17193,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -19957,29 +17211,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" @@ -19988,13 +17241,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -20003,29 +17256,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" @@ -20034,36 +17286,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" @@ -20072,7 +17322,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Volume": { @@ -20081,13 +17331,13 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info" ] }, @@ -20097,30 +17347,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": { @@ -20132,10 +17382,10 @@ "VolumeAttachmentParams": { "type": "object", "properties": { - "instanceid": { + "instance-id": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, "provider": { @@ -20144,17 +17394,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" ] }, @@ -20215,7 +17465,7 @@ "VolumeAttachments": { "type": "object", "properties": { - "volumeattachments": { + "volume-attachments": { "type": "array", "items": { "$ref": "#/definitions/VolumeAttachment" @@ -20224,13 +17474,13 @@ }, "additionalProperties": false, "required": [ - "volumeattachments" + "volume-attachments" ] }, "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -20239,13 +17489,13 @@ "size": { "type": "integer" }, - "volumeid": { + "volume-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumeid", + "volume-id", "size", "persistent" ] @@ -20279,13 +17529,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "size", "provider" ] @@ -20344,59 +17594,19 @@ }, "additionalProperties": false }, - "Volumes": { - "type": "object", - "properties": { - "volumes": { - "type": "array", - "items": { - "$ref": "#/definitions/Volume" - } - } - }, - "additionalProperties": false, - "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": { + "Volumes": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "volumes": { + "type": "array", + "items": { + "$ref": "#/definitions/Volume" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "volumes" ] } } @@ -20424,29 +17634,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" } }, @@ -20454,102 +17664,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" ] } } @@ -20604,16 +17739,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" @@ -20622,13 +17757,13 @@ }, "additionalProperties": false, "required": [ - "SpaceTag" + "space-tag" ] }, "AddSubnetsParams": { "type": "object", "properties": { - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/AddSubnetParams" @@ -20637,35 +17772,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" } }, @@ -20674,19 +17809,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" @@ -20695,13 +17827,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ListSubnetsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -20710,66 +17842,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" @@ -20778,43 +17876,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" @@ -20823,20 +17909,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" } }, @@ -20845,27 +17931,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" @@ -20874,47 +17959,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" ] } } @@ -20983,7 +18028,7 @@ "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -20992,50 +18037,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" } }, @@ -21044,19 +18089,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" @@ -21065,50 +18107,17 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -21120,29 +18129,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" @@ -21151,13 +18159,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -21166,91 +18174,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" ] } } @@ -21297,7 +18264,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -21306,25 +18273,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": { ".*": { @@ -21333,50 +18300,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" } }, @@ -21385,19 +18352,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" @@ -21406,50 +18370,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" @@ -21458,70 +18389,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" ] } } @@ -21529,7 +18418,7 @@ }, { "Name": "Uniter", - "Version": 3, + "Version": 4, "Schema": { "type": "object", "properties": { @@ -21593,6 +18482,17 @@ } } }, + "ApplicationStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ApplicationStatusResults" + } + } + }, "AssignedMachine": { "type": "object", "properties": { @@ -22007,29 +18907,18 @@ } } }, - "ServiceOwner": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, - "ServiceStatus": { + "SetAgentStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/SetStatus" }, "Result": { - "$ref": "#/definitions/ServiceStatusResults" + "$ref": "#/definitions/ErrorResults" } } }, - "SetAgentStatus": { + "SetApplicationStatus": { "type": "object", "properties": { "Params": { @@ -22051,7 +18940,7 @@ } } }, - "SetServiceStatus": { + "SetStatus": { "type": "object", "properties": { "Params": { @@ -22062,7 +18951,7 @@ } } }, - "SetStatus": { + "SetUnitStatus": { "type": "object", "properties": { "Params": { @@ -22073,11 +18962,11 @@ } } }, - "SetUnitStatus": { + "SetWorkloadVersion": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SetStatus" + "$ref": "#/definitions/EntityWorkloadVersions" }, "Result": { "$ref": "#/definitions/ErrorResults" @@ -22169,6 +19058,17 @@ } } }, + "WatchApplicationRelations": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StringsWatchResults" + } + } + }, "WatchConfigSettings": { "type": "object", "properties": { @@ -22221,47 +19121,47 @@ } } }, - "WatchServiceRelations": { + "WatchStorageAttachments": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/StorageAttachmentIds" }, "Result": { - "$ref": "#/definitions/StringsWatchResults" + "$ref": "#/definitions/NotifyWatchResults" } } }, - "WatchStorageAttachments": { + "WatchUnitAddresses": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/StorageAttachmentIds" + "$ref": "#/definitions/Entities" }, "Result": { "$ref": "#/definitions/NotifyWatchResults" } } }, - "WatchUnitAddresses": { + "WatchUnitStorageAttachments": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/StringsWatchResults" } } }, - "WatchUnitStorageAttachments": { + "WorkloadVersion": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/StringsWatchResults" + "$ref": "#/definitions/StringResults" } } } @@ -22270,7 +19170,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -22282,7 +19182,7 @@ }, "additionalProperties": false, "required": [ - "Servers" + "servers" ] }, "Action": { @@ -22317,7 +19217,7 @@ "ActionExecutionResult": { "type": "object", "properties": { - "actiontag": { + "action-tag": { "type": "string" }, "message": { @@ -22338,7 +19238,7 @@ }, "additionalProperties": false, "required": [ - "actiontag", + "action-tag", "status" ] }, @@ -22408,46 +19308,84 @@ "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": { + "$ref": "#/definitions/StatusResult" + }, + "error": { + "$ref": "#/definitions/Error" + }, + "units": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/StatusResult" + } + } + } + }, + "additionalProperties": false, + "required": [ + "application", + "units" + ] + }, + "ApplicationStatusResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ApplicationStatusResult" + } + } + }, + "additionalProperties": false, + "required": [ + "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" @@ -22456,13 +19394,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "BytesResult": { "type": "object", "properties": { - "Result": { + "result": { "type": "array", "items": { "type": "integer" @@ -22471,25 +19409,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" @@ -22498,16 +19468,16 @@ }, "additionalProperties": false, "required": [ - "URLs" + "urls" ] }, "ConfigSettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22519,14 +19489,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Settings" + "settings" ] }, "ConfigSettingsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ConfigSettingsResult" @@ -22535,29 +19504,29 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Endpoint": { "type": "object", "properties": { - "Relation": { - "$ref": "#/definitions/Relation" - }, - "ServiceName": { + "application-name": { "type": "string" + }, + "relation": { + "$ref": "#/definitions/CharmRelation" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Relation" + "application-name", + "relation" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -22566,13 +19535,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesCharmURL": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityCharmURL" @@ -22581,13 +19550,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesPortRanges": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityPortRange" @@ -22596,117 +19565,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" + }, + "to-port": { + "type": "integer" + } + }, + "additionalProperties": false, + "required": [ + "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" }, - "ToPort": { - "type": "integer" + "workload-version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Protocol", - "FromPort", - "ToPort" + "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" } }, @@ -22715,19 +19715,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" @@ -22736,13 +19733,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetLeadershipSettingsBulkResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/GetLeadershipSettingsResult" @@ -22751,16 +19748,16 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetLeadershipSettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22771,8 +19768,7 @@ }, "additionalProperties": false, "required": [ - "Settings", - "Error" + "settings" ] }, "HostPort": { @@ -22781,36 +19777,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" @@ -22819,29 +19814,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" @@ -22850,73 +19844,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" @@ -22925,14 +19886,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Ports" + "ports" ] }, "MachinePortsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachinePortsResult" @@ -22941,13 +19901,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "MergeLeadershipSettingsBulkParams": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/MergeLeadershipSettingsParam" @@ -22956,16 +19916,16 @@ }, "additionalProperties": false, "required": [ - "Params" + "params" ] }, "MergeLeadershipSettingsParam": { "type": "object", "properties": { - "ServiceTag": { + "application-tag": { "type": "string" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22976,34 +19936,33 @@ }, "additionalProperties": false, "required": [ - "ServiceTag", - "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" @@ -23012,78 +19971,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" @@ -23092,13 +20051,13 @@ }, "additionalProperties": false, "required": [ - "Batches" + "batches" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -23110,137 +20069,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" @@ -23249,65 +20206,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" @@ -23316,41 +20241,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" @@ -23359,49 +20283,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" @@ -23410,16 +20334,16 @@ }, "additionalProperties": false, "required": [ - "RelationUnitPairs" + "relation-unit-pairs" ] }, "RelationUnitSettings": { "type": "object", "properties": { - "Relation": { + "relation": { "type": "string" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23427,21 +20351,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" @@ -23450,13 +20374,13 @@ }, "additionalProperties": false, "required": [ - "RelationUnits" + "relation-units" ] }, "RelationUnitsChange": { "type": "object", "properties": { - "Changed": { + "changed": { "type": "object", "patternProperties": { ".*": { @@ -23464,7 +20388,7 @@ } } }, - "Departed": { + "departed": { "type": "array", "items": { "type": "string" @@ -23473,14 +20397,13 @@ }, "additionalProperties": false, "required": [ - "Changed", - "Departed" + "changed" ] }, "RelationUnitsSettings": { "type": "object", "properties": { - "RelationUnits": { + "relation-units": { "type": "array", "items": { "$ref": "#/definitions/RelationUnitSettings" @@ -23489,33 +20412,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" @@ -23524,29 +20446,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" @@ -23555,53 +20476,13 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "ServiceStatusResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Service": { - "$ref": "#/definitions/StatusResult" - }, - "Units": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/StatusResult" - } - } - } - }, - "additionalProperties": false, - "required": [ - "Service", - "Units", - "Error" - ] - }, - "ServiceStatusResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ServiceStatusResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -23610,16 +20491,16 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "SettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23630,14 +20511,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Settings" + "settings" ] }, "SettingsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/SettingsResult" @@ -23646,13 +20526,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StatusResult": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -23661,41 +20541,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" @@ -23704,13 +20583,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StorageAddParams": { "type": "object", "properties": { - "StorageName": { + "name": { "type": "string" }, "storage": { @@ -23723,56 +20602,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": { @@ -23847,22 +20726,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", @@ -23882,27 +20756,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" @@ -23911,29 +20784,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" @@ -23942,32 +20814,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" @@ -23976,36 +20844,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" @@ -24014,32 +20880,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" @@ -24048,14 +20914,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Info" + "info" ] }, "UnitNetworkConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/UnitNetworkConfigResult" @@ -24064,25 +20929,25 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "UnitSettings": { "type": "object", "properties": { - "Version": { + "version": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Version" + "version" ] }, "UnitsNetworkConfig": { "type": "object", "properties": { - "Args": { + "args": { "type": "array", "items": { "$ref": "#/definitions/UnitNetworkConfig" @@ -24091,47 +20956,7 @@ }, "additionalProperties": false, "required": [ - "Args" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "args" ] } } @@ -24212,7 +21037,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -24221,13 +21046,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesVersion": { "type": "object", "properties": { - "AgentTools": { + "agent-tools": { "type": "array", "items": { "$ref": "#/definitions/EntityVersion" @@ -24236,63 +21061,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" } }, @@ -24301,19 +21126,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" @@ -24322,66 +21144,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" @@ -24390,7 +21178,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Number": { @@ -24447,13 +21235,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" @@ -24462,15 +21250,14 @@ }, "additionalProperties": false, "required": [ - "ToolsList", - "DisableSSLHostnameVerification", - "Error" + "tools", + "disable-ssl-hostname-verification" ] }, "ToolsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ToolsResult" @@ -24479,41 +21266,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" @@ -24522,47 +21305,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" ] } } @@ -24722,7 +21465,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -24731,41 +21474,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" @@ -24774,35 +21517,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" } }, @@ -24811,19 +21554,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" @@ -24832,45 +21572,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", @@ -24977,46 +21684,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" - ] } } } @@ -25043,29 +21710,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" } }, @@ -25073,122 +21740,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" ] } } } } ] -