diff --git a/glance/api/versions.py b/glance/api/versions.py index 6fb8613ed8..4e2ca6cf2d 100644 --- a/glance/api/versions.py +++ b/glance/api/versions.py @@ -59,7 +59,8 @@ class Controller(object): version_objs = [] if CONF.enable_v2_api: version_objs.extend([ - build_version_object(2.2, 'v2', 'CURRENT'), + build_version_object(2.3, 'v2', 'CURRENT'), + build_version_object(2.2, 'v2', 'SUPPORTED'), build_version_object(2.1, 'v2', 'SUPPORTED'), build_version_object(2.0, 'v2', 'SUPPORTED'), ]) diff --git a/glance/tests/functional/test_api.py b/glance/tests/functional/test_api.py index 6252ca98ff..ca0ee7be3b 100644 --- a/glance/tests/functional/test_api.py +++ b/glance/tests/functional/test_api.py @@ -34,10 +34,15 @@ class TestRootApi(functional.FunctionalTest): url = 'http://127.0.0.1:%d/v%%s/' % self.api_port versions = {'versions': [ { - 'id': 'v2.2', + 'id': 'v2.3', 'status': 'CURRENT', 'links': [{'rel': 'self', 'href': url % '2'}], }, + { + 'id': 'v2.2', + 'status': 'SUPPORTED', + 'links': [{'rel': 'self', 'href': url % '2'}], + }, { 'id': 'v2.1', 'status': 'SUPPORTED', @@ -78,10 +83,15 @@ class TestRootApi(functional.FunctionalTest): url = 'http://127.0.0.1:%d/v%%s/' % self.api_port versions = {'versions': [ { - 'id': 'v2.2', + 'id': 'v2.3', 'status': 'CURRENT', 'links': [{'rel': 'self', 'href': url % '2'}], }, + { + 'id': 'v2.2', + 'status': 'SUPPORTED', + 'links': [{'rel': 'self', 'href': url % '2'}], + }, { 'id': 'v2.1', 'status': 'SUPPORTED', @@ -141,10 +151,15 @@ class TestRootApi(functional.FunctionalTest): url = 'http://127.0.0.1:%d/v%%s/' % self.api_port versions = {'versions': [ { - 'id': 'v2.2', + 'id': 'v2.3', 'status': 'CURRENT', 'links': [{'rel': 'self', 'href': url % '2'}], }, + { + 'id': 'v2.2', + 'status': 'SUPPORTED', + 'links': [{'rel': 'self', 'href': url % '2'}], + }, { 'id': 'v2.1', 'status': 'SUPPORTED', diff --git a/glance/tests/functional/v1/test_ssl.py b/glance/tests/functional/v1/test_ssl.py index f73f3f9d63..624f149abb 100644 --- a/glance/tests/functional/v1/test_ssl.py +++ b/glance/tests/functional/v1/test_ssl.py @@ -470,11 +470,16 @@ class TestSSL(functional.FunctionalTest): self.start_servers(**self.__dict__.copy()) versions = {'versions': [{ - "id": "v2.2", + "id": "v2.3", "status": "CURRENT", "links": [{ "rel": "self", "href": "https://127.0.0.1:%d/v2/" % self.api_port}]}, + {"id": "v2.2", + "status": "SUPPORTED", + "links": [{ + "rel": "self", + "href": "https://127.0.0.1:%d/v2/" % self.api_port}]}, {"id": "v2.1", "status": "SUPPORTED", "links": [{ diff --git a/glance/tests/unit/test_versions.py b/glance/tests/unit/test_versions.py index c58f80b641..f26c4ebb17 100644 --- a/glance/tests/unit/test_versions.py +++ b/glance/tests/unit/test_versions.py @@ -35,11 +35,17 @@ class VersionsTest(base.IsolatedUnitTest): results = jsonutils.loads(res.body)['versions'] expected = [ { - 'id': 'v2.2', + 'id': 'v2.3', 'status': 'CURRENT', 'links': [{'rel': 'self', 'href': 'http://127.0.0.1:9292/v2/'}], }, + { + 'id': 'v2.2', + 'status': 'SUPPORTED', + 'links': [{'rel': 'self', + 'href': 'http://127.0.0.1:9292/v2/'}], + }, { 'id': 'v2.1', 'status': 'SUPPORTED', @@ -78,11 +84,17 @@ class VersionsTest(base.IsolatedUnitTest): results = jsonutils.loads(res.body)['versions'] expected = [ { - 'id': 'v2.2', + 'id': 'v2.3', 'status': 'CURRENT', 'links': [{'rel': 'self', 'href': 'https://example.com:9292/v2/'}], }, + { + 'id': 'v2.2', + 'status': 'SUPPORTED', + 'links': [{'rel': 'self', + 'href': 'https://example.com:9292/v2/'}], + }, { 'id': 'v2.1', 'status': 'SUPPORTED',