diff --git a/api-ref/src/docbkx/ch_blockstorage-api-v1.xml b/api-ref/src/docbkx/ch_blockstorage-api-v1.xml index 80098c099..424bccf4a 100644 --- a/api-ref/src/docbkx/ch_blockstorage-api-v1.xml +++ b/api-ref/src/docbkx/ch_blockstorage-api-v1.xml @@ -28,25 +28,25 @@ IN-USE. The volume is attached to an instance. DELETING. The volume is being deleted. - ERROR. An error has occurred with the - volume. - ERROR_DELETING. There was an error deleting the - volume. + ERROR. An error occurred. + + ERROR_DELETING. A volume deletion error occurred. + -
+
API versions + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#versions"> + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#version">
-
+
Volumes The snapshot_id and source_volid @@ -57,61 +57,57 @@ + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#volumes"> - + - + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#detail-volume"> + - + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#volume_id"> +
-
+
Volume types - - - + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#types"> + - - - + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#volume_type_id"> + + +
-
+
Snapshots + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#snapshots"> - + - + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#detail-snapshots"> + - + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#snapshot_id"> + + href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#snapshot-metadata"> @@ -125,20 +121,20 @@ Shows, updates, and deletes quotas for a tenant. - + - - + + - + - + diff --git a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml index 63d4c9d70..0be2f21ab 100644 --- a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml +++ b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml @@ -12,21 +12,21 @@ Manages volumes and snapshots for use with the Block Storage API, also known as cinder services. -
+
API versions - + - +
-
+
API extensions (extensions) - + @@ -40,10 +40,10 @@ An absolute limit value of -1 indicates that the absolute limit for the item is infinite. -
-
+
Volumes (volumes) A volume is a detachable block storage device similar to a USB @@ -95,13 +95,14 @@ error - An error occurred during volume - creation. + + A volume creation error occurred. + error_deleting - An error occurred during volume - deletion. + + A volume deletion error occurred. backing-up @@ -114,8 +115,7 @@ error_restoring - An error occurred during backup restoration to a - volume. + A backup restoration error occurred. error_extending @@ -126,19 +126,19 @@ - + - + - - + + - - + + - + @@ -158,12 +158,12 @@ administrative role and context. - - + +
-
+
Volume actions (volumes, action) Extends the size of, resets statuses for, sets image metadata for, @@ -173,7 +173,7 @@ storage object associated with it. - + @@ -256,7 +256,7 @@ - An error has occurred with the backup. + A backup error occurred. @@ -280,8 +280,7 @@ - An error occurred during backup restoration to a - volume. + A backup restoration error occurred. @@ -293,18 +292,18 @@ in the fail_reason field for the backup. - + - + - + - + @@ -315,19 +314,19 @@ Force-deletes a backup. - +
-
+
Capabilities for storage back ends (capabilities) Shows capabilities for a storage back end. - - + +
@@ -340,25 +339,25 @@ Shows, updates, and deletes quotas for a tenant. - + - - + + - + - +
-
+
Quality of service (QoS) specifications (qos-specs) Administrators only, depending on policy settings. @@ -369,45 +368,42 @@ specifications. - + - - + + - + - + - - + +
-
+
Volume types (types) - - - - + + + href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#volume_type_id"> - +
-
+
Volume snapshots (snapshots) A snapshot is a point-in-time copy of the data that a volume @@ -472,7 +468,7 @@ - An error occurred during snapshot creation. + A snapshot creation error occurred. @@ -484,7 +480,7 @@ - An error occurred during snapshot deletion. + A snapshot deletion error occurred. @@ -492,19 +488,19 @@ - + - + - + - + @@ -516,14 +512,14 @@ Creates volumes by using existing storage instead of allocating new storage. - +
Volume image metadata extension (os-vol-image-meta) Shows image metadata that is associated with a volume. - +
Back-end storage pools @@ -531,14 +527,14 @@ Administrator only. Lists all back-end storage pools that are known to the scheduler service. - +
Volume transfer Transfers a volume from one user to another user. - +
Consistency groups @@ -554,7 +550,7 @@ Use the policy.json file to grant permissions for these actions to limit roles. - +
Consistency group snapshots @@ -562,6 +558,6 @@ Lists all, lists all with details, shows details for, creates, and deletes consistency group snapshots. - +
diff --git a/api-ref/src/wadls/common_project.ent b/api-ref/src/wadls/common_project.ent index 39bb879e3..c8574627c 100644 --- a/api-ref/src/wadls/common_project.ent +++ b/api-ref/src/wadls/common_project.ent @@ -1,31 +1,30 @@ + style="query" required="false" type="xsd:int"> + xmlns:wadl="http://wadl.dev.java.net/2009/02" + xml:lang="EN"> - Requests a page size of returned items from the query. - Returns a number of items up to a limit value. Use the - limit parameter to make an initial limited request - and use the ID of the last-seen item from the response as the - marker parameter value in a subsequent limited - request. + Requests a page size of items. Returns a number of items up to a + limit value. Use the limit parameter to make an + initial limited request and use the ID of the last-seen item from + the response as the marker parameter value in a + subsequent limited request. '> + style="query" required="false" type="xsd:string"> + xmlns:wadl="http://wadl.dev.java.net/2009/02" + xml:lang="EN"> - Specifies the ID of the last-seen item. Use the limit - parameter to make an initial limited request and use the ID of the - last-seen item from the response as the marker - parameter value in a subsequent limited request. + The ID of the last-seen item. Use the limit parameter + to make an initial limited request and use the ID of the last-seen + item from the response as the marker parameter value + in a subsequent limited request. '> @@ -36,11 +35,11 @@ + name="before_timestamp" style="query" required="true" + type="xsd:dateTime"> + xmlns:wadl="http://wadl.dev.java.net/2009/02" + xml:lang="EN"> The date and time before which to list usage audits. @@ -65,18 +64,18 @@ + xmlns:wadl="http://wadl.dev.java.net/2009/02" + xml:lang="EN"> The date and time when the image or server last changed status. - Use this query parameter to check for changes since a previous request - rather than re-downloading and re-parsing the full status at each - polling interval. If data has changed, only the items changed since - the changes-since time are returned in the response. If - data has not changed since the changes-since time, an - empty list is returned. + Use this query parameter to check for changes since a previous + request rather than re-downloading and re-parsing the full status + at each polling interval. If data has changed, the response + returns only the items that have changed since the + changes-since time. If data has not changed since the + changes-since time, the response returns an empty list. For example, issue a &GET; request against the following endpoint to @@ -86,9 +85,10 @@ GET /v2/010101/servers?changes-since=2015-01-24T17:08:00Z To enable you to keep track of changes, this filter also displays - images and servers that were deleted if the changes-since - value specifies a date in the last 30 days. Items deleted more than 30 - days ago might be returned, but it is not guaranteed. + deleted images and servers if the changes-since value + specifies a date in the last 30 days. The response might include + items that were deleted more than 30 days ago, but it is not + guaranteed. The date and time stamp format is '> + style="plain" required="false" type="xsd:string"> - The nonce. This random string is uniquely generated for each - request and enables the service provider to verify that a request has never - been made before. A nonce helps prevent replay attacks when requests are made - over a non-secure channel, such as HTTP. For information, see Nonce and Timestamp. + The nonce. The API generates this unique, random string for each + request and enables the service provider to verify that a request + has never been made before. A nonce helps prevent replay attacks + when requests are made over a non-secure channel, such as HTTP. + For information, see Nonce and + Timestamp. '> @@ -693,7 +695,7 @@ Wed, 26 Aug 2015 19:57:28 GMT. - If not set, this header is not returned by this operation. + If not set, this operation does not return this header. '> diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json deleted file mode 100644 index 70d4b66eb..000000000 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "quota_set": { - "cores": 20, - "floating_ips": 10, - "id": "fake_tenant", - "injected_file_content_bytes": 10240, - "injected_file_path_bytes": 255, - "injected_files": 5, - "instances": 10, - "key_pairs": 100, - "metadata_items": 128, - "ram": 51200, - "security_group_rules": 20, - "security_groups": 10 - } -} \ No newline at end of file diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml deleted file mode 100644 index ef52457e0..000000000 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 20 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/versionv1-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/versionv1-get-resp.json deleted file mode 100644 index 63c8957a2..000000000 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/versionv1-get-resp.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": { - "id": "v1.0", - "links": [ - { - "href": "http://23.253.211.234:8776/v1/", - "rel": "self" - }, - { - "href": "http://docs.openstack.org/", - "rel": "describedby", - "type": "text/html" - } - ], - "media-types": [ - { - "base": "application/xml", - "type": "application/vnd.openstack.volume+xml;version=1" - }, - { - "base": "application/json", - "type": "application/vnd.openstack.volume+json;version=1" - } - ], - "status": "DEPRECATED", - "updated": "2014-06-28T12:20:21Z" - } -} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.json index 0f5407545..239c64d23 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.json @@ -14,4 +14,4 @@ "security_group_rules": 20, "security_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.json index 0f5407545..239c64d23 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.json @@ -14,4 +14,4 @@ "security_group_rules": 20, "security_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.json similarity index 96% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.json index 0b78cff30..1f12caa04 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.json @@ -2,4 +2,4 @@ "quota_set": { "security_groups": 45 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.xml similarity index 89% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.xml index 4bb7b3a47..596ce56ac 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.xml @@ -1,4 +1,4 @@ 45 - \ No newline at end of file + diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.json index e64b50df6..2be76d472 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.json @@ -13,4 +13,4 @@ "security_group_rules": 20, "security_groups": 45 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-detail-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-detail-response.json index 6948bb67b..53ecff0ba 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-detail-response.json @@ -61,4 +61,4 @@ "reserved": 0 } } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.json index 0f5407545..239c64d23 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.json @@ -14,4 +14,4 @@ "security_group_rules": 20, "security_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json similarity index 97% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json index cbd6f18af..b322b2a87 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json @@ -3,4 +3,4 @@ "force": "True", "instances": 9 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.json index 9fbee648b..553933292 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.json @@ -13,4 +13,4 @@ "security_group_rules": 20, "security_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.json similarity index 98% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.json index ffe9dd372..cc8ce2865 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.json @@ -5,4 +5,4 @@ "volume_id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c", "force": true } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.json index d833b1f49..68c54641d 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.json @@ -13,4 +13,4 @@ "id": "dfcd17fe-3b64-44ba-b95f-1c9c7109ef95", "name": "my-snapshot" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.json similarity index 95% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.json index d8c2868a9..75accc1a6 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.json @@ -2,4 +2,4 @@ "metadata": { "key": "v1" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.json similarity index 95% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.json index d8c2868a9..75accc1a6 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.json @@ -2,4 +2,4 @@ "metadata": { "key": "v1" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.json index 8f5923b58..f1514e860 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.json @@ -8,4 +8,4 @@ "size": 30, "created_at": "2012-02-29T03:50:07Z" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshots-list-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshots-list-response.json diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshots-list-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshots-list-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/version-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/version-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/version-get-resp.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/version-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/cinder-versions-response.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/versions-list-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/cinder-versions-response.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/versions-list-response.json diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.json index 8d337ff21..fbbfe360c 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.json @@ -9,4 +9,4 @@ }, "availability_zone": "us-east1" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_create_request.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-create-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_create_request.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-create-request.json diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_create_request.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-create-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_create_request.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-create-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.json index d39da2592..dc4ae5046 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.json +++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.json @@ -13,4 +13,4 @@ "extra_specs": {} } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volumes-list-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.json rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volumes-list-response.json diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volumes-list-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.xml rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volumes-list-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/os-quota-sets-v1.wadl b/api-ref/src/wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl similarity index 78% rename from api-ref/src/wadls/volume-api/src/v1/os-quota-sets-v1.wadl rename to api-ref/src/wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl index a2820ac12..85ec08ffe 100644 --- a/api-ref/src/wadls/volume-api/src/v1/os-quota-sets-v1.wadl +++ b/api-ref/src/wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl @@ -1,9 +1,9 @@ + %common; - + %common_project; ]> - &tenantIdRequestParameter; + &tenant_idTemplateParameter; - - - - The ID for the tenant for which you want - to show, update, or delete quotas. This ID - is different from the first tenant ID that - you specify in the URI: That ID is for the - admin tenant. - - - + &tenant_idTemplateParameter2; - + - - - - The ID of the tenant for which you want to - show or update quotas. This ID is - different from the first tenant ID that - you specify in the URI: That ID is for the - admin tenant. - - - + &tenant_idTemplateParameter2; - - - - The user ID. Specify in the - URI as a query string: - user_id={user_id}. - - - + &user_idTemplateParameter; @@ -79,18 +42,7 @@ - - - - The user ID. Specify in the - URI as a query string: - user_id={user_id}. - - - + &user_idTemplateParameter; @@ -99,11 +51,11 @@ - + + title="Show default quotas"> - Gets default quotas for a + Shows default quotas for a tenant. @@ -111,18 +63,18 @@ + title="Show default quotas: JSON response"> + title="Show default quotas: XML response"> "aSetsRespParameters; @@ -144,7 +96,7 @@ @@ -152,10 +104,11 @@ - "aSetsRespParameters; - "asShowResponse; + + "aSetsRespParameters; + "asShowResponse; @@ -171,7 +124,7 @@ @@ -179,7 +132,7 @@ "aSetsReqParameters; @@ -188,7 +141,7 @@ @@ -196,7 +149,7 @@ "aSetsRespParameters; @@ -226,7 +179,7 @@ xml:lang="EN" title="Show quotas for user response: JSON"> @@ -235,7 +188,7 @@ xml:lang="EN" title="Show quotas for user response: XML"> "aSetsRespParameters; @@ -254,7 +207,7 @@ xml:lang="EN" title="Update quotas for user request: JSON"> @@ -263,7 +216,7 @@ xml:lang="EN" title="Update quotas for user request: XML"> "aSetsReqParameters; @@ -273,7 +226,7 @@ xml:lang="EN" title="Update quotas for user response: JSON"> @@ -282,7 +235,7 @@ xml:lang="EN" title="Show quotas for user response: XML"> "aSetsRespParameters; @@ -311,7 +264,7 @@ xmlns="http://docbook.org/ns/docbook" title="Show quota details for user response: JSON"> + %common; - + %common_project; ]> - &tenantIdRequestParameter; + &tenant_idTemplateParameter; - + - + - - - The unique identifier of an existing volume. - - - + &volume_idTemplateParameter; + - + - - - The unique identifier of an existing volume type. - - + &vol_type_idTemplateParameter; - + - + - + - - - The unique identifier of an existing snapshot. - - - + &snapshot_idTemplateParameter; + @@ -91,7 +78,7 @@ - + @@ -99,7 +86,7 @@ --> @@ -114,7 +101,7 @@ - + @@ -123,7 +110,7 @@ + href="../samples/version-show-resp.xml"/> - + @@ -152,17 +139,19 @@ - + - + - A partial representation of a volume used in the creation - process. + + A partial representation of a volume that the + creation process uses. + &createVolumeParameters; @@ -171,12 +160,12 @@ - + - + @@ -187,7 +176,7 @@ - + Lists volumes. @@ -196,12 +185,12 @@ - + - + @@ -212,7 +201,7 @@ - + @@ -222,12 +211,12 @@ - + - + @@ -238,7 +227,7 @@ - + @@ -248,12 +237,12 @@ - + - + @@ -274,7 +263,7 @@ - + Lists volume types. @@ -283,12 +272,12 @@ - + - + @@ -302,18 +291,18 @@ - + - + - A partial representation of a volume type used in the creation - process. + A partial representation of a volume type that the + creation process uses. @@ -322,12 +311,12 @@ - + - + @@ -342,17 +331,19 @@ - + - + - A volume type offers a way to categorize - or group volumes. + + Use volume types to categorize + or group volumes. + @@ -360,12 +351,12 @@ - + - + @@ -374,25 +365,23 @@ - Updates the extra specifications that are - assigned to a volume type. + Updates the extra specifications for a volume type. - + - + - A volume type. Use to categorize - or group volumes. + A volume type. Use to categorize or group volumes. @@ -400,10 +389,9 @@ A key and value pair that contains additional - specifications associated with the volume type. - Examples include capabilities, capacity, - compression, and so on, depending on the storage - driver in use. + specifications for the volume type. Examples + include capabilities, capacity, compression, and + so on, depending on the storage driver in use. @@ -412,24 +400,26 @@ - + - + - A partial representation of a volume used in the creation - process. + + A partial representation of a volume that the + creation process uses. + &volumeDetailResponseParameters; - + @@ -439,12 +429,12 @@ - + - + @@ -466,17 +456,19 @@ - + - + - A partial representation of a snapshot used in the creation - process. + + A partial representation of a snapshot that the + creation process uses. + @@ -484,17 +476,17 @@ - + - + - + Lists simple snapshots. @@ -503,17 +495,17 @@ - + - + - + Lists all snapshots, with details. @@ -521,17 +513,17 @@ - + - + - + @@ -541,12 +533,12 @@ - + - + @@ -568,12 +560,12 @@ - + - + @@ -588,12 +580,12 @@ - + - + @@ -601,12 +593,19 @@ One or more metadata key and value pairs to set or unset for the snapshot. - To unset a metadata key value, specify only the key name. - To set a metadata key value, specify the key and value pair. - The Block Storage server does not respect case-sensitive key names. - For example, if you specify both "key": "v1" and - "KEY": "V1", the server sets and returns only the - KEY key and value pair. + + To unset a metadata key value, specify only the key name. + + + To set a metadata key value, specify the key and value pair. + + + The Block Storage server does not respect case- + sensitive key names. For example, if you specify + both "key": "v1" and "KEY": + "V1", the server sets and returns only the + KEY key and value pair. + @@ -614,12 +613,12 @@ - + - + diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.xml deleted file mode 100644 index 5bc57b13f..000000000 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.xml deleted file mode 100644 index 2e26764d9..000000000 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 0 - 100 - - - diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.json deleted file mode 100644 index d691eb1f6..000000000 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "qos_specs": { - "specs": { - "availability": "100", - "numberOfFailures": "0" - }, - "consumer": "back-end", - "name": "reliability-spec", - "id": "0388d6c6-d5d4-42a3-b289-95205c50dd15" - }, - "links": [ - { - "href": "http://23.253.228.211:8776/v2/e1cf63117ae74309a5bcc2002a23be8b/qos_specs/0388d6c6-d5d4-42a3-b289-95205c50dd15", - "rel": "self" - }, - { - "href": "http://23.253.228.211:8776/e1cf63117ae74309a5bcc2002a23be8b/qos_specs/0388d6c6-d5d4-42a3-b289-95205c50dd15", - "rel": "bookmark" - } - ] -} \ No newline at end of file diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.xml deleted file mode 100644 index d7e8a0807..000000000 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/versionv2-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/versionv2-get-resp.json deleted file mode 100644 index e741f7b9f..000000000 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/versionv2-get-resp.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": { - "id": "v2.0", - "links": [ - { - "href": "http://23.253.211.234:8776/v2/v2.0", - "rel": "self" - } - ], - "media-types": [ - { - "base": "application/xml", - "type": "application/vnd.openstack.volume+xml;version=1" - }, - { - "base": "application/json", - "type": "application/vnd.openstack.volume+json;version=1" - } - ], - "status": "CURRENT" - } -} diff --git a/api-ref/src/wadls/volume-api/src/v2/common.ent b/api-ref/src/wadls/volume-api/src/v2/common.ent index e59305387..1988c66d2 100644 --- a/api-ref/src/wadls/volume-api/src/v2/common.ent +++ b/api-ref/src/wadls/volume-api/src/v2/common.ent @@ -38,8 +38,112 @@ '> - - + + + An alias, which is a name for a pointer to a resource. For example, a + named extension. + + +'> + + + + The UUID for a backup. + + +'> + + + + The unique identifier of the consistency + group snapshot. + + +'> + + + + The unique identifier of the consistency + group. + + +'> + + + + The name of the host that hosts the storage back end. + + +'> + + + + The interface ID. + + +'> + + + + The ID for the QoS specification. + + +'> + + + The UUID for the server of + interest to you. + +'> + + + + The UUID of the snapshot. + + +'> + + '> + + + + The UUID for the tenant for which you want to show, update, or delete + quotas. This UUID is different from the first tenant ID that you specify + in the URI: That UUID is for the administrative tenant. + + +'> + + + + The user ID. Specify in the URI as user_id={user_id}. + + +'> + + + + The ID of the volume type. + + +'> + + + + The UUID of the volume. + + +'> + + + + The UUID for an existing volume type. + + +'> + style="query" required="false" type="xsd:string"> @@ -434,7 +596,7 @@ + type="csapi:UUID" required="false"> @@ -467,7 +629,7 @@ + type="csapi:UUID" required="false"> @@ -498,7 +660,7 @@ The volume name. ' > + + + The availability zone. + + + + + The UUID of the source volume, if any. + + + + + + The volume description. + + + + + + If true, this volume can attach to more than one instance. + + + + + + + The UUID of the source snapshot, if any. + + + + + + + The size of the volume, in gibibytes (GiB). + + + + + + The volume name. + + + + + The UUID of the source image, if any. + + + + + + The associated volume type. + + + + + Metadata key and value pairs that are associated with the + volume. + + +'> + type="csapi:UUID" required="true"> @@ -687,7 +950,7 @@ + type="csapi:UUID" required="true"> @@ -709,7 +972,7 @@ The associated volume type. + type="csapi:UUID" required="true"> @@ -826,7 +1089,7 @@ + type="csapi:UUID" required="true"> @@ -848,7 +1111,7 @@ '> - @@ -1192,7 +1455,7 @@ '> - @@ -1499,6 +1762,17 @@ '> + + + + A qos_specs object. + + +'> - - - - - %common; - - %common_project; -]> - - - - - - - - The unique identifier of the tenant or - account. - - - - - - - - - The name of the host that hosts the storage back end. - - - - - - - - - - - - - Shows capabilities for a storage back end. - - - - - - - - - - - - &backendParametersResponse; - - - - diff --git a/api-ref/src/wadls/volume-api/src/v2/os-volume-type-access-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/os-volume-type-access-v2.wadl deleted file mode 100644 index 4cd7443e8..000000000 --- a/api-ref/src/wadls/volume-api/src/v2/os-volume-type-access-v2.wadl +++ /dev/null @@ -1,75 +0,0 @@ - - - - %common; - - %common_project; -]> - - - - - &tenantIdRequestParameter; - - - - - - - - - - Creates a private Block Storage volume. - - - - - - - - - - - - - &createVolumeParameters; - &isPublicParameterReq; - - - - - - - - - - - - - &volumeDetailResponseParameters; - &isPublicParameterResp; - - - - diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-response.json index 68a598c64..e2aec1c8f 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-response.json @@ -13,4 +13,4 @@ ], "name": "backup001" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_force_delete_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-force-delete-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_force_delete_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-force-delete-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_export_record_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-export-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_export_record_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-export-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_import_record_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-import-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_import_record_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-import-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_import_record_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-import-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_import_record_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-import-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-response.json similarity index 98% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-response.json index 4896f3aaf..a344ea56c 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-response.json @@ -3,4 +3,4 @@ "backup_id": "2ef47aee-8844-490c-804d-2a8efe561c65", "volume_id": "795114e8-7489-40be-a978-83797f2c1dd3" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_show_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_detail_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-detailed-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_detail_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-detailed-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_simple_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_simple_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-response.json index df0e87ba0..8dd7d785a 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_simple_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-response.json @@ -29,4 +29,4 @@ "name": "backup002" } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backend-capabilities/backend-capabilities-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/capabilities/backend-capabilities-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backend-capabilities/backend-capabilities-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/capabilities/backend-capabilities-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-create-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-create-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-create-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-create-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-create-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-create-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-create-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-create-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-list-detailed-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-list-detailed-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-list-detailed-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-list-detailed-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-list-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-list-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-list-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-list-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-show-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-from-src-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-from-src-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-from-src-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-from-src-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-delete-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-delete-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-delete-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-delete-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-update-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-update-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-update-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-update-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-list-detailed-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-groups-list-detailed-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-list-detailed-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-groups-list-detailed-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-list-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-groups-list-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-list-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-groups-list-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/host_attach_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/host-attach-request.json similarity index 96% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/host_attach_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/host-attach-request.json index f4d65e215..01d064451 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/host_attach_request.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/host-attach-request.json @@ -2,4 +2,4 @@ "os-attach": { "host_name": "my_host" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.json index 49605abcf..4235759ea 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.json @@ -10,4 +10,4 @@ "maxTotalVolumes": 10 } } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-defaults-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-defaults-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-defaults-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-defaults-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-detailed-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-detailed-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-manage-existing/manage_existing_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-manage-existing/manage_existing_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-manage-existing/manage_existing_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-manage-existing/manage_existing_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-request.json new file mode 100644 index 000000000..39f60e87a --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-request.json @@ -0,0 +1,18 @@ +{ + "volume": { + "host": "geraint-VirtualBox", + "ref": { + "source-volume-name": "existingLV", + "source-volume-id": "1234" + }, + "name": "New Volume", + "availability_zone": "az2", + "description": "Volume imported from existingLV", + "volume_type": null, + "bootable": "True", + "metadata": { + "key1": "value1", + "key2": "value2" + } + } +} diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-response.json new file mode 100644 index 000000000..343ca66bc --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-response.json @@ -0,0 +1,33 @@ +{ + "volume": { + "status": "creating", + "user_id": "eae1472b5fc5496998a3d06550929e7e", + "attachments": [], + "links": [ + { + "href": "http://10.0.2.15:8776/v2/87c8522052ca4eed98bc672b4c1a3ddb/volumes/23cf872b-c781-4cd4-847d-5f2ec8cbd91c", + "rel": "self" + }, + { + "href": "http://10.0.2.15:8776/87c8522052ca4eed98bc672b4c1a3ddb/volumes/23cf872b-c781-4cd4-847d-5f2ec8cbd91c", + "rel": "bookmark" + } + ], + "availability_zone": "az2", + "bootable": "false", + "encrypted": "false", + "created_at": "2014-07-18T00:12:54.000000", + "description": "Volume imported from existingLV", + "os-vol-tenant-attr:tenant_id": "87c8522052ca4eed98bc672b4c1a3ddb", + "volume_type": null, + "name": "New Volume", + "source_volid": null, + "snapshot_id": null, + "metadata": { + "key2": "value2", + "key1": "value1" + }, + "id": "23cf872b-c781-4cd4-847d-5f2ec8cbd91c", + "size": 0 + } +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-accept-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-accept-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-accept-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-accept-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-accept-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-accept-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-accept-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-accept-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-create-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-create-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-create-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-create-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-create-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-create-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-create-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-create-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-show-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-list-details-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfers-list-detailed-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-list-details-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfers-list-detailed-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-list-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfers-list-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-list-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfers-list-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_request.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.json similarity index 98% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.json index 06fa74a48..c0db909bd 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.json @@ -4,4 +4,4 @@ "name": "reliability-spec", "numberOfFailures": "0" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.xml new file mode 100644 index 000000000..ac772236c --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.xml @@ -0,0 +1,2 @@ + + diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.json new file mode 100644 index 000000000..8fbf23376 --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.json @@ -0,0 +1,21 @@ +{ + "qos_specs": { + "specs": { + "numberOfFailures": "0", + "availability": "100" + }, + "consumer": "back-end", + "name": "reliability-spec", + "id": "599ef437-1c99-42ec-9fc6-239d0519fef1" + }, + "links": [ + { + "href": "http://23.253.248.171:8776/v2/bab7d5c60cd041a0a36f7c4b6e1dd978/qos_specs/599ef437-1c99-42ec-9fc6-239d0519fef1", + "rel": "self" + }, + { + "href": "http://23.253.248.171:8776/bab7d5c60cd041a0a36f7c4b6e1dd978/qos_specs/599ef437-1c99-42ec-9fc6-239d0519fef1", + "rel": "bookmark" + } + ] +} diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.xml new file mode 100644 index 000000000..b23932486 --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.xml @@ -0,0 +1,9 @@ + + + + + 0 + 100 + + + diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.json index 6c956dfbf..92f2a6216 100644 --- a/api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.json @@ -19,4 +19,4 @@ "id": "ecfc6e2e-7117-44a4-8eec-f84d04f531a8" } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.json index d691eb1f6..d9a1dc191 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.json @@ -18,4 +18,4 @@ "rel": "bookmark" } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.json similarity index 96% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.json index 362308a79..1d3987705 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.json @@ -2,4 +2,4 @@ "qos_specs": { "delay": "1" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.xml new file mode 100644 index 000000000..78524c7ca --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.xml @@ -0,0 +1,2 @@ + + diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.json similarity index 96% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.json index 362308a79..1d3987705 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.json @@ -2,4 +2,4 @@ "qos_specs": { "delay": "1" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.json index 0c2826404..4a5d9db6a 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.json @@ -6,4 +6,4 @@ "id": "a12983c2-83bd-4afa-be9f-ad796573ead6" } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/list-pools-detail.json b/api-ref/src/wadls/volume-api/src/v2/samples/scheduler-stats/pools-list-detailed-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/list-pools-detail.json rename to api-ref/src/wadls/volume-api/src/v2/samples/scheduler-stats/pools-list-detailed-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.json index 0f5407545..239c64d23 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.json @@ -14,4 +14,4 @@ "security_group_rules": 20, "security_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json similarity index 97% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json index cbd6f18af..b322b2a87 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json @@ -3,4 +3,4 @@ "force": "True", "instances": 9 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.json index 9fbee648b..553933292 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.json @@ -13,4 +13,4 @@ "security_group_rules": 20, "security_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.json index a2ee9683a..55003a906 100644 --- a/api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.json @@ -209,4 +209,4 @@ "description": "Services support." } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.json similarity index 98% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.json index ba6cd172e..3c0fe5d88 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.json @@ -5,4 +5,4 @@ "volume_id": "5aa119a8-d25b-45a7-8d1b-88e127885635", "force": true } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.json index c432145d2..d8901e88d 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.json @@ -9,4 +9,4 @@ "id": "ffa9bc5e-1172-4021-acaf-cdcd78a9584d", "name": "snap-001" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_metadata_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_metadata_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_metadata_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_metadata_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.json similarity index 95% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.json index 983ce9527..4373b0018 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.json @@ -2,4 +2,4 @@ "metadata": { "key": "v2" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.json similarity index 95% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.json index 983ce9527..4373b0018 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.json @@ -2,4 +2,4 @@ "metadata": { "key": "v2" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.json index a36f18890..25a8c6c9d 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.json @@ -11,4 +11,4 @@ "id": "2bb856e1-b3d8-4432-a858-09e4ce939389", "name": "snap-001" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-detailed-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-detailed-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-detailed-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-detailed-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/version-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/version-get-resp.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.json index 0df53b29f..06ba84d07 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/version-get-resp.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.json @@ -30,4 +30,4 @@ } ] } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.xml new file mode 100644 index 000000000..38cecbc61 --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-v2-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-v2-show-response.json new file mode 100644 index 000000000..2719a8135 --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-v2-show-response.json @@ -0,0 +1,44 @@ +{ + "choices": [ + { + "status": "SUPPORTED", + "media-types": [ + { + "base": "application/xml", + "type": "application/vnd.openstack.volume+xml;version=1" + }, + { + "base": "application/json", + "type": "application/vnd.openstack.volume+json;version=1" + } + ], + "id": "v1.0", + "links": [ + { + "href": "http://23.253.248.171:8776/v1/v2.json", + "rel": "self" + } + ] + }, + { + "status": "CURRENT", + "media-types": [ + { + "base": "application/xml", + "type": "application/vnd.openstack.volume+xml;version=1" + }, + { + "base": "application/json", + "type": "application/vnd.openstack.volume+json;version=1" + } + ], + "id": "v2.0", + "links": [ + { + "href": "http://23.253.248.171:8776/v2/v2.json", + "rel": "self" + } + ] + } + ] +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cinder-versions-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.json similarity index 54% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cinder-versions-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.json index 29b36bd17..03a8df8cc 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/cinder-versions-response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.json @@ -1,26 +1,26 @@ { "versions": [ { + "status": "SUPPORTED", + "updated": "2014-06-28T12:20:21Z", "id": "v1.0", "links": [ { - "href": "http://23.253.211.234:8776/v1/", + "href": "http://23.253.248.171:8776/v1/", "rel": "self" } - ], - "status": "DEPRECATED", - "updated": "2014-06-28T12:20:21Z" + ] }, { + "status": "CURRENT", + "updated": "2012-11-21T11:33:21Z", "id": "v2.0", "links": [ { - "href": "http://23.253.211.234:8776/v2/", + "href": "http://23.253.248.171:8776/v2/", "rel": "self" } - ], - "status": "CURRENT", - "updated": "2012-11-21T11:33:21Z" + ] } ] } diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.xml new file mode 100644 index 000000000..bb4fff452 --- /dev/null +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_attach_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-attach-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_attach_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-attach-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_extend_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-extend-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_extend_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-extend-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-force-detach/os-force-detach-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-force-detach-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-force-detach/os-force-detach-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-force-detach-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_set_image_metadata_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-image-metadata-set-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_set_image_metadata_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-image-metadata-set-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_unset_image_metadata_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-image-metadata-unset-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_unset_image_metadata_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-image-metadata-unset-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-show-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-show-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-show-response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-request.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-replica/os-promote-replica-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-replica-promote-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-replica/os-promote-replica-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-replica-promote-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-replica/os-reenable-replica-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-replica-reenable-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-replica/os-reenable-replica-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-replica-reenable-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_reset_status_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-status-reset-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_reset_status_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-status-reset-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-create-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_create_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-create-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-create-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_create_request.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-create-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.json similarity index 98% rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.json index 60690e6a6..a91f2e94d 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.json @@ -6,4 +6,4 @@ "capabilities": "gpu" } } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.json index 8049eb592..1d72f923e 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.json @@ -13,4 +13,4 @@ "name": "SATA" } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-unmanage/os-unmanage-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-unmanage-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-unmanage/os-unmanage-request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-unmanage-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-request.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-request.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-request.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-request.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.json similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.json diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.json similarity index 99% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.json rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.json index fef9fd6a4..b3c7cc051 100644 --- a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.json +++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.json @@ -29,4 +29,4 @@ "name": "vol-003" } ] -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.xml similarity index 100% rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.xml rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.xml diff --git a/api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/backups-v2.wadl similarity index 89% rename from api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/backups-v2.wadl index 06a06cd47..46cc466ef 100644 --- a/api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/backups-v2.wadl @@ -1,9 +1,9 @@ + %common; - + %common_project; ]> - - - - The unique identifier of the tenant or account. - - - + &tenant_idTemplateParameter; @@ -32,16 +24,7 @@ - - - - The unique identifier for a backup. - - - + &backup_idTemplateParameter; @@ -67,7 +50,7 @@ + type="csapi:UUID" required="true"> - The ID of the volume that you want to + The UUID of the volume that you want to back up. A backup object. - - The ID of the backup. + The UUID of the backup. @@ -177,7 +160,7 @@ A backups object. - - The ID of the backup. + The UUID of the backup. @@ -227,7 +210,7 @@ - - The ID of the backup. + The UUID of the backup. @@ -306,10 +289,10 @@ available. + type="csapi:UUID" required="true"> - The ID of the volume from which the + The UUID of the volume from which the backup was created. - - The ID of the backup. + The UUID of the backup. @@ -429,10 +412,10 @@ available. + type="csapi:UUID" required="true"> - The ID of the volume from which the + The UUID of the volume from which the backup was created. - You must specify either the volume ID or name. If you specify - both the volume ID and name, the ID takes priority. + You must specify either the UUID or name of the volume. If you specify + both the UUID and name, the UUID takes priority. @@ -487,7 +470,7 @@ The ID of the volume to + xml:lang="EN">The UUID of the volume to which you want to restore a backup. @@ -518,7 +501,7 @@ The ID of the + xml:lang="EN">The UUID of the backup. The ID of the volume to + xml:lang="EN">The UUID of the volume to which the backup was restored. @@ -565,7 +548,7 @@ + + + %common; + + %common_project; +]> + + + + + &tenant_idTemplateParameter; + + + &hostnameTemplateParameter; + + + + + + + + + + Shows capabilities for a storage back end. + + + + + + + + + + + + &backendParametersResponse; + + + + diff --git a/api-ref/src/wadls/volume-api/src/v2/cgsnapshots-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/cgsnapshots-v2.wadl similarity index 81% rename from api-ref/src/wadls/volume-api/src/v2/cgsnapshots-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/cgsnapshots-v2.wadl index 0f0d0b9a0..51d06ccb5 100644 --- a/api-ref/src/wadls/volume-api/src/v2/cgsnapshots-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/cgsnapshots-v2.wadl @@ -1,9 +1,9 @@ + %common; - + %common_project; ]> - &tenantIdRequestParameter; + &tenant_idTemplateParameter; - + - - - - The unique identifier of the consistency - group snapshot. - - - + &cgsnapshot_idTemplateParameter; @@ -55,7 +46,7 @@ @@ -64,7 +55,7 @@ - + @@ -76,7 +67,7 @@ @@ -97,7 +88,7 @@ @@ -110,7 +101,7 @@ + href="../samples/cgsnapshots/cgsnapshots-create-response.json"/> @@ -140,7 +131,7 @@ diff --git a/api-ref/src/wadls/volume-api/src/v2/consistencygroups-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/consistencygroups-v2.wadl similarity index 75% rename from api-ref/src/wadls/volume-api/src/v2/consistencygroups-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/consistencygroups-v2.wadl index 231161c2f..64d0558dd 100644 --- a/api-ref/src/wadls/volume-api/src/v2/consistencygroups-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/consistencygroups-v2.wadl @@ -1,9 +1,9 @@ + %common; - + %common_project; ]> - - - - The unique identifier of the tenant or account. - - - + &tenant_idTemplateParameter; - + - + - - - - The unique identifier of the consistency - group. - - - - + &consistencygroup_idTemplateParameter; + @@ -59,7 +42,7 @@ - + @@ -71,16 +54,16 @@ - &getConsistencyGroupsResponseParameters; + &listConsistencyGroupsResponseParameters; - + @@ -92,12 +75,12 @@ - &getConsistencyGroupsDetailResponseParameters; + &listConsistencyGroupsDetailResponseParameters; @@ -113,7 +96,7 @@ @@ -126,7 +109,7 @@ + href="../samples/consistencygroups/consistency-group-create-response.json"/> @@ -143,7 +126,7 @@ @@ -156,7 +139,7 @@ + href="../samples/consistencygroups/consistency-group-create-response.json"/> @@ -173,7 +156,7 @@ @@ -196,7 +179,7 @@ + href="../samples/consistencygroups/consistency-group-update-request.json"/> &postConsistencyGroupsUpdateParameters; @@ -204,7 +187,7 @@ - + @@ -216,12 +199,12 @@ - &getConsistencyGroupsDetailResponseParameters; + &listConsistencyGroupsDetailResponseParameters; diff --git a/api-ref/src/wadls/volume-api/src/v2/os-limits-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/limits-v2.wadl similarity index 74% rename from api-ref/src/wadls/volume-api/src/v2/os-limits-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/limits-v2.wadl index 6b0bce04e..9997ed786 100644 --- a/api-ref/src/wadls/volume-api/src/v2/os-limits-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/limits-v2.wadl @@ -1,28 +1,23 @@ + %common; - + %common_project; ]> + xmlns:wadl="http://wadl.dev.java.net/2009/02" + xmlns:xlink="http://www.w3.org/1999/xlink"> - - - The ID for the tenant or project in a - multi-tenancy cloud. - + &tenant_idTemplateParameter; @@ -32,8 +27,9 @@ - Shows absolute limits for a - tenant. + + Shows absolute limits for a tenant. + An absolute limit value of -1 indicates that the absolute limit for the item is infinite. @@ -45,7 +41,7 @@ xml:lang="EN" title="Show absolute limits: JSON response"> @@ -54,7 +50,7 @@ xml:lang="EN" title="Show absolute limits: XML response"> @@ -65,7 +61,7 @@ xml:lang="EN" title="Show absolute limits: JSON response"> @@ -74,7 +70,7 @@ xml:lang="EN" title="Show absolute limits: XML response"> diff --git a/api-ref/src/wadls/volume-api/src/v2/os-attach-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-attach-interfaces-v2.wadl similarity index 68% rename from api-ref/src/wadls/volume-api/src/v2/os-attach-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-attach-interfaces-v2.wadl index d65ef3ab9..a1c852ec7 100644 --- a/api-ref/src/wadls/volume-api/src/v2/os-attach-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-attach-interfaces-v2.wadl @@ -1,5 +1,11 @@ - + + + %common; + + %common_project; +]> + xmlns:atom="http://www.w3.org/2005/Atom" + xmlns:xlink="http://www.w3.org/1999/xlink"> - - - The ID for the tenant or account in a - multi-tenancy cloud. - - + &tenant_idTemplateParameter; - - - The UUID for the server of - interest to you. - - + &server_idTemplateParameter; - - - The interface ID. - - - + &interface_idTemplateParameter; + @@ -56,15 +42,17 @@ - Creates and uses a port interface - to attach the port to a server instance. + + Creates and uses a port interface to attach the port to a + server instance. + @@ -72,24 +60,27 @@ - Specify the - interfaceAttachment - action in the request body. + + Specify the interfaceAttachment + action in the request body. + - - The ID of the port for which you want to - create an interface. + + The UUID of the port for which you want to create an + interface. + @@ -99,7 +90,7 @@ @@ -107,36 +98,43 @@ - Fixed IP addresses with subnet - IDs. + + Fixed IP addresses with subnet IDs. + - The MAC address. + + The MAC address. + - - The network ID. + + The network ID. + - - The port ID. + + The port ID. + - The port state. + + The port state. + @@ -153,14 +153,16 @@ - Lists port interfaces. + + Lists port interfaces. + @@ -168,43 +170,53 @@ - The port state. + + The port state. + - Fixed IP addresses with subnet - IDs. + + Fixed IP addresses with subnet + IDs. + - The MAC address. + + The MAC address. + - - The network ID. + + The network ID. + - - The port ID. + + The port ID. + @@ -213,15 +225,16 @@ - Shows details for a - port interface. + + Shows details for a port interface. + @@ -229,7 +242,7 @@ diff --git a/api-ref/src/wadls/volume-api/src/v2/os-quota-sets-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl similarity index 69% rename from api-ref/src/wadls/volume-api/src/v2/os-quota-sets-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl index 83a74670d..f57ee8a14 100644 --- a/api-ref/src/wadls/volume-api/src/v2/os-quota-sets-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl @@ -1,75 +1,41 @@ + %common; - + %common_project; ]> + xmlns:wadl="http://wadl.dev.java.net/2009/02" + xmlns:xlink="http://www.w3.org/1999/xlink"> - &tenantIdRequestParameter; + &tenant_idTemplateParameter; - - - - The ID for the tenant for which you want to - show, update, or delete quotas. This ID is - different than the first tenant ID that you - specify in the URI: That ID is for the admin - tenant. - - - + &tenant_idTemplateParameter2; - + - - - - The ID for the tenant for which you want to show - or update quotas. This ID is different than the - first tenant ID that you specify in the URI: - That ID is for the admin tenant. - - - + &tenant_idTemplateParameter2; - - - - The user ID. Specify in the URI as a query - string: user_id={user_id}. - - - + &user_idTemplateParameter; @@ -77,17 +43,7 @@ - - - - The user ID. Specify in the URI as a query - string: user_id={user_id}. - - - + &user_idTemplateParameter; @@ -96,7 +52,7 @@ - + @@ -109,7 +65,7 @@ xml:lang="EN" title="Get default quotas response: JSON"> @@ -118,7 +74,7 @@ xml:lang="EN" title="Get default quotas response: XML"> "asResponse; @@ -142,7 +98,7 @@ @@ -150,7 +106,7 @@ "asResponse; @@ -170,7 +126,7 @@ @@ -178,7 +134,7 @@ "asResponse; @@ -189,7 +145,7 @@ @@ -197,7 +153,7 @@ "asResponse; @@ -227,7 +183,7 @@ xml:lang="EN" title="Show quotas for user response: JSON"> @@ -236,7 +192,7 @@ xml:lang="EN" title="Show quotas for user response: XML"> "asResponse; @@ -256,7 +212,7 @@ xml:lang="EN" title="Update quotas for user request: JSON"> @@ -265,7 +221,7 @@ xml:lang="EN" title="Update quotas for user request: XML"> "asResponse; @@ -277,7 +233,7 @@ xml:lang="EN" title="Update quotas for user response: JSON"> @@ -286,7 +242,7 @@ xml:lang="EN" title="Show quotas for user response: XML"> "asResponse; @@ -316,7 +272,7 @@ xmlns="http://docbook.org/ns/docbook" title="Show quota details for user response: JSON"> "asResponse; diff --git a/api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-vol-image-meta-v2.wadl similarity index 82% rename from api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-vol-image-meta-v2.wadl index 22cae8f82..11c2e300a 100644 --- a/api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-vol-image-meta-v2.wadl @@ -1,21 +1,22 @@ + + %common; + + %common_project; +]> + xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xlink="http://www.w3.org/1999/xlink"> - - - The unique identifier of the tenant or - account. - + &tenant_idTemplateParameter; @@ -26,25 +27,22 @@ - Shows image metadata that is associated with a - volume. + Shows image metadata for a volume. + + + When the request is made, the caller must specify a reference to an existing storage + volume in the ref element. Each storage driver may interpret the + existing storage volume reference differently but should accept a reference + structure containing either a source-volume-id or + source-volume-name element, if possible. - When the request is made, the caller must specify - (in the ref element) a - reference to an existing storage volume. Each storage - driver may interpret the existing storage volume - reference differently, but should accept a reference - structure containing either a - source-volume-id or - source-volume-name element if - possible. diff --git a/api-ref/src/wadls/volume-api/src/v2/os-volume-manage-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-manage-v2.wadl similarity index 87% rename from api-ref/src/wadls/volume-api/src/v2/os-volume-manage-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-manage-v2.wadl index 7aedfdb41..8ad0f73f8 100644 --- a/api-ref/src/wadls/volume-api/src/v2/os-volume-manage-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-manage-v2.wadl @@ -1,23 +1,22 @@ + + %common; + + %common_project; +]> + xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xlink="http://www.w3.org/1999/xlink"> - - - - The unique identifier of the tenant or account. - - - + &tenant_idTemplateParameter; @@ -36,15 +35,14 @@ volume in the ref parameter in the request. Although each storage driver might interpret this reference differently, the driver should accept a reference - structure that contains either a - source-volume-id or - source-volume-name + structure that contains either a source-volume- + id or source-volume-name element, if possible. - The API chooses the size of the volume by rounding up the - size of the existing storage volume to the next gibibyte - (GiB). + The API chooses the size of the volume by rounding up the + size of the existing storage volume to the next gibibyte + (GiB). @@ -52,7 +50,7 @@ diff --git a/api-ref/src/wadls/volume-api/src/v2/os-volume-transfer-api-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-transfer-v2.wadl similarity index 87% rename from api-ref/src/wadls/volume-api/src/v2/os-volume-transfer-api-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-transfer-v2.wadl index 4981a341e..b14123943 100644 --- a/api-ref/src/wadls/volume-api/src/v2/os-volume-transfer-api-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-transfer-v2.wadl @@ -1,9 +1,9 @@ + %common; - + %common_project; ]> - - - - The unique identifier of the tenant or account. - - - + &tenant_idTemplateParameter; @@ -42,7 +34,7 @@ - + @@ -64,7 +56,7 @@ - The ID of the volume. + The UUID of the volume. @@ -89,15 +81,15 @@ - - The ID of the volume transfer. + The UUID of the volume transfer. @@ -119,12 +111,12 @@ - - The ID of the volume. + The UUID of the volume. @@ -161,15 +153,15 @@ - - The ID of the volume transfer. + The UUID of the volume transfer. @@ -187,7 +179,7 @@ - The ID of the volume. + The UUID of the volume. @@ -215,15 +207,15 @@ - - The ID of the volume transfer. + The UUID of the volume transfer. @@ -250,7 +242,7 @@ - The ID of the volume. + The UUID of the volume. @@ -266,7 +258,7 @@ - + @@ -278,15 +270,15 @@ - - The ID of the volume transfer. + The UUID of the volume transfer. @@ -313,7 +305,7 @@ - The ID of the volume. + The UUID of the volume. @@ -350,7 +342,7 @@ - - The ID of the volume transfer. + The UUID of the volume transfer. @@ -388,7 +380,7 @@ required="true"> - The ID of the volume. + The UUID of the volume. diff --git a/api-ref/src/wadls/volume-api/src/v2/os-qos-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl similarity index 69% rename from api-ref/src/wadls/volume-api/src/v2/os-qos-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl index c753a7e5d..9e26b8fa7 100644 --- a/api-ref/src/wadls/volume-api/src/v2/os-qos-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl @@ -1,66 +1,37 @@ + %common; - + %common_project; ]> - + xmlns:json="http://json-schema.org/schema#" + xmlns:wadl="http://wadl.dev.java.net/2009/02" + xmlns:xlink="http://www.w3.org/1999/xlink"> + - - - The unique ID of the tenant or - account. - + &tenant_idTemplateParameter; - - The UUID for the - QoS specification. - - + &qos_idTemplateParameter; - - - The unique ID of the volume - type. - + - - - The unique ID of the volume - type. - + - + @@ -84,27 +55,75 @@ Creates a QoS specification. + + Specify one or more key and value pairs in the request body. + + href="../samples/qos-specs/qos-create-request.json"/> + href="../samples/qos-specs/qos-create-request.xml"/> - + &qos_specsParameter; + - A qos_specs object. + The name of the QoS specification. + + + + + + + The consumer type. + + + + + + + + + + + + + + + + &qos_specsParameter; + + + + A specs object. + + + + + + + The consumer type. @@ -117,71 +136,23 @@ - + + xml:lang="EN"> - Specification key and value pairs. + The generated ID for the QoS specification. - - - - - - - - - - - - - - - A qos_specs - object. - - - - A specs - object. - - - - The consumer type. - - - - The name of the QoS - specification. - - - - The generated ID for the QoS - specification. - - The QoS specification - links. + + The QoS specification links. + + @@ -198,22 +169,16 @@ - - + - - - A qos_specs - object. - + &qos_specsParameter; - @@ -258,8 +223,7 @@ - Shows details for a QoS - specification. + Shows details for a QoS specification. @@ -267,7 +231,7 @@ @@ -275,20 +239,12 @@ - - - - A qos_specs object. - - - + &qos_specsParameter; + type="xsd:dict"> @@ -310,18 +266,16 @@ - The name of the QoS - specification. + The name of the QoS specification. - - The generated ID for the QoS - specification. + The generated ID for the QoS specification. @@ -368,11 +322,11 @@ - + - Gets all associations for a QoS specification. + Lists all associations for a QoS specification. @@ -380,14 +334,14 @@ + href="../samples/qos-specs/qos-show-response.xml"/> + href="../samples/qos-specs/qos-show-response.json"/> @@ -405,24 +359,16 @@ + href="../samples/qos-specs/qos-update-request.xml"/> + href="../samples/qos-specs/qos-update-request.json"/> - - - - A qos_specs object. - - - + &qos_specsParameter; + href="../samples/qos-specs/qos-update-response.xml"/> + href="../samples/qos-specs/qos-update-response.json"/> @@ -461,21 +407,13 @@ - + - The unique ID of the QoS specification. - - - - - - - Optional flag that indicates whether to delete a - QoS specification, even if it is in-use. + Set to true to delete a QoS + specification, even if it is in-use. Default is + false. diff --git a/api-ref/src/wadls/volume-api/src/v2/os-vol-pool-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl similarity index 85% rename from api-ref/src/wadls/volume-api/src/v2/os-vol-pool-v2.wadl rename to api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl index ca453f9ab..46a59b3d0 100644 --- a/api-ref/src/wadls/volume-api/src/v2/os-vol-pool-v2.wadl +++ b/api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl @@ -1,33 +1,31 @@ - - + + %common; + + %common_project; +]> + + - - - - The unique identifier of the tenant or account. - - - + &tenant_idTemplateParameter; - + - + @@ -58,7 +56,7 @@ + %common; - + %common_project; ]> - &tenantIdRequestParameter; + &tenant_idTemplateParameter; - - - - An alias, which is a name for a pointer to - a resource. For example, a named - extension. - - - - + &aliasTemplateParameter; + - + + - + - - - - The UUID of an existing - volume. - - - - + &volume_idTemplateParameter; + - + - - - - The UUID for an existing volume - type. - - - + &vol_type_idTemplateParameter; - + @@ -108,16 +76,7 @@ - - - - The UUID of the snapshot. - - - + &snapshot_idTemplateParameter; @@ -162,19 +121,17 @@ - - + @@ -189,16 +146,14 @@ + href="../samples/volumes/version-v2-show-response.json"/> - - + + href="../samples/volumes/version-v2-show-response.json"/> @@ -232,7 +187,7 @@ @@ -240,7 +195,7 @@ @@ -253,7 +208,7 @@ Creates a volume. - To create a bootable volume, include the ID of the image from + To create a bootable volume, include the UUID of the image from which you want to create the volume in the imageRef attribute in the request body. @@ -312,7 +267,7 @@ @@ -320,7 +275,7 @@ + href="../samples/volumes/volume-create-request.xml"/> &createVolumeParameters; @@ -330,7 +285,7 @@ @@ -338,14 +293,14 @@ &volumeDetailResponseParameters; - + @@ -364,7 +319,7 @@ @@ -372,14 +327,14 @@ &volumeSimpleResponseParameters; - + @@ -398,7 +353,7 @@ @@ -406,14 +361,14 @@ &volumeDetailResponseParameters; - + @@ -433,14 +388,14 @@ + href="../samples/volumes/volume-show-response.xml"/> + href="../samples/volumes/volume-show-response.json"/> &volumeDetailResponseParameters; @@ -458,7 +413,7 @@ + href="../samples/volumes/volume-update-request.xml"/> @@ -476,7 +431,7 @@ @@ -484,7 +439,7 @@ &volumeDetailResponseParameters; @@ -545,7 +500,7 @@ @@ -553,7 +508,7 @@ @@ -571,7 +526,7 @@ @@ -579,7 +534,7 @@ @@ -589,7 +544,7 @@ @@ -597,7 +552,7 @@ @@ -638,7 +593,7 @@ - The metadata key name for the metadata that you want to remove. + The metadata key name for the metadata that you + want to remove. @@ -777,8 +733,8 @@ - Attaches a volume to a server. Specify the os-attach action in the - request body. + Attaches a volume to a server. Specify the os- + attach action in the request body. Preconditions @@ -799,7 +755,7 @@ &attachVolumeReqParameters; @@ -818,7 +774,11 @@ Preconditions - Volume status must be available. + + + Volume status must be available. + + @@ -826,7 +786,7 @@ &unmanageVolumeReqParameters; @@ -851,7 +811,7 @@ &forcedetachVolumeReqParameters; @@ -873,7 +833,7 @@ &promotereplicaVolumeReqParameters; @@ -886,7 +846,7 @@ title="Reenable volume replication"> Re-enables replication of a volume. Specify the - os-reenable-replica action in the request body. + volume-replica-reenable- action in the request body. @@ -894,7 +854,7 @@ &reenablereplicaVolumeReqParameters; @@ -902,7 +862,7 @@ - + @@ -914,7 +874,7 @@ @@ -922,7 +882,7 @@ &VolTypeResponseParameters; @@ -956,14 +916,14 @@ - + - @@ -972,13 +932,13 @@ - + - + &VolTypeResponseParameters; @@ -1009,12 +969,12 @@ - + - + @@ -1028,12 +988,12 @@ - + - + &VolTypeResponseParameters; @@ -1050,12 +1010,12 @@ - + - + @@ -1080,18 +1040,18 @@ - + - + &VolTypeResponseParameters; - + @@ -1103,7 +1063,7 @@ @@ -1111,7 +1071,7 @@ &VolTypeResponseParameters; @@ -1140,7 +1100,8 @@ + href="../samples/volumes/snapshot-create-request.xml" + /> @@ -1181,13 +1142,13 @@ - To create a snapshot from an existing volume, - specify the ID of the existing volume. + specify the UUID of the existing volume. @@ -1207,7 +1168,8 @@ + href="../samples/volumes/snapshot-create-request.json" + /> @@ -1216,14 +1178,15 @@ + href="../samples/volumes/snapshot-create-response.xml" + /> &snapshotResponseParameter; @@ -1250,7 +1213,7 @@ @@ -1258,7 +1221,7 @@ &snapshotsResponseParameter; @@ -1279,7 +1242,7 @@ @@ -1287,7 +1250,7 @@ &snapshotsResponseParameter; @@ -1301,7 +1264,7 @@ - @@ -1325,7 +1288,7 @@ @@ -1333,7 +1296,7 @@ &snapshotResponseParameter; @@ -1347,7 +1310,7 @@ - @@ -1371,7 +1334,7 @@ @@ -1380,7 +1343,7 @@ @@ -1437,7 +1400,7 @@ &snapshotResponseParameter; @@ -1466,7 +1429,7 @@ @@ -1474,7 +1437,7 @@ &snapshotResponseParameter; @@ -1488,7 +1451,7 @@ - @@ -1512,7 +1475,7 @@ @@ -1521,7 +1484,7 @@ @@ -1549,19 +1512,56 @@ - - + + + + + + Creates a private Block Storage volume. + + + + + - - One or more metadata key and value pairs for the snapshot, if any. - - - + + + + + + + + &createVolumeParameters; + &isPublicParameterReq; + + + + + + + + + + + + + &createVolumeResponseParameters; + &isPublicParameterResp;