x/deb-python-tempest-lib
Code Issues Proposed changes

Allow passing --insecure to python client binaries

Browse Source 
This is needed when running tests against a deployment with insecure
SSL.

Change-Id: I837fd3107484aa50383f581553651a02e2e413aa
This commit is contained in:
Vincent Untz
2015-11-17 09:27:14 +01:00
parent 588e675e8b
commit 2fef45e301
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tempest_lib/cli/base.py
View File

@@ -86,10 +86,12 @@ class CLIClient(object):
:param cli_dir: The path where the python client binaries are installed. :param cli_dir: The path where the python client binaries are installed.
defaults to /usr/bin defaults to /usr/bin
:type cli_dir: string :type cli_dir: string
:param insecure: if True, --insecure is passed to python client binaries.
:type insecure: boolean
""" """
def __init__(self, username='', password='', tenant_name='', uri='', def __init__(self, username='', password='', tenant_name='', uri='',
cli_dir='', *args, **kwargs): cli_dir='', insecure=False, *args, **kwargs):
"""Initialize a new CLIClient object.""" """Initialize a new CLIClient object."""
super(CLIClient, self).__init__() super(CLIClient, self).__init__()
self.cli_dir = cli_dir if cli_dir else '/usr/bin' self.cli_dir = cli_dir if cli_dir else '/usr/bin'
@@ -97,6 +99,7 @@ class CLIClient(object):
self.tenant_name = tenant_name self.tenant_name = tenant_name
self.password = password self.password = password
self.uri = uri self.uri = uri
self.insecure = insecure
def nova(self, action, flags='', params='', fail_ok=False, def nova(self, action, flags='', params='', fail_ok=False,
endpoint_type='publicURL', merge_stderr=False): endpoint_type='publicURL', merge_stderr=False):
@@ -357,6 +360,9 @@ class CLIClient(object):
self.tenant_name, self.tenant_name,
self.password, self.password,
self.uri)) self.uri))
if self.insecure:
flags = creds + ' --insecure ' + flags
else:
flags = creds + ' ' + flags flags = creds + ' ' + flags
return execute(cmd, action, flags, params, fail_ok, merge_stderr, return execute(cmd, action, flags, params, fail_ok, merge_stderr,
self.cli_dir) self.cli_dir)