Skip to content

Commit bc8e77d

Browse files
CSTACKEX-209: addressing copilot comments
1 parent 5d4c773 commit bc8e77d

3 files changed

Lines changed: 1 addition & 14 deletions

File tree

plugins/storage/volume/ontap/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
<version>${maven-surefire-plugin.version}</version>
165165
<configuration>
166166
<skipTests>false</skipTests>
167-
<argLine>-javaagent:${settings.localRepository}/net/bytebuddy/byte-buddy-agent/${byte-buddy-agent.version}/byte-buddy-agent-${byte-buddy-agent.version}.jar</argLine>
168167
<includes>
169168
<include>**/*Test.java</include>
170169
</includes>

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,6 @@ private long validateInitializeInputs(Long capacityBytes, Long podId, Long clust
235235
throw new CloudRuntimeException("Provider name is null or empty, cannot create primary storage");
236236
}
237237

238-
PrimaryDataStoreParameters parameters = new PrimaryDataStoreParameters();
239-
if (clusterId != null) {
240-
ClusterVO clusterVO = _clusterDao.findById(clusterId);
241-
Preconditions.checkNotNull(clusterVO, "Unable to locate the specified cluster");
242-
if (clusterVO.getHypervisorType() != Hypervisor.HypervisorType.KVM) {
243-
throw new CloudRuntimeException("ONTAP primary storage is supported only for KVM hypervisor");
244-
}
245-
parameters.setHypervisorType(clusterVO.getHypervisorType());
246-
}
247-
248238
logger.debug("ONTAP primary storage will be created as " + (managed ? "managed" : "unmanaged"));
249239
if (!managed) {
250240
throw new CloudRuntimeException("ONTAP primary storage must be managed");
@@ -402,8 +392,8 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host
402392
} else {
403393
ip = ip.isEmpty() ? host.getPrivateIpAddress().trim() : ip;
404394
}
395+
hostIdentifiers.add(ip);
405396
}
406-
hostIdentifiers.add(ip);
407397
}
408398
break;
409399
default:

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ public CloudStackVolume getCloudStackVolume(Map<String, String> cloudStackVolume
127127
cloudStackVolume = new CloudStackVolume();
128128
cloudStackVolume.setFlexVolumeUuid(cloudStackVolumeMap.get(OntapStorageConstants.VOLUME_UUID));
129129
cloudStackVolume.setFile(fileInfo);
130-
} else {
131-
logger.warn("getCloudStackVolume: File not found for volume UUID: {} and file path: {}", cloudStackVolumeMap.get(OntapStorageConstants.VOLUME_UUID), cloudStackVolumeMap.get(OntapStorageConstants.FILE_PATH));
132130
}
133131

134132
return cloudStackVolume;

0 commit comments

Comments
 (0)