openstack/osc-lib
Code Issues Proposed changes

Fix default handling for verify option in ClientManager

Browse Source 
The default for self.verify should be self._cli_options.verify,
this was missing.  This also simplified setting the default for
self.cacert.

Closes-bug: #1616891
Change-Id: I53f0e18fe8fdd07c58c1b687146522ffba9e0044
This commit is contained in:
Dean Troyer 2016-08-25 09:35:34 -05:00
parent 79240acbf4
commit 9bf62fde0c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc_lib/clientmanager.py
View File

@ -93,6 +93,8 @@ class ClientManager(object):
# NOTE(dtroyer): Per bug https://bugs.launchpad.net/bugs/1447784
# --insecure overrides any --os-cacert setting
# Set a hard default
self.verify = True
if self._cli_options.insecure:
# Handle --insecure
self.verify = False
@ -105,7 +107,8 @@ class ClientManager(object):
self.cacert = self._cli_options.cacert
else:
# Fall through also gets --verify
self.verify = True
if self._cli_options.verify is not None:
self.verify = self._cli_options.verify
self.cacert = None
# Set up client certificate and key

12
osc_lib/tests/test_clientmanager.py
View File

@ -122,6 +122,18 @@ class TestClientManager(utils.TestClientManager):
self.assertEqual('cafile', client_manager.cacert)
self.assertTrue(client_manager.is_service_available('network'))
def test_client_manager_password_verify_false(self):
config_args = {
'verify': False,
}
client_manager = self._make_clientmanager(
config_args=config_args,
)
self.assertFalse(client_manager.verify)
self.assertEqual(None, client_manager.cacert)
self.assertTrue(client_manager.is_service_available('network'))
def test_client_manager_password_verify_insecure(self):
config_args = {
'insecure': True,