Merge "Reject enabling v1 API"

2025-08-12 00:47:01 +00:00
parent 30cd9699c3 582bf02ab4
commit 36b986a615
23 changed files with 26 additions and 26 deletions
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -81,7 +81,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,1.1
+    iniset $ZAQAR_CONF DEFAULT enable_deprecated_api_versions 1.1
    iniset $ZAQAR_CONF signed_url secret_key notreallysecret

    if is_service_enabled key; then
--- a/zaqar/conf/default.py
+++ b/zaqar/conf/default.py
@@ -35,7 +35,7 @@ unreliable = cfg.BoolOpt(

 enable_deprecated_api_versions = cfg.ListOpt(
    'enable_deprecated_api_versions', default=[],
-    item_type=cfg.types.String(choices=('1', '1.1')),
+    item_type=cfg.types.String(choices=('1.1',)),
    help='List of deprecated API versions to enable.')


--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = invalid
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [zaqar]
 # url = http://0.0.0.0:8888
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 # Log to this file!
 ; log_file = /var/log/zaqar/server.log
@@ -22,7 +22,7 @@ enable_deprecated_api_versions = 1,1.1
 ;syslog_log_facility = LOG_LOCAL0

 unreliable = True
-enable_deprecated_api_versions = 1, 1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 # Transport driver module (e.g., wsgi)
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]

--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]

--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]

--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- a/zaqar/tests/etc/wsgi_mongodb_pooled_disable_virtual_pool.conf
+++ b/zaqar/tests/etc/wsgi_mongodb_pooled_disable_virtual_pool.conf
@@ -2,7 +2,7 @@
 pooling = True
 admin_mode = True
 unreliable = True
-enable_deprecated_api_versions = 1,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- 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,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- a/zaqar/tests/etc/wsgi_swift.conf
+++ b/zaqar/tests/etc/wsgi_swift.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 debug = False
 verbose = False
-enable_deprecated_api_versions = 1,1.1
+enable_deprecated_api_versions = 1.1

 [drivers]
 transport = wsgi
--- a/zaqar/tests/unit/common/test_decorators.py
+++ b/zaqar/tests/unit/common/test_decorators.py
@@ -150,7 +150,7 @@ class TestDecorators(base.TestBase):
        self.config(enable_deprecated_api_versions=[])
        # 1. Test accessing current API version
        VERSION = {
-            'id': '1',
+            'id': '2',
            'status': 'CURRENT',
            'updated': 'Just yesterday'
        }
@@ -163,7 +163,7 @@ class TestDecorators(base.TestBase):

        # 2. Test accessing deprecated API version
        VERSION = {
-            'id': '1',
+            'id': '1.1',
            'status': 'DEPRECATED',
            'updated': 'A long time ago'
        }
@@ -175,7 +175,7 @@ class TestDecorators(base.TestBase):
        public_endpoint_2(None, self.conf)

        # 3. Test enabling deprecated API version
-        self.config(enable_deprecated_api_versions=['1'])
+        self.config(enable_deprecated_api_versions=['1.1'])

        @decorators.api_version_manager(VERSION)
        def public_endpoint_3(driver, conf):