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

some unfinished cleanup on removing the caller and account

This commit is contained in:
Alex Huang 2013-06-11 16:45:18 -07:00
parent 33dfe4f752
commit 1310535be5
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/components-api/src/com/cloud/vm/VirtualMachineManager.java
View File

@ -42,7 +42,6 @@ import com.cloud.storage.StoragePool;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Manager;
import com.cloud.utils.fsm.NoTransitionException;
@ -125,9 +124,9 @@ public interface VirtualMachineManager extends Manager {
VirtualMachine migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException,
ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;
void reboot(String vmUuid, User caller, Account account);
void reboot(String vmUuid);
void advanceReboot(String vmUuid, User caller, Account account) throws InsufficientCapacityException,
void advanceReboot(String vmUuid) throws InsufficientCapacityException,
ResourceUnavailableException, ConcurrentOperationException, OperationTimedoutException;
VirtualMachine storageMigration(String vmUuid, StoragePool storagePoolId);

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

@ -740,8 +740,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
private UserVm rebootVirtualMachine(long userId, long vmId) {
UserVmVO vm = _vmDao.findById(vmId);
User caller = _accountMgr.getActiveUser(userId);
Account owner = _accountMgr.getAccount(vm.getAccountId());
if (vm == null || vm.getState() == State.Destroyed
|| vm.getState() == State.Expunging || vm.getRemoved() != null) {
@ -751,7 +749,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
if (vm.getState() == State.Running && vm.getHostId() != null) {
collectVmDiskStatistics(vm);
_itMgr.reboot(vm.getUuid(), caller, owner);
_itMgr.reboot(vm.getUuid());
return _vmDao.findById(vmId);
} else {
s_logger.error("Vm id=" + vmId

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

@ -2145,9 +2145,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
@Override
public void reboot(String vmUuid, User caller, Account account) {
public void reboot(String vmUuid) {
try {
advanceReboot(vmUuid, caller, account);
advanceReboot(vmUuid);
} catch (ConcurrentOperationException e) {
throw new CloudRuntimeException("Unable to reboot a VM due to concurrent operation", e).add(VirtualMachine.class, vmUuid);
} catch (InsufficientCapacityException e) {
@ -2160,7 +2160,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
@Override
public void advanceReboot(String vmUuid, User caller, Account account) throws InsufficientCapacityException,
public void advanceReboot(String vmUuid) throws InsufficientCapacityException,
ConcurrentOperationException, ResourceUnavailableException, OperationTimedoutException {
VMInstanceVO vm = _vmDao.findByUuid(vmUuid);
if (vm.getHostId() == null) {

6
server/test/com/cloud/vm/VmWorkMockVirtualMachineManagerImpl.java
View File

@ -52,7 +52,6 @@ import com.cloud.storage.StoragePool;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.utils.Pair;
import com.cloud.utils.fsm.NoTransitionException;
import com.cloud.vm.VirtualMachine.Event;
@ -230,13 +229,12 @@ public class VmWorkMockVirtualMachineManagerImpl implements VirtualMachineManage
}
@Override
public void reboot(String vmUuid,
User caller, Account account) {
public void reboot(String vmUuid) {
// TODO Auto-generated method stub
}
@Override
public void advanceReboot(String vmUuid, User caller, Account account)
public void advanceReboot(String vmUuid)
throws InsufficientCapacityException, ResourceUnavailableException,
ConcurrentOperationException, OperationTimedoutException {
// TODO Auto-generated method stub