openstack
/
openstacksdk
Code Issues Proposed changes

Merge "Throw an error on conflicting microversion config"

This commit is contained in:
Zuul 2018-06-14 20:33:50 +00:00 committed by Gerrit Code Review
parent 178d2868a6 b6b270f58e
commit 07d3828860
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openstack/config/cloud_region.py
View File

@ -38,6 +38,18 @@ def _make_key(key, service_type):
return "_".join([service_type, key])
def _get_implied_microversion(version):
if not version:
return
if '.' in version:
# Some services historically had a .0 in their normal api version.
# Neutron springs to mind with version "2.0". If a user has "2.0"
# set in a variable or config file just because history, we don't
# need to send any microversion headers.
if version.split('.')[1] != "0":
return version
def from_session(session, name=None, region_name=None,
force_ipv4=False,
app_name=None, app_version=None, **kwargs):
@ -348,17 +360,22 @@ class CloudRegion(object):
version_request.version = version
default_microversion = self.get_default_microversion(service_type)
if not default_microversion and version and '.' in version:
# Some services historically had a .0 in their normal api version.
# Neutron springs to mind with version "2.0". If a user has "2.0"
# set in a variable or config file just because history, we don't
# need to send any microversion headers.
if version.split('.')[1] != "0":
default_microversion = version
# If we're inferring a microversion, don't pass the whole
# string in as api_version, since that tells keystoneauth
# we're looking for a major api version.
version_request.version = version[0]
implied_microversion = _get_implied_microversion(version)
if (implied_microversion and default_microversion
and implied_microversion != default_microversion):
raise exceptions.ConfigException(
"default_microversion of {default_microversion} was given"
" for {service_type}, but api_version looks like a"
" microversion as well. Please set api_version to just the"
" desired major version, or omit default_microversion".format(
default_microversion=default_microversion,
service_type=service_type))
if implied_microversion:
default_microversion = implied_microversion
# If we're inferring a microversion, don't pass the whole
# string in as api_version, since that tells keystoneauth
# we're looking for a major api version.
version_request.version = version[0]
version_request.default_microversion = default_microversion

10
openstack/tests/unit/test_microversions.py
View File

@ -106,3 +106,13 @@ class TestMicroversions(base.TestCase):
self.assertEqual(server1['name'], r['name'])
self.assert_calls()
def test_conflicting_implied_and_direct(self):
self.cloud.config.config['compute_default_microversion'] = '2.7'
self.cloud.config.config['compute_api_version'] = '2.13'
self.assertRaises(exceptions.ConfigException, self.cloud.get_server)
# We should fail before we even authenticate
self.assertEqual(0, len(self.adapter.request_history))