Change tests to adapt alarm spliting
Currently, alarm module has been diceded to be splitted out from
Ceilometer tree, named as aodh. This change make tests adapt to the
spliting.
NOTE: This change temporarily set the aodh service availability config
option as False, it is mainly because the alarming service spliting
change[1] need to be merged now. I will enable aodh in tempest and
make it works by another change.
[1] https://review.openstack.org/#/c/197161/
Closes-Bug: #1509885
Change-Id: I3983128d2d964b0f1f3326948b27f5d94df65a04
diff --git a/tempest/config.py b/tempest/config.py
index 26823de..f9c532f 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -921,6 +921,20 @@
"notification tests")
]
+alarming_group = cfg.OptGroup(name='alarming',
+ title='Alarming Service Options')
+
+AlarmingGroup = [
+ cfg.StrOpt('catalog_type',
+ default='alarming',
+ help="Catalog type of the Alarming service."),
+ cfg.StrOpt('endpoint_type',
+ default='publicURL',
+ choices=['public', 'admin', 'internal',
+ 'publicURL', 'adminURL', 'internalURL'],
+ help="The endpoint type to use for the alarming service."),
+]
+
telemetry_feature_group = cfg.OptGroup(name='telemetry-feature-enabled',
title='Enabled Ceilometer Features')
@@ -1131,6 +1145,9 @@
cfg.BoolOpt('ceilometer',
default=True,
help="Whether or not Ceilometer is expected to be available"),
+ cfg.BoolOpt('aodh',
+ default=False,
+ help="Whether or not Aodh is expected to be available"),
cfg.BoolOpt('horizon',
default=True,
help="Whether or not Horizon is expected to be available"),
@@ -1277,6 +1294,7 @@
(orchestration_group, OrchestrationGroup),
(telemetry_group, TelemetryGroup),
(telemetry_feature_group, TelemetryFeaturesGroup),
+ (alarming_group, AlarmingGroup),
(dashboard_group, DashboardGroup),
(data_processing_group, DataProcessingGroup),
(data_processing_feature_group, DataProcessingFeaturesGroup),