openstack/python-watcherclient
Code Issues Proposed changes

Prepare watcherclient for microversioning

Browse Source 
Implements: blueprint bp/api-microversioning

Change-Id: I049f9aac84a5658efaccc9e9fdf6c9d4be677d29
This commit is contained in:
Alexander Chadin 2018-10-12 17:36:17 +03:00
parent 825e5cb081
commit 2e9de6868b
2 changed files with 5 additions and 14 deletions
.gitignore
watcherclient/common
httpclient.py

3
.gitignore vendored

@ -59,3 +59,6 @@ sftp-config.json
# Desktop Service Store # Desktop Service Store
*.DS_Store *.DS_Store
# Atom
.remote-sync.json

14
watcherclient/common/httpclient.py

@ -42,7 +42,7 @@ from watcherclient import exceptions
# microversion support in the client properly! See # microversion support in the client properly! See
# http://specs.openstack.org/openstack/watcher-specs/specs/kilo/api-microversions.html # noqa # http://specs.openstack.org/openstack/watcher-specs/specs/kilo/api-microversions.html # noqa
# for full details. # for full details.
DEFAULT_VER = '1.0' DEFAULT_VER = 'latest'
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -104,18 +104,6 @@ class VersionNegotiationMixin(object):
{'valid': ', '.join(API_VERSION_SELECTED_STATES), {'valid': ', '.join(API_VERSION_SELECTED_STATES),
'value': self.api_version_select_state}) 'value': self.api_version_select_state})
min_ver, max_ver = self._parse_version_headers(resp) min_ver, max_ver = self._parse_version_headers(resp)
# NOTE: servers before commit 32fb6e99 did not return version headers
# on error, so we need to perform a GET to determine
# the supported version range
if not max_ver:
LOG.debug('No version header in response, requesting from server')
if self.os_watcher_api_version:
base_version = ("/v%s" %
str(self.os_watcher_api_version).split('.')[0])
else:
base_version = API_VERSION
resp = self._make_simple_request(conn, 'GET', base_version)
min_ver, max_ver = self._parse_version_headers(resp)
# If the user requested an explicit version or we have negotiated a # If the user requested an explicit version or we have negotiated a
# version and still failing then error now. The server could # version and still failing then error now. The server could
# support the version requested but the requested operation may not # support the version requested but the requested operation may not