Fix smoke tests due to change in behavior of restore VM (apache#10583)

* Fix unit tests due to change in behavior of restore VM

* update numbering in comments

* revert delete operations

* fix placement of start vm after refactoring

Author: Pearl1594

test/integration/smoke/test_events_resource.py

@@ -20,10 +20,6 @@
 import os
 import tempfile
 import time
-import unittest
-import urllib.error
-import urllib.parse
-import urllib.request
 
 from datetime import datetime
 
@@ -165,6 +161,7 @@ def test_01_events_resource(self):
         self.cleanup.remove(volume)
         ts = str(time.time())
         virtual_machine.update(self.apiclient, displayname=ts)
+        virtual_machine.start(self.apiclient)
         virtual_machine.delete(self.apiclient)
         self.cleanup.remove(virtual_machine)
         account_network.update(self.apiclient, name=account_network.name + ts)

test/integration/smoke/test_network_permissions.py

@@ -733,33 +733,38 @@ def test_04_deploy_vm_for_other_user_and_test_vm_operations(self):
         self.exec_command("self.user_apiclient", command, expected=False)
         self.exec_command("self.otheruser_apiclient", command, expected=True)
 
-        # 22. Destroy vm2, should succeed by vm owner
+        # 22. Start VM before destroying, to recreate ROOT volume that was deleted as part of restore operation
+        command = """self.virtual_machine.start({apiclient})"""
+        self.exec_command("self.user_apiclient", command, expected=False)
+        self.exec_command("self.otheruser_apiclient", command, expected=True)
+
+        # 23. Destroy vm2, should succeed by vm owner
         command = """self.virtual_machine.delete({apiclient}, expunge=False)"""
         self.exec_command("self.user_apiclient", command, expected=False)
         self.exec_command("self.otheruser_apiclient", command, expected=True)
 
-        # 23. Recover vm2, should succeed by vm owner
+        # 24. Recover vm2, should succeed by vm owner
         allow_expunge_recover_vm = Configurations.list(self.apiclient, name="allow.user.expunge.recover.vm")[0].value
         self.logger.debug("Global configuration allow.user.expunge.recover.vm = %s", allow_expunge_recover_vm)
         if allow_expunge_recover_vm == "true":
             command = """self.virtual_machine.recover({apiclient})"""
             self.exec_command("self.user_apiclient", command, expected=False)
             self.exec_command("self.otheruser_apiclient", command, expected=True)
 
-        # 24. Destroy vm2, should succeed by vm owner
+        # 25. Destroy vm2, should succeed by vm owner
         command = """self.virtual_machine.delete({apiclient}, expunge=False)"""
         self.exec_command("self.user_apiclient", command, expected=False)
         self.exec_command("self.otheruser_apiclient", command, expected=True)
 
-        # 25. Expunge vm2, should succeed by vm owner
+        # 26. Expunge vm2, should succeed by vm owner
         if allow_expunge_recover_vm == "true":
             command = """self.virtual_machine.expunge({apiclient})"""
             self.exec_command("self.user_apiclient", command, expected=False)
             self.exec_command("self.otheruser_apiclient", command, expected=True)
         else:
             self.virtual_machine.expunge(self.apiclient)
 
-        # 26. Reset network permissions, should succeed by network owner
+        # 27. Reset network permissions, should succeed by network owner
         command = """self.reset_network_permission({apiclient}, self.user_network, expected=True)"""
         self.exec_command("self.otheruser_apiclient", command, expected=False)
         self.exec_command("self.user_apiclient", command, expected=True)