This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 3de1f8b4baf2af1b1cd5387aff4024a1fdd5a8ec
Merge: b23ceefc7ea 9d5d4e55648
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Mon Apr 29 13:44:34 2024 +0530
Merge remote-tracking branch 'origin/4.18' into 4.19
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
.../upgrade/SystemVmTemplateRegistration.java | 11 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +
.../hypervisor/kvm/resource/MigrateKVMAsync.java | 45 +++++++-
.../wrapper/LibvirtMigrateCommandWrapper.java | 29 +++++-
.../kvm/resource/MigrateKVMAsyncTest.java | 83 +++++++++++++++
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 78 ++++++++++++--
.../kvm/storage/LinstorStorageAdaptor.java | 114 +++++++++++++--------
.../configuration/ConfigurationManagerImpl.java | 2 +-
8 files changed, 311 insertions(+), 55 deletions(-)
diff --cc
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
index 67e00aa7063,7071758fcbe..29a5e1f934b
---
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
+++
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
@@@ -29,6 -30,8 +30,7 @@@ import java.util.Arrays
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Scanner;
+ import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@@ -750,13 -771,11 +760,11 @@@ public class LibvirtMigrateCommandWrapp
@Test
public void testReplaceStorage() throws Exception {
- Map<String, MigrateDiskInfo> mapMigrateStorage = new HashMap<String,
MigrateDiskInfo>();
+ Map<String, MigrateDiskInfo> mapMigrateStorage =
createMapMigrateStorage("sourceTest",
"/mnt/812ea6a3-7ad0-30f4-9cab-01e3f2985b98/4650a2f7-fce5-48e2-beaa-bcdf063194e6");
- MigrateDiskInfo diskInfo = new MigrateDiskInfo("123456",
DiskType.BLOCK, DriverType.RAW, Source.FILE, "sourctest");
-
mapMigrateStorage.put("/mnt/812ea6a3-7ad0-30f4-9cab-01e3f2985b98/4650a2f7-fce5-48e2-beaa-bcdf063194e6",
diskInfo);
final String result =
libvirtMigrateCmdWrapper.replaceStorage(fullfile, mapMigrateStorage, true);
- InputStream in = IOUtils.toInputStream(result);
+ InputStream in = IOUtils.toInputStream(result, "UTF-8");
DocumentBuilderFactory docFactory =
DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
Document doc = docBuilder.parse(in);
diff --cc
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index d560c4ee806,b38ab382a42..3a327b158d2
---
a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
+++
b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@@ -33,7 -35,10 +33,8 @@@ import org.apache.cloudstack.utils.qemu
import org.apache.log4j.Logger;
import org.libvirt.LibvirtException;
-import com.cloud.storage.Storage;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.linbit.linstor.api.ApiClient;
+ import com.linbit.linstor.api.ApiConsts;
import com.linbit.linstor.api.ApiException;
import com.linbit.linstor.api.Configuration;
import com.linbit.linstor.api.DevelopersApi;
