From 4a008914b53414ff755de6228ac8a33f37dbf7d0 Mon Sep 17 00:00:00 2001 From: junboli Date: Tue, 20 Jun 2017 20:26:06 +0800 Subject: [PATCH] [Api-ref]: Add missing key/values in the json files. In api-ref/source/v3/samples, some of JSON file contents does not match the current v3 input or output, This patch is to update the Request and Response JSON contents. Change-Id: Ib6f0fcb9dc476f77b20cd780cfc6e8e1e425f4e1 --- .../v3/samples/backup-show-response.json | 3 ++ .../v3/samples/backups-list-response.json | 40 ++++++++++++++++--- .../v3/samples/snapshots-list-response.json | 4 ++ .../volume-transfers-list-response.json | 2 + .../samples/volume-types-list-response.json | 18 +++++++-- 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/api-ref/source/v3/samples/backup-show-response.json b/api-ref/source/v3/samples/backup-show-response.json index c4fe0ffc4e5..32a50f80c9f 100644 --- a/api-ref/source/v3/samples/backup-show-response.json +++ b/api-ref/source/v3/samples/backup-show-response.json @@ -19,6 +19,9 @@ "name": "backup001", "object_count": 22, "size": 1, + "updated_at": "2013-04-20T05:30:19.000000", + "data_timestamp": "2013-04-20T05:30:19.000000", + "snapshot_id": null, "status": "available", "volume_id": "e5185058-943a-4cb4-96d9-72c184c337d6", "is_incremental": true, diff --git a/api-ref/source/v3/samples/backups-list-response.json b/api-ref/source/v3/samples/backups-list-response.json index 8dd7d785abd..5c818b16aeb 100644 --- a/api-ref/source/v3/samples/backups-list-response.json +++ b/api-ref/source/v3/samples/backups-list-response.json @@ -1,10 +1,13 @@ { "backups": [ { - "id": "2ef47aee-8844-490c-804d-2a8efe561c65", + "status": "available", + "object_count": 0, + "container": null, + "name": "volume-backup", "links": [ { - "href": "http://localhost:8776/v1/c95fc3e4afe248a49a28828f286a7b38/backups/2ef47aee-8844-490c-804d-2a8efe561c65", + "href": "http://localhost:8776/v3/c95fc3e4afe248a49a28828f286a7b38/backups/2ef47aee-8844-490c-804d-2a8efe561c65", "rel": "self" }, { @@ -12,13 +15,27 @@ "rel": "bookmark" } ], - "name": "backup001" + "availability_zone": "nova", + "created_at": "2017-06-20T05:30:19.000000", + "description": null, + "updated_at": "2017-06-20T05:30:19.000000", + "data_timestamp": "2017-06-20T05:30:19.000000", + "has_dependent_backups": false, + "snapshot_id": null, + "volume_id": "0b38d3f5-68fb-41db-9a99-337a96fdfa96", + "fail_reason": null, + "is_incremental": false, + "id": "2ef47aee-8844-490c-804d-2a8efe561c65", + "size": 1 }, { - "id": "4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8", + "status": "available", + "object_count": 0, + "container": null, + "name": "volume-backup", "links": [ { - "href": "http://localhost:8776/v1/c95fc3e4afe248a49a28828f286a7b38/backups/4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8", + "href": "http://localhost:8776/v3/c95fc3e4afe248a49a28828f286a7b38/backups/4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8", "rel": "self" }, { @@ -26,7 +43,18 @@ "rel": "bookmark" } ], - "name": "backup002" + "availability_zone": "nova", + "created_at": "2017-06-20T05:30:19.000000", + "description": null, + "updated_at": "2017-06-20T05:30:19.000000", + "data_timestamp": "2017-06-20T05:30:19.000000", + "has_dependent_backups": false, + "snapshot_id": null, + "volume_id": "0b38d3f5-68fb-41db-9a99-337a96fdfa96", + "fail_reason": null, + "is_incremental": false, + "id": "4dbf0ec2-0b57-4669-9823-9f7c76f2b4f8", + "size": 1 } ] } diff --git a/api-ref/source/v3/samples/snapshots-list-response.json b/api-ref/source/v3/samples/snapshots-list-response.json index 8d7e4973acb..8ba90085cb8 100644 --- a/api-ref/source/v3/samples/snapshots-list-response.json +++ b/api-ref/source/v3/samples/snapshots-list-response.json @@ -6,9 +6,13 @@ "name": "test" }, "name": "test-volume-snapshot", + "user_id": "40c2102f4a554b848d96b14f3eec39ed", "volume_id": "173f7b48-c4c1-4e70-9acc-086b39073506", "created_at": "2015-11-29T02:25:51.000000", "size": 1, + "updated_at": "2015-11-20T05:36:40.000000", + "os-extended-snapshot-attributes:progress": "100%", + "os-extended-snapshot-attributes:project_id": "0892d23df5c5471da88299517a412b90", "id": "b1323cda-8e4b-41c1-afc5-2fc791809c8c", "description": "volume snapshot" } diff --git a/api-ref/source/v3/samples/volume-transfers-list-response.json b/api-ref/source/v3/samples/volume-transfers-list-response.json index 66a2db54e5b..5546a71bd82 100644 --- a/api-ref/source/v3/samples/volume-transfers-list-response.json +++ b/api-ref/source/v3/samples/volume-transfers-list-response.json @@ -4,6 +4,7 @@ "id": "cac5c677-73a9-4288-bb9c-b2ebfb547377", "name": "first volume transfer", "volume_id": "894623a6-e901-4312-aa06-4275e6321cce", + "created_at": "2017-06-20T05:48:49.000000", "links": [ { "href": "http://localhost/v3/firstproject/volumes/1", @@ -19,6 +20,7 @@ "id": "f26c0dee-d20d-4e80-8dee-a8d91b9742a1", "name": "second volume transfer", "volume_id": "673db275-379f-41af-8371-e1652132b4c1", + "created_at": "2017-06-20T05:48:49.000000", "links": [ { "href": "http://localhost/v3/firstproject/volumes/2", diff --git a/api-ref/source/v3/samples/volume-types-list-response.json b/api-ref/source/v3/samples/volume-types-list-response.json index 1d72f923e23..ded409499c5 100644 --- a/api-ref/source/v3/samples/volume-types-list-response.json +++ b/api-ref/source/v3/samples/volume-types-list-response.json @@ -1,16 +1,26 @@ { "volume_types": [ { + "name": "SSD", + "qos_specs_id": null, "extra_specs": { - "capabilities": "gpu" + "volume_backend_name": "lvmdriver-1" }, + "os-volume-type-access:is_public": true, + "is_public": true, "id": "6685584b-1eac-4da6-b5c3-555430cf68ff", - "name": "SSD" + "description": null }, { - "extra_specs": {}, + "name": "SATA", + "qos_specs_id": null, + "extra_specs": { + "volume_backend_name": "lvmdriver-1" + }, + "os-volume-type-access:is_public": true, + "is_public": true, "id": "8eb69a46-df97-4e41-9586-9a40a7533803", - "name": "SATA" + "description": null } ] }