From 56e24ab2e6ee4612f0e3c7709b432a2b4ba11719 Mon Sep 17 00:00:00 2001 From: Alexandr Kostrikov Date: Thu, 20 Oct 2016 17:10:31 +0300 Subject: [PATCH] Temporary disable ceilometer check The service is under uwsgi so it can not be checked with ps ax Change-Id: Ib17a7f58f140832839227e67c2ca1540162864b9 Closes-bug: 1590479 --- fuelweb_test/tests/test_services.py | 69 ++++++++++++++++++----------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/fuelweb_test/tests/test_services.py b/fuelweb_test/tests/test_services.py index 89547ca36..1e9bf7afa 100644 --- a/fuelweb_test/tests/test_services.py +++ b/fuelweb_test/tests/test_services.py @@ -27,6 +27,14 @@ from fuelweb_test import logger from fuelweb_test.tests.base_test_case import SetupEnvironment from fuelweb_test.tests.base_test_case import TestBasic +SERVICES_TO_CHECK = ['ceilometer-agent-notification', + 'ceilometer-collector', + # 'ceilometer-polling', + 'aodh-listener', + 'aodh-notifier', + # 'aodh-evaluator' + ] + @test(groups=["services", "services.sahara", "services_ha_one_controller"]) class SaharaHAOneController(TestBasic): @@ -535,9 +543,10 @@ class CeilometerHAOneControllerMongo(OSTFCeilometerHelper): self.fuel_web.deploy_cluster_wait(cluster_id) _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] - checkers.verify_service(_ip, - service_name='ceilometer-api', - ignore_count_of_proccesses=True) + for service_name in SERVICES_TO_CHECK: + checkers.verify_service(_ip, + service_name=service_name, + ignore_count_of_proccesses=True) _ip = self.fuel_web.get_nailgun_node_by_name("slave-03")['ip'] partitions = utils.get_mongo_partitions(_ip, "vda5") @@ -589,10 +598,11 @@ class CeilometerHAOneControllerMongo(OSTFCeilometerHelper): ) self.fuel_web.deploy_cluster_wait(cluster_id) - _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] - checkers.verify_service(_ip, - service_name='ceilometer-api', - ignore_count_of_proccesses=True) + for service_name in SERVICES_TO_CHECK: + _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] + checkers.verify_service(_ip, + service_name=service_name, + ignore_count_of_proccesses=True) self.run_tests(cluster_id) self.env.make_snapshot("deploy_ceilometer_ha_one_controller_multirole") @@ -646,10 +656,11 @@ class CeilometerHAMongo(OSTFCeilometerHelper): ) self.fuel_web.deploy_cluster_wait(cluster_id) - _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] - checkers.verify_service(_ip, - service_name='ceilometer-api', - ignore_count_of_proccesses=True) + for service_name in SERVICES_TO_CHECK: + _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] + checkers.verify_service(_ip, + service_name=service_name, + ignore_count_of_proccesses=True) self.run_tests(cluster_id, skip_tests=['test_check_volume_events']) @@ -697,10 +708,11 @@ class CeilometerHAMongo(OSTFCeilometerHelper): ) self.fuel_web.deploy_cluster_wait(cluster_id) - _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] - checkers.verify_service(_ip, - service_name='ceilometer-api', - ignore_count_of_proccesses=True) + for service_name in SERVICES_TO_CHECK: + _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] + checkers.verify_service(_ip, + service_name=service_name, + ignore_count_of_proccesses=True) self.run_tests(cluster_id) self.env.make_snapshot("deploy_ceilometer_ha_multirole", is_make=True) @@ -791,10 +803,11 @@ class CeilometerHAMongo(OSTFCeilometerHelper): ) self.fuel_web.deploy_cluster_wait(cluster_id) - _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] - checkers.verify_service(_ip, - service_name='ceilometer-api', - ignore_count_of_proccesses=True) + for service_name in SERVICES_TO_CHECK: + _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] + checkers.verify_service(_ip, + service_name=service_name, + ignore_count_of_proccesses=True) self.run_tests(cluster_id) self.env.make_snapshot("deploy_ceilometer_ha_with_external_mongo") @@ -857,10 +870,11 @@ class HeatHAOneController(TestBasic): _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] checkers.verify_service(_ip, service_name='heat-api', count=5) - _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] - checkers.verify_service(_ip, - service_name='ceilometer-api', - ignore_count_of_proccesses=True) + for service_name in SERVICES_TO_CHECK: + _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] + checkers.verify_service(_ip, + service_name=service_name, + ignore_count_of_proccesses=True) logger.debug('Run Heat OSTF platform tests') @@ -946,10 +960,11 @@ class HeatHA(TestBasic): for slave in ["slave-01", "slave-02", "slave-03"]: _ip = self.fuel_web.get_nailgun_node_by_name(slave)['ip'] - checkers.verify_service(_ip, service_name='heat-api', count=5) - checkers.verify_service(_ip, - service_name='ceilometer-api', - ignore_count_of_proccesses=True) + for service_name in SERVICES_TO_CHECK: + checkers.verify_service(_ip, service_name='heat-api', count=5) + checkers.verify_service(_ip, + service_name=service_name, + ignore_count_of_proccesses=True) logger.debug('Run Heat OSTF platform tests')