(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19

[rohit]

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 a851ee375c11cc6c6f1e87f45d95465fd041a3bb
Merge: 601e9b67ead 537c0a1e8d2
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Wed Sep 4 12:30:00 2024 +0530

    Merge remote-tracking branch 'origin/4.18' into 4.19
    
    Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>

 plugins/storage/volume/linstor/CHANGELOG.md        | 12 +++++
 .../kvm/storage/LinstorStorageAdaptor.java         | 57 +++++++++++++++-------
 .../storage/datastore/util/LinstorUtil.java        | 13 +++--
 3 files changed, 59 insertions(+), 23 deletions(-)

diff --cc 
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index 64626788999,0ae65573d2b..83a84a91622
--- 
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
@@@ -16,6 -16,11 +16,7 @@@
  // under the License.
  package com.cloud.hypervisor.kvm.storage;
  
 -import java.io.BufferedReader;
 -import java.io.IOException;
 -import java.io.InputStreamReader;
 -
+ import java.util.ArrayList;
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
@@@ -24,8 -29,7 +25,9 @@@ import java.util.Optional
  
  import javax.annotation.Nonnull;
  
 +import com.cloud.storage.Storage;
 +import com.cloud.utils.exception.CloudRuntimeException;
++
  import org.apache.cloudstack.storage.datastore.util.LinstorUtil;
  import org.apache.cloudstack.utils.qemu.QemuImg;
  import org.apache.cloudstack.utils.qemu.QemuImgException;
@@@ -43,8 -50,9 +45,8 @@@ import com.linbit.linstor.api.model.Api
  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.ResourceConnectionModify;
  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;