openstack/python-cinderclient
Code Issues Proposed changes

Fix client retries default value.

Browse Source 
In case of constructing Client with session without specifying `retries`
value, `cinderclient.client.Client.retries` value become to None,
instead of 0. This raises TypeError on python 3 during comparison
`attempts > self.retries` on
`cinderclient.client.SessionClient._cs_request`

Closes-Bug: #1684787
Change-Id: If1ac36acb0d1c92e9779e3e8995606c9b34f2cde
This commit is contained in:
Georgy Dyuldin
2017-04-20 14:03:44 +03:00
parent 51f6668e48
commit 85b56e1d88
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cinderclient/v1/client.py
View File

@@ -52,7 +52,7 @@ class Client(object):
endpoint_type='publicURL', extensions=None, endpoint_type='publicURL', extensions=None,
service_type='volume', service_name=None, service_type='volume', service_name=None,
volume_service_name=None, bypass_url=None, volume_service_name=None, bypass_url=None,
retries=None, http_log_debug=False, retries=0, http_log_debug=False,
cacert=None, auth_system='keystone', auth_plugin=None, cacert=None, auth_system='keystone', auth_plugin=None,
session=None, **kwargs): session=None, **kwargs):
# FIXME(comstud): Rename the api_key argument above when we # FIXME(comstud): Rename the api_key argument above when we

2
cinderclient/v2/client.py
View File

@@ -55,7 +55,7 @@ class Client(object):
proxy_tenant_id=None, proxy_token=None, region_name=None, proxy_tenant_id=None, proxy_token=None, region_name=None,
endpoint_type='publicURL', extensions=None, endpoint_type='publicURL', extensions=None,
service_type='volumev2', service_name=None, service_type='volumev2', service_name=None,
volume_service_name=None, bypass_url=None, retries=None, volume_service_name=None, bypass_url=None, retries=0,
http_log_debug=False, cacert=None, auth_system='keystone', http_log_debug=False, cacert=None, auth_system='keystone',
auth_plugin=None, session=None, api_version=None, auth_plugin=None, session=None, api_version=None,
logger=None, **kwargs): logger=None, **kwargs):

2
cinderclient/v3/client.py
View File

@@ -61,7 +61,7 @@ class Client(object):
proxy_tenant_id=None, proxy_token=None, region_name=None, proxy_tenant_id=None, proxy_token=None, region_name=None,
endpoint_type='publicURL', extensions=None, endpoint_type='publicURL', extensions=None,
service_type='volumev3', service_name=None, service_type='volumev3', service_name=None,
volume_service_name=None, bypass_url=None, retries=None, volume_service_name=None, bypass_url=None, retries=0,
http_log_debug=False, cacert=None, auth_system='keystone', http_log_debug=False, cacert=None, auth_system='keystone',
auth_plugin=None, session=None, api_version=None, auth_plugin=None, session=None, api_version=None,
logger=None, **kwargs): logger=None, **kwargs):