openstack
/
cinder
Code Issues Proposed changes

Merge "Fix v3 sample files"

This commit is contained in:
Zuul 2018-06-22 21:46:01 +00:00 committed by Gerrit Code Review
parent cc8ede2892 299f4ecd0c
commit 333c0e4f5d
38 changed files with 217 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-ref/source/v3/qos-specs-v3-qos-specs.inc
View File

@ -46,7 +46,7 @@ Response codes
.. rest_status_code:: success ../status.yaml
- 200
- 202
Request

3
api-ref/source/v3/samples/attachment-complete.json
View File

@ -1,4 +1,3 @@
{
"os-complete": {
}
"os-complete": {}
}

18
api-ref/source/v3/samples/attachment-list-response.json
View File

@ -1,10 +1,10 @@
{
"attachments": [
{
"status": "attaching",
"instance": "31c79baf-b59e-469c-979f-1df4ecb6eea7",
"id": "3b8b6631-1cf7-4fd7-9afb-c01e541a073c",
"volume_id": "462dcc2d-130d-4654-8db1-da0df2da6a0d"
}
]
}
"attachments": [
{
"status": "attaching",
"instance": "31c79baf-b59e-469c-979f-1df4ecb6eea7",
"id": "3b8b6631-1cf7-4fd7-9afb-c01e541a073c",
"volume_id": "462dcc2d-130d-4654-8db1-da0df2da6a0d"
}
]
}

1
api-ref/source/v3/samples/backup-show-response.json
View File

@ -24,7 +24,6 @@
"data_timestamp": "2013-04-20T05:30:19.000000",
"snapshot_id": null,
"status": "available",
"updated_at": "2013-04-02T10:35:27.000000",
"volume_id": "e5185058-943a-4cb4-96d9-72c184c337d6",
"is_incremental": true,
"has_dependent_backups": false,

2
api-ref/source/v3/samples/group-create-from-src-request.json
View File

@ -3,6 +3,6 @@
"name": "first_group",
"description": "first group",
"group_snapshot_id": "6f519a48-3183-46cf-a32f-41815f813986",
"source_group_id": None
"source_group_id": null
}
}

2
api-ref/source/v3/samples/group-delete-request.json
View File

@ -1,5 +1,5 @@
{
"delete": {
"delete-volumes": False
"delete-volumes": false
}
}

3
api-ref/source/v3/samples/group-replication-disable.json
View File

@ -1,4 +1,3 @@
{
"disable_replication": {
}
"disable_replication": {}
}

3
api-ref/source/v3/samples/group-replication-enable.json
View File

@ -1,4 +1,3 @@
{
"enable_replication": {
}
"enable_replication": {}
}

3
api-ref/source/v3/samples/group-replication-list-targets.json
View File

@ -1,4 +1,3 @@
{
"list_replication_targets": {
}
"list_replication_targets": {}
}

4
api-ref/source/v3/samples/group-show-response.json
View File

@ -11,7 +11,7 @@
"c4daaf47-c530-4901-b28e-f5f0a359c4e6"
],
"volumes": ["a2cdf1ad-5497-4e57-bd7d-f573768f3d03"],
"group_snapshot_id": None,
"source_group_id": None
"group_snapshot_id": null,
"source_group_id": null
}
}

2
api-ref/source/v3/samples/group-type-create-request.json
View File

@ -2,7 +2,7 @@
"group_type": {
"name": "grp-type-001",
"description": "group type 0001",
"is_public": True,
"is_public": true,
"group_specs": {
"consistent_group_snapshot_enabled": "<is> False"
}

2
api-ref/source/v3/samples/group-type-default-response.json
View File

@ -3,7 +3,7 @@
"id": "7270c56e-6354-4528-8e8b-f54dee2232c8",
"name": "group-type-test",
"description": "default group type",
"is_public": "true",
"is_public": true,
"group_specs": {}
}
}

2
api-ref/source/v3/samples/group-type-show-response.json
View File

@ -3,7 +3,7 @@
"id": "6685584b-1eac-4da6-b5c3-555430cf68ff",
"name": "grp-type-001",
"description": "group type 001",
"is_public": "true",
"is_public": true,
"group_specs": {
"consistent_group_snapshot_enabled": "<is> False"
}

0
api-ref/source/v3/samples/qos-unset-response.json
View File

26
api-ref/source/v3/samples/quota-classes-show-response.json
View File

