Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Loading