From 529e9e5b091134ea726f11b3d701de853404f9ec Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Mon, 5 Mar 2012 17:57:34 -0800
Subject: [PATCH] Bug 14028 - Add hostid parameter to StartVmCmd to enable
 admins to start VM on a particular host

Changes:
- Added hostid to StartVMCmd. Only root admin can use it.

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
---
 .../com/cloud/api/commands/StartVMCmd.java    |  8 ++++++
 api/src/com/cloud/vm/UserVmService.java       |  2 +-
 .../src/com/cloud/vm/UserVmManagerImpl.java   | 25 ++++++++++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/api/src/com/cloud/api/commands/StartVMCmd.java b/api/src/com/cloud/api/commands/StartVMCmd.java
index a4ba5c1f331..3756eefaa85 100644
--- a/api/src/com/cloud/api/commands/StartVMCmd.java
+++ b/api/src/com/cloud/api/commands/StartVMCmd.java
@@ -51,6 +51,10 @@ public class StartVMCmd extends BaseAsyncCmd {
 
     @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="The ID of the virtual machine")
     private Long id;
+    
+    @IdentityMapper(entityTableName="host")
+    @Parameter(name=ApiConstants.HOST_ID, type=CommandType.LONG, description="destination Host ID to deploy the VM to - parameter available for root admin only")
+    private Long hostId;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -59,6 +63,10 @@ public class StartVMCmd extends BaseAsyncCmd {
     public Long getId() {
         return id;
     }
+    
+    public Long getHostId() {
+        return hostId;
+    }    
 
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index c335b19bae3..467108e519a 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -333,7 +333,7 @@ public interface UserVmService {
 
     UserVm stopVirtualMachine(long vmId, boolean forced) throws ConcurrentOperationException;
 
-    UserVm startVirtualMachine(long vmId) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+    UserVm startVirtualMachine(long vmId, Long hostId) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
 
     void deletePrivateTemplateRecord(Long templateId);
 
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index f212ebd4f63..2f653a88f7f 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -105,7 +105,6 @@ import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.StorageUnavailableException;
-import com.cloud.exception.UnsupportedServiceException;
 import com.cloud.exception.VirtualMachineMigrationException;
 import com.cloud.ha.HighAvailabilityManager;
 import com.cloud.host.Host;
@@ -1869,7 +1868,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_VM_START, eventDescription = "starting Vm", async = true)
     public UserVm startVirtualMachine(StartVMCmd cmd) throws ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
-        return startVirtualMachine(cmd.getId());
+        return startVirtualMachine(cmd.getId(), cmd.getHostId());
     }
 
     @Override
@@ -2935,7 +2934,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
     }
 
     @Override
-    public UserVm startVirtualMachine(long vmId) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+    public UserVm startVirtualMachine(long vmId, Long hostId) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
         // Input validation
         Account account = UserContext.current().getCaller();
         Long userId = UserContext.current().getCallerUserId();
@@ -2950,8 +2949,20 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
             throw new InvalidParameterValueException("unable to find a virtual machine with id " + vmId);
         }
 
+
         userId = accountAndUserValidation(vmId, account, userId, vm);
         UserVO user = _userDao.findById(userId);
+        
+        Host destinationHost = null;
+        if(hostId != null){
+            if(!_accountService.isRootAdmin(account.getType())){
+                throw new PermissionDeniedException("Parameter hostid can only be specified by a Root Admin, permission denied");
+            }
+            destinationHost = _hostDao.findById(hostId);
+            if (destinationHost == null) {
+                throw new InvalidParameterValueException("Unable to find the host to deploy the VM, host id=" + hostId);
+            }
+        }
 
         //check if vm is security group enabled
         if (_securityGroupMgr.isVmSecurityGroupEnabled(vmId) && !_securityGroupMgr.isVmMappedToDefaultSecurityGroup(vmId)) {
@@ -2967,8 +2978,14 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
                 _securityGroupMgr.addInstanceToGroups(vmId, groupList);
             }
         }
+        
+        DataCenterDeployment plan = null;
+        if (destinationHost != null) {
+            s_logger.debug("Destination Host to deploy the VM is specified, specifying a deployment plan to deploy the VM");
+            plan = new DataCenterDeployment(vm.getDataCenterIdToDeployIn(), destinationHost.getPodId(), destinationHost.getClusterId(), destinationHost.getId(), null);
+        }
 
-        return _itMgr.start(vm, null, user, account);
+        return _itMgr.start(vm, null, user, account, plan);
     }
 
     @Override