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