Correction on conflict resolution

rajiv-jain-netapp · rajiv-jain-netapp · commit 929d30f4af90 · 2026-04-21T13:33:05.000+05:30
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java
@@ -118,11 +118,9 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         }
 
         details.put(OntapStorageConstants.SIZE, capacityBytes.toString());
-        details.putIfAbsent(OntapStorageConstants.IS_DISAGGREGATED, "false");
 
         ProtocolType protocol = ProtocolType.valueOf(details.get(OntapStorageConstants.PROTOCOL));
 
-//        long volumeSize = Long.parseLong(details.get(OntapStorageConstants.SIZE));
         OntapStorage ontapStorage = new OntapStorage(
                 details.get(OntapStorageConstants.USERNAME),
                 details.get(OntapStorageConstants.PASSWORD),

Original file line number	Diff line number	Diff line change
`@@ -118,11 +118,9 @@ public DataStore initialize(Map<String, Object> dsInfos) {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`details.put(OntapStorageConstants.SIZE, capacityBytes.toString());`
`121`		`- details.putIfAbsent(OntapStorageConstants.IS_DISAGGREGATED, "false");`
`122`	`121`
`123`	`122`	`ProtocolType protocol = ProtocolType.valueOf(details.get(OntapStorageConstants.PROTOCOL));`
`124`	`123`
`125`		`-// long volumeSize = Long.parseLong(details.get(OntapStorageConstants.SIZE));`
`126`	`124`	`OntapStorage ontapStorage = new OntapStorage(`
`127`	`125`	`details.get(OntapStorageConstants.USERNAME),`
`128`	`126`	`details.get(OntapStorageConstants.PASSWORD),`