From b745146df42acab86fc027fd01088ab95ee309e5 Mon Sep 17 00:00:00 2001 From: Fei Long Wang Date: Wed, 7 Sep 2016 13:17:33 +1200 Subject: [PATCH] Officially deprecate API v1.1 Zaqar API v2 has been released for several cycles and it's integrated as the default API version by most of the openstack services. So it is time to deprecated v1.1 in favor of v2. DocImpact UpgradeImpact Implements blueprint: deprecate-v1.1 Change-Id: I40c51df5a89e0a883ad14cf7e02b96ca78147294 --- devstack/plugin.sh | 2 +- releasenotes/notes/deprecate-v11-976cccc1b56a28e7.yaml | 6 ++++++ zaqar/tests/etc/drivers_storage_invalid.conf | 2 +- zaqar/tests/etc/drivers_transport_invalid.conf | 2 +- zaqar/tests/etc/functional-tests.conf | 2 +- zaqar/tests/etc/functional-zaqar.conf | 2 +- zaqar/tests/etc/keystone_auth.conf | 2 +- zaqar/tests/etc/websocket_mongodb.conf | 2 +- zaqar/tests/etc/websocket_mongodb_keystone_auth.conf | 2 +- zaqar/tests/etc/websocket_mongodb_subscriptions.conf | 2 +- zaqar/tests/etc/wsgi_faulty.conf | 2 +- zaqar/tests/etc/wsgi_fifo_mongodb.conf | 2 +- zaqar/tests/etc/wsgi_mongodb.conf | 2 +- zaqar/tests/etc/wsgi_mongodb_default_limits.conf | 2 +- zaqar/tests/etc/wsgi_mongodb_pooled.conf | 2 +- zaqar/tests/etc/wsgi_mongodb_validation.conf | 2 +- zaqar/tests/etc/wsgi_redis.conf | 2 +- zaqar/tests/etc/wsgi_redis_pooled.conf | 2 +- zaqar/tests/etc/wsgi_sqlalchemy.conf | 2 +- zaqar/tests/etc/wsgi_sqlalchemy_pooled.conf | 2 +- zaqar/tests/unit/transport/wsgi/test_version.py | 4 ++-- zaqar/transport/wsgi/v1_1/__init__.py | 4 ++-- 22 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 releasenotes/notes/deprecate-v11-976cccc1b56a28e7.yaml diff --git a/devstack/plugin.sh b/devstack/plugin.sh index a39685301..c127ab170 100755 --- a/devstack/plugin.sh +++ b/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 diff --git a/releasenotes/notes/deprecate-v11-976cccc1b56a28e7.yaml b/releasenotes/notes/deprecate-v11-976cccc1b56a28e7.yaml new file mode 100644 index 000000000..027ea925e --- /dev/null +++ b/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. \ No newline at end of file diff --git a/zaqar/tests/etc/drivers_storage_invalid.conf b/zaqar/tests/etc/drivers_storage_invalid.conf index 797fe9bdb..df0dbfcc6 100644 --- a/zaqar/tests/etc/drivers_storage_invalid.conf +++ b/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 diff --git a/zaqar/tests/etc/drivers_transport_invalid.conf b/zaqar/tests/etc/drivers_transport_invalid.conf index 3b1317107..907683d1b 100644 --- a/zaqar/tests/etc/drivers_transport_invalid.conf +++ b/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 diff --git a/zaqar/tests/etc/functional-tests.conf b/zaqar/tests/etc/functional-tests.conf index f49983ebc..4b47c68b5 100644 --- a/zaqar/tests/etc/functional-tests.conf +++ b/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 diff --git a/zaqar/tests/etc/functional-zaqar.conf b/zaqar/tests/etc/functional-zaqar.conf index b00644ce3..011c7dcb6 100644 --- a/zaqar/tests/etc/functional-zaqar.conf +++ b/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 diff --git a/zaqar/tests/etc/keystone_auth.conf b/zaqar/tests/etc/keystone_auth.conf index ef8776d77..78763bbfa 100644 --- a/zaqar/tests/etc/keystone_auth.conf +++ b/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 diff --git a/zaqar/tests/etc/websocket_mongodb.conf b/zaqar/tests/etc/websocket_mongodb.conf index 76e6d7515..c8bbcd5c3 100644 --- a/zaqar/tests/etc/websocket_mongodb.conf +++ b/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] diff --git a/zaqar/tests/etc/websocket_mongodb_keystone_auth.conf b/zaqar/tests/etc/websocket_mongodb_keystone_auth.conf index ebe1ddfc4..f544ee916 100644 --- a/zaqar/tests/etc/websocket_mongodb_keystone_auth.conf +++ b/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] diff --git a/zaqar/tests/etc/websocket_mongodb_subscriptions.conf b/zaqar/tests/etc/websocket_mongodb_subscriptions.conf index b5014cf50..4bdd36fd8 100644 --- a/zaqar/tests/etc/websocket_mongodb_subscriptions.conf +++ b/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] diff --git a/zaqar/tests/etc/wsgi_faulty.conf b/zaqar/tests/etc/wsgi_faulty.conf index 064d15aa0..d3b426c23 100644 --- a/zaqar/tests/etc/wsgi_faulty.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_fifo_mongodb.conf b/zaqar/tests/etc/wsgi_fifo_mongodb.conf index 27649ad45..e49127448 100644 --- a/zaqar/tests/etc/wsgi_fifo_mongodb.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_mongodb.conf b/zaqar/tests/etc/wsgi_mongodb.conf index 629865a55..f89ba18d7 100644 --- a/zaqar/tests/etc/wsgi_mongodb.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_mongodb_default_limits.conf b/zaqar/tests/etc/wsgi_mongodb_default_limits.conf index 38462c674..c4888e7ea 100644 --- a/zaqar/tests/etc/wsgi_mongodb_default_limits.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_mongodb_pooled.conf b/zaqar/tests/etc/wsgi_mongodb_pooled.conf index 092ee5e89..ffc2aadaf 100644 --- a/zaqar/tests/etc/wsgi_mongodb_pooled.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_mongodb_validation.conf b/zaqar/tests/etc/wsgi_mongodb_validation.conf index cb52665c2..4edd9681e 100644 --- a/zaqar/tests/etc/wsgi_mongodb_validation.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_redis.conf b/zaqar/tests/etc/wsgi_redis.conf index 77f48cb04..f7b87b523 100644 --- a/zaqar/tests/etc/wsgi_redis.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_redis_pooled.conf b/zaqar/tests/etc/wsgi_redis_pooled.conf index 4b989a7c1..99045b1c6 100644 --- a/zaqar/tests/etc/wsgi_redis_pooled.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_sqlalchemy.conf b/zaqar/tests/etc/wsgi_sqlalchemy.conf index 0fb54ad70..444f30422 100644 --- a/zaqar/tests/etc/wsgi_sqlalchemy.conf +++ b/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 diff --git a/zaqar/tests/etc/wsgi_sqlalchemy_pooled.conf b/zaqar/tests/etc/wsgi_sqlalchemy_pooled.conf index 160704736..5c961cc2f 100644 --- a/zaqar/tests/etc/wsgi_sqlalchemy_pooled.conf +++ b/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 diff --git a/zaqar/tests/unit/transport/wsgi/test_version.py b/zaqar/tests/unit/transport/wsgi/test_version.py index bb5bd157c..7e56ba778 100644 --- a/zaqar/tests/unit/transport/wsgi/test_version.py +++ b/zaqar/tests/unit/transport/wsgi/test_version.py @@ -38,8 +38,8 @@ EXPECTED_VERSIONS = [ }, { 'id': '1.1', - 'status': 'SUPPORTED', - 'updated': '2014-9-24T04:06:47Z', + 'status': 'DEPRECATED', + 'updated': '2016-7-29T02:22:47Z', 'media-types': [ { 'base': 'application/json', diff --git a/zaqar/transport/wsgi/v1_1/__init__.py b/zaqar/transport/wsgi/v1_1/__init__.py index bfdab7122..df3ad67c5 100644 --- a/zaqar/transport/wsgi/v1_1/__init__.py +++ b/zaqar/transport/wsgi/v1_1/__init__.py @@ -31,8 +31,8 @@ LOG = logging.getLogger(__name__) VERSION = { 'id': '1.1', - 'status': 'SUPPORTED', - 'updated': '2014-9-24T04:06:47Z', + 'status': 'DEPRECATED', + 'updated': '2016-7-29T02:22:47Z', 'media-types': [ { 'base': 'application/json',