Remove qcow2 check while listing volumes (using GetVolumesOnStorageCommand)

Author: sureshanaparti

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapper.java

@@ -31,7 +31,6 @@
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
 import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.storage.volume.VolumeOnStorageTO;
 import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
@@ -83,13 +82,6 @@ private GetVolumesOnStorageAnswer addVolumeByVolumePath(final GetVolumesOnStorag
             if (!isDiskFormatSupported(disk)) {
                 return new GetVolumesOnStorageAnswer(command, false, String.format("disk format %s is unsupported", disk.getFormat()));
             }
-            if (PhysicalDiskFormat.QCOW2.equals(disk.getFormat())) {
-                try {
-                    KVMPhysicalDisk.checkQcow2File(disk.getPath());
-                } catch (CloudRuntimeException e) {
-                    return new GetVolumesOnStorageAnswer(command, false, e.getMessage());
-                }
-            }
             Map<String, String> info = getDiskFileInfo(storagePool, disk, true);
             if (info == null) {
                 return new GetVolumesOnStorageAnswer(command, false, "failed to get information of disk file. The disk might be locked or unsupported");
@@ -142,14 +134,6 @@ private GetVolumesOnStorageAnswer addAllVolumes(final GetVolumesOnStorageCommand
             if (!isDiskFormatSupported(disk)) {
                 continue;
             }
-            if (PhysicalDiskFormat.QCOW2.equals(disk.getFormat())) {
-                try {
-                    KVMPhysicalDisk.checkQcow2File(disk.getPath());
-                } catch (CloudRuntimeException e) {
-                    logger.error("Error while checking for qcow2 volume file: " + e.getMessage());
-                    continue;
-                }
-            }
             VolumeOnStorageTO volumeOnStorageTO = new VolumeOnStorageTO(Hypervisor.HypervisorType.KVM, disk.getName(), disk.getName(), disk.getPath(),
                     disk.getFormat().toString(), disk.getSize(), disk.getVirtualSize());
             if (disk.getQemuEncryptFormat() != null) {

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumesOnStorageCommandWrapperTest.java

@@ -38,7 +38,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockedStatic;
 import org.mockito.MockedConstruction;
 import org.mockito.Mockito;
 import org.mockito.Spy;
@@ -117,17 +116,12 @@ public void testLibvirtGetVolumesOnStorageCommandWrapperForAllVolumes() {
         }
         Mockito.when(storagePool.listPhysicalDisks()).thenReturn(physicalDisks);
 
-        try (MockedStatic<KVMPhysicalDisk> mockedKVMPhysicalDisk = Mockito.mockStatic(KVMPhysicalDisk.class)) {
-            mockedKVMPhysicalDisk.when(() -> KVMPhysicalDisk.checkQcow2File(Mockito.anyString()))
-                    .thenAnswer(invocation -> null);
-
-            Answer answer = libvirtGetVolumesOnStorageCommandWrapper.execute(command, libvirtComputingResource);
-            Assert.assertTrue(answer instanceof GetVolumesOnStorageAnswer);
-            Assert.assertTrue(answer.getResult());
-            List<VolumeOnStorageTO> volumes = ((GetVolumesOnStorageAnswer) answer).getVolumes();
-            Assert.assertEquals(numberDisks, volumes.size());
-            volumeOnStorageTOMock.constructed().forEach(s -> Mockito.verify(s, times(1)).setQemuEncryptFormat(QemuObject.EncryptFormat.LUKS.toString()));
-        }
+        Answer answer = libvirtGetVolumesOnStorageCommandWrapper.execute(command, libvirtComputingResource);
+        Assert.assertTrue(answer instanceof GetVolumesOnStorageAnswer);
+        Assert.assertTrue(answer.getResult());
+        List<VolumeOnStorageTO> volumes = ((GetVolumesOnStorageAnswer) answer).getVolumes();
+        Assert.assertEquals(numberDisks, volumes.size());
+        volumeOnStorageTOMock.constructed().forEach(s -> Mockito.verify(s, times(1)).setQemuEncryptFormat(QemuObject.EncryptFormat.LUKS.toString()));
     }
 
     @Test