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 5b7c86aa452b27c0ff27f125438f1e4fea6272f4
Merge: 22c6f08f77b 896b8bfabf1
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Thu Nov 7 14:51:43 2024 +0530
Merge remote-tracking branch 'origin/4.18' into 4.19
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
.../kvm/storage/LinstorStorageAdaptor.java | 78 +++++++++++++++++-----
.../storage/datastore/util/LinstorUtil.java | 24 +++++++
systemvm/debian/opt/cloud/bin/cs/CsFile.py | 2 +-
3 files changed, 87 insertions(+), 17 deletions(-)
diff --cc
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index 659ff7bfe53,424073e931f..fb00875bb3d
---
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,7 -16,12 +16,8 @@@
// 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.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@@ -47,6 -53,8 +48,7 @@@ import com.linbit.linstor.api.model.Pro
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.ResourceGroup;
+ import com.linbit.linstor.api.model.ResourceDefinitionModify;
import com.linbit.linstor.api.model.ResourceGroupSpawn;
import com.linbit.linstor.api.model.ResourceMakeAvailable;
import com.linbit.linstor.api.model.ResourceWithVolumes;
diff --cc
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
index 9aa6f151abc,bff25969d36..2dbfdea6d11
---
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
@@@ -29,10 -27,8 +30,11 @@@ import com.linbit.linstor.api.model.Res
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.Collection;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
