X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=juju%2Fclient%2Fschemas.json;h=90ba2bbc769d00f71849b93ef93160783eb4e1fd;hb=1dd5b8bb6d597700bd5ae06e00a25f7f7d684797;hp=cdbe0e275ca82cdfb5a3b204342372435fea5e91;hpb=173b900fcd95b2436af55df2618302146f4a2f40;p=osm%2FN2VC.git diff --git a/juju/client/schemas.json b/juju/client/schemas.json index cdbe0e2..90ba2bb 100644 --- a/juju/client/schemas.json +++ b/juju/client/schemas.json @@ -508,6 +508,17 @@ } } }, + "CloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResults" + } + } + }, "ControllerConfig": { "type": "object", "properties": { @@ -613,6 +624,87 @@ "entities" ] }, + "CloudCredential": { + "type": "object", + "properties": { + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "auth-type": { + "type": "string" + }, + "redacted": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "auth-type" + ] + }, + "CloudSpec": { + "type": "object", + "properties": { + "credential": { + "$ref": "#/definitions/CloudCredential" + }, + "endpoint": { + "type": "string" + }, + "identity-endpoint": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "storage-endpoint": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "type", + "name" + ] + }, + "CloudSpecResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/CloudSpec" + } + }, + "additionalProperties": false + }, + "CloudSpecResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, + "additionalProperties": false + }, "ControllerConfigResult": { "type": "object", "properties": { @@ -1549,6 +1641,9 @@ }, "constraints": { "$ref": "#/definitions/Value" + }, + "series": { + "type": "string" } }, "additionalProperties": false, @@ -1556,7 +1651,8 @@ "application", "charm", "config", - "constraints" + "constraints", + "series" ] }, "ApplicationMetricCredential": { @@ -2821,11 +2917,15 @@ "$ref": "#/definitions/CharmMetric" } } + }, + "plan": { + "$ref": "#/definitions/CharmPlan" } }, "additionalProperties": false, "required": [ - "metrics" + "metrics", + "plan" ] }, "CharmOption": { @@ -2863,6 +2963,18 @@ "type" ] }, + "CharmPlan": { + "type": "object", + "properties": { + "required": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "required" + ] + }, "CharmRelation": { "type": "object", "properties": { @@ -3220,6 +3332,14 @@ } } }, + "ModelDefaults": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelDefaultsResult" + } + } + }, "ModelGet": { "type": "object", "properties": { @@ -3339,6 +3459,17 @@ } } }, + "SetModelDefaults": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetModelDefaults" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "StatusHistory": { "type": "object", "properties": { @@ -3350,6 +3481,17 @@ } } }, + "UnsetModelDefaults": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/UnsetModelDefaults" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "WatchAll": { "type": "object", "properties": { @@ -4125,6 +4267,36 @@ "type": "object", "additionalProperties": false }, + "MachineHardware": { + "type": "object", + "properties": { + "arch": { + "type": "string" + }, + "availability-zone": { + "type": "string" + }, + "cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false + }, "MachineStatus": { "type": "object", "properties": { @@ -4218,13 +4390,74 @@ "config" ] }, + "ModelDefaultValues": { + "type": "object", + "properties": { + "cloud-region": { + "type": "string" + }, + "cloud-tag": { + "type": "string" + }, + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelDefaults": { + "type": "object", + "properties": { + "controller": { + "type": "object", + "additionalProperties": true + }, + "default": { + "type": "object", + "additionalProperties": true + }, + "regions": { + "type": "array", + "items": { + "$ref": "#/definitions/RegionDefaults" + } + } + }, + "additionalProperties": false + }, + "ModelDefaultsResult": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ModelDefaults" + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, "ModelInfo": { "type": "object", "properties": { "cloud": { "type": "string" }, - "cloud-credential": { + "cloud-credential-tag": { "type": "string" }, "cloud-region": { @@ -4239,6 +4472,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "name": { "type": "string" }, @@ -4272,7 +4511,23 @@ "owner-tag", "life", "status", - "users" + "users", + "machines" + ] + }, + "ModelMachineInfo": { + "type": "object", + "properties": { + "hardware": { + "$ref": "#/definitions/MachineHardware" + }, + "id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "id" ] }, "ModelSet": { @@ -4302,6 +4557,9 @@ "cloud": { "type": "string" }, + "migration": { + "type": "string" + }, "name": { "type": "string" }, @@ -4335,6 +4593,27 @@ "keys" ] }, + "ModelUnsetKeys": { + "type": "object", + "properties": { + "cloud-region": { + "type": "string" + }, + "cloud-tag": { + "type": "string" + }, + "keys": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "keys" + ] + }, "ModelUserInfo": { "type": "object", "properties": { @@ -4515,17 +4794,34 @@ "public-address" ] }, - "RelationStatus": { + "RegionDefaults": { "type": "object", "properties": { - "endpoints": { - "type": "array", - "items": { - "$ref": "#/definitions/EndpointStatus" - } + "region-name": { + "type": "string" }, - "id": { - "type": "integer" + "value": { + "type": "object", + "additionalProperties": true + } + }, + "additionalProperties": false, + "required": [ + "region-name", + "value" + ] + }, + "RelationStatus": { + "type": "object", + "properties": { + "endpoints": { + "type": "array", + "items": { + "$ref": "#/definitions/EndpointStatus" + } + }, + "id": { + "type": "integer" }, "interface": { "type": "string" @@ -4632,6 +4928,21 @@ "version" ] }, + "SetModelDefaults": { + "type": "object", + "properties": { + "config": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelDefaultValues" + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, "StatusHistoryFilter": { "type": "object", "properties": { @@ -4808,6 +5119,21 @@ "subordinates" ] }, + "UnsetModelDefaults": { + "type": "object", + "properties": { + "keys": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelUnsetKeys" + } + } + }, + "additionalProperties": false, + "required": [ + "keys" + ] + }, "Value": { "type": "object", "properties": { @@ -4870,25 +5196,41 @@ } } }, - "CloudDefaults": { + "Clouds": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/CloudsResult" + } + } + }, + "Credential": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/CloudDefaultsResults" + "$ref": "#/definitions/CloudCredentialResults" + } + } + }, + "DefaultCloud": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringResult" } } }, - "Credentials": { + "RevokeCredentials": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/UserClouds" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/CloudCredentialsResults" + "$ref": "#/definitions/ErrorResults" } } }, @@ -4896,12 +5238,23 @@ "type": "object", "properties": { "Params": { - "$ref": "#/definitions/UsersCloudCredentials" + "$ref": "#/definitions/UpdateCloudCredentials" }, "Result": { "$ref": "#/definitions/ErrorResults" } } + }, + "UserCredentials": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/UserClouds" + }, + "Result": { + "$ref": "#/definitions/StringsResults" + } + } } }, "definitions": { @@ -4917,12 +5270,18 @@ "endpoint": { "type": "string" }, + "identity-endpoint": { + "type": "string" + }, "regions": { "type": "array", "items": { "$ref": "#/definitions/CloudRegion" } }, + "storage-endpoint": { + "type": "string" + }, "type": { "type": "string" } @@ -4945,82 +5304,38 @@ }, "auth-type": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "auth-type" - ] - }, - "CloudCredentialsResult": { - "type": "object", - "properties": { - "credentials": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/CloudCredential" - } - } }, - "error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false - }, - "CloudCredentialsResults": { - "type": "object", - "properties": { - "results": { + "redacted": { "type": "array", "items": { - "$ref": "#/definitions/CloudCredentialsResult" + "type": "string" } } }, - "additionalProperties": false - }, - "CloudDefaults": { - "type": "object", - "properties": { - "cloud-tag": { - "type": "string" - }, - "credential": { - "type": "string" - }, - "region": { - "type": "string" - } - }, "additionalProperties": false, "required": [ - "cloud-tag" + "auth-type" ] }, - "CloudDefaultsResult": { + "CloudCredentialResult": { "type": "object", "properties": { "error": { "$ref": "#/definitions/Error" }, "result": { - "$ref": "#/definitions/CloudDefaults" + "$ref": "#/definitions/CloudCredential" } }, - "additionalProperties": false, - "required": [ - "error" - ] + "additionalProperties": false }, - "CloudDefaultsResults": { + "CloudCredentialResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/CloudDefaultsResult" + "$ref": "#/definitions/CloudCredentialResult" } } }, @@ -5032,8 +5347,14 @@ "endpoint": { "type": "string" }, + "identity-endpoint": { + "type": "string" + }, "name": { "type": "string" + }, + "storage-endpoint": { + "type": "string" } }, "additionalProperties": false, @@ -5065,6 +5386,20 @@ }, "additionalProperties": false }, + "CloudsResult": { + "type": "object", + "properties": { + "clouds": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/Cloud" + } + } + } + }, + "additionalProperties": false + }, "Entities": { "type": "object", "properties": { @@ -5151,73 +5486,106 @@ "type": "object", "additionalProperties": false }, - "UserCloud": { + "StringResult": { "type": "object", "properties": { - "cloud-tag": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "user-tag": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "user-tag", - "cloud-tag" + "result" ] }, - "UserCloudCredentials": { + "StringsResult": { "type": "object", "properties": { - "cloud-tag": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "credentials": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/CloudCredential" - } + "result": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false + }, + "StringsResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringsResult" } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "UpdateCloudCredential": { + "type": "object", + "properties": { + "credential": { + "$ref": "#/definitions/CloudCredential" }, - "user-tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "user-tag", - "cloud-tag", - "credentials" + "tag", + "credential" ] }, - "UserClouds": { + "UpdateCloudCredentials": { "type": "object", "properties": { - "user-clouds": { + "credentials": { "type": "array", "items": { - "$ref": "#/definitions/UserCloud" + "$ref": "#/definitions/UpdateCloudCredential" } } }, "additionalProperties": false }, - "UsersCloudCredentials": { + "UserCloud": { "type": "object", "properties": { - "users": { - "type": "array", - "items": { - "$ref": "#/definitions/UserCloudCredentials" - } + "cloud-tag": { + "type": "string" + }, + "user-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "users" + "user-tag", + "cloud-tag" ] + }, + "UserClouds": { + "type": "object", + "properties": { + "user-clouds": { + "type": "array", + "items": { + "$ref": "#/definitions/UserCloud" + } + } + }, + "additionalProperties": false } } } @@ -5236,6 +5604,17 @@ } } }, + "CloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResults" + } + } + }, "ControllerConfig": { "type": "object", "properties": { @@ -5252,14 +5631,25 @@ } } }, - "InitiateModelMigration": { + "GetControllerAccess": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/UserAccessResults" + } + } + }, + "InitiateMigration": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/InitiateModelMigrationArgs" + "$ref": "#/definitions/InitiateMigrationArgs" }, "Result": { - "$ref": "#/definitions/InitiateModelMigrationResults" + "$ref": "#/definitions/InitiateMigrationResults" } } }, @@ -5290,6 +5680,17 @@ } } }, + "ModifyControllerAccess": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModifyControllerAccessRequest" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "RemoveBlocks": { "type": "object", "properties": { @@ -5320,10 +5721,91 @@ "watcher-id" ] }, - "ConfigValue": { + "CloudCredential": { "type": "object", "properties": { - "source": { + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "auth-type": { + "type": "string" + }, + "redacted": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "auth-type" + ] + }, + "CloudSpec": { + "type": "object", + "properties": { + "credential": { + "$ref": "#/definitions/CloudCredential" + }, + "endpoint": { + "type": "string" + }, + "identity-endpoint": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "storage-endpoint": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "type", + "name" + ] + }, + "CloudSpecResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/CloudSpec" + } + }, + "additionalProperties": false + }, + "CloudSpecResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, + "additionalProperties": false + }, + "ConfigValue": { + "type": "object", + "properties": { + "source": { "type": "string" }, "value": { @@ -5425,13 +5907,37 @@ }, "additionalProperties": false }, - "InitiateModelMigrationArgs": { + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "InitiateMigrationArgs": { "type": "object", "properties": { "specs": { "type": "array", "items": { - "$ref": "#/definitions/ModelMigrationSpec" + "$ref": "#/definitions/MigrationSpec" } } }, @@ -5440,13 +5946,13 @@ "specs" ] }, - "InitiateModelMigrationResult": { + "InitiateMigrationResult": { "type": "object", "properties": { "error": { "$ref": "#/definitions/Error" }, - "id": { + "migration-id": { "type": "string" }, "model-tag": { @@ -5456,16 +5962,16 @@ "additionalProperties": false, "required": [ "model-tag", - "id" + "migration-id" ] }, - "InitiateModelMigrationResults": { + "InitiateMigrationResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/InitiateModelMigrationResult" + "$ref": "#/definitions/InitiateMigrationResult" } } }, @@ -5478,6 +5984,89 @@ "type": "object", "additionalProperties": false }, + "MachineHardware": { + "type": "object", + "properties": { + "arch": { + "type": "string" + }, + "availability-zone": { + "type": "string" + }, + "cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false + }, + "MigrationSpec": { + "type": "object", + "properties": { + "external-control": { + "type": "boolean" + }, + "model-tag": { + "type": "string" + }, + "target-info": { + "$ref": "#/definitions/MigrationTargetInfo" + } + }, + "additionalProperties": false, + "required": [ + "model-tag", + "target-info", + "external-control" + ] + }, + "MigrationTargetInfo": { + "type": "object", + "properties": { + "addrs": { + "type": "array", + "items": { + "type": "string" + } + }, + "auth-tag": { + "type": "string" + }, + "ca-cert": { + "type": "string" + }, + "controller-tag": { + "type": "string" + }, + "macaroons": { + "type": "string" + }, + "password": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "controller-tag", + "addrs", + "ca-cert", + "auth-tag" + ] + }, "Model": { "type": "object", "properties": { @@ -5554,51 +6143,19 @@ "config" ] }, - "ModelMigrationSpec": { - "type": "object", - "properties": { - "model-tag": { - "type": "string" - }, - "target-info": { - "$ref": "#/definitions/ModelMigrationTargetInfo" - } - }, - "additionalProperties": false, - "required": [ - "model-tag", - "target-info" - ] - }, - "ModelMigrationTargetInfo": { + "ModelMachineInfo": { "type": "object", "properties": { - "addrs": { - "type": "array", - "items": { - "type": "string" - } - }, - "auth-tag": { - "type": "string" - }, - "ca-cert": { - "type": "string" - }, - "controller-tag": { - "type": "string" + "hardware": { + "$ref": "#/definitions/MachineHardware" }, - "password": { + "id": { "type": "string" } }, "additionalProperties": false, "required": [ - "controller-tag", - "addrs", - "ca-cert", - "auth-tag", - "password" + "id" ] }, "ModelStatus": { @@ -5613,6 +6170,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "model-tag": { "type": "string" }, @@ -5644,63 +6207,138 @@ "models" ] }, - "RemoveBlocksArgs": { + "ModifyControllerAccess": { "type": "object", "properties": { - "all": { - "type": "boolean" + "access": { + "type": "string" + }, + "action": { + "type": "string" + }, + "user-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "all" + "user-tag", + "action", + "access" ] }, - "UserModel": { + "ModifyControllerAccessRequest": { "type": "object", "properties": { - "last-connection": { - "type": "string", - "format": "date-time" - }, - "model": { - "$ref": "#/definitions/Model" + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/ModifyControllerAccess" + } } }, "additionalProperties": false, "required": [ - "model", - "last-connection" + "changes" ] }, - "UserModelList": { + "RemoveBlocksArgs": { "type": "object", "properties": { - "user-models": { - "type": "array", - "items": { - "$ref": "#/definitions/UserModel" - } + "all": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "user-models" + "all" ] - } - } - } - }, - { - "Name": "Deployer", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "APIAddresses": { + }, + "UserAccess": { "type": "object", "properties": { - "Result": { + "access": { + "type": "string" + }, + "user-tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "user-tag", + "access" + ] + }, + "UserAccessResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/UserAccess" + } + }, + "additionalProperties": false + }, + "UserAccessResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/UserAccessResult" + } + } + }, + "additionalProperties": false + }, + "UserModel": { + "type": "object", + "properties": { + "last-connection": { + "type": "string", + "format": "date-time" + }, + "model": { + "$ref": "#/definitions/Model" + } + }, + "additionalProperties": false, + "required": [ + "model", + "last-connection" + ] + }, + "UserModelList": { + "type": "object", + "properties": { + "user-models": { + "type": "array", + "items": { + "$ref": "#/definitions/UserModel" + } + } + }, + "additionalProperties": false, + "required": [ + "user-models" + ] + } + } + } + }, + { + "Name": "Deployer", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "APIAddresses": { + "type": "object", + "properties": { + "Result": { "$ref": "#/definitions/StringsResult" } } @@ -6790,6 +7428,17 @@ "Schema": { "type": "object", "properties": { + "CloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResults" + } + } + }, "GetAssignedMachine": { "type": "object", "properties": { @@ -6945,6 +7594,87 @@ "results" ] }, + "CloudCredential": { + "type": "object", + "properties": { + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "auth-type": { + "type": "string" + }, + "redacted": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "auth-type" + ] + }, + "CloudSpec": { + "type": "object", + "properties": { + "credential": { + "$ref": "#/definitions/CloudCredential" + }, + "endpoint": { + "type": "string" + }, + "identity-endpoint": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "storage-endpoint": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "type", + "name" + ] + }, + "CloudSpecResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "$ref": "#/definitions/CloudSpec" + } + }, + "additionalProperties": false + }, + "CloudSpecResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, + "additionalProperties": false + }, "Entities": { "type": "object", "properties": { @@ -7599,6 +8329,30 @@ "ha-members" ] }, + "MongoVersion": { + "type": "object", + "properties": { + "engine": { + "type": "string" + }, + "major": { + "type": "integer" + }, + "minor": { + "type": "integer" + }, + "patch": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "major", + "minor", + "patch", + "engine" + ] + }, "ResumeReplicationParams": { "type": "object", "properties": { @@ -7618,7 +8372,7 @@ "type": "object", "properties": { "target": { - "$ref": "#/definitions/Version" + "$ref": "#/definitions/MongoVersion" } }, "additionalProperties": false, @@ -7667,30 +8421,6 @@ } }, "additionalProperties": false - }, - "Version": { - "type": "object", - "properties": { - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "string" - }, - "StorageEngine": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Major", - "Minor", - "Patch", - "StorageEngine" - ] } } } @@ -9527,11 +10257,15 @@ }, "record-id": { "type": "integer" + }, + "record-timestamp": { + "type": "integer" } }, "additionalProperties": false, "required": [ "record-id", + "record-timestamp", "err" ] }, @@ -9574,12 +10308,16 @@ }, "record-id": { "type": "integer" + }, + "record-timestamp": { + "type": "integer" } }, "additionalProperties": false, "required": [ "LogForwardingID", - "record-id" + "record-id", + "record-timestamp" ] }, "LogForwardingSetLastSentParams": { @@ -10390,75 +11128,309 @@ } }, { - "Name": "Machiner", + "Name": "MachineUndertaker", "Version": 1, "Schema": { "type": "object", "properties": { - "APIAddresses": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" - } - } - }, - "APIHostPorts": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/APIHostPortsResult" - } - } - }, - "CACert": { + "AllMachineRemovals": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/BytesResult" + "$ref": "#/definitions/EntitiesResults" } } }, - "EnsureDead": { + "CompleteMachineRemovals": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" } } }, - "Jobs": { + "GetMachineProviderInterfaceInfo": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/JobsResults" + "$ref": "#/definitions/ProviderInterfaceInfoResults" } } }, - "Life": { + "WatchMachineRemovals": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/LifeResults" + "$ref": "#/definitions/NotifyWatchResults" } } - }, - "ModelUUID": { + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/StringResult" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } } - } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "EntitiesResult": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "EntitiesResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/EntitiesResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "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" + ] + }, + "ProviderInterfaceInfo": { + "type": "object", + "properties": { + "interface-name": { + "type": "string" + }, + "mac-address": { + "type": "string" + }, + "provider-id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "interface-name", + "mac-address", + "provider-id" + ] + }, + "ProviderInterfaceInfoResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "interfaces": { + "type": "array", + "items": { + "$ref": "#/definitions/ProviderInterfaceInfo" + } + }, + "machine-tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "machine-tag", + "interfaces" + ] + }, + "ProviderInterfaceInfoResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ProviderInterfaceInfoResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "Name": "Machiner", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "APIAddresses": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringsResult" + } + } + }, + "APIHostPorts": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/APIHostPortsResult" + } + } + }, + "CACert": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/BytesResult" + } + } + }, + "EnsureDead": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "Jobs": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/JobsResults" + } + } + }, + "Life": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/LifeResults" + } + } + }, + "ModelUUID": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringResult" + } + } }, "SetMachineAddresses": { "type": "object", @@ -11499,6 +12471,9 @@ "type": "string", "format": "date-time" }, + "unit": { + "type": "string" + }, "value": { "type": "string" } @@ -11507,7 +12482,8 @@ "required": [ "time", "key", - "value" + "value", + "unit" ] }, "MetricResults": { @@ -11779,10 +12755,7 @@ "type": "string" } }, - "additionalProperties": false, - "required": [ - "phase" - ] + "additionalProperties": false }, "PhaseResults": { "type": "object", @@ -11816,36 +12789,74 @@ } } }, - "GetMigrationStatus": { + "MigrationStatus": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/FullMigrationStatus" + "$ref": "#/definitions/MasterMigrationStatus" } } }, - "SetPhase": { + "MinionReports": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetMigrationPhaseArgs" + "Result": { + "$ref": "#/definitions/MinionReports" } } }, - "Watch": { + "ModelInfo": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/MigrationModelInfo" } } - } - }, - "definitions": { - "Error": { - "type": "object", - "properties": { - "code": { + }, + "Prechecks": { + "type": "object" + }, + "Reap": { + "type": "object" + }, + "SetPhase": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMigrationPhaseArgs" + } + } + }, + "SetStatusMessage": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMigrationStatusMessageArgs" + } + } + }, + "Watch": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "WatchMinionReports": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + } + }, + "definitions": { + "Error": { + "type": "object", + "properties": { + "code": { "type": "string" }, "info": { @@ -11873,47 +12884,80 @@ }, "additionalProperties": false }, - "FullMigrationStatus": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MasterMigrationStatus": { "type": "object", "properties": { - "attempt": { - "type": "integer" + "migration-id": { + "type": "string" }, "phase": { "type": "string" }, + "phase-changed-time": { + "type": "string", + "format": "date-time" + }, "spec": { - "$ref": "#/definitions/ModelMigrationSpec" + "$ref": "#/definitions/MigrationSpec" } }, "additionalProperties": false, "required": [ "spec", - "attempt", - "phase" + "migration-id", + "phase", + "phase-changed-time" ] }, - "Macaroon": { + "MigrationModelInfo": { "type": "object", - "additionalProperties": false + "properties": { + "agent-version": { + "$ref": "#/definitions/Number" + }, + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "uuid", + "name", + "owner-tag", + "agent-version" + ] }, - "ModelMigrationSpec": { + "MigrationSpec": { "type": "object", "properties": { + "external-control": { + "type": "boolean" + }, "model-tag": { "type": "string" }, "target-info": { - "$ref": "#/definitions/ModelMigrationTargetInfo" + "$ref": "#/definitions/MigrationTargetInfo" } }, "additionalProperties": false, "required": [ "model-tag", - "target-info" + "target-info", + "external-control" ] }, - "ModelMigrationTargetInfo": { + "MigrationTargetInfo": { "type": "object", "properties": { "addrs": { @@ -11931,6 +12975,9 @@ "controller-tag": { "type": "string" }, + "macaroons": { + "type": "string" + }, "password": { "type": "string" } @@ -11940,8 +12987,45 @@ "controller-tag", "addrs", "ca-cert", - "auth-tag", - "password" + "auth-tag" + ] + }, + "MinionReports": { + "type": "object", + "properties": { + "failed": { + "type": "array", + "items": { + "type": "string" + } + }, + "migration-id": { + "type": "string" + }, + "phase": { + "type": "string" + }, + "success-count": { + "type": "integer" + }, + "unknown-count": { + "type": "integer" + }, + "unknown-sample": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "migration-id", + "phase", + "success-count", + "unknown-count", + "unknown-sample", + "failed" ] }, "NotifyWatchResult": { @@ -11959,6 +13043,34 @@ "NotifyWatcherId" ] }, + "Number": { + "type": "object", + "properties": { + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "Major", + "Minor", + "Tag", + "Patch", + "Build" + ] + }, "SerializedModel": { "type": "object", "properties": { @@ -11967,11 +13079,41 @@ "items": { "type": "integer" } + }, + "charms": { + "type": "array", + "items": { + "type": "string" + } + }, + "tools": { + "type": "array", + "items": { + "$ref": "#/definitions/SerializedModelTools" + } } }, "additionalProperties": false, "required": [ - "bytes" + "bytes", + "charms", + "tools" + ] + }, + "SerializedModelTools": { + "type": "object", + "properties": { + "uri": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "version", + "uri" ] }, "SetMigrationPhaseArgs": { @@ -11985,6 +13127,18 @@ "required": [ "phase" ] + }, + "SetMigrationStatusMessageArgs": { + "type": "object", + "properties": { + "message": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message" + ] } } } @@ -11995,6 +13149,14 @@ "Schema": { "type": "object", "properties": { + "Report": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/MinionReport" + } + } + }, "Watch": { "type": "object", "properties": { @@ -12040,6 +13202,26 @@ "type": "object", "additionalProperties": false }, + "MinionReport": { + "type": "object", + "properties": { + "migration-id": { + "type": "string" + }, + "phase": { + "type": "string" + }, + "success": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "migration-id", + "phase", + "success" + ] + }, "NotifyWatchResult": { "type": "object", "properties": { @@ -12083,6 +13265,9 @@ "attempt": { "type": "integer" }, + "migration-id": { + "type": "string" + }, "phase": { "type": "string" }, @@ -12092,89 +13277,500 @@ "type": "string" } }, - "source-ca-cert": { + "source-ca-cert": { + "type": "string" + }, + "target-api-addrs": { + "type": "array", + "items": { + "type": "string" + } + }, + "target-ca-cert": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "migration-id", + "attempt", + "phase", + "source-api-addrs", + "source-ca-cert", + "target-api-addrs", + "target-ca-cert" + ] + } + } + } + }, + { + "Name": "MigrationTarget", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Abort": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelArgs" + } + } + }, + "Activate": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelArgs" + } + } + }, + "Import": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SerializedModel" + } + } + }, + "Prechecks": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/MigrationModelInfo" + } + } + } + }, + "definitions": { + "MigrationModelInfo": { + "type": "object", + "properties": { + "agent-version": { + "$ref": "#/definitions/Number" + }, + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "uuid", + "name", + "owner-tag", + "agent-version" + ] + }, + "ModelArgs": { + "type": "object", + "properties": { + "model-tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "model-tag" + ] + }, + "Number": { + "type": "object", + "properties": { + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "Major", + "Minor", + "Tag", + "Patch", + "Build" + ] + }, + "SerializedModel": { + "type": "object", + "properties": { + "bytes": { + "type": "array", + "items": { + "type": "integer" + } + }, + "charms": { + "type": "array", + "items": { + "type": "string" + } + }, + "tools": { + "type": "array", + "items": { + "$ref": "#/definitions/SerializedModelTools" + } + } + }, + "additionalProperties": false, + "required": [ + "bytes", + "charms", + "tools" + ] + }, + "SerializedModelTools": { + "type": "object", + "properties": { + "uri": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "version", + "uri" + ] + } + } + } + }, + { + "Name": "ModelConfig", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "ModelDefaults": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelDefaultsResult" + } + } + }, + "ModelGet": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResults" + } + } + }, + "ModelSet": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelSet" + } + } + }, + "ModelUnset": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelUnset" + } + } + }, + "SetModelDefaults": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetModelDefaults" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "UnsetModelDefaults": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/UnsetModelDefaults" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + } + }, + "definitions": { + "ConfigValue": { + "type": "object", + "properties": { + "source": { + "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true + } + }, + "additionalProperties": false, + "required": [ + "value", + "source" + ] + }, + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "ModelConfigResults": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ConfigValue" + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelDefaultValues": { + "type": "object", + "properties": { + "cloud-region": { + "type": "string" + }, + "cloud-tag": { + "type": "string" + }, + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelDefaults": { + "type": "object", + "properties": { + "controller": { + "type": "object", + "additionalProperties": true + }, + "default": { + "type": "object", + "additionalProperties": true + }, + "regions": { + "type": "array", + "items": { + "$ref": "#/definitions/RegionDefaults" + } + } + }, + "additionalProperties": false + }, + "ModelDefaultsResult": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ModelDefaults" + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelSet": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "ModelUnset": { + "type": "object", + "properties": { + "keys": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "keys" + ] + }, + "ModelUnsetKeys": { + "type": "object", + "properties": { + "cloud-region": { + "type": "string" + }, + "cloud-tag": { "type": "string" }, - "target-api-addrs": { + "keys": { "type": "array", "items": { "type": "string" } - }, - "target-ca-cert": { - "type": "string" } }, "additionalProperties": false, "required": [ - "attempt", - "phase", - "source-api-addrs", - "source-ca-cert", - "target-api-addrs", - "target-ca-cert" + "keys" ] - } - } - } - }, - { - "Name": "MigrationTarget", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Abort": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModelArgs" - } - } }, - "Activate": { + "RegionDefaults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ModelArgs" + "region-name": { + "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true } - } + }, + "additionalProperties": false, + "required": [ + "region-name", + "value" + ] }, - "Import": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SerializedModel" - } - } - } - }, - "definitions": { - "ModelArgs": { + "SetModelDefaults": { "type": "object", "properties": { - "model-tag": { - "type": "string" + "config": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelDefaultValues" + } } }, "additionalProperties": false, "required": [ - "model-tag" + "config" ] }, - "SerializedModel": { + "UnsetModelDefaults": { "type": "object", "properties": { - "bytes": { + "keys": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ModelUnsetKeys" } } }, "additionalProperties": false, "required": [ - "bytes" + "keys" ] } } @@ -12200,6 +13796,39 @@ "DestroyModel": { "type": "object" }, + "DestroyModels": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "DumpModels": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/MapResults" + } + } + }, + "DumpModelsDB": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/MapResults" + } + } + }, "ListModels": { "type": "object", "properties": { @@ -12351,6 +13980,72 @@ "type": "object", "additionalProperties": false }, + "MachineHardware": { + "type": "object", + "properties": { + "arch": { + "type": "string" + }, + "availability-zone": { + "type": "string" + }, + "cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false + }, + "MapResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "result" + ] + }, + "MapResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/MapResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, "Model": { "type": "object", "properties": { @@ -12374,6 +14069,9 @@ "ModelCreateArgs": { "type": "object", "properties": { + "cloud-tag": { + "type": "string" + }, "config": { "type": "object", "patternProperties": { @@ -12408,7 +14106,7 @@ "cloud": { "type": "string" }, - "cloud-credential": { + "cloud-credential-tag": { "type": "string" }, "cloud-region": { @@ -12423,6 +14121,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "name": { "type": "string" }, @@ -12456,7 +14160,8 @@ "owner-tag", "life", "status", - "users" + "users", + "machines" ] }, "ModelInfoResult": { @@ -12486,6 +14191,21 @@ "results" ] }, + "ModelMachineInfo": { + "type": "object", + "properties": { + "hardware": { + "$ref": "#/definitions/MachineHardware" + }, + "id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "id" + ] + }, "ModelUserInfo": { "type": "object", "properties": { @@ -12768,6 +14488,17 @@ } } }, + "MarkMachinesForRemoval": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "ModelConfig": { "type": "object", "properties": { @@ -15609,7 +17340,7 @@ }, { "Name": "Storage", - "Version": 2, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -16305,7 +18036,7 @@ }, { "Name": "StorageProvisioner", - "Version": 2, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -16397,14 +18128,6 @@ } } }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, "Remove": { "type": "object", "properties": { @@ -16581,14 +18304,6 @@ } } }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, "WatchMachines": { "type": "object", "properties": { @@ -17196,24 +18911,6 @@ "results" ] }, - "ModelConfigResult": { - "type": "object", - "properties": { - "config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - } - }, - "additionalProperties": false, - "required": [ - "config" - ] - }, "NotifyWatchResult": { "type": "object", "properties": { @@ -21361,6 +23058,17 @@ } } }, + "RemoveUser": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "SetPassword": { "type": "object", "properties": { @@ -21391,18 +23099,9 @@ "display-name": { "type": "string" }, - "model-access-permission": { - "type": "string" - }, "password": { "type": "string" }, - "shared-model-tags": { - "type": "array", - "items": { - "type": "string" - } - }, "username": { "type": "string" } @@ -21410,8 +23109,7 @@ "additionalProperties": false, "required": [ "username", - "display-name", - "shared-model-tags" + "display-name" ] }, "AddUserResult": { @@ -21609,6 +23307,9 @@ "UserInfo": { "type": "object", "properties": { + "access": { + "type": "string" + }, "created-by": { "type": "string" }, @@ -21634,6 +23335,7 @@ "required": [ "username", "display-name", + "access", "created-by", "date-created", "disabled"