X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fclient%2Fschemas.json;h=90ba2bbc769d00f71849b93ef93160783eb4e1fd;hb=5acba37aaefa55fab65eb3ca8b5a5fcf24606a2a;hp=4aabb1bd50e39f17646cb4b032a3639433b2ec38;hpb=1bd3bd858aaf21ecccc64134c536d105c10b0d7e;p=osm%2FN2VC.git diff --git a/juju/client/schemas.json b/juju/client/schemas.json index 4aabb1b..90ba2bb 100644 --- a/juju/client/schemas.json +++ b/juju/client/schemas.json @@ -2917,11 +2917,15 @@ "$ref": "#/definitions/CharmMetric" } } + }, + "plan": { + "$ref": "#/definitions/CharmPlan" } }, "additionalProperties": false, "required": [ - "metrics" + "metrics", + "plan" ] }, "CharmOption": { @@ -2959,6 +2963,18 @@ "type" ] }, + "CharmPlan": { + "type": "object", + "properties": { + "required": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "required" + ] + }, "CharmRelation": { "type": "object", "properties": { @@ -4251,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": { @@ -4426,6 +4472,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "name": { "type": "string" }, @@ -4459,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": { @@ -5916,9 +5984,42 @@ "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" }, @@ -5929,7 +6030,8 @@ "additionalProperties": false, "required": [ "model-tag", - "target-info" + "target-info", + "external-control" ] }, "MigrationTargetInfo": { @@ -5950,7 +6052,7 @@ "controller-tag": { "type": "string" }, - "macaroon": { + "macaroons": { "type": "string" }, "password": { @@ -6041,6 +6143,21 @@ "config" ] }, + "ModelMachineInfo": { + "type": "object", + "properties": { + "hardware": { + "$ref": "#/definitions/MachineHardware" + }, + "id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "id" + ] + }, "ModelStatus": { "type": "object", "properties": { @@ -6053,6 +6170,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "model-tag": { "type": "string" }, @@ -8206,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": { @@ -8225,7 +8372,7 @@ "type": "object", "properties": { "target": { - "$ref": "#/definitions/Version" + "$ref": "#/definitions/MongoVersion" } }, "additionalProperties": false, @@ -8274,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" - ] } } } @@ -12348,6 +12471,9 @@ "type": "string", "format": "date-time" }, + "unit": { + "type": "string" + }, "value": { "type": "string" } @@ -12356,7 +12482,8 @@ "required": [ "time", "key", - "value" + "value", + "unit" ] }, "MetricResults": { @@ -12795,6 +12922,9 @@ "name": { "type": "string" }, + "owner-tag": { + "type": "string" + }, "uuid": { "type": "string" } @@ -12803,12 +12933,16 @@ "required": [ "uuid", "name", + "owner-tag", "agent-version" ] }, "MigrationSpec": { "type": "object", "properties": { + "external-control": { + "type": "boolean" + }, "model-tag": { "type": "string" }, @@ -12819,7 +12953,8 @@ "additionalProperties": false, "required": [ "model-tag", - "target-info" + "target-info", + "external-control" ] }, "MigrationTargetInfo": { @@ -12840,7 +12975,7 @@ "controller-tag": { "type": "string" }, - "macaroon": { + "macaroons": { "type": "string" }, "password": { @@ -13203,12 +13338,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 +13452,6 @@ "version", "uri" ] - }, - "TargetPrechecksArgs": { - "type": "object", - "properties": { - "agent-version": { - "$ref": "#/definitions/Number" - } - }, - "additionalProperties": false, - "required": [ - "agent-version" - ] } } } @@ -13833,6 +13980,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": { @@ -13944,6 +14121,12 @@ "life": { "type": "string" }, + "machines": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelMachineInfo" + } + }, "name": { "type": "string" }, @@ -13977,7 +14160,8 @@ "owner-tag", "life", "status", - "users" + "users", + "machines" ] }, "ModelInfoResult": { @@ -14007,6 +14191,21 @@ "results" ] }, + "ModelMachineInfo": { + "type": "object", + "properties": { + "hardware": { + "$ref": "#/definitions/MachineHardware" + }, + "id": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "id" + ] + }, "ModelUserInfo": { "type": "object", "properties": {