diff options
| author | Fei Long Wang <flwang@catalyst.net.nz> | 2015-04-15 12:00:17 +1200 |
|---|---|---|
| committer | nikhil komawar <nikhil.komawar@rackspace.com> | 2015-04-23 19:38:13 +0000 |
| commit | 2453127ff7e45718733b62194d13106b22937951 (patch) | |
| tree | e4432fa6c3c1b9fb1300b53c37aee0fdce9ec660 | |
| parent | e3bed85d5123764dfa25059bba31acbf5fa9c035 (diff) | |
| download | glance-2453127ff7e45718733b62194d13106b22937951.tar.gz | |
v1 API should be in SUPPORTED status
Fixes Bug: 1447327
Backport change:-
Has been cherry picked from
commit 1bfbcf7cc0c12b65ea323231b3243953cc31d4b8
Change-Id: I98e182aaee3d3577764ec957dfbbd898a1137ea9
| -rw-r--r-- | glance/api/versions.py | 2 | ||||
| -rw-r--r-- | glance/tests/functional/test_api.py | 6 | ||||
| -rw-r--r-- | glance/tests/unit/test_versions.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/glance/api/versions.py b/glance/api/versions.py index 17361301b..e72152136 100644 --- a/glance/api/versions.py +++ b/glance/api/versions.py @@ -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'), ]) diff --git a/glance/tests/functional/test_api.py b/glance/tests/functional/test_api.py index 860df8fd8..dc6f58b61 100644 --- a/glance/tests/functional/test_api.py +++ b/glance/tests/functional/test_api.py @@ -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'}], }, { diff --git a/glance/tests/unit/test_versions.py b/glance/tests/unit/test_versions.py index f26c4ebb1..2055d8bd2 100644 --- a/glance/tests/unit/test_versions.py +++ b/glance/tests/unit/test_versions.py @@ -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/'}], }, |