diff --git a/releasenotes/notes/removal-deprecated-volume-config-options-21c4412f3c600923.yaml b/releasenotes/notes/removal-deprecated-volume-config-options-21c4412f3c600923.yaml new file mode 100644 index 0000000000..32147c7409 --- /dev/null +++ b/releasenotes/notes/removal-deprecated-volume-config-options-21c4412f3c600923.yaml @@ -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 diff --git a/tempest/clients.py b/tempest/clients.py index 4f2846e002..204ce080c2 100644 --- a/tempest/clients.py +++ b/tempest/clients.py @@ -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): diff --git a/tempest/cmd/verify_tempest_config.py b/tempest/cmd/verify_tempest_config.py index aa333b3022..50691adf2e 100644 --- a/tempest/cmd/verify_tempest_config.py +++ b/tempest/cmd/verify_tempest_config.py @@ -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', diff --git a/tempest/config.py b/tempest/config.py index 0f3fa54352..8314e1e455 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -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",