Remove condition that are prevent resizing for root volumes (vmware) (#5186)

* remove condition that are prevent resizing for root volumes

* adjust tests acordingly

* enable disk resize tests for VMware

Co-authored-by: DK101010 <dirk.klahre@itelligence.de>
Co-authored-by: mib1185 <mail@mib85.de>

Author: 3 people

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

@@ -1159,10 +1159,6 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
         UserVmVO userVm = _userVmDao.findById(volume.getInstanceId());
 
         if (userVm != null) {
-            if (volume.getVolumeType().equals(Volume.Type.ROOT) && userVm.getPowerState() != VirtualMachine.PowerState.PowerOff && hypervisorType == HypervisorType.VMware) {
-                s_logger.error(" For ROOT volume resize VM should be in Power Off state.");
-                throw new InvalidParameterValueException("VM current state is : " + userVm.getPowerState() + ". But VM should be in " + VirtualMachine.PowerState.PowerOff + " state.");
-            }
             // serialize VM operation
             AsyncJobExecutionContext jobContext = AsyncJobExecutionContext.getCurrentExecutionContext();
 

test/integration/component/test_rootvolume_resize.py

@@ -228,25 +228,22 @@ def chk_volume_resize(self, apiclient, vm):
             listall='True'
         )
         rootvolume = list_volume_response[0]
-        if vm.state == "Running" and \
-                (vm.hypervisor.lower() == "xenserver" or \
-                             vm.hypervisor.lower() == "vmware"):
+        if vm.state == "Running" and vm.hypervisor.lower() == "xenserver":
             self.virtual_machine.stop(apiclient)
             time.sleep(self.services["sleep"])
-            if vm.hypervisor.lower() == "vmware":
-                rootdiskcontroller = self.getDiskController(vm)
-                if rootdiskcontroller!="scsi":
-                    raise Exception("root volume resize only supported on scsi disk ,"
-                                    "please check rootdiskcontroller type")
+        if vm.hypervisor.lower() == "vmware":
+            rootdiskcontroller = self.getDiskController(vm)
+            if rootdiskcontroller!="scsi":
+                raise Exception("root volume resize only supported on scsi disk ,"
+                                "please check rootdiskcontroller type")
 
         rootvolobj = Volume(rootvolume.__dict__)
         newsize = (rootvolume.size >> 30) + 2
         success = False
         if rootvolume is not None:
             try:
                 rootvolobj.resize(apiclient, size=newsize)
-                if vm.hypervisor.lower() == "xenserver" or \
-                                vm.hypervisor.lower() == "vmware":
+                if vm.hypervisor.lower() == "xenserver":
                     self.virtual_machine.start(apiclient)
                     time.sleep(self.services["sleep"])
                 ssh = SshClient(self.virtual_machine.ssh_ip, 22,
@@ -916,9 +913,7 @@ def test_6_resized_rootvolume_with_lessvalue(self):
             )
             res = validateList(list_volume_response)
             self.assertNotEqual(res[2], INVALID_INPUT, "listVolumes returned invalid object in response")
-            if vm.state == "Running" and (
-                            vm.hypervisor.lower() == "xenserver" or
-                            vm.hypervisor.lower() == "vmware"):
+            if vm.state == "Running" and vm.hypervisor.lower() == "xenserver":
                 self.virtual_machine.stop(self.apiclient)
                 time.sleep(self.services["sleep"])
 
@@ -998,9 +993,7 @@ def test_7_usage_events_after_rootvolume_resized_(self):
             )
             res = validateList(list_volume_response)
             self.assertNotEqual(res[2], INVALID_INPUT, "listVolumes returned invalid object in response")
-            if vm.state == "Running" and (
-                            vm.hypervisor.lower() == "xenserver" or
-                            vm.hypervisor.lower() == "vmware"):
+            if vm.state == "Running" and vm.hypervisor.lower() == "xenserver":
                 self.virtual_machine.stop(self.apiclient)
                 time.sleep(self.services["sleep"])
             rootvolume = list_volume_response[0]
@@ -1115,9 +1108,7 @@ def test_08_increase_volume_size_within_account_limit(self):
             )
             res = validateList(list_volume_response)
             self.assertNotEqual(res[2], INVALID_INPUT, "listVolumes returned invalid object in response")
-            if vm.state == "Running" and \
-                    (vm.hypervisor.lower() == "xenserver" or
-                             vm.hypervisor.lower() == "vmware"):
+            if vm.state == "Running" and vm.hypervisor.lower() == "xenserver":
                 self.virtual_machine.stop(self.apiclient)
                 time.sleep(self.services["sleep"])
             rootvolume = list_volume_response[0]

test/integration/smoke/test_volumes.py

@@ -627,8 +627,8 @@ def test_07_resize_fail(self):
 
         if hosts[0].hypervisor == "XenServer":
             self.virtual_machine.stop(self.apiClient)
-        elif hosts[0].hypervisor.lower() in ("vmware", "hyperv"):
-            self.skipTest("Resize Volume is unsupported on VmWare and Hyper-V")
+        elif hosts[0].hypervisor.lower() == "hyperv":
+            self.skipTest("Resize Volume is unsupported on Hyper-V")
 
         # Attempting to resize it should throw an exception, as we're using a non
         # customisable disk offering, therefore our size parameter should be ignored
@@ -659,8 +659,8 @@ def test_08_resize_volume(self):
 
         if hosts[0].hypervisor == "XenServer":
             self.virtual_machine.stop(self.apiClient)
-        elif hosts[0].hypervisor.lower() in ("vmware", "hyperv"):
-            self.skipTest("Resize Volume is unsupported on VmWare and Hyper-V")
+        elif hosts[0].hypervisor.lower() == "hyperv":
+            self.skipTest("Resize Volume is unsupported on Hyper-V")
 
         # resize the data disk
         self.debug("Resize Volume ID: %s" % self.volume.id)