x/cloudpulse
Code Issues Proposed changes

Adding ssl verification if it is present

Browse Source 
Change-Id: Ife22bf324a130816fd9ba0a8b07947648b796160
This commit is contained in:
Anand Shanmugam 2016-02-26 13:28:47 -08:00
parent e787448eea
commit 61b13d06db
2 changed files with 4 additions and 0 deletions
cloudpulse
openstack/api
neutron_api.py
scenario/plugins/endpoint_tests
endpoint.py

1
cloudpulse/openstack/api/neutron_api.py

@ -17,6 +17,7 @@ from neutronclient.v2_0 import client as neutron_client
class NeutronHealth(object): class NeutronHealth(object):
def __init__(self, creds): def __init__(self, creds):
creds['timeout'] = 30 creds['timeout'] = 30
creds['ca_cert'] = creds['cacert']
self.neutronclient = neutron_client.Client(**creds) self.neutronclient = neutron_client.Client(**creds)
def neutron_agent_list(self): def neutron_agent_list(self):

3
cloudpulse/scenario/plugins/endpoint_tests/endpoint.py

@ -49,6 +49,7 @@ CONF.register_opts(TESTS_OPTS, periodic_test_group)
class endpoint_scenario(base.Scenario): class endpoint_scenario(base.Scenario):
def _get_credentials(self): def _get_credentials(self):
importutils.import_module('keystonemiddleware.auth_token') importutils.import_module('keystonemiddleware.auth_token')
creds = {} creds = {}
@ -56,6 +57,7 @@ class endpoint_scenario(base.Scenario):
creds['tenant_name'] = cfg.CONF.keystone_authtoken.project_name creds['tenant_name'] = cfg.CONF.keystone_authtoken.project_name
creds['password'] = cfg.CONF.keystone_authtoken.password creds['password'] = cfg.CONF.keystone_authtoken.password
creds['auth_url'] = cfg.CONF.keystone_authtoken.auth_uri creds['auth_url'] = cfg.CONF.keystone_authtoken.auth_uri
creds['cacert'] = cfg.CONF.keystone_authtoken.cafile
return creds return creds
def _get_nova_v2_credentials(self): def _get_nova_v2_credentials(self):
@ -66,6 +68,7 @@ class endpoint_scenario(base.Scenario):
creds['api_key'] = cfg.CONF.keystone_authtoken.password creds['api_key'] = cfg.CONF.keystone_authtoken.password
creds['auth_url'] = cfg.CONF.keystone_authtoken.auth_uri creds['auth_url'] = cfg.CONF.keystone_authtoken.auth_uri
creds['version'] = 2 creds['version'] = 2
creds['cacert'] = cfg.CONF.keystone_authtoken.cafile
return creds return creds
@base.scenario(admin_only=False, operator=False) @base.scenario(admin_only=False, operator=False)