From 8f52075d1bfa62dd4099d1358c363d78c480ebfd Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 20 Nov 2026 14:32:27 +0100 Subject: [PATCH 1/2] fix condition for detaching root volumes --- .../src/main/java/com/cloud/storage/VolumeApiServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index 11b24a9beef6..9de9547c05b3 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -3547,7 +3547,7 @@ private void validateRootVolumeDetachAttach(VolumeVO volume, UserVmVO vm) { || vm.getHypervisorType() == HypervisorType.Simulator)) { throw new InvalidParameterValueException("Root volume detach is not supported for hypervisor type " + vm.getHypervisorType()); } - if (!(vm.getState() == State.Stopped) || (vm.getState() == State.Destroyed)) { + if (!(vm.getState() == State.Stopped || vm.getState() == State.Destroyed)) { throw new InvalidParameterValueException("Root volume detach can happen only when vm is in states: " + State.Stopped.toString() + " or " + State.Destroyed.toString()); } From 33526a6891b9bf32df76b9c87f709ffe34c80f1e Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 20 Nov 2026 14:39:40 +0100 Subject: [PATCH 2/2] tests --- .../storage/VolumeApiServiceImplTest.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java index 401b12ebbf46..5bed36f7c203 100644 --- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java +++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java @@ -624,6 +624,28 @@ public void testDetachVolumeFromStoppedXenVm() throws NoSuchFieldException, Ille volumeApiServiceImpl.detachVolumeFromVM(detachCmd); } + private void validateRootVolumeDetachAttachForVmInState(State state) { + UserVmVO vm = new UserVmVO(7L, "vm", "vm", 1, HypervisorType.KVM, 1L, false, false, 1L, 1L, 1, 1L, null, null, null, "vm"); + vm.setState(state); + VolumeVO rootVolume = new VolumeVO("root", 1L, 1L, 1L, 1L, 7L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT); + ReflectionTestUtils.invokeMethod(volumeApiServiceImpl, "validateRootVolumeDetachAttach", rootVolume, vm); + } + + @Test + public void validateRootVolumeDetachAttachAllowsStoppedVm() { + validateRootVolumeDetachAttachForVmInState(State.Stopped); + } + + @Test + public void validateRootVolumeDetachAttachAllowsDestroyedVm() { + validateRootVolumeDetachAttachForVmInState(State.Destroyed); + } + + @Test(expected = InvalidParameterValueException.class) + public void validateRootVolumeDetachAttachRejectsRunningVm() { + validateRootVolumeDetachAttachForVmInState(State.Running); + } + /** * TESTS FOR ATTACH ROOT VOLUME, COUNT=7 */