Browse Source

Adjust snapshot names in system tests

Change-Id: If9875945a7f71bad67f52dddf775f870b8bc5e89
Victor Ryzhenkin 2 years ago
parent
commit
5e79fce304

+ 6
- 2
murano_plugin_tests/murano_plugin/test_failover.py View File

@@ -45,6 +45,7 @@ class TestMuranoFailover(api.MuranoPluginApi):
45 45
             3. Run OSTF.
46 46
 
47 47
         Duration 30m
48
+        Snapshot soft_reboot_murano_node
48 49
         """
49 50
         self._test_failover("soft_reboot", self.settings.role_name)
50 51
 
@@ -62,10 +63,11 @@ class TestMuranoFailover(api.MuranoPluginApi):
62 63
             3. Run OSTF.
63 64
 
64 65
         Duration 30m
66
+        Snapshot hard_reboot_murano_node
65 67
         """
66 68
         self._test_failover("hard_reboot", self.settings.role_name)
67 69
 
68
-    @test(depends_on_groups=["deploy_murano_plugin"],
70
+    @test(depends_on_groups=["deploy_murano_plugin_on_controller"],
69 71
           groups=["failover", "murano", "system", "destructive",
70 72
                   "soft_reboot_controller_node_murano_plugin"])
71 73
     @log_snapshot_after_test
@@ -79,10 +81,11 @@ class TestMuranoFailover(api.MuranoPluginApi):
79 81
             3. Run OSTF.
80 82
 
81 83
         Duration 30m
84
+        Snapshot soft_reboot_controller_node_murano_plugin
82 85
         """
83 86
         self._test_failover("soft_reboot", ["controller"])
84 87
 
85
-    @test(depends_on_groups=["deploy_murano_plugin"],
88
+    @test(depends_on_groups=["deploy_murano_plugin_on_controller"],
86 89
           groups=["failover", "murano", "system", "destructive",
87 90
                   "hard_reboot_controller_node_murano_plugin"])
88 91
     @log_snapshot_after_test
@@ -96,5 +99,6 @@ class TestMuranoFailover(api.MuranoPluginApi):
96 99
             3. Run OSTF.
97 100
 
98 101
         Duration 30m
102
+        Snapshot hard_reboot_controller_node_murano_plugin
99 103
         """
100 104
         self._test_failover("hard_reboot", ["controller"])

+ 8
- 4
murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py View File

@@ -39,7 +39,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
39 39
             7. Run OSTF
40 40
 
41 41
         Duration 90m
42
-        Snapshot deploy_murano_plugin
42
+        Snapshot deploy_murano_plugin_on_controller
43 43
         """
44 44
         self.check_run("deploy_murano_plugin")
45 45
 
@@ -55,7 +55,8 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
55 55
 
56 56
         self.run_ostf(['sanity', 'smoke', 'tests_platform'])
57 57
 
58
-        self.env.make_snapshot("deploy_murano_plugin", is_make=True)
58
+        self.env.make_snapshot("deploy_murano_plugin_on_controller",
59
+                               is_make=True)
59 60
 
60 61
     @test(depends_on_groups=["prepare_slaves_5"],
61 62
           groups=["deploy_murano_plugin_on_controller_ha", "deploy",
@@ -74,7 +75,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
74 75
             7. Run OSTF
75 76
 
76 77
         Duration 90m
77
-        Snapshot deploy_murano_plugin
78
+        Snapshot deploy_murano_plugin_on_controller_ha
78 79
         """
79 80
         self.check_run("deploy_murano_plugin")
80 81
 
@@ -90,7 +91,8 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
90 91
 
91 92
         self.run_ostf(['sanity', 'smoke', 'tests_platform'])
92 93
 
93
-        self.env.make_snapshot("deploy_murano_plugin", is_make=True)
94
+        self.env.make_snapshot("deploy_murano_plugin_on_controller_ha",
95
+                               is_make=True)
94 96
 
95 97
     @test(depends_on_groups=["prepare_slaves_3"],
96 98
           groups=["deploy_murano_plugin", "deploy", "deploy_murano_bvt",
@@ -214,6 +216,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
214 216
             4.  Remove the plugins.
215 217
 
216 218
         Duration 20m
219
+        Snapshot uninstall_deployed_murano_plugin
217 220
         """
218 221
         self.env.revert_snapshot("deploy_murano_plugin")
219 222
 
@@ -235,6 +238,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
235 238
             2.  Remove the plugins.
236 239
 
237 240
         Duration 5m
241
+        Snapshot uninstall_murano_plugin
238 242
         """
239 243
         self.env.revert_snapshot("ready_with_3_slaves")
240 244
 

+ 4
- 3
murano_plugin_tests/murano_plugin/test_murano_plugin_update.py View File

@@ -40,7 +40,7 @@ class TestMuranoPluginUpdate(api.MuranoPluginApi):
40 40
             7. Run OSTF
41 41
 
42 42
         Duration 90m
43
-        Snapshot deploy_environment_with_murano_plugin
43
+        Snapshot deploy_murano_plugin_in_environment_with_murano
44 44
         """
45 45
 
46 46
         self.check_run("deploy_environment_with_murano_plugin")
@@ -70,8 +70,9 @@ class TestMuranoPluginUpdate(api.MuranoPluginApi):
70 70
 
71 71
         self.helpers.run_ostf(['sanity', 'smoke', 'tests_platform'])
72 72
 
73
-        self.env.make_snapshot("deploy_environment_with_murano_plugin",
74
-                               is_make=True)
73
+        self.env.make_snapshot(
74
+            "deploy_murano_plugin_in_environment_with_murano",
75
+            is_make=True)
75 76
 
76 77
     @test(depends_on_groups=["prepare_slaves_3"],
77 78
           groups=["deploy_murano_and_plugin_add_role", "deploy",

+ 1
- 1
murano_plugin_tests/murano_plugin/test_post_install.py View File

@@ -80,7 +80,7 @@ class TestMuranoPostInstallation(api.MuranoPluginApi):
80 80
             5. Run OSTF
81 81
 
82 82
         Duration 60m
83
-
83
+        Snapshot deploy_murano_plugin_in_existing_environment
84 84
         """
85 85
         self.check_run("deploy_murano_plugin_in_existing_environment")
86 86
 

+ 7
- 0
murano_plugin_tests/murano_plugin/test_system.py View File

@@ -49,6 +49,7 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
49 49
             13. Run OSTF
50 50
 
51 51
         Duration 240m
52
+        Snapshot add_remove_controller_compute_murano
52 53
         """
53 54
         self.env.revert_snapshot("deploy_murano_plugin_full_ha")
54 55
 
@@ -87,6 +88,9 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
87 88
 
88 89
         self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
89 90
 
91
+        self.env.make_snapshot("add_remove_controller_compute_murano",
92
+                               is_make=False)
93
+
90 94
     @test(depends_on_groups=["deploy_murano_plugin_full_ha"],
91 95
           groups=["check_scaling_murano", "scaling",
92 96
                   "murano", "system",
@@ -107,6 +111,7 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
107 111
             7. Run OSTF
108 112
 
109 113
         Duration 120m
114
+        Snapshot add_remove_murano_node
110 115
         """
111 116
         self.env.revert_snapshot("deploy_murano_plugin_full_ha")
112 117
 
@@ -125,3 +130,5 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
125 130
         self.check_plugin_online()
126 131
 
127 132
         self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
133
+
134
+        self.env.make_snapshot("add_remove_murano_node", is_make=False)

Loading…
Cancel
Save