openstack/deb-ceilometer
Code Issues Proposed changes

Merge "Fix Ceilometer tests config options"

Browse Source
This commit is contained in:
Jenkins 2016-06-07 03:56:28 +00:00 committed by Gerrit Code Review
commit c9ba93f21f
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/tests/tempest/api/base.py
View File

@ -49,7 +49,7 @@ class BaseTelemetryTest(tempest.test.BaseTestCase):
@classmethod
def skip_checks(cls):
super(BaseTelemetryTest, cls).skip_checks()
if not CONF.service_available.ceilometer_plugin:
if not CONF.service_available.ceilometer:
raise cls.skipException("Ceilometer support is required")
@classmethod

2
ceilometer/tests/tempest/api/test_telemetry_notification_api.py
View File

@ -78,7 +78,7 @@ class TelemetryNotificationAdminAPITest(base.BaseTelemetryAdminTest):
body = self.create_server()
if CONF.telemetry_plugin.event_enabled:
if CONF.telemetry.event_enabled:
query = ('instance_id', 'eq', body['id'])
self.await_events(query)

4
ceilometer/tests/tempest/config.py
View File

@ -20,12 +20,12 @@ service_available_group = cfg.OptGroup(name="service_available",
title="Available OpenStack Services")
ServiceAvailableGroup = [
cfg.BoolOpt('ceilometer_plugin',
cfg.BoolOpt('ceilometer',
default=True,
help="Whether or not Ceilometer is expected to be available"),
]
telemetry_group = cfg.OptGroup(name='telemetry_plugin',
telemetry_group = cfg.OptGroup(name='telemetry',
title='Telemetry Service Options')
TelemetryGroup = [

2
ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py
View File

@ -64,7 +64,7 @@ class TestObjectStorageTelemetry(test.BaseTestCase):
skip_msg = ("%s skipped as swift is not available" %
cls.__name__)
raise cls.skipException(skip_msg)
if not CONF.service_available.ceilometer_plugin:
if not CONF.service_available.ceilometer:
skip_msg = ("%s skipped as ceilometer is not available" %
cls.__name__)
raise cls.skipException(skip_msg)

4
ceilometer/tests/tempest/service/client.py
View File

@ -135,9 +135,9 @@ class Manager(manager.Manager):
image_params.update(default_params)
telemetry_params = {
'service': CONF.telemetry_plugin.catalog_type,
'service': CONF.telemetry.catalog_type,
'region': CONF.identity.region,
'endpoint_type': CONF.telemetry_plugin.endpoint_type,
'endpoint_type': CONF.telemetry.endpoint_type,
}
telemetry_params.update(default_params)