openstack/glance
Code Issues Proposed changes

Merge "v1 API should be in SUPPORTED status"

Browse Source
This commit is contained in:
Jenkins
2015-04-23 03:23:33 +00:00
committed by Gerrit Code Review
parent eebaffd5a4 1bfbcf7cc0
commit cbffaf4db1
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glance/api/versions.py
View File

@@ -66,7 +66,7 @@ class Controller(object):
])
if CONF.enable_v1_api:
version_objs.extend([
build_version_object(1.1, 'v1', 'CURRENT'),
build_version_object(1.1, 'v1', 'SUPPORTED'),
build_version_object(1.0, 'v1', 'SUPPORTED'),
])

6
glance/tests/functional/test_api.py
View File

@@ -53,7 +53,7 @@ class TestApiVersions(functional.FunctionalTest):
},
{
'id': 'v1.1',
'status': 'CURRENT',
'status': 'SUPPORTED',
'links': [{'rel': 'self', 'href': url % '1'}],
},
{
@@ -117,7 +117,7 @@ class TestApiVersions(functional.FunctionalTest):
versions = {'versions': [
{
'id': 'v1.1',
'status': 'CURRENT',
'status': 'SUPPORTED',
'links': [{'rel': 'self', 'href': url % '1'}],
},
{
@@ -165,7 +165,7 @@ class TestApiPaths(functional.FunctionalTest):
},
{
'id': 'v1.1',
'status': 'CURRENT',
'status': 'SUPPORTED',
'links': [{'rel': 'self', 'href': url % '1'}],
},
{

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

@@ -60,7 +60,7 @@ class VersionsTest(base.IsolatedUnitTest):
},
{
'id': 'v1.1',
'status': 'CURRENT',
'status': 'SUPPORTED',
'links': [{'rel': 'self',
'href': 'http://127.0.0.1:9292/v1/'}],
},
@@ -109,7 +109,7 @@ class VersionsTest(base.IsolatedUnitTest):
},
{
'id': 'v1.1',
'status': 'CURRENT',
'status': 'SUPPORTED',
'links': [{'rel': 'self',
'href': 'https://example.com:9292/v1/'}],
},