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

some minor adjustments before doing the big work

This commit is contained in:
Alex Huang 2011-02-04 12:05:35 -08:00
parent 66573d34f0
commit f948926a2f
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2157,8 +2157,6 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
throw new PermissionDeniedException("The owner of " + vm + " either does not exist or is disabled: " + vm.getAccountId());
}
VirtualMachineTemplate template = profile.getTemplate();
if (vm.getIsoId() != null) {
template = _templateDao.findById(vm.getIsoId());

2
server/src/com/cloud/vm/VirtualMachineManager.java
View File

@ -101,6 +101,4 @@ public interface VirtualMachineManager extends Manager {
<T extends VMInstanceVO> T advanceReboot(T vm, Map<VirtualMachineProfile.Param, Object> params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, OperationTimedoutException;
VMInstanceVO findById(VirtualMachine.Type type, long vmId);
VirtualMachine start(VirtualMachine.Type type, long vmId, Map<VirtualMachineProfile.Param, Object> params);
}

8
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -692,7 +692,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, StateLi
continue;
} catch (RuntimeException e) {
s_logger.warn("Failed to start instance " + vm, e);
throw new CloudRuntimeException("Failed to start " + vm, e);
throw e;
} finally {
if (startedVm == null) {
_workDao.updateStep(work, Step.Release);
@ -1220,12 +1220,6 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, StateLi
return true;
}
@Override
public VirtualMachine start(VirtualMachine.Type type, long vmId, Map<VirtualMachineProfile.Param, Object> params) {
return null;
}
@Override
public VMInstanceVO findById(VirtualMachine.Type type, long vmId) {
VirtualMachineGuru<? extends VMInstanceVO> guru = _vmGurus.get(type);