Remove deprecated option volume_feature_enabled.api_v1

volume_feature_enabled.api_v1 config option to enable the
Cinder v1 API was deprecated in Juno
- https://review.openstack.org/#/c/446238/

Cinder v1 API tests were also got removed from Tempest in Juno
- https://review.openstack.org/#/c/446233/

This commit remove the deprecated api_v1 config option and also
remove the cinder service clients alias from clients.py

Note: clients.py cinder v1 service clients alias are being used by
many plugins (depends-on patches). These are being used mainly in
scenario manger copy of plugins.

Depends-On: https://review.openstack.org/#/c/573168/
Depends-On: https://review.openstack.org/#/c/573167/
Depends-On: https://review.openstack.org/#/c/573164/
Depends-On: https://review.openstack.org/#/c/573174/
Depends-On: https://review.openstack.org/#/c/573169/
Depends-On: https://review.openstack.org/#/c/573163/
Depends-On: https://review.openstack.org/#/c/573171/
Depends-On: https://review.openstack.org/#/c/573175/
Depends-On: https://review.openstack.org/#/c/573172/
Next we will deprecated the cinder v1 service clients present in
db876f990d/tempest/lib/services/volume/v1

Only networking-fortinet left to merge the changes which seems inactive
now a days- https://review.openstack.org/#/c/573170/

As reminder sent in ML, we are good to merge this patch
- http://lists.openstack.org/pipermail/openstack-dev/2018-August/133189.html

Change-Id: Ief961758ee413d69d89d45a1b36f1d126c6101cf
This commit is contained in:
Ghanshyam 2018-06-07 08:41:58 +00:00 committed by Ghanshyam Mann
parent 22fe5f091d
commit ff2c986da2
4 changed files with 24 additions and 27 deletions

View File

@ -0,0 +1,24 @@
---
upgrade:
- |
Below config option was deprecated for removal since juno release.
It's time to remove it as all supported stable branches and Tempest plugins
are good to handle it.
* ``[volume_feature_enabled].api_v1``
Also Tempest removes the below corresponding service clients alias from
client.py which were being set based on above removed config option.
* self.backups_client
* self.encryption_types_client
* self.snapshots_client
* self.volume_availability_zone_client
* self.volume_hosts_client
* self.volume_limits_client
* self.volume_qos_client
* self.volume_quotas_client
* self.volume_services_client
* self.volume_types_client
* self.volumes_client
* self.volumes_extension_client

View File

@ -222,22 +222,6 @@ class Manager(clients.ServiceClients):
def _set_volume_clients(self):
if CONF.volume_feature_enabled.api_v1:
self.backups_client = self.volume_v1.BackupsClient()
self.encryption_types_client = \
self.volume_v1.EncryptionTypesClient()
self.snapshots_client = self.volume_v1.SnapshotsClient()
self.volume_availability_zone_client = \
self.volume_v1.AvailabilityZoneClient()
self.volume_hosts_client = self.volume_v1.HostsClient()
self.volume_limits_client = self.volume_v1.LimitsClient()
self.volume_qos_client = self.volume_v1.QosSpecsClient()
self.volume_quotas_client = self.volume_v1.QuotasClient()
self.volume_services_client = self.volume_v1.ServicesClient()
self.volume_types_client = self.volume_v1.TypesClient()
self.volumes_client = self.volume_v1.VolumesClient()
self.volumes_extension_client = self.volume_v1.ExtensionsClient()
# if only api_v3 is enabled, all these clients should be available
if (CONF.volume_feature_enabled.api_v2 or
CONF.volume_feature_enabled.api_v3):

View File

@ -205,10 +205,6 @@ def verify_keystone_api_versions(os, update):
def verify_cinder_api_versions(os, update):
# Check cinder api versions
versions = _get_api_versions(os, 'cinder')
if (CONF.volume_feature_enabled.api_v1 !=
contains_version('v1.', versions)):
print_and_or_update('api_v1', 'volume-feature-enabled',
not CONF.volume_feature_enabled.api_v1, update)
if (CONF.volume_feature_enabled.api_v2 !=
contains_version('v2.', versions)):
print_and_or_update('api_v2', 'volume-feature-enabled',

View File

@ -836,13 +836,6 @@ VolumeFeaturesGroup = [
help='A list of enabled volume extensions with a special '
'entry all which indicates every extension is enabled. '
'Empty list indicates all extensions are disabled'),
cfg.BoolOpt('api_v1',
default=False,
help="Is the v1 volume API enabled",
deprecated_for_removal=True,
deprecated_reason="The v1 volume API has been deprecated "
"since Juno release, and the API will be "
"removed."),
cfg.BoolOpt('api_v2',
default=True,
help="Is the v2 volume API enabled"),