More explicit exception

Author: winterhazel

api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java

@@ -121,26 +121,15 @@ public List<Long> getSecurityGroupIdList() {
     public void execute() {
         try {
             UserVm userVm = _userVmService.moveVmToUser(this);
-            if (userVm == null) {
-                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm");
-            }
             UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", userVm).get(0);
             response.setResponseName(getCommandName());
             setResponseObject(response);
-        } catch (InvalidParameterValueException e){
-            e.printStackTrace();
-            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
         } catch (Exception e) {
-            logger.error("Failed to move vm due to: " + e.getStackTrace());
-            if (e.getMessage() != null) {
-                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm due to " + e.getMessage());
-            } else if (e.getCause() != null) {
-                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm due to " + e.getCause());
-            } else {
-                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm");
-            }
+            ApiErrorCode errorCode = e instanceof InvalidParameterValueException ? ApiErrorCode.PARAM_ERROR : ApiErrorCode.INTERNAL_ERROR;
+            String msg = String.format("Failed to move VM [%s].", getVmId());
+            logger.error(msg, e);
+            throw new ServerApiException(errorCode, msg);
         }
-
     }
 
     @Override

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -7450,9 +7450,7 @@ protected void validateIfVmSupportsMigration(UserVmVO vm, Long vmId) {
         if (vm == null) {
             throw new InvalidParameterValueException(String.format("There is no VM by ID [%s].", vmId));
         } else if (vm.getState() == State.Running) {
-            String errMsg = String.format("Unable to move VM [%s] in [%s] state.", vm, vm.getState());
-            logger.warn(errMsg);
-            throw new InvalidParameterValueException(errMsg);
+            throw new InvalidParameterValueException(String.format("Unable to move VM [%s] in [%s] state.", vm, vm.getState()));
         } else if (UserVmManager.SHAREDFSVM.equals(vm.getUserVmType())) {
             throw new InvalidParameterValueException("Migration is not supported for Shared FileSystem Instances.");
         }
@@ -7527,13 +7525,19 @@ protected void verifyResourceLimitsForAccountAndStorage(Account account, UserVmV
     }
 
     protected void validateIfNewOwnerHasAccessToTemplate(UserVmVO vm, Account newAccount, VirtualMachineTemplate template) {
-        logger.trace(String.format("Validating if new owner [%s] has access to the template specified for VM [%s].", newAccount, vm));
+        logger.trace("Validating if new owner [{}] has access to the template specified for VM [{}].", newAccount, vm);
 
         if (template == null) {
             throw new InvalidParameterValueException(String.format("Template for VM [%s] cannot be found.", vm.getUuid()));
         }
 
-        _accountMgr.checkAccess(newAccount, AccessType.UseEntry, true, template);
+        logger.debug("Verifying if new owner [{}] has access to the template [{}].", newAccount, template.getUuid());
+        try {
+            _accountMgr.checkAccess(newAccount, AccessType.UseEntry, true, template);
+        } catch (PermissionDeniedException e) {
+            String newMsg = String.format("New owner [%s] does not have access to the template specified for VM [%s].", newAccount, vm);
+            throw new PermissionDeniedException(newMsg, e);
+        }
     }
 
     /**
@@ -7674,6 +7678,8 @@ protected void updateVmNetwork(AssignVMCmd cmd, Account caller, UserVmVO vm, Acc
     protected void validateOldAndNewAccounts(Account oldAccount, Account newAccount, Long oldAccountId, String newAccountName, Long domainId)
             throws InvalidParameterValueException {
 
+        logger.trace("Validating old [{}] and new accounts [{}].", oldAccount, newAccount);
+
         if (oldAccount == null) {
             throw new InvalidParameterValueException(String.format("Invalid old account [%s] for VM in domain [%s].", oldAccountId, domainId));
         }