Skip to content

Commit d2499c0

Browse files
committed
linstor: update java-linstor to 0.6.1
1 parent bcd23eb commit d2499c0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ private void resizeResource(DevelopersApi api, String resourceName, long sizeByt
616616
*/
617617
private void updateRscGrpIfNecessary(DevelopersApi api, String rscName, String tgtRscGrp) throws ApiException {
618618
List<ResourceDefinition> rscDfns = api.resourceDefinitionList(
619-
Collections.singletonList(rscName), null, null, null);
619+
Collections.singletonList(rscName), false, null, null, null);
620620
if (rscDfns != null && !rscDfns.isEmpty()) {
621621
ResourceDefinition rscDfn = rscDfns.get(0);
622622

@@ -646,7 +646,7 @@ private void updateRscGrpIfNecessary(DevelopersApi api, String rscName, String t
646646
private void deleteTemplateForProps(
647647
DevelopersApi api, String rscName) throws ApiException {
648648
List<ResourceDefinition> rdList = api.resourceDefinitionList(
649-
Collections.singletonList(rscName), null, null, null);
649+
Collections.singletonList(rscName), false, null, null, null);
650650

651651
if (CollectionUtils.isNotEmpty(rdList)) {
652652
ResourceDefinitionModify rdm = new ResourceDefinitionModify();

plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public static ApiCallRcList applyAuxProps(DevelopersApi api, String rscName, Str
303303
public static List<ResourceDefinition> getRDListStartingWith(DevelopersApi api, String startWith)
304304
throws ApiException
305305
{
306-
List<ResourceDefinition> rscDfns = api.resourceDefinitionList(null, null, null, null);
306+
List<ResourceDefinition> rscDfns = api.resourceDefinitionList(null, false, null, null, null);
307307

308308
return rscDfns.stream()
309309
.filter(rscDfn -> rscDfn.getName().toLowerCase().startsWith(startWith.toLowerCase()))
@@ -386,7 +386,7 @@ public static void setAuxTemplateForProperty(DevelopersApi api, String rscName,
386386
*/
387387
public static ResourceDefinition findResourceDefinition(DevelopersApi api, String rscName, String rscGrpName)
388388
throws ApiException {
389-
List<ResourceDefinition> rscDfns = api.resourceDefinitionList(null, null, null, null);
389+
List<ResourceDefinition> rscDfns = api.resourceDefinitionList(null, false, null, null, null);
390390

391391
List<ResourceDefinition> rdsStartingWith = rscDfns.stream()
392392
.filter(rscDfn -> rscDfn.getName().toLowerCase().startsWith(rscName.toLowerCase()))

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<cs.nitro.version>10.1</cs.nitro.version>
170170
<cs.opensaml.version>2.6.6</cs.opensaml.version>
171171
<cs.rados-java.version>0.6.0</cs.rados-java.version>
172-
<cs.java-linstor.version>0.6.0</cs.java-linstor.version>
172+
<cs.java-linstor.version>0.6.1</cs.java-linstor.version>
173173
<cs.reflections.version>0.10.2</cs.reflections.version>
174174
<cs.servicemix.version>3.4.4_1</cs.servicemix.version>
175175
<cs.servlet.version>4.0.1</cs.servlet.version>

0 commit comments

Comments
 (0)