e05b261af7
In this patch: - adjusted VersionsController to return only v3 - removed cinder.api.v2.router - adjustments to cinder.tests.unit.api.contrib to use /v3 only - moved cinder.api.v2.snapshot_metadata (and tests) to cinder.api.v3 - moved cinder.api.v2.types (and view, tests) to cinder.api.v3 - updated versions response in api-ref - removed unnecessary config option - updated various sample config files - removed experimental tempest-cinder-v2-api job - updated some docs - updated non-voting rally job config Some cinder.api.v2 modules are left because the v3 classes depend on them, but with the v2 router removed, these are unreachable via the /v2 path. Depends-on: https://review.opendev.org/c/openstack/rally-openstack/+/794891 (changes rally to use Block Storage API v3) Depends-on: https://review.opendev.org/c/openstack/requirements/+/794894 (corrects regression in upper-constraint on Sphinx) Change-Id: I2093d77db9beec7543c7524d2cd273e79dd5fd5d
45 lines
1.7 KiB
Python
45 lines
1.7 KiB
Python
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
|
|
from oslo_config import cfg
|
|
from oslo_log import log as logging
|
|
import paste.urlmap
|
|
|
|
|
|
CONF = cfg.CONF
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def root_app_factory(loader, global_conf, **local_conf):
|
|
# To support upgrades from previous api-paste config files, we need
|
|
# to check for and remove any legacy references to the v1 API
|
|
if '/v1' in local_conf:
|
|
LOG.warning('The v1 API has been removed and is no longer '
|
|
'available. Client applications should be '
|
|
'using v3. Ensure enable_v3_api=true in your '
|
|
'cinder.conf file.')
|
|
del local_conf['/v1']
|
|
|
|
if '/v2' in local_conf:
|
|
LOG.warning('The v2 API has been removed and is no longer available. '
|
|
'Client applications must now use the v3 API only. '
|
|
'The \'enable_v2_api\' option has been removed and is '
|
|
'ignored in the cinder.conf file.')
|
|
del local_conf['/v2']
|
|
|
|
return paste.urlmap.urlmap_factory(loader, global_conf, **local_conf)
|