honor delete volumes when delete vm requests

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java

@@ -48,7 +48,6 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
 
     List<VolumeVO> findByInstanceAndNotStates(long id, Volume.State...states);
 
-
     List<VolumeVO> findIncludingRemovedByInstanceAndType(long id, Volume.Type vType);
 
     List<VolumeVO> findNonDestroyedVolumesByInstanceIdAndPoolId(long instanceId, long poolId);

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java

@@ -568,7 +568,8 @@ protected GuestOS getGuestOsForInstance(Vm request, boolean isWorkerVm) {
             os = guestOSDao.findOneByDisplayName(guestOsName);
         }
         if (os == null) {
-            logger.debug("Guest OS could not be identified with ID: {} and name: {} for the VM request", os);
+            logger.debug("Guest OS could not be identified with ID: {} and name: {} for the VM request",
+                    guestOsId, guestOsName);
         }
         return os;
     }
@@ -1311,7 +1312,7 @@ public Vm updateInstance(String uuid, Vm request) {
     }
 
     @ApiAccess(command = DestroyVMCmd.class)
-    public VmAction deleteInstance(String uuid, boolean async) {
+    public VmAction deleteInstance(String uuid, boolean deleteVolumes, boolean async) {
         UserVmVO vo = userVmDao.findByUuid(uuid);
         if (vo == null) {
             throw new InvalidParameterValueException("VM with ID " + uuid + " not found");
@@ -1324,6 +1325,15 @@ public VmAction deleteInstance(String uuid, boolean async) {
             Map<String, String> params = new HashMap<>();
             params.put(ApiConstants.ID, vo.getUuid());
             params.put(ApiConstants.EXPUNGE, Boolean.TRUE.toString());
+            if (deleteVolumes) {
+                List<String>volumeIds = volumeDao.findByInstance(vo.getId()).stream()
+                        .filter(v -> Volume.Type.DATADISK.equals(v.getVolumeType()))
+                        .map(VolumeVO::getUuid)
+                        .collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(volumeIds)) {
+                    params.put(ApiConstants.VOLUME_IDS, String.join(",", volumeIds));
+                }
+            }
             if (isAdmin) {
                 params.put(ApiConstants.FORCED, Boolean.TRUE.toString());
             }

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/VmsRouteHandler.java

@@ -299,8 +299,9 @@ protected void handleUpdateById(final String id, final HttpServletRequest req, f
     protected void handleDeleteById(final String id, final HttpServletRequest req, final HttpServletResponse resp,
                 final Negotiation.OutFormat outFormat, final VeeamControlServlet io) throws IOException {
         boolean async = RouteHandler.isRequestAsync(req);
+        boolean deleteVolumes = Boolean.FALSE.toString().equals(req.getParameter("detach_only"));
         try {
-            VmAction vm = serverAdapter.deleteInstance(id, async);
+            VmAction vm = serverAdapter.deleteInstance(id, deleteVolumes, async);
             io.getWriter().write(resp, HttpServletResponse.SC_OK, vm, outFormat);
         } catch (CloudRuntimeException e) {
             io.badRequest(resp, e.getMessage(), outFormat);

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/dto/OvfXmlUtil.java

@@ -821,7 +821,7 @@ private static void updateFromXmlCloudStackMetadataSection(Vm vm, Node metadataS
         }
         String guestOsName = xpathString(xpath, metadataSection, ".//*[local-name()='GuestOsName']/text()");
         if (StringUtils.isNotBlank(guestOsName)) {
-            vm.setGuestOsId(guestOsName);
+            vm.setGuestOsName(guestOsName);
         }
         String instanceType = xpathString(xpath, metadataSection, ".//*[local-name()='Type']/text()");
         if (StringUtils.isNotBlank(instanceType)) {

plugins/integrations/veeam-control-service/src/test/java/org/apache/cloudstack/veeam/adapter/ServerAdapterTest.java

@@ -925,7 +925,7 @@ public void testGetInstance_NotFound_Throws() {
     @Test(expected = InvalidParameterValueException.class)
     public void testDeleteInstance_VmNotFound_Throws() {
         when(userVmDao.findByUuid("vm-uuid")).thenReturn(null);
-        serverAdapter.deleteInstance("vm-uuid", false);
+        serverAdapter.deleteInstance("vm-uuid", true, false);
     }
 
 

plugins/integrations/veeam-control-service/src/test/java/org/apache/cloudstack/veeam/api/VmsRouteHandlerTest.java

@@ -105,7 +105,7 @@ public void testHandleGetByIdDeleteAndPowerActions() throws Exception {
         stopAction.setStatus("stopping");
         final VmAction shutdownAction = new VmAction();
         shutdownAction.setStatus("shutting_down");
-        when(handler.serverAdapter.deleteInstance("vm-1", true)).thenReturn(deleteAction);
+        when(handler.serverAdapter.deleteInstance("vm-1", true, true)).thenReturn(deleteAction);
         when(handler.serverAdapter.startInstance("vm-1", false)).thenReturn(startAction);
         when(handler.serverAdapter.stopInstance("vm-1", false)).thenReturn(stopAction);
         when(handler.serverAdapter.shutdownInstance("vm-1", false)).thenReturn(shutdownAction);
@@ -119,9 +119,9 @@ public void testHandleGetByIdDeleteAndPowerActions() throws Exception {
         assertContains(get.body(), "\"id\":\"vm-1\"");
 
         final ResponseCapture delete = newResponse();
-        handler.handle(newRequest("DELETE", Map.of("async", "true"), null, null), delete.response,
+        handler.handle(newRequest("DELETE", Map.of("async", "true", "detach_only", "false"), null, null), delete.response,
                 "/api/vms/vm-1", Negotiation.OutFormat.JSON, newServlet());
-        verify(handler.serverAdapter).deleteInstance("vm-1", true);
+        verify(handler.serverAdapter).deleteInstance("vm-1", true, true);
         verify(delete.response).setStatus(200);
         assertContains(delete.body(), "deleted");