From 5077ee78182de458eea3e26c4ed6dde92594982f Mon Sep 17 00:00:00 2001 From: Anastasia Kuznetsova Date: Tue, 21 Mar 2017 18:13:12 +0400 Subject: [PATCH] Remove extra ceilometer services check in Heat tests There is no need to check Ceilometer related services status if Ceilometer is not installed. Change-Id: I66ae6c3a4609bd4b677eb5cce83b93e719d83234 --- fuelweb_test/tests/test_services.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/fuelweb_test/tests/test_services.py b/fuelweb_test/tests/test_services.py index 4e6f544b2..ce6de1683 100644 --- a/fuelweb_test/tests/test_services.py +++ b/fuelweb_test/tests/test_services.py @@ -834,10 +834,10 @@ class HeatHAOneController(TestBasic): Scenario: 1. Create cluster - 2. Add 1 node with controller role and mongo + 2. Add 1 node with controller role 3. Add 1 nodes with compute role 4. Deploy the cluster - 5. Verify Heat, Ceilometer services + 5. Verify Heat services 6. Run OSTF platform tests Duration 40m @@ -876,12 +876,6 @@ 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) - 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') test_class_main = ('fuel_health.tests.tests_platform.' @@ -920,10 +914,10 @@ class HeatHA(TestBasic): Scenario: 1. Create cluster - 2. Add 3 node with controller role and mongo + 2. Add 3 node with controller role 3. Add 1 nodes with compute role 4. Deploy the cluster - 5. Verify Heat and Ceilometer services + 5. Verify Heat services 6. Run OSTF platform tests Duration 70m @@ -961,14 +955,6 @@ class HeatHA(TestBasic): cluster_vip, data['user'], data['password'], data['tenant']) self.fuel_web.assert_cluster_ready(os_conn, smiles_count=13) - for slave in ["slave-01", "slave-02", "slave-03"]: - _ip = self.fuel_web.get_nailgun_node_by_name(slave)['ip'] - 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') test_class_main = ('fuel_health.tests.tests_platform.'