X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fclient%2Fschemas.json;h=1191024379a35905083ed127f4b7c6b7aab3382e;hb=cde1c24a5157d1a7c308d5c2d3436fae86be24fc;hp=4aabb1bd50e39f17646cb4b032a3639433b2ec38;hpb=1bd3bd858aaf21ecccc64134c536d105c10b0d7e;p=osm%2FN2VC.git diff --git a/juju/client/schemas.json b/juju/client/schemas.json index 4aabb1b..1191024 100644 --- a/juju/client/schemas.json +++ b/juju/client/schemas.json @@ -527,6 +527,17 @@ } } }, + "GetCloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelTag" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, "GetEntities": { "type": "object", "properties": { @@ -573,6 +584,17 @@ } } }, + "WatchCredentials": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + }, "WatchForModelConfigChanges": { "type": "object", "properties": { @@ -870,6 +892,10 @@ "config" ] }, + "ModelTag": { + "type": "object", + "additionalProperties": false + }, "NotifyWatchResult": { "type": "object", "properties": { @@ -885,6 +911,21 @@ "NotifyWatcherId" ] }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, "StateServingInfo": { "type": "object", "properties": { @@ -1240,7 +1281,7 @@ }, { "Name": "Application", - "Version": 1, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -1722,6 +1763,17 @@ "charm-url": { "type": "string" }, + "config-settings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "config-settings-yaml": { + "type": "string" + }, "force-series": { "type": "boolean" }, @@ -1735,6 +1787,14 @@ "type": "string" } } + }, + "storage-constraints": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/StorageConstraints" + } + } } }, "additionalProperties": false, @@ -2031,6 +2091,21 @@ "constraints" ] }, + "StorageConstraints": { + "type": "object", + "properties": { + "count": { + "type": "integer" + }, + "pool": { + "type": "string" + }, + "size": { + "type": "integer" + } + }, + "additionalProperties": false + }, "StringResult": { "type": "object", "properties": { @@ -2055,7 +2130,7 @@ "container": { "type": "string" }, - "cpu-cores": { + "cores": { "type": "integer" }, "cpu-power": { @@ -2091,6 +2166,144 @@ } } }, + { + "Name": "ApplicationRelationsWatcher", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Next": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ApplicationRelationsWatchResult" + } + } + }, + "Stop": { + "type": "object" + } + }, + "definitions": { + "ApplicationRelationsChange": { + "type": "object", + "properties": { + "changed": { + "type": "array", + "items": { + "$ref": "#/definitions/RelationChange" + } + }, + "removed": { + "type": "array", + "items": { + "type": "integer" + } + } + }, + "additionalProperties": false + }, + "ApplicationRelationsWatchResult": { + "type": "object", + "properties": { + "ApplicationRelationsWatcherId": { + "type": "string" + }, + "changes": { + "$ref": "#/definitions/ApplicationRelationsChange" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "ApplicationRelationsWatcherId" + ] + }, + "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 + }, + "RelationChange": { + "type": "object", + "properties": { + "changedunits": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/RelationUnitChange" + } + } + }, + "departedunits": { + "type": "array", + "items": { + "type": "string" + } + }, + "id": { + "type": "integer" + }, + "life": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "id", + "life" + ] + }, + "RelationUnitChange": { + "type": "object", + "properties": { + "settings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false + } + } + } + }, { "Name": "ApplicationScaler", "Version": 1, @@ -2611,64 +2824,147 @@ } }, { - "Name": "CharmRevisionUpdater", - "Version": 2, + "Name": "Bundle", + "Version": 1, "Schema": { "type": "object", "properties": { - "UpdateLatestRevisions": { + "GetChanges": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/BundleChangesParams" + }, "Result": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/BundleChangesResults" } } } }, "definitions": { - "Error": { + "BundleChange": { "type": "object", "properties": { - "code": { - "type": "string" + "args": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } }, - "info": { - "$ref": "#/definitions/ErrorInfo" + "id": { + "type": "string" }, - "message": { + "method": { "type": "string" + }, + "requires": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "message", - "code" + "id", + "method", + "args", + "requires" ] }, - "ErrorInfo": { + "BundleChangesParams": { "type": "object", "properties": { - "macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "macaroon-path": { + "yaml": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "yaml" + ] }, - "ErrorResult": { + "BundleChangesResults": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/BundleChange" + } + }, + "errors": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false - }, - "Macaroon": { - "type": "object", - "additionalProperties": false + } + } + } + }, + { + "Name": "CharmRevisionUpdater", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "UpdateLatestRevisions": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ErrorResult" + } + } + } + }, + "definitions": { + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false } } } @@ -2917,11 +3213,15 @@ "$ref": "#/definitions/CharmMetric" } } + }, + "plan": { + "$ref": "#/definitions/CharmPlan" } }, "additionalProperties": false, "required": [ - "metrics" + "metrics", + "plan" ] }, "CharmOption": { @@ -2959,6 +3259,18 @@ "type" ] }, + "CharmPlan": { + "type": "object", + "properties": { + "required": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "required" + ] + }, "CharmRelation": { "type": "object", "properties": { @@ -3290,10 +3602,10 @@ "type": "object", "properties": { "Params": { - "$ref": "#/definitions/GetBundleChangesParams" + "$ref": "#/definitions/BundleChangesParams" }, "Result": { - "$ref": "#/definitions/GetBundleChangesResults" + "$ref": "#/definitions/BundleChangesResults" } } }, @@ -3316,14 +3628,6 @@ } } }, - "ModelDefaults": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelDefaultsResult" - } - } - }, "ModelGet": { "type": "object", "properties": { @@ -3443,17 +3747,6 @@ } } }, - "SetModelDefaults": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetModelDefaults" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, "StatusHistory": { "type": "object", "properties": { @@ -3465,17 +3758,6 @@ } } }, - "UnsetModelDefaults": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/UnsetModelDefaults" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, "WatchAll": { "type": "object", "properties": { @@ -3788,7 +4070,7 @@ "Arch" ] }, - "BundleChangesChange": { + "BundleChange": { "type": "object", "properties": { "args": { @@ -3819,6 +4101,36 @@ "requires" ] }, + "BundleChangesParams": { + "type": "object", + "properties": { + "yaml": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "yaml" + ] + }, + "BundleChangesResults": { + "type": "object", + "properties": { + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/BundleChange" + } + }, + "errors": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false + }, "ConfigValue": { "type": "object", "properties": { @@ -4131,6 +4443,14 @@ "items": { "$ref": "#/definitions/RelationStatus" } + }, + "remote-applications": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/RemoteApplicationStatus" + } + } } }, "additionalProperties": false, @@ -4138,39 +4458,10 @@ "model", "machines", "applications", + "remote-applications", "relations" ] }, - "GetBundleChangesParams": { - "type": "object", - "properties": { - "yaml": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "yaml" - ] - }, - "GetBundleChangesResults": { - "type": "object", - "properties": { - "changes": { - "type": "array", - "items": { - "$ref": "#/definitions/BundleChangesChange" - } - }, - "errors": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "GetConstraintsResults": { "type": "object", "properties": { @@ -4251,6 +4542,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": { @@ -4283,6 +4604,12 @@ "instance-status": { "$ref": "#/definitions/DetailedStatus" }, + "ip-addresses": { + "type": "array", + "items": { + "type": "string" + } + }, "jobs": { "type": "array", "items": { @@ -4301,6 +4628,7 @@ "agent-status", "instance-status", "dns-name", + "ip-addresses", "instance-id", "series", "id", @@ -4344,122 +4672,95 @@ "config" ] }, - "ModelDefaultValues": { + "ModelInfo": { "type": "object", "properties": { + "cloud-credential-tag": { + "type": "string" + }, "cloud-region": { "type": "string" }, "cloud-tag": { "type": "string" }, - "config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "controller-uuid": { + "type": "string" + }, + "default-series": { + "type": "string" + }, + "life": { + "type": "string" + }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, + "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": [ - "config" + "name", + "uuid", + "controller-uuid", + "provider-type", + "default-series", + "cloud-tag", + "owner-tag", + "life", + "status", + "users", + "machines" ] }, - "ModelDefaults": { + "ModelMachineInfo": { "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-tag": { - "type": "string" - }, - "cloud-region": { - "type": "string" - }, - "controller-uuid": { - "type": "string" - }, - "default-series": { - "type": "string" - }, - "life": { - "type": "string" + "hardware": { + "$ref": "#/definitions/MachineHardware" }, - "name": { - "type": "string" + "has-vote": { + "type": "boolean" }, - "owner-tag": { + "id": { "type": "string" }, - "provider-type": { + "instance-id": { "type": "string" }, "status": { - "$ref": "#/definitions/EntityStatus" - }, - "users": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelUserInfo" - } - }, - "uuid": { "type": "string" + }, + "wants-vote": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "name", - "uuid", - "controller-uuid", - "provider-type", - "default-series", - "cloud", - "owner-tag", - "life", - "status", - "users" + "id" ] }, "ModelSet": { @@ -4486,7 +4787,7 @@ "available-version": { "type": "string" }, - "cloud": { + "cloud-tag": { "type": "string" }, "migration": { @@ -4505,7 +4806,7 @@ "additionalProperties": false, "required": [ "name", - "cloud", + "cloud-tag", "version", "available-version" ] @@ -4525,27 +4826,6 @@ "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": { @@ -4726,39 +5006,97 @@ "public-address" ] }, - "RegionDefaults": { + "RelationStatus": { "type": "object", "properties": { - "region-name": { + "endpoints": { + "type": "array", + "items": { + "$ref": "#/definitions/EndpointStatus" + } + }, + "id": { + "type": "integer" + }, + "interface": { "type": "string" }, - "value": { - "type": "object", - "additionalProperties": true + "key": { + "type": "string" + }, + "scope": { + "type": "string" } }, "additionalProperties": false, "required": [ - "region-name", - "value" + "id", + "key", + "interface", + "scope", + "endpoints" ] }, - "RelationStatus": { + "RemoteApplicationStatus": { "type": "object", "properties": { + "application-name": { + "type": "string" + }, + "application-url": { + "type": "string" + }, "endpoints": { "type": "array", "items": { - "$ref": "#/definitions/EndpointStatus" + "$ref": "#/definitions/RemoteEndpoint" } }, - "id": { - "type": "integer" + "err": { + "type": "object", + "additionalProperties": true + }, + "life": { + "type": "string" + }, + "relations": { + "type": "object", + "patternProperties": { + ".*": { + "type": "array", + "items": { + "type": "string" + } + } + } }, + "status": { + "$ref": "#/definitions/DetailedStatus" + } + }, + "additionalProperties": false, + "required": [ + "application-url", + "application-name", + "endpoints", + "life", + "relations", + "status" + ] + }, + "RemoteEndpoint": { + "type": "object", + "properties": { "interface": { "type": "string" }, - "key": { + "limit": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "role": { "type": "string" }, "scope": { @@ -4767,11 +5105,11 @@ }, "additionalProperties": false, "required": [ - "id", - "key", + "name", + "role", "interface", - "scope", - "endpoints" + "limit", + "scope" ] }, "ResolveCharmResult": { @@ -4860,21 +5198,6 @@ "version" ] }, - "SetModelDefaults": { - "type": "object", - "properties": { - "config": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelDefaultValues" - } - } - }, - "additionalProperties": false, - "required": [ - "config" - ] - }, "StatusHistoryFilter": { "type": "object", "properties": { @@ -5012,6 +5335,9 @@ "charm": { "type": "string" }, + "leader": { + "type": "boolean" + }, "machine": { "type": "string" }, @@ -5051,21 +5377,6 @@ "subordinates" ] }, - "UnsetModelDefaults": { - "type": "object", - "properties": { - "keys": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelUnsetKeys" - } - } - }, - "additionalProperties": false, - "required": [ - "keys" - ] - }, "Value": { "type": "object", "properties": { @@ -5075,7 +5386,7 @@ "container": { "type": "string" }, - "cpu-cores": { + "cores": { "type": "integer" }, "cpu-power": { @@ -5563,6 +5874,17 @@ } } }, + "GetCloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelTag" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, "GetControllerAccess": { "type": "object", "properties": { @@ -5574,6 +5896,14 @@ } } }, + "HostedModelConfigs": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/HostedModelConfigsResults" + } + } + }, "InitiateMigration": { "type": "object", "properties": { @@ -5863,28 +6193,74 @@ "results" ] }, - "InitiateMigrationArgs": { - "type": "object", - "properties": { - "specs": { - "type": "array", - "items": { - "$ref": "#/definitions/MigrationSpec" - } - } - }, - "additionalProperties": false, - "required": [ - "specs" - ] - }, - "InitiateMigrationResult": { + "HostedModelConfig": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" + "cloud-spec": { + "$ref": "#/definitions/CloudSpec" }, - "migration-id": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "error": { + "$ref": "#/definitions/Error" + }, + "name": { + "type": "string" + }, + "owner": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "owner" + ] + }, + "HostedModelConfigsResults": { + "type": "object", + "properties": { + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/HostedModelConfig" + } + } + }, + "additionalProperties": false, + "required": [ + "models" + ] + }, + "InitiateMigrationArgs": { + "type": "object", + "properties": { + "specs": { + "type": "array", + "items": { + "$ref": "#/definitions/MigrationSpec" + } + } + }, + "additionalProperties": false, + "required": [ + "specs" + ] + }, + "InitiateMigrationResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "migration-id": { "type": "string" }, "model-tag": { @@ -5916,12 +6292,48 @@ "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" }, + "skip-initial-prechecks": { + "type": "boolean" + }, "target-info": { "$ref": "#/definitions/MigrationTargetInfo" } @@ -5929,7 +6341,9 @@ "additionalProperties": false, "required": [ "model-tag", - "target-info" + "target-info", + "external-control", + "skip-initial-prechecks" ] }, "MigrationTargetInfo": { @@ -5950,7 +6364,7 @@ "controller-tag": { "type": "string" }, - "macaroon": { + "macaroons": { "type": "string" }, "password": { @@ -6041,6 +6455,33 @@ "config" ] }, + "ModelMachineInfo": { + "type": "object", + "properties": { + "hardware": { + "$ref": "#/definitions/MachineHardware" + }, + "has-vote": { + "type": "boolean" + }, + "id": { + "type": "string" + }, + "instance-id": { + "type": "string" + }, + "status": { + "type": "string" + }, + "wants-vote": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "id" + ] + }, "ModelStatus": { "type": "object", "properties": { @@ -6053,6 +6494,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "model-tag": { "type": "string" }, @@ -6084,6 +6531,10 @@ "models" ] }, + "ModelTag": { + "type": "object", + "additionalProperties": false + }, "ModifyControllerAccess": { "type": "object", "properties": { @@ -6285,6 +6736,17 @@ } } }, + "SetStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetStatus" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "StateAddresses": { "type": "object", "properties": { @@ -6293,6 +6755,17 @@ } } }, + "UpdateStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetStatus" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, "WatchAPIHostPorts": { "type": "object", "properties": { @@ -6450,6 +6923,36 @@ "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": { @@ -6570,6 +7073,21 @@ "NotifyWatcherId" ] }, + "SetStatus": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityStatusArgs" + } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, "StringResult": { "type": "object", "properties": { @@ -7327,6 +7845,17 @@ } } }, + "GetCloudSpec": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelTag" + }, + "Result": { + "$ref": "#/definitions/CloudSpecResult" + } + } + }, "GetExposed": { "type": "object", "properties": { @@ -7746,6 +8275,10 @@ "config" ] }, + "ModelTag": { + "type": "object", + "additionalProperties": false + }, "NotifyWatchResult": { "type": "object", "properties": { @@ -8039,9 +8572,6 @@ "constraints": { "$ref": "#/definitions/Value" }, - "model-tag": { - "type": "string" - }, "num-controllers": { "type": "integer" }, @@ -8057,7 +8587,6 @@ }, "additionalProperties": false, "required": [ - "model-tag", "num-controllers" ] }, @@ -8206,6 +8735,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": { @@ -8225,7 +8778,7 @@ "type": "object", "properties": { "target": { - "$ref": "#/definitions/Version" + "$ref": "#/definitions/MongoVersion" } }, "additionalProperties": false, @@ -8242,7 +8795,7 @@ "container": { "type": "string" }, - "cpu-cores": { + "cores": { "type": "integer" }, "cpu-power": { @@ -8274,30 +8827,6 @@ } }, "additionalProperties": false - }, - "Version": { - "type": "object", - "properties": { - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "string" - }, - "StorageEngine": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Major", - "Minor", - "Patch", - "StorageEngine" - ] } } } @@ -10968,7 +11497,7 @@ "container": { "type": "string" }, - "cpu-cores": { + "cores": { "type": "integer" }, "cpu-power": { @@ -12348,6 +12877,9 @@ "type": "string", "format": "date-time" }, + "unit": { + "type": "string" + }, "value": { "type": "string" } @@ -12356,7 +12888,8 @@ "required": [ "time", "key", - "value" + "value", + "unit" ] }, "MetricResults": { @@ -12795,6 +13328,9 @@ "name": { "type": "string" }, + "owner-tag": { + "type": "string" + }, "uuid": { "type": "string" } @@ -12803,15 +13339,22 @@ "required": [ "uuid", "name", + "owner-tag", "agent-version" ] }, "MigrationSpec": { "type": "object", "properties": { + "external-control": { + "type": "boolean" + }, "model-tag": { "type": "string" }, + "skip-initial-prechecks": { + "type": "boolean" + }, "target-info": { "$ref": "#/definitions/MigrationTargetInfo" } @@ -12819,7 +13362,9 @@ "additionalProperties": false, "required": [ "model-tag", - "target-info" + "target-info", + "external-control", + "skip-initial-prechecks" ] }, "MigrationTargetInfo": { @@ -12840,7 +13385,7 @@ "controller-tag": { "type": "string" }, - "macaroon": { + "macaroons": { "type": "string" }, "password": { @@ -13130,6 +13675,9 @@ "attempt": { "type": "integer" }, + "external-control": { + "type": "boolean" + }, "migration-id": { "type": "string" }, @@ -13160,6 +13708,7 @@ "migration-id", "attempt", "phase", + "external-control", "source-api-addrs", "source-ca-cert", "target-api-addrs", @@ -13203,12 +13752,36 @@ "type": "object", "properties": { "Params": { - "$ref": "#/definitions/TargetPrechecksArgs" + "$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": { @@ -13293,18 +13866,6 @@ "version", "uri" ] - }, - "TargetPrechecksArgs": { - "type": "object", - "properties": { - "agent-version": { - "$ref": "#/definitions/Number" - } - }, - "additionalProperties": false, - "required": [ - "agent-version" - ] } } } @@ -13315,14 +13876,6 @@ "Schema": { "type": "object", "properties": { - "ModelDefaults": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelDefaultsResult" - } - } - }, "ModelGet": { "type": "object", "properties": { @@ -13346,28 +13899,6 @@ "$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": { @@ -13388,65 +13919,6 @@ "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": { @@ -13464,67 +13936,6 @@ "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": { @@ -13557,74 +13968,6 @@ "required": [ "keys" ] - }, - "ModelUnsetKeys": { - "type": "object", - "properties": { - "cloud-region": { - "type": "string" - }, - "cloud-tag": { - "type": "string" - }, - "keys": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false, - "required": [ - "keys" - ] - }, - "RegionDefaults": { - "type": "object", - "properties": { - "region-name": { - "type": "string" - }, - "value": { - "type": "object", - "additionalProperties": true - } - }, - "additionalProperties": false, - "required": [ - "region-name", - "value" - ] - }, - "SetModelDefaults": { - "type": "object", - "properties": { - "config": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelDefaultValues" - } - } - }, - "additionalProperties": false, - "required": [ - "config" - ] - }, - "UnsetModelDefaults": { - "type": "object", - "properties": { - "keys": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelUnsetKeys" - } - } - }, - "additionalProperties": false, - "required": [ - "keys" - ] } } } @@ -13646,9 +13989,6 @@ } } }, - "DestroyModel": { - "type": "object" - }, "DestroyModels": { "type": "object", "properties": { @@ -13693,6 +14033,14 @@ } } }, + "ModelDefaults": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelDefaultsResult" + } + } + }, "ModelInfo": { "type": "object", "properties": { @@ -13704,6 +14052,17 @@ } } }, + "ModelStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ModelStatusResults" + } + } + }, "ModifyModelAccess": { "type": "object", "properties": { @@ -13714,6 +14073,28 @@ "$ref": "#/definitions/ErrorResults" } } + }, + "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": { @@ -13833,6 +14214,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 + }, "MapResult": { "type": "object", "properties": { @@ -13889,52 +14300,113 @@ "owner-tag" ] }, - "ModelCreateArgs": { + "ModelCreateArgs": { + "type": "object", + "properties": { + "cloud-tag": { + "type": "string" + }, + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "credential": { + "type": "string" + }, + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "owner-tag" + ] + }, + "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": { - "cloud-tag": { - "type": "string" - }, "config": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/ModelDefaults" } } - }, - "credential": { - "type": "string" - }, - "name": { - "type": "string" - }, - "owner-tag": { - "type": "string" - }, - "region": { - "type": "string" } }, "additionalProperties": false, "required": [ - "name", - "owner-tag" + "config" ] }, "ModelInfo": { "type": "object", "properties": { - "cloud": { - "type": "string" - }, "cloud-credential-tag": { "type": "string" }, "cloud-region": { "type": "string" }, + "cloud-tag": { + "type": "string" + }, "controller-uuid": { "type": "string" }, @@ -13944,6 +14416,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "name": { "type": "string" }, @@ -13973,11 +14451,12 @@ "controller-uuid", "provider-type", "default-series", - "cloud", + "cloud-tag", "owner-tag", "life", "status", - "users" + "users", + "machines" ] }, "ModelInfoResult": { @@ -14007,6 +14486,103 @@ "results" ] }, + "ModelMachineInfo": { + "type": "object", + "properties": { + "hardware": { + "$ref": "#/definitions/MachineHardware" + }, + "has-vote": { + "type": "boolean" + }, + "id": { + "type": "string" + }, + "instance-id": { + "type": "string" + }, + "status": { + "type": "string" + }, + "wants-vote": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "id" + ] + }, + "ModelStatus": { + "type": "object", + "properties": { + "application-count": { + "type": "integer" + }, + "hosted-machine-count": { + "type": "integer" + }, + "life": { + "type": "string" + }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, + "model-tag": { + "type": "string" + }, + "owner-tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "model-tag", + "life", + "hosted-machine-count", + "application-count", + "owner-tag" + ] + }, + "ModelStatusResults": { + "type": "object", + "properties": { + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelStatus" + } + } + }, + "additionalProperties": false, + "required": [ + "models" + ] + }, + "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": { @@ -14071,6 +14647,53 @@ "changes" ] }, + "RegionDefaults": { + "type": "object", + "properties": { + "region-name": { + "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true + } + }, + "additionalProperties": false, + "required": [ + "region-name", + "value" + ] + }, + "SetModelDefaults": { + "type": "object", + "properties": { + "config": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelDefaultValues" + } + } + }, + "additionalProperties": false, + "required": [ + "config" + ] + }, + "UnsetModelDefaults": { + "type": "object", + "properties": { + "keys": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelUnsetKeys" + } + } + }, + "additionalProperties": false, + "required": [ + "keys" + ] + }, "UserModel": { "type": "object", "properties": { @@ -15707,7 +16330,7 @@ "container": { "type": "string" }, - "cpu-cores": { + "cores": { "type": "integer" }, "cpu-power": { @@ -16565,10 +17188,21 @@ }, { "Name": "SSHClient", - "Version": 1, + "Version": 2, "Schema": { "type": "object", "properties": { + "AllAddresses": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/SSHAddressesResults" + } + } + }, "PrivateAddress": { "type": "object", "properties": { @@ -16701,6 +17335,39 @@ "results" ] }, + "SSHAddressesResult": { + "type": "object", + "properties": { + "addresses": { + "type": "array", + "items": { + "type": "string" + } + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "addresses" + ] + }, + "SSHAddressesResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/SSHAddressesResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, "SSHProxyResult": { "type": "object", "properties": { @@ -22826,17 +23493,6 @@ } } }, - "CreateLocalLoginMacaroon": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/MacaroonResults" - } - } - }, "DisableUser": { "type": "object", "properties": { @@ -23078,33 +23734,6 @@ "type": "object", "additionalProperties": false }, - "MacaroonResult": { - "type": "object", - "properties": { - "error": { - "$ref": "#/definitions/Error" - }, - "result": { - "$ref": "#/definitions/Macaroon" - } - }, - "additionalProperties": false - }, - "MacaroonResults": { - "type": "object", - "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/MacaroonResult" - } - } - }, - "additionalProperties": false, - "required": [ - "results" - ] - }, "UserInfo": { "type": "object", "properties": {