@ -1,15 +1,15 @@
{
"quota_class_set": {
"per_volume_gigabytes": -1,
"volumes_lvmdriver-1": -1,
"groups": 10,
"gigabytes": 1000,
"backup_gigabytes": 1000,
"snapshots": 10,
"gigabytes_lvmdriver-1": -1,
"volumes": 10,
"snapshots_lvmdriver-1": -1,
"backups": 10,
"id": "default"
}
"quota_class_set": {
"per_volume_gigabytes": -1,
"volumes_lvmdriver-1": -1,
"groups": 10,
"gigabytes": 1000,
"backup_gigabytes": 1000,
"snapshots": 10,
"gigabytes_lvmdriver-1": -1,
"volumes": 10,
"snapshots_lvmdriver-1": -1,
"backups": 10,
"id": "default"
}
}

10
api-ref/source/v3/samples/quota-classes-update-request.json
View File

@ -1,7 +1,7 @@
{
"quota_class_set": {
"volumes_lmv": 10,
"gigabytes_lmv": 1000,
"snapshots_lmv": 10
}
"quota_class_set": {
"volumes_lmv": 10,
"gigabytes_lmv": 1000,
"snapshots_lmv": 10
}
}

24
api-ref/source/v3/samples/quota-classes-update-response.json
View File

@ -1,14 +1,14 @@
{
"quota_class_set": {
"per_volume_gigabytes": -1,
"volumes_lvmdriver-1": -1,
"groups": 10,
"gigabytes": 1000,
"backup_gigabytes": 1000,
"snapshots": 10,
"gigabytes_lvmdriver-1": -1,
"volumes": 10,
"snapshots_lvmdriver-1": -1,
"backups": 10
}
"quota_class_set": {
"per_volume_gigabytes": -1,
"volumes_lvmdriver-1": -1,
"groups": 10,
"gigabytes": 1000,
"backup_gigabytes": 1000,
"snapshots": 10,
"gigabytes_lvmdriver-1": -1,
"volumes": 10,
"snapshots_lvmdriver-1": -1,
"backups": 10
}
}

9
api-ref/source/v3/samples/services-get-log-response.json
View File

