Merge "Fix improper parameter setup for cacert and client certs"

1 files changed, 25 insertions, 1 deletions

diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py
index a0fbae2..9ee3742 100644
--- a/ceilometerclient/client.py
+++ b/ceilometerclient/client.py
@@ -222,6 +222,28 @@ def Client(version, *args, **kwargs):
     return client_class(*args, **kwargs)
 
 
+def _adjust_params(kwargs):
+    timeout = kwargs.get('timeout')
+    if timeout is not None:
+        timeout = int(timeout)
+        if timeout <= 0:
+            timeout = None
+
+    insecure = strutils.bool_from_string(kwargs.get('insecure'))
+    verify = kwargs.get('verify')
+    if verify is None:
+        if insecure:
+            verify = False
+        else:
+            verify = kwargs.get('cacert') or True
+
+    cert = kwargs.get('cert_file')
+    key = kwargs.get('key_file')
+    if cert and key:
+        cert = cert, key
+    return {'verify': verify, 'cert': cert, 'timeout': timeout}
+
+
 def get_client(version, **kwargs):
     """Get an authenticated client, based on the credentials
         in the keyword args.
@@ -274,6 +296,8 @@ def get_client(version, **kwargs):
     }
 
     cli_kwargs.update(kwargs)
+    cli_kwargs.update(_adjust_params(cli_kwargs))
+
     return Client(version, endpoint, **cli_kwargs)
 
 
@@ -283,7 +307,7 @@ def get_auth_plugin(endpoint, **kwargs):
         service_type=kwargs.get('service_type'),
         token=kwargs.get('token'),
         endpoint_type=kwargs.get('endpoint_type'),
-        cacert=kwargs.get('ca_file'),
+        cacert=kwargs.get('cacert'),
         tenant_id=kwargs.get('project_id') or kwargs.get('tenant_id'),
         endpoint=endpoint,
         username=kwargs.get('username'),