[CSTACKEX-279] Fix review comments related to qos policy remove from volume table

Author: Gupta, Surya

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -769,7 +769,6 @@ public void deleteAsync(DataStore store, DataObject data, AsyncCompletionCallbac
                 CloudStackVolume cloudStackVolumeRequest = createDeleteCloudStackVolumeRequest(storagePool, details, volumeInfo);
                 storageStrategy.deleteCloudStackVolume(cloudStackVolumeRequest);
                 if (qosPolicyDetail != null) {
-                    volumeDetailsDao.removeDetail(volumeInfo.getId(), OntapStorageConstants.QOS_POLICY_UUID);
                     deleteUnusedQosPolicy(storageStrategy, qosPolicyDetail.getValue());
                 }
                 logger.info("deleteAsync: Volume deleted: " + volumeInfo.getId());

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriverTest.java

@@ -2358,7 +2358,7 @@ void testDeleteAsync_DeletesUnusedQosPolicy() {
             ArgumentCaptor<CommandResult> resultCaptor = ArgumentCaptor.forClass(CommandResult.class);
             verify(commandCallback).complete(resultCaptor.capture());
             assertTrue(resultCaptor.getValue().isSuccess());
-            verify(volumeDetailsDao).removeDetail(100L, OntapStorageConstants.QOS_POLICY_UUID);
+            verify(volumeDetailsDao, never()).removeDetail(100L, OntapStorageConstants.QOS_POLICY_UUID);
             verify(sanStrategy).deleteVolumeQosPolicy("qos-uuid");
         }
     }
@@ -2391,7 +2391,7 @@ void testDeleteAsync_QosPolicyDeleteFails_VolumeDeleteStillSucceeds() {
             ArgumentCaptor<CommandResult> resultCaptor = ArgumentCaptor.forClass(CommandResult.class);
             verify(commandCallback).complete(resultCaptor.capture());
             assertTrue(resultCaptor.getValue().isSuccess());
-            verify(volumeDetailsDao).removeDetail(100L, OntapStorageConstants.QOS_POLICY_UUID);
+            verify(volumeDetailsDao, never()).removeDetail(100L, OntapStorageConstants.QOS_POLICY_UUID);
             verify(sanStrategy).deleteVolumeQosPolicy("qos-uuid");
         }
     }