openstack/glance
Code Issues Proposed changes

Bump Images API version to 2.12

Browse Source 
Related: blueprint messages-api
Change-Id: Icd56ce4f0fb0b70fdfc649474766b638a707fdd0
This commit is contained in:
Abhishek Kekane 2021-02-16 15:24:33 +00:00
parent 03696299d2
commit af3ce1adc9
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glance/api/middleware/version_negotiation.py
View File

@ -86,6 +86,7 @@ class VersionNegotiationFilter(wsgi.Middleware):
allowed_versions['v2.8'] = 2
allowed_versions['v2.10'] = 2
allowed_versions['v2.11'] = 2
allowed_versions['v2.12'] = 2
return allowed_versions
def _match_version_string(self, subject):

3
glance/api/versions.py
View File

@ -78,7 +78,8 @@ class Controller(object):
version_objs = []
if CONF.enabled_backends:
version_objs.extend([
build_version_object(2.11, 'v2', 'CURRENT'),
build_version_object(2.12, 'v2', 'CURRENT'),
build_version_object(2.11, 'v2', 'SUPPORTED'),
build_version_object('2.10', 'v2', 'SUPPORTED'),
build_version_object(2.9, 'v2', 'SUPPORTED'),
build_version_object(2.8, 'v2', 'SUPPORTED'),

33
glance/tests/unit/test_versions.py
View File

@ -28,7 +28,7 @@ from glance.tests.unit import base
# make this public so it doesn't need to be repeated for the
# functional tests
def get_versions_list(url, enabled_backends=False):
versions = [
image_versions = [
{
'id': 'v2.7',
'status': 'SUPPORTED',
@ -79,10 +79,16 @@ def get_versions_list(url, enabled_backends=False):
},
]
if enabled_backends:
versions = [
image_versions = [
{
'id': 'v2.12',
'status': 'CURRENT',
'links': [{'rel': 'self',
'href': '%s/v2/' % url}],
},
{
'id': 'v2.11',
'status': 'CURRENT',
'status': 'SUPPORTED',
'links': [{'rel': 'self',
'href': '%s/v2/' % url}],
},
@ -104,16 +110,16 @@ def get_versions_list(url, enabled_backends=False):
'links': [{'rel': 'self',
'href': '%s/v2/' % url}],
}
] + versions
] + image_versions
else:
versions.insert(0, {
image_versions.insert(0, {
'id': 'v2.9',
'status': 'CURRENT',
'links': [{'rel': 'self',
'href': '%s/v2/' % url}],
})
return versions
return image_versions
class VersionsTest(base.IsolatedUnitTest):
@ -304,15 +310,26 @@ class VersionNegotiationTest(base.IsolatedUnitTest):
self.middleware.process_request(request)
self.assertEqual('/v2/images', request.path_info)
# version 2.12 does not exist
def test_request_url_v2_12_default_unsupported(self):
request = webob.Request.blank('/v2.12/images')
resp = self.middleware.process_request(request)
self.assertIsInstance(resp, versions.Controller)
def test_request_url_v2_12_enabled_unsupported(self):
def test_request_url_v2_12_enabled_supported(self):
self.config(enabled_backends='slow:one,fast:two')
request = webob.Request.blank('/v2.12/images')
self.middleware.process_request(request)
self.assertEqual('/v2/images', request.path_info)
# version 2.13 does not exist
def test_request_url_v2_13_default_unsupported(self):
request = webob.Request.blank('/v2.13/images')
resp = self.middleware.process_request(request)
self.assertIsInstance(resp, versions.Controller)
def test_request_url_v2_13_enabled_unsupported(self):
self.config(enabled_backends='slow:one,fast:two')
request = webob.Request.blank('/v2.13/images')
resp = self.middleware.process_request(request)
self.assertIsInstance(resp, versions.Controller)