From 47208dc23d4ee68db758889cd9e60e58aca1b72f Mon Sep 17 00:00:00 2001 From: Chris Suich Date: Thu, 10 Apr 2014 22:28:57 -0400 Subject: [PATCH] CLOUDSTACK-6422: Fixed errors with simulator VM snapshot delete and revert --- .../src/com/cloud/agent/manager/MockVmManagerImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java index f487eb4bcf9..e0a7e62b36b 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java @@ -485,22 +485,23 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager { public Answer deleteVmSnapshot(DeleteVMSnapshotCommand cmd) { String vm = cmd.getVmName(); String snapshotName = cmd.getTarget().getSnapshotName(); - if (_mockVmDao.findByVmName(cmd.getVmName()) != null) { + if (_mockVmDao.findByVmName(cmd.getVmName()) == null) { return new DeleteVMSnapshotAnswer(cmd, false, "No VM by name " + cmd.getVmName()); } s_logger.debug("Removed snapshot " + snapshotName + " of VM " + vm); - return new DeleteVMSnapshotAnswer(cmd, true, "success"); + return new DeleteVMSnapshotAnswer(cmd, cmd.getVolumeTOs()); } @Override public Answer revertVmSnapshot(RevertToVMSnapshotCommand cmd) { String vm = cmd.getVmName(); String snapshot = cmd.getTarget().getSnapshotName(); - if (_mockVmDao.findByVmName(cmd.getVmName()) != null) { + MockVMVO vmVo = _mockVmDao.findByVmName(cmd.getVmName()); + if (vmVo == null) { return new RevertToVMSnapshotAnswer(cmd, false, "No VM by name " + cmd.getVmName()); } s_logger.debug("Reverted to snapshot " + snapshot + " of VM " + vm); - return new RevertToVMSnapshotAnswer(cmd, true, "success"); + return new RevertToVMSnapshotAnswer(cmd, cmd.getVolumeTOs(), vmVo.getState()); } @Override