Include recoverVirtualMachine API validation

Author: nvazquez

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

@@ -199,4 +199,9 @@ static Set<String> getStrictHostTags() {
 
     Boolean getDestroyRootVolumeOnVmDestruction(Long domainId);
 
+    /**
+     * @return true if the VM is part of a CKS cluster, false otherwise.
+     */
+    boolean isVMPartOfAnyCKSCluster(VMInstanceVO vm);
+
 }

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

@@ -2352,6 +2352,11 @@ public UserVm recoverVirtualMachine(RecoverVMCmd cmd) throws ResourceAllocationE
             throw new InvalidParameterValueException("Vm with id " + vm.getUuid() + " is not in the right state");
         }
 
+        if (isVMPartOfAnyCKSCluster(vm)) {
+            throw new UnsupportedServiceException("Cannot recover VM with id = " + vm.getUuid() +
+                    " as it belongs to a CKS cluster. Please remove the VM from the CKS cluster before recovering.");
+        }
+
         if (logger.isDebugEnabled()) {
             logger.debug("Recovering vm {}", vm);
         }
@@ -9955,6 +9960,11 @@ public Boolean getDestroyRootVolumeOnVmDestruction(Long domainId){
         return DestroyRootVolumeOnVmDestruction.valueIn(domainId);
     }
 
+    @Override
+    public boolean isVMPartOfAnyCKSCluster(VMInstanceVO vm) {
+        return kubernetesServiceHelpers.get(0).findByVmId(vm.getId()) != null;
+    }
+
     private void setVncPasswordForKvmIfAvailable(Map<String, String> customParameters, UserVmVO vm) {
         if (customParameters.containsKey(VmDetailConstants.KVM_VNC_PASSWORD)
                 && StringUtils.isNotEmpty(customParameters.get(VmDetailConstants.KVM_VNC_PASSWORD))) {

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

@@ -71,7 +71,6 @@
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.HypervisorGuru;
 import com.cloud.hypervisor.HypervisorGuruManager;
-import com.cloud.kubernetes.cluster.KubernetesServiceHelper;
 import com.cloud.network.Network;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.Networks;
@@ -315,12 +314,6 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
     @Inject
     private ImportVmTasksManager importVmTasksManager;
 
-    private List<KubernetesServiceHelper> kubernetesServiceHelpers;
-
-    public void setKubernetesServiceHelpers(final List<KubernetesServiceHelper> kubernetesServiceHelpers) {
-        this.kubernetesServiceHelpers = kubernetesServiceHelpers;
-    }
-
     protected Gson gson;
 
     public UnmanagedVMsManagerImpl() {
@@ -2386,16 +2379,12 @@ void performUnmanageVMInstancePrechecks(VMInstanceVO vmVO) {
                     " as there is an ISO attached. Please detach ISO before unmanaging.");
         }
 
-        if (isVmPartOfCKSCluster(vmVO)) {
+        if (userVmManager.isVMPartOfAnyCKSCluster(vmVO)) {
             throw new UnsupportedServiceException("Cannot unmanage VM with id = " + vmVO.getUuid() +
                     " as it belongs to a CKS cluster. Please remove the VM from the CKS cluster before unmanaging.");
         }
     }
 
-    private boolean isVmPartOfCKSCluster(VMInstanceVO vmVO) {
-        return kubernetesServiceHelpers.get(0).findByVmId(vmVO.getId()) != null;
-    }
-
     private boolean hasVolumeSnapshotsPriorToUnmanageVM(VMInstanceVO vmVO) {
         List<VolumeVO> volumes = volumeDao.findByInstance(vmVO.getId());
         for (VolumeVO volume : volumes) {

server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml

@@ -35,9 +35,7 @@
         <property name="name" value="LXCGuru" />
     </bean>
 
-    <bean id="vmImportService" class="org.apache.cloudstack.vm.UnmanagedVMsManagerImpl">
-        <property name="kubernetesServiceHelpers" value="#{kubernetesServiceHelperRegistry.registered}" />
-    </bean>
+    <bean id="vmImportService" class="org.apache.cloudstack.vm.UnmanagedVMsManagerImpl" />
 
     <bean id="importVmTasksManager" class="org.apache.cloudstack.vm.ImportVmTasksManagerImpl" />
 

server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java

@@ -39,13 +39,11 @@
 import java.util.Map;
 import java.util.UUID;
 
-import com.cloud.kubernetes.cluster.KubernetesServiceHelper;
 import com.cloud.offering.DiskOffering;
 import com.cloud.storage.Snapshot;
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.dao.SnapshotDao;
 import com.cloud.vm.ImportVMTaskVO;
-import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.apache.cloudstack.api.ResponseObject;
@@ -248,8 +246,6 @@ public class UnmanagedVMsManagerImplTest {
     @Mock
     private ImportVmTasksManager importVmTasksManager;
     @Mock
-    private KubernetesServiceHelper kubernetesServiceHelper;
-    @Mock
     private SnapshotDao snapshotDao;
 
     @Mock
@@ -289,8 +285,6 @@ public void setUp() throws Exception {
         UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
         CallContext.register(user, account);
 
-        unmanagedVMsManager.setKubernetesServiceHelpers(List.of(kubernetesServiceHelper));
-
         instance = new UnmanagedInstanceTO();
         instance.setName("TestInstance");
         instance.setCpuCores(2);
@@ -623,7 +617,7 @@ public void testUnmanageVMInstanceBelongingToCksClusterFail() {
         when(userVmVO.getIsoId()).thenReturn(null);
         when(userVmDao.findById(anyLong())).thenReturn(userVmVO);
         when(vmDao.findById(virtualMachineId)).thenReturn(virtualMachine);
-        when(kubernetesServiceHelper.findByVmId(virtualMachineId)).thenReturn(mock(ControlledEntity.class));
+        when(userVmManager.isVMPartOfAnyCKSCluster(virtualMachine)).thenReturn(true);
         unmanagedVMsManager.unmanageVMInstance(virtualMachineId, null, false);
     }