Merge "Officially deprecate API v1.1"

devstack/plugin.sh

@@ -84,7 +84,7 @@ function configure_zaqar {
     iniset $ZAQAR_CONF DEFAULT debug True
     iniset $ZAQAR_CONF DEFAULT unreliable True
     iniset $ZAQAR_CONF DEFAULT admin_mode True
-    iniset $ZAQAR_CONF DEFAULT enable_deprecated_api_versions 1
+    iniset $ZAQAR_CONF DEFAULT enable_deprecated_api_versions 1,1.1
     iniset $ZAQAR_CONF signed_url secret_key notreallysecret
 
     if is_service_enabled key; then

releasenotes/notes/deprecate-v11-976cccc1b56a28e7.yaml

@@ -0,0 +1,6 @@
+---
+deprecations:
+  - Zaqar API v2 has been released for several cycles and it is integrated
+    as the default API version by most of the OpenStack services. So it is time
+    to deprecated v1.1 in favor of v2. Now in Newton cycle, Zaqar API v1.1 is
+    officially deprecated.

zaqar/tests/etc/drivers_storage_invalid.conf

@@ -2,7 +2,7 @@
 debug = False
 verbose = False
 admin_mode = False
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/drivers_transport_invalid.conf

@@ -1,7 +1,7 @@
 [DEFAULT]
 debug = False
 verbose = False
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = invalid

zaqar/tests/etc/functional-tests.conf

@@ -1,7 +1,7 @@
 [DEFAULT]
 # run_tests = True
 unreliable = True
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [zaqar]
 # url = http://0.0.0.0:8888

zaqar/tests/etc/functional-zaqar.conf

@@ -5,7 +5,7 @@ verbose = True
 # Show debugging output in logs (sets DEBUG log level output)
 debug = True
 
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 # Log to this file!
 ; log_file = /var/log/zaqar/server.log

zaqar/tests/etc/keystone_auth.conf

@@ -3,7 +3,7 @@ auth_strategy = keystone
 
 debug = False
 verbose = False
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/websocket_mongodb.conf

@@ -1,6 +1,6 @@
 [DEFAULT]
 unreliable = True
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 

zaqar/tests/etc/websocket_mongodb_keystone_auth.conf

@@ -1,6 +1,6 @@
 [DEFAULT]
 auth_strategy = keystone
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 

zaqar/tests/etc/websocket_mongodb_subscriptions.conf

@@ -1,6 +1,6 @@
 [DEFAULT]
 unreliable = True
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 

zaqar/tests/etc/wsgi_faulty.conf

@@ -1,7 +1,7 @@
 [DEFAULT]
 debug = False
 verbose = False
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_fifo_mongodb.conf

@@ -2,7 +2,7 @@
 debug = False
 verbose = False
 unreliable = True
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_mongodb.conf

@@ -2,7 +2,7 @@
 debug = False
 verbose = False
 unreliable = True
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_mongodb_default_limits.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_mongodb_pooled.conf

@@ -2,7 +2,7 @@
 pooling = True
 admin_mode = True
 unreliable = True
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_mongodb_validation.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_redis.conf

@@ -1,7 +1,7 @@
 [DEFAULT]
 debug = False
 verbose = False
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_redis_pooled.conf

@@ -1,6 +1,6 @@
 [DEFAULT]
 pooling = True
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_sqlalchemy.conf

@@ -2,7 +2,7 @@
 debug = False
 verbose = False
 admin_mode = False
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/etc/wsgi_sqlalchemy_pooled.conf

@@ -1,7 +1,7 @@
 [DEFAULT]
 pooling = True
 admin_mode = True
-enable_deprecated_api_versions = 1
+enable_deprecated_api_versions = 1,1.1
 
 [drivers]
 transport = wsgi

zaqar/tests/unit/transport/wsgi/test_version.py

@@ -38,8 +38,8 @@ EXPECTED_VERSIONS = [
     },
     {
         'id': '1.1',
-        'status': 'SUPPORTED',
+        'status': 'DEPRECATED',
-        'updated': '2014-9-24T04:06:47Z',
+        'updated': '2016-7-29T02:22:47Z',
         'media-types': [
             {
                 'base': 'application/json',

zaqar/transport/wsgi/v1_1/__init__.py

@@ -31,8 +31,8 @@ LOG = logging.getLogger(__name__)
 
 VERSION = {
     'id': '1.1',
-    'status': 'SUPPORTED',
+    'status': 'DEPRECATED',
-    'updated': '2014-9-24T04:06:47Z',
+    'updated': '2016-7-29T02:22:47Z',
     'media-types': [
         {
             'base': 'application/json',