diff options
| author | Ekaterina Khripunova <e.khripunova@gmail.com> | 2016-10-17 12:24:25 +0300 |
|---|---|---|
| committer | Ekaterina Khripunova <e.khripunova@gmail.com> | 2016-10-17 15:16:53 +0300 |
| commit | 5328c3168a7ed011fc2c6ac16ba8f8e4f9c5e380 (patch) | |
| tree | 592e1ae84b3890a75e54eb769eeb3dd7ad54d885 | |
| parent | 79d6e3c5ac06228fc07537356ef4e8403e3201d4 (diff) | |
| download | python-ceilometerclient-5328c3168a7ed011fc2c6ac16ba8f8e4f9c5e380.tar.gz | |
Fixes SSLError during cclient.meters.list() by https2.7.0
The problem causes the function _adjust_kwargs(kwargs) which creates
a new dict client_kwargs with new-named keys. It gets 'os_insecure' key
from kwargs and gives it key-name 'insecure'.
But the bug is in using kwargs.get('insecure') <which is None> to
produse value of 'verify'.
Change-Id: If77b2d3c75beddcd1a0a82353b56c84b29184ec7
Closes-Bug: 1634027
Related-Bug: 1394449
| -rw-r--r-- | ceilometerclient/client.py | 4 | ||||
| -rw-r--r-- | ceilometerclient/tests/unit/test_client.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index dfd0160..c00ab1c 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -288,7 +288,7 @@ def _adjust_kwargs(kwargs): if timeout <= 0: timeout = None - insecure = strutils.bool_from_string(kwargs.get('insecure')) + insecure = strutils.bool_from_string(client_kwargs.get('insecure')) verify = kwargs.get('verify') if verify is None: if insecure: @@ -388,7 +388,7 @@ def get_auth_plugin(endpoint, **kwargs): return auth_plugin -LEGACY_OPTS = ('auth_plugin', 'auth_url', 'token', 'insecure', 'cacert', +LEGACY_OPTS = ('auth_plugin', 'auth_url', 'token', 'insecure', 'cacert', 'tenant_id', 'project_id', 'username', 'password', 'project_name', 'tenant_name', 'user_domain_name', 'user_domain_id', diff --git a/ceilometerclient/tests/unit/test_client.py b/ceilometerclient/tests/unit/test_client.py index e8a1eb5..bfbc355 100644 --- a/ceilometerclient/tests/unit/test_client.py +++ b/ceilometerclient/tests/unit/test_client.py @@ -173,7 +173,7 @@ class ClientTest(utils.BaseTestCase): def test_v2_client_insecure(self): env = FAKE_ENV.copy() env.pop('auth_plugin') - env['insecure'] = 'True' + env['os_insecure'] = 'True' client = self.create_client(env) self.assertIn('insecure', client.auth_plugin.opts) self.assertEqual('True', client.auth_plugin.opts['insecure']) |