openstack/cinder
Code Issues Proposed changes

Fix version numbers on media-types

Browse Source 
On "list API versions", 'media-types' type needed to show the version
number as "version=". However all versions represent "1" always.
It is confusing, so this patch fixes them for accurate ones.

Closes-Bug: #1675112
Change-Id: I43ee2661b5412e24f225c6a272702b42d779667a
This commit is contained in:
Ken'ichi Ohmichi 2017-03-21 16:44:47 -07:00
parent c6ab33858a
commit 678a77a905
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@
"media-types": [ "media-types": [
{ {
"base": "application/json", "base": "application/json",
"type": "application/vnd.openstack.volume+json;version=1" "type": "application/vnd.openstack.volume+json;version=2"
} }
], ],
"id": "v2.0" "id": "v2.0"
@ -67,7 +67,7 @@
"media-types": [ "media-types": [
{ {
"base": "application/json", "base": "application/json",
"type": "application/vnd.openstack.volume+json;version=1" "type": "application/vnd.openstack.volume+json;version=3"
} }
], ],
"id": "v3.0" "id": "v3.0"

22
cinder/api/versions.py
View File

@ -32,13 +32,6 @@ _LINKS = [{
"href": "http://docs.openstack.org/", "href": "http://docs.openstack.org/",
}] }]
_MEDIA_TYPES = [{
"base":
"application/json",
"type":
"application/vnd.openstack.volume+json;version=1",
},
]
_KNOWN_VERSIONS = { _KNOWN_VERSIONS = {
"v1.0": { "v1.0": {
@ -48,7 +41,10 @@ _KNOWN_VERSIONS = {
"min_version": "", "min_version": "",
"updated": "2016-05-02T20:25:19Z", "updated": "2016-05-02T20:25:19Z",
"links": _LINKS, "links": _LINKS,
"media-types": _MEDIA_TYPES, "media-types": [{
"base": "application/json",
"type": "application/vnd.openstack.volume+json;version=1",
}]
}, },
"v2.0": { "v2.0": {
"id": "v2.0", "id": "v2.0",
@ -57,7 +53,10 @@ _KNOWN_VERSIONS = {
"min_version": "", "min_version": "",
"updated": "2017-02-25T12:00:00Z", "updated": "2017-02-25T12:00:00Z",
"links": _LINKS, "links": _LINKS,
"media-types": _MEDIA_TYPES, "media-types": [{
"base": "application/json",
"type": "application/vnd.openstack.volume+json;version=2",
}]
}, },
"v3.0": { "v3.0": {
"id": "v3.0", "id": "v3.0",
@ -66,7 +65,10 @@ _KNOWN_VERSIONS = {
"min_version": api_version_request._MIN_API_VERSION, "min_version": api_version_request._MIN_API_VERSION,
"updated": "2016-02-08T12:20:21Z", "updated": "2016-02-08T12:20:21Z",
"links": _LINKS, "links": _LINKS,
"media-types": _MEDIA_TYPES, "media-types": [{
"base": "application/json",
"type": "application/vnd.openstack.volume+json;version=3",
}]
}, },
} }