Browse Source

Fix issues with suspended cluster after snapshot creating.

Enable snapshot reverting for tests which is used dvs_vcenter_systest_setup.

Change-Id: If1bba1301fc29e412c206866076bb79b057bc2b7
Closes-Bug: #1616025
Vasily Gorin 2 years ago
parent
commit
89ee57e1f5

+ 7
- 7
plugin_test/tests/test_plugin_vmware_dvs_destructive.py View File

@@ -165,14 +165,15 @@ class TestDVSDestructive(TestBasic):
165 165
         Scenario:
166 166
             1. Revert snapshot to dvs_vcenter_systest_setup.
167 167
             2. Try to uninstall dvs plugin.
168
+            3. Check that plugin is not removed
168 169
 
169 170
         Duration: 1.8 hours
170 171
 
171 172
         """
172
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
173
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
173
+        self.show_step(1)
174
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
174 175
 
175
-        # Try to uninstall dvs plugin
176
+        self.show_step(2)
176 177
         cmd = 'fuel plugins --remove {0}=={1}'.format(
177 178
             plugin.plugin_name, plugin.DVS_PLUGIN_VERSION)
178 179
 
@@ -182,7 +183,7 @@ class TestDVSDestructive(TestBasic):
182 183
             assert_ec_equal=[1]
183 184
         )
184 185
 
185
-        # Check that plugin is not removed
186
+        self.show_step(3)
186 187
         output = self.ssh_manager.execute_on_remote(
187 188
             ip=self.ssh_manager.admin_ip, cmd='fuel plugins list')['stdout']
188 189
         assert_true(
@@ -197,7 +198,7 @@ class TestDVSDestructive(TestBasic):
197 198
         """Check abilities to bind port on DVS to VM, disable/enable this port.
198 199
 
199 200
         Scenario:
200
-            1. Revert snapshot to dvs_vcenter_destructive_setup
201
+            1. Revert snapshot to dvs_vcenter_systest_setup
201 202
             2. Create private networks net01 with sunet.
202 203
             3. Launch instances VM_1 and VM_2 in the net01
203 204
                with image TestVM and flavor m1.micro in nova az.
@@ -213,8 +214,7 @@ class TestDVSDestructive(TestBasic):
213 214
         Duration: 1,5 hours
214 215
 
215 216
         """
216
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
217
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
217
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
218 218
 
219 219
         cluster_id = self.fuel_web.get_last_created_cluster()
220 220
 

+ 18
- 36
plugin_test/tests/test_plugin_vmware_dvs_system.py View File

@@ -167,8 +167,7 @@ class TestDVSSystem(TestBasic):
167 167
 
168 168
         """
169 169
         self.show_step(1)
170
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
171
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
170
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
172 171
 
173 172
         cluster_id = self.fuel_web.get_last_created_cluster()
174 173
 
@@ -256,8 +255,7 @@ class TestDVSSystem(TestBasic):
256 255
 
257 256
         """
258 257
         self.show_step(1)
259
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
260
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
258
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
261 259
 
262 260
         cluster_id = self.fuel_web.get_last_created_cluster()
263 261
 
@@ -331,8 +329,7 @@ class TestDVSSystem(TestBasic):
331 329
 
332 330
         """
333 331
         self.show_step(1)
334
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
335
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
332
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
336 333
 
337 334
         cluster_id = self.fuel_web.get_last_created_cluster()
338 335
 
@@ -423,8 +420,7 @@ class TestDVSSystem(TestBasic):
423 420
         wait_to_update_rules_on_dvs_ports = 30
424 421
 
425 422
         self.show_step(1)
426
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
427
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
423
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
428 424
 
429 425
         cluster_id = self.fuel_web.get_last_created_cluster()
430 426
 
@@ -597,8 +593,7 @@ class TestDVSSystem(TestBasic):
597 593
 
598 594
         """
599 595
         self.show_step(1)
600
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
601
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
596
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
602 597
 
603 598
         cluster_id = self.fuel_web.get_last_created_cluster()
604 599
 
@@ -711,8 +706,7 @@ class TestDVSSystem(TestBasic):
711 706
 
712 707
         """
713 708
         self.show_step(1)
714
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
715
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
709
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
716 710
 
717 711
         cluster_id = self.fuel_web.get_last_created_cluster()
718 712
 
@@ -960,8 +954,7 @@ class TestDVSSystem(TestBasic):
960 954
 
