From d2a6a0d5faf4d8c17442763731f67224fe3a6717 Mon Sep 17 00:00:00 2001 From: Daisuke Fujita Date: Tue, 13 Oct 2015 15:56:23 +0900 Subject: [PATCH] Correct Block Storage v1 and v2 list versions and show version The "Shows details for Block Storage API v2" shows incorrect version ID: 1. "id": "v1.0" to "id": "v2.0" The responses for the v1 and v2 list versions calls were incorrect. The responses for the show details for Block Storage API v1 and v2 were incorrect. Change-Id: Icdd60fdb02bcf05ce8dc8744893ed52ca9f5a0e6 Closes-Bug: #1503549 --- .../api_samples/cinder-versions-response.json | 18 +++++----- .../src/v1/api_samples/version-get-resp.json | 35 ++++++++----------- .../v1/api_samples/versionv1-get-resp.json | 35 ++++++++----------- .../api_samples/cinder-versions-response.json | 18 +++++----- .../v2/api_samples/versionv2-get-resp.json | 29 +++++---------- 5 files changed, 57 insertions(+), 78 deletions(-) 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/api_samples/cinder-versions-response.json index 6dddff1a0..5d4772d6f 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/cinder-versions-response.json +++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/cinder-versions-response.json @@ -1,26 +1,26 @@ { "versions": [ { - "status": "CURRENT", - "updated": "2012-01-04T11:33:21Z", "id": "v1.0", "links": [ { - "href": "http://23.253.228.211:8776/v1/", + "href": "http://23.253.211.234:8776/v1/", "rel": "self" } - ] + ], + "status": "SUPPORTED", + "updated": "2014-06-28T12:20:21Z" }, { - "status": "CURRENT", - "updated": "2012-11-21T11:33:21Z", "id": "v2.0", "links": [ { - "href": "http://23.253.228.211:8776/v2/", + "href": "http://23.253.211.234:8776/v2/", "rel": "self" } - ] + ], + "status": "CURRENT", + "updated": "2012-11-21T11:33:21Z" } ] -} \ No newline at end of file +} 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/api_samples/version-get-resp.json index 0df53b29f..5f7c9ae43 100644 --- a/api-ref/src/wadls/volume-api/src/v1/api_samples/version-get-resp.json +++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/version-get-resp.json @@ -1,7 +1,17 @@ { "version": { - "status": "CURRENT", - "updated": "2012-01-04T11:33:21Z", + "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", @@ -12,22 +22,7 @@ "type": "application/vnd.openstack.volume+json;version=1" } ], - "id": "v1.0", - "links": [ - { - "href": "http://23.253.228.211:8776/v1/", - "rel": "self" - }, - { - "href": "http://jorgew.github.com/block-storage-api/content/os-block-storage-1.0.pdf", - "type": "application/pdf", - "rel": "describedby" - }, - { - "href": "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl", - "type": "application/vnd.sun.wadl+xml", - "rel": "describedby" - } - ] + "status": "SUPPORTED", + "updated": "2014-06-28T12:20:21Z" } -} \ No newline at end of file +} 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 index 0df53b29f..5f7c9ae43 100644 --- 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 @@ -1,7 +1,17 @@ { "version": { - "status": "CURRENT", - "updated": "2012-01-04T11:33:21Z", + "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", @@ -12,22 +22,7 @@ "type": "application/vnd.openstack.volume+json;version=1" } ], - "id": "v1.0", - "links": [ - { - "href": "http://23.253.228.211:8776/v1/", - "rel": "self" - }, - { - "href": "http://jorgew.github.com/block-storage-api/content/os-block-storage-1.0.pdf", - "type": "application/pdf", - "rel": "describedby" - }, - { - "href": "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl", - "type": "application/vnd.sun.wadl+xml", - "rel": "describedby" - } - ] + "status": "SUPPORTED", + "updated": "2014-06-28T12:20:21Z" } -} \ No newline at end of file +} 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/api_samples/cinder-versions-response.json index 6dddff1a0..5d4772d6f 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/api_samples/cinder-versions-response.json @@ -1,26 +1,26 @@ { "versions": [ { - "status": "CURRENT", - "updated": "2012-01-04T11:33:21Z", "id": "v1.0", "links": [ { - "href": "http://23.253.228.211:8776/v1/", + "href": "http://23.253.211.234:8776/v1/", "rel": "self" } - ] + ], + "status": "SUPPORTED", + "updated": "2014-06-28T12:20:21Z" }, { - "status": "CURRENT", - "updated": "2012-11-21T11:33:21Z", "id": "v2.0", "links": [ { - "href": "http://23.253.228.211:8776/v2/", + "href": "http://23.253.211.234:8776/v2/", "rel": "self" } - ] + ], + "status": "CURRENT", + "updated": "2012-11-21T11:33:21Z" } ] -} \ 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 index 697da9694..e741f7b9f 100644 --- 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 @@ -1,7 +1,12 @@ { "version": { - "status": "CURRENT", - "updated": "2012-01-04T11:33:21Z", + "id": "v2.0", + "links": [ + { + "href": "http://23.253.211.234:8776/v2/v2.0", + "rel": "self" + } + ], "media-types": [ { "base": "application/xml", @@ -12,22 +17,6 @@ "type": "application/vnd.openstack.volume+json;version=1" } ], - "id": "v1.0", - "links": [ - { - "href": "http://23.253.228.211:8776/v2/", - "rel": "self" - }, - { - "href": "http://jorgew.github.com/block-storage-api/content/os-block-storage-1.0.pdf", - "type": "application/pdf", - "rel": "describedby" - }, - { - "href": "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl", - "type": "application/vnd.sun.wadl+xml", - "rel": "describedby" - } - ] + "status": "CURRENT" } -} \ No newline at end of file +}