Browse Source

Enable Heat system tests

Since Ceilometer was removed from MOS 10.0 all system tests with
Ceilometer installation were disabled including Heat system tests.
Need to know that Ceilometer is required for only one Heat OSTF test
and it is enough to disable only one OSTF test instead all suite,
because otherwise we miss running and checking regular Heat scenarios.

Change-Id: Ieaa6c34c41824a0c3313eb60a615ccb5271797c6
Anastasia Kuznetsova 2 years ago
parent
commit
6697b184f1
1 changed files with 12 additions and 20 deletions
  1. 12
    20
      fuelweb_test/tests/test_services.py

+ 12
- 20
fuelweb_test/tests/test_services.py View File

@@ -827,8 +827,7 @@ class HeatHAOneController(TestBasic):
827 827
     Don't recommend to start tests without kvm
828 828
     """
829 829
     @test(depends_on=[SetupEnvironment.prepare_slaves_3],
830
-          groups=["deploy_heat_ha_one_controller_neutron"],
831
-          enabled=False)
830
+          groups=["deploy_heat_ha_one_controller_neutron"])
832 831
     @log_snapshot_after_test
833 832
     def deploy_heat_ha_one_controller_neutron(self):
834 833
         """Deploy Heat cluster in HA mode with Neutron VXLAN
@@ -837,10 +836,9 @@ class HeatHAOneController(TestBasic):
837 836
             1. Create cluster
838 837
             2. Add 1 node with controller role and mongo
839 838
             3. Add 1 nodes with compute role
840
-            4. Set install Ceilometer option
841
-            5. Deploy the cluster
842
-            6. Verify Heat, Ceilometer services
843
-            7. Run OSTF platform tests
839
+            4. Deploy the cluster
840
+            5. Verify Heat, Ceilometer services
841
+            6. Run OSTF platform tests
844 842
 
845 843
         Duration 40m
846 844
         Snapshot: deploy_heat_ha_one_controller_neutron
@@ -849,7 +847,6 @@ class HeatHAOneController(TestBasic):
849 847
         self.env.revert_snapshot("ready_with_3_slaves")
850 848
 
851 849
         data = {
852
-            'ceilometer': True,
853 850
             'net_provider': 'neutron',
854 851
             'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
855 852
             'tenant': 'heatSimple',
@@ -865,7 +862,7 @@ class HeatHAOneController(TestBasic):
865 862
         self.fuel_web.update_nodes(
866 863
             cluster_id,
867 864
             {
868
-                'slave-01': ['controller', 'mongo'],
865
+                'slave-01': ['controller'],
869 866
                 'slave-02': ['compute']
870 867
             }
871 868
         )
@@ -892,7 +889,6 @@ class HeatHAOneController(TestBasic):
892 889
                            'HeatSmokeTests')
893 890
         tests_names = ['test_actions',
894 891
                        'test_advanced_actions',
895
-                       'test_autoscaling',
896 892
                        'test_rollback',
897 893
                        'test_update',
898 894
                        'test_wait_condition']
@@ -917,8 +913,7 @@ class HeatHA(TestBasic):
917 913
     Don't recommend to start tests without kvm
918 914
     """
919 915
     @test(depends_on=[SetupEnvironment.prepare_slaves_5],
920
-          groups=["deploy_heat_ha"],
921
-          enabled=False)
916
+          groups=["deploy_heat_ha"])
922 917
     @log_snapshot_after_test
923 918
     def deploy_heat_ha(self):
924 919
         """Deploy Heat cluster in HA mode
@@ -927,10 +922,9 @@ class HeatHA(TestBasic):
927 922
             1. Create cluster
928 923
             2. Add 3 node with controller role and mongo
929 924
             3. Add 1 nodes with compute role
930
-            4. Set Ceilometer install option
931
-            5. Deploy the cluster
932
-            6. Verify Heat and Ceilometer services
933
-            7. Run OSTF platform tests
925
+            4. Deploy the cluster
926
+            5. Verify Heat and Ceilometer services
927
+            6. Run OSTF platform tests
934 928
 
935 929
         Duration 70m
936 930
         Snapshot: deploy_heat_ha
@@ -939,7 +933,6 @@ class HeatHA(TestBasic):
939 933
         self.env.revert_snapshot("ready_with_5_slaves")
940 934
 
941 935
         data = {
942
-            'ceilometer': True,
943 936
             'net_provider': 'neutron',
944 937
             'net_segment_type': settings.NEUTRON_SEGMENT['tun'],
945 938
             'tenant': 'heatHA',
@@ -955,9 +948,9 @@ class HeatHA(TestBasic):
955 948
         self.fuel_web.update_nodes(
956 949
             cluster_id,
957 950
             {
958
-                'slave-01': ['controller', 'mongo'],
959
-                'slave-02': ['controller', 'mongo'],
960
-                'slave-03': ['controller', 'mongo'],
951
+                'slave-01': ['controller'],
952
+                'slave-02': ['controller'],
953
+                'slave-03': ['controller'],
961 954
                 'slave-04': ['compute']
962 955
             }
963 956
         )
@@ -983,7 +976,6 @@ class HeatHA(TestBasic):
983 976
                            'HeatSmokeTests')
984 977
         tests_names = ['test_actions',
985 978
                        'test_advanced_actions',
986
-                       'test_autoscaling',
987 979
                        'test_rollback',
988 980
                        'test_update']
989 981
 

Loading…
Cancel
Save