@ -5,17 +5,20 @@
"levels": {
"cinder.volume.api": "DEBUG"
}
}, {
},
{
"binary": "cinder-scheduler",
"host": "devstack",
"levels": {
"cinder.volume.api": "DEBUG"
}
}, {
},
{
"binary": "cinder-backup",
"host": "devstack",
"levels": {}
}, {
},
{
"binary": "cinder-volume",
"host": "devstack@lvmdriver-1",
"levels": {

55
api-ref/source/v3/samples/snapshot-manage-list-detail-response.json
View File

@ -1,29 +1,30 @@
{
"manageable-snapshots": [
{
"cinder_id": null,
"reason_not_safe": null,
"reference": {
"source-name": "lvol0"
},
"source_reference": {
"source-name": "volume-7c064b34-1e4b-40bd-93ca-4ac5a973661b"},
"safe_to_manage": true,
"size": 1,
"extra_info": null
},
{
"cinder_id": "d0c84570-a01f-4579-9789-5e9f266587cd",
"reason_not_safe": "already managed",
"reference": {
"source-name":"_snapshot-d0c84570-a01f-4579-9789-5e9f266587cd"
},
"source_reference": {
"source-name": "volume-7c064b34-1e4b-40bd-93ca-4ac5a973661b"
},
"safe_to_manage": false,
"size": 1,
"extra_info": null
}
]
"manageable-snapshots": [
{
"cinder_id": null,
"reason_not_safe": null,
"reference": {
"source-name": "lvol0"
},
"source_reference": {
"source-name": "volume-7c064b34-1e4b-40bd-93ca-4ac5a973661b"
},
"safe_to_manage": true,
"size": 1,
"extra_info": null
},
{
"cinder_id": "d0c84570-a01f-4579-9789-5e9f266587cd",
"reason_not_safe": "already managed",
"reference": {
"source-name":"_snapshot-d0c84570-a01f-4579-9789-5e9f266587cd"
},
"source_reference": {
"source-name": "volume-7c064b34-1e4b-40bd-93ca-4ac5a973661b"
},
"safe_to_manage": false,
"size": 1,
"extra_info": null
}
]
}

44
api-ref/source/v3/samples/snapshot-manage-list-response.json
View File

@ -1,24 +1,24 @@
{
"manageable-snapshots": [
{
"source_reference": {
"source-name": "volume-7c064b34-1e4b-40bd-93ca-4ac5a973661b"
},
"safe_to_manage": true,
"reference": {
"source-name": "lvol0"
},
"size": 1
},
{
"source_reference": {
"source-name": "volume-7c064b34-1e4b-40bd-93ca-4ac5a973661b"
},
"safe_to_manage": false,
"reference": {
"source-name": "_snapshot-d0c84570-a01f-4579-9789-5e9f266587cd"
},
"size": 1
}
]
"manageable-snapshots": [
{
"source_reference": {
"source-name": "volume-7c064b34-1e4b-40bd-93ca-4ac5a973661b"
},
"safe_to_manage": true,
"reference": {
"source-name": "lvol0"
},
"size": 1
},
{
"source_reference": {
"source-name": "volume-7c064b34-1e4b-40bd-93ca-4ac5a973661b"
},
"safe_to_manage": false,
"reference": {
"source-name": "_snapshot-d0c84570-a01f-4579-9789-5e9f266587cd"
},
"size": 1
}
]
}

18
api-ref/source/v3/samples/snapshot-manage-request.json
View File

@ -1,11 +1,11 @@
{
"snapshot": {
"description": null,
"metadata": null,
"ref": {
"source-name": "lvol0"
},
"name": null,
"volume_id": "7c064b34-1e4b-40bd-93ca-4ac5a973661b"
}
"snapshot": {
"description": null,
"metadata": null,
"ref": {
"source-name": "lvol0"
},
"name": null,
"volume_id": "7c064b34-1e4b-40bd-93ca-4ac5a973661b"
}
}

6
api-ref/source/v3/samples/snapshot-metadata-show-key-response.json
View File

@ -1,5 +1,5 @@
{
"meta": {
"name": "test"
}
"meta": {
"name": "test"
}
}

6
api-ref/source/v3/samples/snapshot-metadata-update-key-response.json
View File

@ -1,5 +1,5 @@
{
"meta": {
"name": "new_name"
}
"meta": {
"name": "new_name"
}
}

2
api-ref/source/v3/samples/volume-begin-detaching-request.json
View File

@ -1,3 +1,3 @@
{
"os-begin_detaching": {}
"os-begin_detaching": {}
}

2
api-ref/source/v3/samples/volume-force-delete-request.json
View File

@ -1,3 +1,3 @@
{
"os-force_delete": {}
"os-force_delete": {}
}

6
api-ref/source/v3/samples/volume-initialize-connection-request.json
View File

@ -1,6 +1,6 @@
{
"os-initialize_connection": {
"connector":{
"connector": {
"platform":"x86_64",
"host": "node2",
"do_local_attach": false,
@ -8,6 +8,6 @@
"os_type": "linux2",
"multipath": false,
"initiator": "iqn.1994-05.com.redhat:d16cbb5d31e5"
}
}
}
}
}

44
api-ref/source/v3/samples/volume-manage-list-detail-response.json
View File

@ -1,24 +1,24 @@
{
"manageable-volumes": [
{
"cinder_id": "9ba5bb53-4a18-4b38-be06-992999da338d",
"reason_not_safe": "already managed",
"reference": {
"source-name": "volume-9ba5bb53-4a18-4b38-be06-992999da338d"
},
"safe_to_manage": false,
"size": 1,
"extra_info": null
},
{
"cinder_id": null,
"reason_not_safe": null,
"reference": {
"source-name": "lvol0"
},
"safe_to_manage": true,
"size": 1,
"extra_info": null
}
]
"manageable-volumes": [
{
"cinder_id": "9ba5bb53-4a18-4b38-be06-992999da338d",
"reason_not_safe": "already managed",
"reference": {
"source-name": "volume-9ba5bb53-4a18-4b38-be06-992999da338d"
},
"safe_to_manage": false,
"size": 1,
"extra_info": null
},
{
"cinder_id": null,
"reason_not_safe": null,
"reference": {
"source-name": "lvol0"
},
"safe_to_manage": true,
"size": 1,
"extra_info": null
}
]
}

32
api-ref/source/v3/samples/volume-manage-list-response.json
View File

@ -1,18 +1,18 @@
{
"manageable-volumes": [
{
"safe_to_manage": false,
"reference": {
"source-name": "volume-3a81fdac-e8ae-4e61-b6a2-2e14ff316f19"
},
"size": 1
},
{
"safe_to_manage": true,
"reference": {
"source-name": "lvol0"
},
"size": 1
}
]
"manageable-volumes": [
{
"safe_to_manage": false,
"reference": {
"source-name": "volume-3a81fdac-e8ae-4e61-b6a2-2e14ff316f19"
},
"size": 1
},
{
"safe_to_manage": true,
"reference": {
"source-name": "lvol0"
},
"size": 1
}
]
}

6
api-ref/source/v3/samples/volume-metadata-show-key-response.json
View File

@ -1,5 +1,5 @@
{
"meta": {
"name": "test"
}
"meta": {
"name": "test"
}
}

6
api-ref/source/v3/samples/volume-metadata-update-key-request.json
View File

@ -1,5 +1,5 @@
{
"meta": {
"name": "new_name"
}
"meta": {
"name": "new_name"
}
}

6
api-ref/source/v3/samples/volume-metadata-update-key-response.json
View File

@ -1,5 +1,5 @@
{
"meta": {
"name": "new_name"
}
"meta": {
"name": "new_name"
}
}

2
api-ref/source/v3/samples/volume-os-retype-request.json
View File

@ -2,5 +2,5 @@
"os-retype": {
"new_type": "dedup-tier-replicaton",
"migration_policy": "never"
}
}
}

