summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-22 12:28:34 +0000
committerGerrit Code Review <review@openstack.org>2017-03-22 12:28:34 +0000
commit8667ad5a924aecdeece9b37400f1f9074426bbb1 (patch)
tree49bee2c597d9c40acbe66eb365f5fa1151d1c0e1
parentd6b67554ad401438ce31db4212c3d9f83fcd28ea (diff)
parent5077ee78182de458eea3e26c4ed6dde92594982f (diff)
Merge "Remove extra ceilometer services check in Heat tests"
-rw-r--r--fuelweb_test/tests/test_services.py22
1 files changed, 4 insertions, 18 deletions
diff --git a/fuelweb_test/tests/test_services.py b/fuelweb_test/tests/test_services.py
index 4e6f544..ce6de16 100644
--- a/fuelweb_test/tests/test_services.py
+++ b/fuelweb_test/tests/test_services.py
@@ -834,10 +834,10 @@ class HeatHAOneController(TestBasic):
834 834
835 Scenario: 835 Scenario:
836 1. Create cluster 836 1. Create cluster
837 2. Add 1 node with controller role and mongo 837 2. Add 1 node with controller role
838 3. Add 1 nodes with compute role 838 3. Add 1 nodes with compute role
839 4. Deploy the cluster 839 4. Deploy the cluster
840 5. Verify Heat, Ceilometer services 840 5. Verify Heat services
841 6. Run OSTF platform tests 841 6. Run OSTF platform tests
842 842
843 Duration 40m 843 Duration 40m
@@ -876,12 +876,6 @@ class HeatHAOneController(TestBasic):
876 _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] 876 _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip']
877 checkers.verify_service(_ip, service_name='heat-api', count=5) 877 checkers.verify_service(_ip, service_name='heat-api', count=5)
878 878
879 for service_name in SERVICES_TO_CHECK:
880 _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip']
881 checkers.verify_service(_ip,
882 service_name=service_name,
883 ignore_count_of_proccesses=True)
884
885 logger.debug('Run Heat OSTF platform tests') 879 logger.debug('Run Heat OSTF platform tests')
886 880
887 test_class_main = ('fuel_health.tests.tests_platform.' 881 test_class_main = ('fuel_health.tests.tests_platform.'
@@ -920,10 +914,10 @@ class HeatHA(TestBasic):
920 914
921 Scenario: 915 Scenario:
922 1. Create cluster 916 1. Create cluster
923 2. Add 3 node with controller role and mongo 917 2. Add 3 node with controller role
924 3. Add 1 nodes with compute role 918 3. Add 1 nodes with compute role
925 4. Deploy the cluster 919 4. Deploy the cluster
926 5. Verify Heat and Ceilometer services 920 5. Verify Heat services
927 6. Run OSTF platform tests 921 6. Run OSTF platform tests
928 922
929 Duration 70m 923 Duration 70m
@@ -961,14 +955,6 @@ class HeatHA(TestBasic):
961 cluster_vip, data['user'], data['password'], data['tenant']) 955 cluster_vip, data['user'], data['password'], data['tenant'])
962 self.fuel_web.assert_cluster_ready(os_conn, smiles_count=13) 956 self.fuel_web.assert_cluster_ready(os_conn, smiles_count=13)
963 957
964 for slave in ["slave-01", "slave-02", "slave-03"]:
965 _ip = self.fuel_web.get_nailgun_node_by_name(slave)['ip']
966 for service_name in SERVICES_TO_CHECK:
967 checkers.verify_service(_ip, service_name='heat-api', count=5)
968 checkers.verify_service(_ip,
969 service_name=service_name,
970 ignore_count_of_proccesses=True)
971
972 logger.debug('Run Heat OSTF platform tests') 958 logger.debug('Run Heat OSTF platform tests')
973 959
974 test_class_main = ('fuel_health.tests.tests_platform.' 960 test_class_main = ('fuel_health.tests.tests_platform.'