openstack
/
openstacksdk
Code Issues Proposed changes

Merge "Clarify error if no version can be found"

This commit is contained in:
Zuul 2019-04-11 10:57:49 +00:00 committed by Gerrit Code Review
parent ae96f31073 d1f880fc78
commit d93911b84b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openstack/service_description.py
View File

@ -177,13 +177,21 @@ class ServiceDescription(object):
**version_kwargs
)
found_version = temp_adapter.get_api_major_version()
if found_version is None and version_kwargs:
raise exceptions.NotSupported(
"The {service_type} service for {cloud}:{region_name}"
" exists but does not have any supported versions.".format(
service_type=self.service_type,
cloud=instance.name,
region_name=instance.config.region_name))
if found_version is None:
if version_kwargs:
raise exceptions.NotSupported(
"The {service_type} service for {cloud}:{region_name}"
" exists but does not have any supported versions.".format(
service_type=self.service_type,
cloud=instance.name,
region_name=instance.config.region_name))
else:
raise exceptions.NotSupported(
"The {service_type} service for {cloud}:{region_name}"
" exists but no version was discoverable.".format(
service_type=self.service_type,
cloud=instance.name,
region_name=instance.config.region_name))
proxy_class = self.supported_versions.get(str(found_version[0]))
if not proxy_class:
# Maybe openstacksdk is being used for the passthrough