961 955
         """
962 956
         self.show_step(1)
963
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
964
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
957
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
965 958
         cluster_id = self.fuel_web.get_last_created_cluster()
966 959
 
967 960
         os_ip = self.fuel_web.get_public_vip(cluster_id)
@@ -1029,8 +1022,7 @@ class TestDVSSystem(TestBasic):
1029 1022
 
1030 1023
         """
1031 1024
         self.show_step(1)
1032
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
1033
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
1025
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
1034 1026
         cluster_id = self.fuel_web.get_last_created_cluster()
1035 1027
 
1036 1028
         os_ip = self.fuel_web.get_public_vip(cluster_id)
@@ -1126,8 +1118,7 @@ class TestDVSSystem(TestBasic):
1126 1118
 
1127 1119
         """
1128 1120
         self.show_step(1)
1129
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
1130
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
1121
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
1131 1122
         cluster_id = self.fuel_web.get_last_created_cluster()
1132 1123
 
1133 1124
         os_ip = self.fuel_web.get_public_vip(cluster_id)
@@ -1240,8 +1231,7 @@ class TestDVSSystem(TestBasic):
1240 1231
 
1241 1232
         """
1242 1233
         self.show_step(1)
1243
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
1244
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
1234
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
1245 1235
 
1246 1236
         cluster_id = self.fuel_web.get_last_created_cluster()
1247 1237
 
@@ -1384,8 +1374,7 @@ class TestDVSSystem(TestBasic):
1384 1374
         template_path = 'plugin_test/templates/dvs_stack.yaml'
1385 1375
 
1386 1376
         self.show_step(1)
1387
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
1388
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
1377
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
1389 1378
 
1390 1379
         cluster_id = self.fuel_web.get_last_created_cluster()
1391 1380
 
@@ -1455,8 +1444,7 @@ class TestDVSSystem(TestBasic):
1455 1444
 
1456 1445
         """
1457 1446
         self.show_step(1)
1458
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
1459
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
1447
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
1460 1448
         cluster_id = self.fuel_web.get_last_created_cluster()
1461 1449
 
1462 1450
         os_ip = self.fuel_web.get_public_vip(cluster_id)
@@ -1610,8 +1598,7 @@ class TestDVSSystem(TestBasic):
1610 1598
 
1611 1599
         """
1612 1600
         self.show_step(1)
1613
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
1614
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
1601
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
1615 1602
         cluster_id = self.fuel_web.get_last_created_cluster()
1616 1603
 
1617 1604
         os_ip = self.fuel_web.get_public_vip(cluster_id)
@@ -1761,8 +1748,7 @@ class TestDVSSystem(TestBasic):
1761 1748
 
1762 1749
         """
1763 1750
         self.show_step(1)
1764
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
1765
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
1751
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
1766 1752
         cluster_id = self.fuel_web.get_last_created_cluster()
1767 1753
 
1768 1754
         os_ip = self.fuel_web.get_public_vip(cluster_id)
@@ -1897,8 +1883,7 @@ class TestDVSSystem(TestBasic):
1897 1883
 
1898 1884
         """
1899 1885
         self.show_step(1)
1900
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
1901
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
1886
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
1902 1887
 
1903 1888
         cluster_id = self.fuel_web.get_last_created_cluster()
1904 1889
 
@@ -2037,8 +2022,7 @@ class TestDVSSystem(TestBasic):
2037 2022
 
2038 2023
         """
2039 2024
         self.show_step(1)
2040
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
2041
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
2025
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
2042 2026
         cluster_id = self.fuel_web.get_last_created_cluster()
2043 2027
 
2044 2028
         os_ip = self.fuel_web.get_public_vip(cluster_id)
@@ -2211,8 +2195,7 @@ class TestDVSSystem(TestBasic):
2211 2195
 
2212 2196
         """
2213 2197
         self.show_step(1)
2214
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
2215
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
2198
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
2216 2199
 
2217 2200
         cluster_id = self.fuel_web.get_last_created_cluster()
2218 2201
 
@@ -2278,8 +2261,7 @@ class TestDVSSystem(TestBasic):
2278 2261
 
2279 2262
         """
2280 2263
         self.show_step(1)
2281
-        # TODO(vgorin) Uncomment when reverting of WS snapshot is available
2282
-        # self.env.revert_snapshot("dvs_vcenter_systest_setup")
2264
+        self.env.revert_snapshot("dvs_vcenter_systest_setup")
2283 2265
 
2284 2266
         cluster_id = self.fuel_web.get_last_created_cluster()
2285 2267
 

Loading…
Cancel
Save