Browse Source

Merge "Remove extra ceilometer services check in Heat tests"

Jenkins 2 years ago
parent
commit
8667ad5a92
1 changed files with 4 additions and 18 deletions
  1. 4
    18
      fuelweb_test/tests/test_services.py

+ 4
- 18
fuelweb_test/tests/test_services.py View File

@@ -834,10 +834,10 @@ class HeatHAOneController(TestBasic):
834 834
 
835 835
         Scenario:
836 836
             1. Create cluster
837
-            2. Add 1 node with controller role and mongo
837
+            2. Add 1 node with controller role
838 838
             3. Add 1 nodes with compute role
839 839
             4. Deploy the cluster
840
-            5. Verify Heat, Ceilometer services
840
+            5. Verify Heat services
841 841
             6. Run OSTF platform tests
842 842
 
843 843
         Duration 40m
@@ -876,12 +876,6 @@ class HeatHAOneController(TestBasic):
876 876
         _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip']
877 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 879
         logger.debug('Run Heat OSTF platform tests')
886 880
 
887 881
         test_class_main = ('fuel_health.tests.tests_platform.'
@@ -920,10 +914,10 @@ class HeatHA(TestBasic):
920 914
 
921 915
         Scenario:
922 916
             1. Create cluster
923
-            2. Add 3 node with controller role and mongo
917
+            2. Add 3 node with controller role
924 918
             3. Add 1 nodes with compute role
925 919
             4. Deploy the cluster
926
-            5. Verify Heat and Ceilometer services
920
+            5. Verify Heat services
927 921
             6. Run OSTF platform tests
928 922
 
929 923
         Duration 70m
@@ -961,14 +955,6 @@ class HeatHA(TestBasic):
961 955
             cluster_vip, data['user'], data['password'], data['tenant'])
962 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 958
         logger.debug('Run Heat OSTF platform tests')
973 959
 
974 960
         test_class_main = ('fuel_health.tests.tests_platform.'

Loading…
Cancel
Save