(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 aad410ae6c0593fb810e59c37c18d25f1bcb633d Merge: d1ca79b65b3 5c9d79e3fb4 Author: Rohit Yadav AuthorDate: Wed May 1 12:05:52 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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
AuthorDate: Mon Apr 29 13:44:34 2024 +0530
Merge remote-tracking branch 'origin/4.18' into 4.19
Signed-off-by: Rohit Yadav
.../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 mapMigrateStorage = new HashMap();
+ Map 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;
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 0fa71f56966c834e10060cdbba1c124fd3b075f0 Merge: 582249c1f72 0577b0ac8ef Author: Rohit Yadav AuthorDate: Tue Apr 23 15:21:44 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-- .../kvm/storage/LinstorStorageAdaptor.java | 33 +-- .../storage/datastore/util/LinstorUtil.java| 19 +++ .../com/cloud/network/IpAddressManagerImpl.java| 38 +- 4 files changed, 72 insertions(+), 22 deletions(-) diff --cc plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java index 33cbea0996d,c8544fd3e3e..8c42bdc2a96 --- a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java +++ b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java @@@ -22,14 -22,10 +22,15 @@@ import com.linbit.linstor.api.Configura import com.linbit.linstor.api.DevelopersApi; import com.linbit.linstor.api.model.ApiCallRc; import com.linbit.linstor.api.model.ApiCallRcList; +import com.linbit.linstor.api.model.Node; import com.linbit.linstor.api.model.ProviderKind; + import com.linbit.linstor.api.model.Resource; import com.linbit.linstor.api.model.ResourceGroup; +import com.linbit.linstor.api.model.ResourceWithVolumes; import com.linbit.linstor.api.model.StoragePool; +import com.linbit.linstor.api.model.Volume; + +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List;
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 cadbb563afaa907a45e8931cb8a95e8ca5b8f034 Merge: 85110147071 8a101fbbc11 Author: Rohit Yadav AuthorDate: Thu Apr 18 10:21:54 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 a55ba96a08e3904641582eb1d03514098c8b8a90 Merge: 0a26f3315a1 6cd5c6a1d01 Author: Rohit Yadav AuthorDate: Tue Apr 16 16:10:33 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 .../kvm/storage/LinstorStorageAdaptor.java | 53 -- 1 file changed, 29 insertions(+), 24 deletions(-) diff --cc plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java index 101e8d3597e,9ad8332d0e1..dd50c8d2214 --- 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 @@@ -41,8 -45,10 +41,9 @@@ import com.linbit.linstor.api.model.Api import com.linbit.linstor.api.model.ApiCallRcList; import com.linbit.linstor.api.model.Properties; import com.linbit.linstor.api.model.ProviderKind; + import com.linbit.linstor.api.model.Resource; import com.linbit.linstor.api.model.ResourceDefinition; import com.linbit.linstor.api.model.ResourceDefinitionModify; -import com.linbit.linstor.api.model.ResourceGroup; import com.linbit.linstor.api.model.ResourceGroupSpawn; import com.linbit.linstor.api.model.ResourceMakeAvailable; import com.linbit.linstor.api.model.ResourceWithVolumes;
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 f2da882d68fc6ff403883311d96b4ab70fbb0a36 Merge: 16aba6b5881 7a9985b42bf Author: Rohit Yadav AuthorDate: Thu Apr 4 14:58:50 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 .../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 83 ++ 1 file changed, 83 insertions(+)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 16aba6b5881d57115b5b75d3c64b4c653ce64ed0 Merge: b642500f153 ff3e9bd821f Author: Rohit Yadav AuthorDate: Thu Apr 4 14:17:24 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 308ed1399eed89d068dce2fee7ae833326007ed9 Merge: fe5d7412364 8c62365dbb1 Author: Rohit Yadav AuthorDate: Wed Mar 20 15:49:21 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 .../storage/snapshot/SnapshotSchedulerImpl.java| 7 ++ systemvm/debian/opt/cloud/bin/setup/postinit.sh| 26 +++--- 2 files changed, 20 insertions(+), 13 deletions(-)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 a1f547a011038296a2125586cbb8c8d18d249455 Merge: 1d1b3321416 56f0448f0d4 Author: Rohit Yadav AuthorDate: Fri Feb 9 00:10:34 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 Signed-off-by: Rohit Yadav Conflicts: plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java .../kvm/storage/LinstorStorageAdaptor.java | 28 +++--- 1 file changed, 19 insertions(+), 9 deletions(-)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 7394af3071825537f3d43f4ec0df41dcc4f410c9 Merge: e53d3274fa3 3fa052c1f57 Author: Rohit Yadav AuthorDate: Thu Feb 8 23:53:32 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
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 0d36098c76833ad3f7510f72e54ece3f3d7f3ba2 Merge: 376243975ba 69e8ebc03fc Author: Rohit Yadav AuthorDate: Wed Feb 7 14:20:39 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 .../cluster/KubernetesClusterManagerImpl.java | 1 + .../cluster/KubernetesClusterService.java | 6 +++ .../KubernetesClusterUpgradeWorker.java| 61 +++--- test/integration/smoke/test_kubernetes_clusters.py | 48 - 4 files changed, 59 insertions(+), 57 deletions(-)
