etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10620: allow ISO attachment failure to propogate up

This commit is contained in:
Kelven Yang 2011-07-07 17:00:41 -07:00
parent a7f8b66813
commit 25d2c893e6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/template/TemplateManagerImpl.java
View File

@ -819,6 +819,9 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
throw new InvalidParameterValueException("Cannot attach Xenserver PV drivers to incompatible hypervisor " + vm.getHypervisorType());
}
if("vmware-tools.iso".equals(iso.getName()) && vm.getHypervisorType() != Hypervisor.HypervisorType.VMware) {
throw new InvalidParameterValueException("Cannot attach VMware tools drivers to incompatible hypervisor " + vm.getHypervisorType());
}
return attachISOToVM(vmId, userId, isoId, true);
}

3
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -861,7 +861,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
cmd.setStoreUrl(isoPathPair.second());
}
Answer a = _agentMgr.easySend(vm.getHostId(), cmd);
return (a != null);
return (a != null && a.getResult());
}
private UserVm rebootVirtualMachine(long userId, long vmId) throws InsufficientCapacityException, ResourceUnavailableException {