openstack/ceilometer
Code Issues Proposed changes

Merge panko tempest config into ceilometer repo

Browse Source 
* https://review.openstack.org/525072 removes the dummy panko
  tempest plugin from panko repo but panko tempest config is used
  in ceilometer integration tests. It merges the required config
  in order to avoid turbulence in integration tests.


Change-Id: I97a5abed3486f63363782f52e7746e87bd88ed4a
This commit is contained in:
Chandan Kumar 2017-12-04 16:04:15 +05:30
parent 163f2d756c
commit 92f275ffc5
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,14 +16,21 @@
from oslo_config import cfg from oslo_config import cfg
service_option = cfg.BoolOpt('ceilometer', service_option = [cfg.BoolOpt('ceilometer',
default=True, default=True,
help="Whether or not Ceilometer is expected to be" help="Whether or not Ceilometer is expected to"
"available") "be available"),
cfg.BoolOpt('panko',
default=True,
help="Whether or not Panko is expected to be"
"available")]
telemetry_group = cfg.OptGroup(name='telemetry', telemetry_group = cfg.OptGroup(name='telemetry',
title='Telemetry Service Options') title='Telemetry Service Options')
event_group = cfg.OptGroup(name='event',
title='Event Service Options')
TelemetryGroup = [ TelemetryGroup = [
cfg.IntOpt('notification_wait', cfg.IntOpt('notification_wait',
default=120, default=120,
@ -39,3 +46,14 @@ TelemetryGroup = [
"configured Gnocchi archive policy") "configured Gnocchi archive policy")
] ]
event_opts = [
cfg.StrOpt('catalog_type',
default='event',
help="Catalog type of the Event service."),
cfg.StrOpt('endpoint_type',
default='publicURL',
choices=['public', 'admin', 'internal',
'publicURL', 'adminURL', 'internalURL'],
help="The endpoint type to use for the event service."),
]

24
ceilometer/tests/tempest/plugin.py
View File

@ -15,6 +15,7 @@
import os import os
from tempest import config
from tempest.test_discover import plugins from tempest.test_discover import plugins
import ceilometer import ceilometer
@ -31,13 +32,20 @@ class CeilometerTempestPlugin(plugins.TempestPlugin):
return full_test_dir, base_path return full_test_dir, base_path
def register_opts(self, conf): def register_opts(self, conf):
conf.register_group(tempest_config.telemetry_group) config.register_opt_group(
conf.register_opts(tempest_config.TelemetryGroup, group='telemetry') conf, config.service_available_group,
conf.register_opt(tempest_config.service_option, tempest_config.service_option)
group='service_available') config.register_opt_group(
conf, tempest_config.telemetry_group,
tempest_config.TelemetryGroup)
config.register_opt_group(
conf, tempest_config.event_group,
tempest_config.event_opts)
def get_opt_lists(self): def get_opt_lists(self):
return [ return [(tempest_config.telemetry_group.name,
(tempest_config.telemetry_group.name, tempest_config.TelemetryGroup),
tempest_config.TelemetryGroup), (tempest_config.event_group.name,
('service_available', [tempest_config.service_option])] tempest_config.event_opts),
(config.service_available_group.name,
tempest_config.service_option)]