openstack
/
zaqar-tempest-plugin
Code Issues Proposed changes

Start accepting **kwargs in service clients 

rest_client started taking new param 'http_timeout' for
timeout value but zaqar service clients pass defined set of
kwrags instead of allow all **kwargs.

Below patch added 'http_timeout' in 'default_params' returned from
tempest->config.py and zaqar service clients broke as they do not accept
any new kwargs.
- Ic035fdb93734c926b26b33feb610e0977e48c646

This patch makes zaqar service clients to accept and pass **kwargs
to rest_client.

This fix the current gate failure.

Change-Id: I37a0106a08bcf7b30437323fbe4a427d852831ef
This commit is contained in:
ghanshyam 2016-08-02 14:50:11 +09:00 committed by Ghanshyam Mann
parent db4a9e3cf2
commit 31ad2a72df
1 changed files with 8 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
zaqar/tests/tempest_plugin/services/messaging/json/messaging_client.py
View File

@ -29,19 +29,9 @@ from zaqar.tests.tempest_plugin.api_schema.response.v2 \
class MessagingClient(rest_client.RestClient):
def __init__(self, auth_provider, service, region,
endpoint_type='publicURL', build_interval=1, build_timeout=60,
disable_ssl_certificate_validation=False, ca_certs=None,
trace_requests=''):
dscv = disable_ssl_certificate_validation
def __init__(self, auth_provider, service, region, **kwargs):
super(MessagingClient, self).__init__(
auth_provider, service, region,
endpoint_type=endpoint_type,
build_interval=build_interval,
build_timeout=build_timeout,
disable_ssl_certificate_validation=dscv,
ca_certs=ca_certs,
trace_requests=trace_requests)
auth_provider, service, region, **kwargs)
self.version = '1'
self.uri_prefix = 'v{0}'.format(self.version)
@ -51,19 +41,9 @@ class MessagingClient(rest_client.RestClient):
class V1MessagingClient(MessagingClient):
def __init__(self, auth_provider, service, region,
endpoint_type='publicURL', build_interval=1, build_timeout=60,
disable_ssl_certificate_validation=False, ca_certs=None,
trace_requests=''):
dscv = disable_ssl_certificate_validation
def __init__(self, auth_provider, service, region, **kwargs):
super(V1MessagingClient, self).__init__(
auth_provider, service, region,
endpoint_type=endpoint_type,
build_interval=build_interval,
build_timeout=build_timeout,
disable_ssl_certificate_validation=dscv,
ca_certs=ca_certs,
trace_requests=trace_requests)
auth_provider, service, region, **kwargs)
self.version = '1'
@ -200,19 +180,9 @@ class V1MessagingClient(MessagingClient):
class V11MessagingClient(MessagingClient):
def __init__(self, auth_provider, service, region,
endpoint_type='publicURL', build_interval=1, build_timeout=60,
disable_ssl_certificate_validation=False, ca_certs=None,
trace_requests=''):
dscv = disable_ssl_certificate_validation
def __init__(self, auth_provider, service, region, **kwargs):
super(V11MessagingClient, self).__init__(
auth_provider, service, region,
endpoint_type=endpoint_type,
build_interval=build_interval,
build_timeout=build_timeout,
disable_ssl_certificate_validation=dscv,
ca_certs=ca_certs,
trace_requests=trace_requests)
auth_provider, service, region, **kwargs)
self.version = '1.1'
self.uri_prefix = 'v{0}'.format(self.version)
@ -349,19 +319,9 @@ class V11MessagingClient(MessagingClient):
class V2MessagingClient(MessagingClient):
def __init__(self, auth_provider, service, region,
endpoint_type='publicURL', build_interval=1, build_timeout=60,
disable_ssl_certificate_validation=False, ca_certs=None,
trace_requests=''):
dscv = disable_ssl_certificate_validation
def __init__(self, auth_provider, service, region, **kwargs):
super(V2MessagingClient, self).__init__(
auth_provider, service, region,
endpoint_type=endpoint_type,
build_interval=build_interval,
build_timeout=build_timeout,
disable_ssl_certificate_validation=dscv,
ca_certs=ca_certs,
trace_requests=trace_requests)
auth_provider, service, region, **kwargs)
self.version = '2'
self.uri_prefix = 'v{0}'.format(self.version)