openstack/heat
Code Issues Proposed changes

Run functional tests when no ceilometer endpoint

Browse Source 
Currently if there is no metering endpoint in the service
catalog then no functional/integration tests can be done.

This change tolerates missing ceilometer endpoint.

Change-Id: I55d45048284c4e78b9a1a94a35ef3cddc7bc3a37
This commit is contained in:
Steve Baker
2015-05-26 13:28:28 +12:00
parent 022a863284
commit d0e5cad7f3
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
heat_integrationtests/common/clients.py
View File

@@ -144,12 +144,16 @@ class ClientManager(object):
dscv = self.conf.disable_ssl_certificate_validation dscv = self.conf.disable_ssl_certificate_validation
keystone = self._get_identity_client() keystone = self._get_identity_client()
try:
endpoint = keystone.service_catalog.url_for( endpoint = keystone.service_catalog.url_for(
attr='region', attr='region',
filter_value=self.conf.region, filter_value=self.conf.region,
service_type='metering', service_type='metering',
endpoint_type='publicURL') endpoint_type='publicURL')
except keystoneclient.exceptions.EndpointNotFound:
return None
else:
args = { args = {
'username': self.conf.username, 'username': self.conf.username,
'password': self.conf.password, 'password': self.conf.password,