openstack/python-zaqarclient
Code Issues Proposed changes

Fix wrong api version type

Browse Source 
The api version from openstack client is a string, not a number.
So we need to convert it to the right type before comparing it
with a version number.

Closes-Bug: 1534378

Change-Id: I55f149b90028f89bb7ff0878a7450df981524026
This commit is contained in:
Fei Long Wang 2016-01-23 23:47:50 +13:00
parent 2966750d9a
commit 0e2f625dd7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zaqarclient/queues/cli.py
View File

@ -32,6 +32,11 @@ API_VERSIONS = {
def make_client(instance): def make_client(instance):
"""Returns an queues service client.""" """Returns an queues service client."""
version = instance._api_version[API_NAME] version = instance._api_version[API_NAME]
try:
version = int(version)
except ValueError:
version = float(version)
queues_client = utils.get_client_class( queues_client = utils.get_client_class(
API_NAME, API_NAME,
version, version,

4
zaqarclient/queues/v1/queues.py
View File

@ -71,7 +71,7 @@ class Queue(object):
right after it was called. right after it was called.
""" """
req, trans = self.client._request_and_transport() req, trans = self.client._request_and_transport()
if force_create or float(self.client.api_version) < 1.1: if force_create or self.client.api_version < 1.1:
core.queue_create(trans, req, self._name) core.queue_create(trans, req, self._name)
def metadata(self, new_meta=None, force_reload=False): def metadata(self, new_meta=None, force_reload=False):
@ -95,7 +95,7 @@ class Queue(object):
# NOTE(jeffrey4l): Ensure that metadata is cleared when the new_meta # NOTE(jeffrey4l): Ensure that metadata is cleared when the new_meta
# is a empty dict. # is a empty dict.
if new_meta is not None: if new_meta is not None:
if float(self.client.api_version) < 1.1: if self.client.api_version < 1.1:
core.queue_set_metadata(trans, req, self._name, new_meta) core.queue_set_metadata(trans, req, self._name, new_meta)
else: else:
core.queue_create(trans, req, self._name, metadata=new_meta) core.queue_create(trans, req, self._name, metadata=new_meta)