Fix restore VM

Author: nvazquez

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

@@ -2352,11 +2352,6 @@ 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);
         }
@@ -8765,6 +8760,10 @@ public UserVm restoreVM(RestoreVMCmd cmd) throws InsufficientCapacityException,
             throw new InvalidParameterValueException(String.format("Operation not supported for instance: %s",
                     vm.getName()));
         }
+        if (isVMPartOfAnyCKSCluster(vm)) {
+            throw new UnsupportedServiceException("Cannot restore VM with id = " + vm.getUuid() +
+                    " as it belongs to a CKS cluster. Please remove the VM from the CKS cluster before restoring.");
+        }
         _accountMgr.checkAccess(caller, null, true, vm);
 
         VMTemplateVO template;

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

@@ -59,6 +59,7 @@
 import java.util.TimeZone;
 import java.util.UUID;
 
+import com.cloud.kubernetes.cluster.KubernetesServiceHelper;
 import com.cloud.storage.dao.SnapshotPolicyDao;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker;
@@ -1475,6 +1476,9 @@ public void testRestoreVMWithVolumeSnapshots() throws ResourceUnavailableExcepti
         when(cmd.getVmId()).thenReturn(vmId);
         when(cmd.getTemplateId()).thenReturn(2L);
         when(userVmDao.findById(vmId)).thenReturn(userVmVoMock);
+        KubernetesServiceHelper helper = mock(KubernetesServiceHelper.class);
+        when(helper.findByVmId(anyLong())).thenReturn(null);
+        userVmManagerImpl.setKubernetesServiceHelpers(Collections.singletonList(helper));
 
         userVmManagerImpl.restoreVM(cmd);
     }