From 515412b59f5b3af07a1787b9f8e85a4d656d3e1c Mon Sep 17 00:00:00 2001
From: Erno Kuvaja <jokke@usr.fi>
Date: Tue, 1 Oct 2019 16:56:20 +0100
Subject: [PATCH] Set API version 2.9 CURRENT

This change removes experimental status from Api versions
>2.7 setting 2.8 (multi-store support) to SUPPORTED and
2.9 (caching) to CURRENT.

NOTE: 2.8 will show up in list only if the glance-api service
is configured with multi-store. The API versions list can be
used to determine if the multi-store functionality is availabe
in the endpoint.

Change-Id: I37350fc46191074d42edc73c2451eae73261957d
---
 api-ref/source/versions/index.rst                           | 6 ++++++
 .../source/versions/samples/image-versions-response.json    | 6 +++---
 glance/api/versions.py                                      | 6 +++---
 glance/tests/functional/test_api.py                         | 4 ++--
 glance/tests/unit/test_versions.py                          | 4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/api-ref/source/versions/index.rst b/api-ref/source/versions/index.rst
index 7eb8b57dd7..ce76dbb7da 100644
--- a/api-ref/source/versions/index.rst
+++ b/api-ref/source/versions/index.rst
@@ -24,6 +24,12 @@ Image Service Versions
 Version History
 ***************
 
+**Train changes**
+
+- version 2.9 is CURRENT
+- version 2.8 is SUPPORTED
+- version 2.7 is SUPPORTED
+
 **Rocky changes**
 
 - version 2.8 is EXPERIMENTAL
diff --git a/api-ref/source/versions/samples/image-versions-response.json b/api-ref/source/versions/samples/image-versions-response.json
index a04c565ef0..263a49c2db 100644
--- a/api-ref/source/versions/samples/image-versions-response.json
+++ b/api-ref/source/versions/samples/image-versions-response.json
@@ -8,7 +8,7 @@
                     "rel": "self"
                 }
             ],
-            "status": "EXPERIMENTAL"
+            "status": "CURRENT"
         },
         {
             "id": "v2.8",
@@ -18,7 +18,7 @@
                     "rel": "self"
                 }
             ],
-            "status": "EXPERIMENTAL"
+            "status": "SUPPORTED"
         },
         {
             "id": "v2.7",
@@ -28,7 +28,7 @@
                     "rel": "self"
                 }
             ],
-            "status": "CURRENT"
+            "status": "SUPPORTED"
         },
         {
             "id": "v2.6",
diff --git a/glance/api/versions.py b/glance/api/versions.py
index 4c56b0882e..7148c12788 100644
--- a/glance/api/versions.py
+++ b/glance/api/versions.py
@@ -75,11 +75,11 @@ class Controller(object):
         if CONF.enable_v2_api:
             if CONF.enabled_backends:
                 version_objs.extend([
-                    build_version_object(2.8, 'v2', 'EXPERIMENTAL')
+                    build_version_object(2.8, 'v2', 'SUPPORTED')
                 ])
             version_objs.extend([
-                build_version_object(2.9, 'v2', 'EXPERIMENTAL'),
-                build_version_object(2.7, 'v2', 'CURRENT'),
+                build_version_object(2.9, 'v2', 'CURRENT'),
+                build_version_object(2.7, 'v2', 'SUPPORTED'),
                 build_version_object(2.6, 'v2', 'SUPPORTED'),
                 build_version_object(2.5, 'v2', 'SUPPORTED'),
                 build_version_object(2.4, 'v2', 'SUPPORTED'),
diff --git a/glance/tests/functional/test_api.py b/glance/tests/functional/test_api.py
index 387ac3ca93..c60b6e529c 100644
--- a/glance/tests/functional/test_api.py
+++ b/glance/tests/functional/test_api.py
@@ -28,12 +28,12 @@ def _generate_v2_versions(url):
     version_list.extend([
         {
             'id': 'v2.9',
-            'status': 'EXPERIMENTAL',
+            'status': 'CURRENT',
             'links': [{'rel': 'self', 'href': url % '2'}],
         },
         {
             'id': 'v2.7',
-            'status': 'CURRENT',
+            'status': 'SUPPORTED',
             'links': [{'rel': 'self', 'href': url % '2'}],
         },
         {
diff --git a/glance/tests/unit/test_versions.py b/glance/tests/unit/test_versions.py
index 03cc2fa48f..d8cd12b179 100644
--- a/glance/tests/unit/test_versions.py
+++ b/glance/tests/unit/test_versions.py
@@ -31,13 +31,13 @@ class VersionsTest(base.IsolatedUnitTest):
         versions = [
             {
                 'id': 'v2.9',
-                'status': 'EXPERIMENTAL',
+                'status': 'CURRENT',
                 'links': [{'rel': 'self',
                            'href': '%s/v2/' % url}],
             },
             {
                 'id': 'v2.7',
-                'status': 'CURRENT',
+                'status': 'SUPPORTED',
                 'links': [{'rel': 'self',
                            'href': '%s/v2/' % url}],
             },