[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14'

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 562a7db8dfd923c986f231a42c15669922574a7c
Merge: db665fa cd8e28b
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Aug 5 23:59:16 2020 +0530

    Merge remote-tracking branch 'origin/4.14'
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 api/src/main/java/com/cloud/vm/UserVmService.java  |   2 +
 .../java/com/cloud/vm/VirtualMachineManager.java   |   3 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    | 104 +++++++++++
 .../src/main/java/com/cloud/vm/VmWorkRestore.java  |  33 ++++
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |   8 +-
 .../test/java/com/cloud/vm/UserVmManagerTest.java  | 194 ---------------------
 6 files changed, 148 insertions(+), 196 deletions(-)

diff --cc engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
index 9165631,1921e51..50d78f4
--- a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
+++ b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
@@@ -42,7 -41,7 +42,8 @@@ import com.cloud.offering.DiskOfferingI
  import com.cloud.offering.ServiceOffering;
  import com.cloud.storage.StoragePool;
  import com.cloud.template.VirtualMachineTemplate;
 +import com.cloud.user.Account;
+ import com.cloud.uservm.UserVm;
  import com.cloud.utils.component.Manager;
  import com.cloud.utils.fsm.NoTransitionException;
  
@@@ -222,16 -215,5 +223,18 @@@ public interface VirtualMachineManager 
  
      boolean getExecuteInSequence(HypervisorType hypervisorType);
  
 +    static String getHypervisorHostname(String name) {
 +        final Account caller = CallContext.current().getCallingAccount();
 +        String destHostname = (AllowExposeHypervisorHostname.value() && AllowExposeHypervisorHostnameAccountLevel.valueIn(caller.getId())) ? name : null;
 +        return destHostname;
 +    }
 +
 +    /**
 +     * Unmanage a VM from CloudStack:
 +     * - Remove the references of the VM and its volumes, nics, IPs from database
 +     * - Keep the VM as it is on the hypervisor
 +     */
 +    boolean unmanage(String vmUuid);
++
+     UserVm restoreVirtualMachine(long vmId, Long newTemplateId) throws ResourceUnavailableException, InsufficientCapacityException;
  }