2
api-ref/source/v3/samples/volume-show-response.json
View File

@ -21,7 +21,7 @@
"description": "Super volume.",
"name": "vol-002",
"created_at": "2013-02-25T02:40:21.000000",
"volume_type": "None",
"volume_type": null,
"os-vol-tenant-attr:tenant_id": "0c2eba2c5af04d3f9e9d0d410b371fde",
"size": 1,
"metadata": {

22
api-ref/source/v3/samples/volume-terminate-connection-request.json
View File

@ -1,13 +1,13 @@
{
"os-terminate_connection": {
"connector": {
"platform": "x86_64",
"host": "node2",
"do_local_attach": false,
"ip": "192.168.13.101",
"os_type": "linux2",
"multipath": false,
"initiator": "iqn.1994-05.com.redhat:d16cbb5d31e5"
}
}
"os-terminate_connection": {
"connector": {
"platform": "x86_64",
"host": "node2",
"do_local_attach": false,
"ip": "192.168.13.101",
"os_type": "linux2",
"multipath": false,
"initiator": "iqn.1994-05.com.redhat:d16cbb5d31e5"
}
}
}

16
api-ref/source/v3/samples/volume-upload-to-image-request.json
View File

@ -1,10 +1,10 @@
{
"os-volume_upload_image":{
"image_name": "test",
"force": false,
"disk_format": "raw",
"container_format": "bare",
"visibility": "private",
"protected": false
}
"os-volume_upload_image":{
"image_name": "test",
"force": false,
"disk_format": "raw",
"container_format": "bare",
"visibility": "private",
"protected": false
}
}

28
api-ref/source/v3/samples/volume-upload-to-image-response.json
View File

@ -1,16 +1,16 @@
{
"os-volume_upload_image": {
"status": "uploading",
"container_format": "bare",
"image_name": "test",
"visibility": "private",
"updated_at": "2017-06-05T08:44:28.000000",
"image_id": "de75b74e-7f0d-4b59-a263-bd87bfc313bd",
"display_description": null,
"id": "3a81fdac-e8ae-4e61-b6a2-2e14ff316f19",
"size": 1,
"disk_format": "raw",
"volume_type": null,
"protected": false
}
"os-volume_upload_image": {
"status": "uploading",
"container_format": "bare",
"image_name": "test",
"visibility": "private",
"updated_at": "2017-06-05T08:44:28.000000",
"image_id": "de75b74e-7f0d-4b59-a263-bd87bfc313bd",
"display_description": null,
"id": "3a81fdac-e8ae-4e61-b6a2-2e14ff316f19",
"size": 1,
"disk_format": "raw",
"volume_type": null,
"protected": false
}
}

10
api-ref/source/v3/samples/volumes-list-summary-response.json
View File

@ -1,10 +1,10 @@
{
"volume-summary": {
"total_size": 4,
"total_count": 4,
"metadata": {
"volume-summary": {
"total_size": 4,
"total_count": 4,
"metadata": {
"key1": ["value1", "value2"],
"key2": ["value2"]
}
}
}
}

6
api-ref/source/v3/samples/worker-cleanup-request.json
View File

@ -1,9 +1,9 @@
{
"cluster": "test",
"disabled": "True",
"host": "host1@lvmdriver"
"disabled": true,
"host": "host1@lvmdriver",
"service_id": 1,
"is_up": "True",
"is_up": true,
"binary": "cinder-volume",
"resource_id": "b122f668-d15a-40f8-af21-38d218796ab8",
"resource_type": "Volume"