diff --git a/devstack/plugin.sh b/devstack/plugin.sh index a3968530..c127ab17 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 00000000..027ea925 --- /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 797fe9bd..df0dbfcc 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 3b131710..907683d1 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 f49983eb..4b47c68b 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 b00644ce..011c7dcb 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 ef8776d7..78763bbf 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 76e6d751..c8bbcd5c 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 ebe1ddfc..f544ee91 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 b5014cf5..4bdd36fd 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 064d15aa..d3b426c2 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 27649ad4..e4912744 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 629865a5..f89ba18d 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 38462c67..c4888e7e 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 092ee5e8..ffc2aada 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 cb52665c..4edd9681 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 77f48cb0..f7b87b52 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 4b989a7c..99045b1c 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 0fb54ad7..444f3042 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 16070473..5c961cc2 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 bb5bd157..7e56ba77 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 bfdab712..df3ad67c 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',