apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow force reboot VM from user account, to start VM on the same host (#5791)

Browse Source
This commit is contained in:
sureshanaparti 2021-12-22 22:13:02 +05:30 committed by GitHub
parent 936ebbb90f
commit 39e41f6b6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/main/java/com/cloud/vm/UserVmManager.java
View File

@ -110,6 +110,9 @@ public interface UserVmManager extends UserVmService {
Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse) Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException; throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException;
Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse, boolean isExplicitHost)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException;
boolean upgradeVirtualMachine(Long id, Long serviceOfferingId, Map<String, String> customParameters) throws ResourceUnavailableException, boolean upgradeVirtualMachine(Long id, Long serviceOfferingId, Map<String, String> customParameters) throws ResourceUnavailableException,
ConcurrentOperationException, ManagementServerException, ConcurrentOperationException, ManagementServerException,
VirtualMachineMigrationException; VirtualMachineMigrationException;

17
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1078,7 +1078,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
params = new HashMap(); params = new HashMap();
params.put(VirtualMachineProfile.Param.BootIntoSetup, Boolean.TRUE); params.put(VirtualMachineProfile.Param.BootIntoSetup, Boolean.TRUE);
} }
return startVirtualMachine(vmId, null, null, hostId, params, null).first(); return startVirtualMachine(vmId, null, null, hostId, params, null, false).first();
} }
} catch (ResourceUnavailableException e) { } catch (ResourceUnavailableException e) {
throw new CloudRuntimeException("Unable to reboot the VM: " + vmId, e); throw new CloudRuntimeException("Unable to reboot the VM: " + vmId, e);
@ -5063,6 +5063,13 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId, public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId,
Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse) Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException { throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {
return startVirtualMachine(vmId, podId, clusterId, hostId, additionalParams, deploymentPlannerToUse, true);
}
@Override
public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId,
Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse, boolean isExplicitHost)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {
// Input validation // Input validation
final Account callerAccount = CallContext.current().getCallingAccount(); final Account callerAccount = CallContext.current().getCallingAccount();
UserVO callerUser = _userDao.findById(CallContext.current().getCallingUserId()); UserVO callerUser = _userDao.findById(CallContext.current().getCallingUserId());
@ -5118,7 +5125,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
boolean isRootAdmin = _accountService.isRootAdmin(callerAccount.getId()); boolean isRootAdmin = _accountService.isRootAdmin(callerAccount.getId());
Pod destinationPod = getDestinationPod(podId, isRootAdmin); Pod destinationPod = getDestinationPod(podId, isRootAdmin);
Cluster destinationCluster = getDestinationCluster(clusterId, isRootAdmin); Cluster destinationCluster = getDestinationCluster(clusterId, isRootAdmin);
Host destinationHost = getDestinationHost(hostId, isRootAdmin); Host destinationHost = getDestinationHost(hostId, isRootAdmin, isExplicitHost);
DataCenterDeployment plan = null; DataCenterDeployment plan = null;
boolean deployOnGivenHost = false; boolean deployOnGivenHost = false;
if (destinationHost != null) { if (destinationHost != null) {
@ -5271,10 +5278,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
return destinationCluster; return destinationCluster;
} }
private Host getDestinationHost(Long hostId, boolean isRootAdmin) { private Host getDestinationHost(Long hostId, boolean isRootAdmin, boolean isExplicitHost) {
Host destinationHost = null; Host destinationHost = null;
if (hostId != null) { if (hostId != null) {
if (!isRootAdmin) { if (isExplicitHost && !isRootAdmin) {
throw new PermissionDeniedException( throw new PermissionDeniedException(
"Parameter " + ApiConstants.HOST_ID + " can only be specified by a Root Admin, permission denied"); "Parameter " + ApiConstants.HOST_ID + " can only be specified by a Root Admin, permission denied");
} }
@ -5615,7 +5622,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
boolean isRootAdmin = _accountService.isRootAdmin(callerId); boolean isRootAdmin = _accountService.isRootAdmin(callerId);
Long hostId = cmd.getHostId(); Long hostId = cmd.getHostId();
getDestinationHost(hostId, isRootAdmin); getDestinationHost(hostId, isRootAdmin, true);
String ipAddress = cmd.getIpAddress(); String ipAddress = cmd.getIpAddress();
String ip6Address = cmd.getIp6Address(); String ip6Address = cmd.getIp6Address();