Fix running functional tests against deployment with insecure SSL

Change-Id: I106d571e7ddeaeaa1de1ffeff3e88e1eb6898032
This commit is contained in:
Vincent Untz 2015-11-17 08:58:41 +01:00
parent 0927de6c8e
commit e378d32353
2 changed files with 12 additions and 2 deletions

View File

@ -47,4 +47,9 @@ Functional Test Guidelines
OS_TENANT_NAME
OS_AUTH_URL
* Usage of insecure SSL can be configured via the standard client environment
variable::
OS_INSECURE
* Try not to require an additional configuration file

View File

@ -147,6 +147,10 @@ class ClientTestBase(testtools.TestCase):
passwd = auth_info['password']
tenant = auth_info['project_name']
auth_url = auth_info['auth_url']
if 'insecure' in cloud_config.config:
insecure = cloud_config.config['insecure']
else:
insecure = False
if self.COMPUTE_API_VERSION == "2.latest":
version = novaclient.API_MAX_VERSION.get_string()
@ -154,7 +158,7 @@ class ClientTestBase(testtools.TestCase):
version = self.COMPUTE_API_VERSION or "2"
self.client = novaclient.client.Client(
version, user, passwd, tenant,
auth_url=auth_url)
auth_url=auth_url, insecure=insecure)
# pick some reasonable flavor / image combo
self.flavor = pick_flavor(self.client.flavors.list())
@ -174,7 +178,8 @@ class ClientTestBase(testtools.TestCase):
password=passwd,
tenant_name=tenant,
uri=auth_url,
cli_dir=cli_dir)
cli_dir=cli_dir,
insecure=insecure)
def nova(self, action, flags='', params='', fail_ok=False,
endpoint_type='publicURL', merge_stderr=False):