Merge pull request #633 from jschoiRR/mold-main#2025

[Mold Agent] 데이터 볼륨 가져오기, 인스턴스 가져오기시 지원되는 볼륨 항목 추가(SharedMountPoint)

Author: jschoiRR

api/src/main/java/org/apache/cloudstack/storage/volume/VolumeImportUnmanageService.java

@@ -35,7 +35,7 @@ public interface VolumeImportUnmanageService extends PluggableService {
             Arrays.asList(Hypervisor.HypervisorType.KVM, Hypervisor.HypervisorType.VMware);
 
     List<Storage.StoragePoolType> SUPPORTED_STORAGE_POOL_TYPES_FOR_KVM = Arrays.asList(Storage.StoragePoolType.NetworkFilesystem,
-            Storage.StoragePoolType.Filesystem, Storage.StoragePoolType.RBD);
+            Storage.StoragePoolType.Filesystem, Storage.StoragePoolType.RBD, Storage.StoragePoolType.SharedMountPoint);
 
     ListResponse<VolumeForImportResponse> listVolumesForImport(ListVolumesForImportCmd cmd);
 

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

@@ -51,7 +51,8 @@ public Answer execute(final CheckVolumeCommand command, final LibvirtComputingRe
 
         try {
             if (storageFilerTO.getType() == Storage.StoragePoolType.Filesystem ||
-                    storageFilerTO.getType() == Storage.StoragePoolType.NetworkFilesystem) {
+                    storageFilerTO.getType() == Storage.StoragePoolType.NetworkFilesystem ||
+                    storageFilerTO.getType() == Storage.StoragePoolType.SharedMountPoint) {
                 final KVMPhysicalDisk vol = pool.getPhysicalDisk(srcFile);
                 final String path = vol.getPath();
                 long size = getVirtualSizeFromFile(path);

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

@@ -56,7 +56,8 @@ public Answer execute(final CopyRemoteVolumeCommand command, final LibvirtComput
 
         try {
             if (storageFilerTO.getType() == Storage.StoragePoolType.Filesystem ||
-                    storageFilerTO.getType() == Storage.StoragePoolType.NetworkFilesystem) {
+                    storageFilerTO.getType() == Storage.StoragePoolType.NetworkFilesystem||
+                    storageFilerTO.getType() == Storage.StoragePoolType.SharedMountPoint) {
                 String filename = libvirtComputingResource.copyVolume(srcIp, username, password, dstPath, srcFile, tmpPath, timeoutInSecs);
                 logger.debug("Volume " + srcFile + " copy successful, copied to file: " + filename);
                 final KVMPhysicalDisk vol = pool.getPhysicalDisk(filename);