diff --git a/murano_plugin_tests/murano_plugin/test_failover.py b/murano_plugin_tests/murano_plugin/test_failover.py index 027d700..29aceda 100644 --- a/murano_plugin_tests/murano_plugin/test_failover.py +++ b/murano_plugin_tests/murano_plugin/test_failover.py @@ -45,6 +45,7 @@ class TestMuranoFailover(api.MuranoPluginApi): 3. Run OSTF. Duration 30m + Snapshot soft_reboot_murano_node """ self._test_failover("soft_reboot", self.settings.role_name) @@ -62,10 +63,11 @@ class TestMuranoFailover(api.MuranoPluginApi): 3. Run OSTF. Duration 30m + Snapshot hard_reboot_murano_node """ self._test_failover("hard_reboot", self.settings.role_name) - @test(depends_on_groups=["deploy_murano_plugin"], + @test(depends_on_groups=["deploy_murano_plugin_on_controller"], groups=["failover", "murano", "system", "destructive", "soft_reboot_controller_node_murano_plugin"]) @log_snapshot_after_test @@ -79,10 +81,11 @@ class TestMuranoFailover(api.MuranoPluginApi): 3. Run OSTF. Duration 30m + Snapshot soft_reboot_controller_node_murano_plugin """ self._test_failover("soft_reboot", ["controller"]) - @test(depends_on_groups=["deploy_murano_plugin"], + @test(depends_on_groups=["deploy_murano_plugin_on_controller"], groups=["failover", "murano", "system", "destructive", "hard_reboot_controller_node_murano_plugin"]) @log_snapshot_after_test @@ -96,5 +99,6 @@ class TestMuranoFailover(api.MuranoPluginApi): 3. Run OSTF. Duration 30m + Snapshot hard_reboot_controller_node_murano_plugin """ self._test_failover("hard_reboot", ["controller"]) diff --git a/murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py b/murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py index 18de304..aece4f4 100644 --- a/murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py +++ b/murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py @@ -39,7 +39,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi): 7. Run OSTF Duration 90m - Snapshot deploy_murano_plugin + Snapshot deploy_murano_plugin_on_controller """ self.check_run("deploy_murano_plugin") @@ -55,7 +55,8 @@ class TestMuranoPluginBvt(api.MuranoPluginApi): self.run_ostf(['sanity', 'smoke', 'tests_platform']) - self.env.make_snapshot("deploy_murano_plugin", is_make=True) + self.env.make_snapshot("deploy_murano_plugin_on_controller", + is_make=True) @test(depends_on_groups=["prepare_slaves_5"], groups=["deploy_murano_plugin_on_controller_ha", "deploy", @@ -74,7 +75,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi): 7. Run OSTF Duration 90m - Snapshot deploy_murano_plugin + Snapshot deploy_murano_plugin_on_controller_ha """ self.check_run("deploy_murano_plugin") @@ -90,7 +91,8 @@ class TestMuranoPluginBvt(api.MuranoPluginApi): self.run_ostf(['sanity', 'smoke', 'tests_platform']) - self.env.make_snapshot("deploy_murano_plugin", is_make=True) + self.env.make_snapshot("deploy_murano_plugin_on_controller_ha", + is_make=True) @test(depends_on_groups=["prepare_slaves_3"], groups=["deploy_murano_plugin", "deploy", "deploy_murano_bvt", @@ -214,6 +216,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi): 4. Remove the plugins. Duration 20m + Snapshot uninstall_deployed_murano_plugin """ self.env.revert_snapshot("deploy_murano_plugin") @@ -235,6 +238,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi): 2. Remove the plugins. Duration 5m + Snapshot uninstall_murano_plugin """ self.env.revert_snapshot("ready_with_3_slaves") diff --git a/murano_plugin_tests/murano_plugin/test_murano_plugin_update.py b/murano_plugin_tests/murano_plugin/test_murano_plugin_update.py index e806041..2f9ccc3 100644 --- a/murano_plugin_tests/murano_plugin/test_murano_plugin_update.py +++ b/murano_plugin_tests/murano_plugin/test_murano_plugin_update.py @@ -40,7 +40,7 @@ class TestMuranoPluginUpdate(api.MuranoPluginApi): 7. Run OSTF Duration 90m - Snapshot deploy_environment_with_murano_plugin + Snapshot deploy_murano_plugin_in_environment_with_murano """ self.check_run("deploy_environment_with_murano_plugin") @@ -70,8 +70,9 @@ class TestMuranoPluginUpdate(api.MuranoPluginApi): self.helpers.run_ostf(['sanity', 'smoke', 'tests_platform']) - self.env.make_snapshot("deploy_environment_with_murano_plugin", - is_make=True) + self.env.make_snapshot( + "deploy_murano_plugin_in_environment_with_murano", + is_make=True) @test(depends_on_groups=["prepare_slaves_3"], groups=["deploy_murano_and_plugin_add_role", "deploy", diff --git a/murano_plugin_tests/murano_plugin/test_post_install.py b/murano_plugin_tests/murano_plugin/test_post_install.py index 10b99eb..7d9e2d2 100644 --- a/murano_plugin_tests/murano_plugin/test_post_install.py +++ b/murano_plugin_tests/murano_plugin/test_post_install.py @@ -80,7 +80,7 @@ class TestMuranoPostInstallation(api.MuranoPluginApi): 5. Run OSTF Duration 60m - + Snapshot deploy_murano_plugin_in_existing_environment """ self.check_run("deploy_murano_plugin_in_existing_environment") diff --git a/murano_plugin_tests/murano_plugin/test_system.py b/murano_plugin_tests/murano_plugin/test_system.py index 26b522e..11f6bf7 100644 --- a/murano_plugin_tests/murano_plugin/test_system.py +++ b/murano_plugin_tests/murano_plugin/test_system.py @@ -49,6 +49,7 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi): 13. Run OSTF Duration 240m + Snapshot add_remove_controller_compute_murano """ self.env.revert_snapshot("deploy_murano_plugin_full_ha") @@ -87,6 +88,9 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi): self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform']) + self.env.make_snapshot("add_remove_controller_compute_murano", + is_make=False) + @test(depends_on_groups=["deploy_murano_plugin_full_ha"], groups=["check_scaling_murano", "scaling", "murano", "system", @@ -107,6 +111,7 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi): 7. Run OSTF Duration 120m + Snapshot add_remove_murano_node """ self.env.revert_snapshot("deploy_murano_plugin_full_ha") @@ -125,3 +130,5 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi): self.check_plugin_online() self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform']) + + self.env.make_snapshot("add_remove_murano_node", is_make=False)