Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion plugins/storage/volume/ontap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
<version>${maven-surefire-plugin.version}</version>
<configuration>
<skipTests>false</skipTests>
<argLine>-javaagent:${settings.localRepository}/net/bytebuddy/byte-buddy-agent/${byte-buddy-agent.version}/byte-buddy-agent-${byte-buddy-agent.version}.jar</argLine>
<includes>
<include>**/*Test.java</include>
</includes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,16 +235,6 @@ private long validateInitializeInputs(Long capacityBytes, Long podId, Long clust
throw new CloudRuntimeException("Provider name is null or empty, cannot create primary storage");
}

PrimaryDataStoreParameters parameters = new PrimaryDataStoreParameters();
if (clusterId != null) {
ClusterVO clusterVO = _clusterDao.findById(clusterId);
Preconditions.checkNotNull(clusterVO, "Unable to locate the specified cluster");
if (clusterVO.getHypervisorType() != Hypervisor.HypervisorType.KVM) {
throw new CloudRuntimeException("ONTAP primary storage is supported only for KVM hypervisor");
}
parameters.setHypervisorType(clusterVO.getHypervisorType());
}

logger.debug("ONTAP primary storage will be created as " + (managed ? "managed" : "unmanaged"));
if (!managed) {
throw new CloudRuntimeException("ONTAP primary storage must be managed");
Expand Down Expand Up @@ -402,8 +392,8 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host
} else {
ip = ip.isEmpty() ? host.getPrivateIpAddress().trim() : ip;
}
hostIdentifiers.add(ip);
}
hostIdentifiers.add(ip);
}
break;
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ public CloudStackVolume getCloudStackVolume(Map<String, String> cloudStackVolume
cloudStackVolume = new CloudStackVolume();
cloudStackVolume.setFlexVolumeUuid(cloudStackVolumeMap.get(OntapStorageConstants.VOLUME_UUID));
cloudStackVolume.setFile(fileInfo);
} else {
logger.warn("getCloudStackVolume: File not found for volume UUID: {} and file path: {}", cloudStackVolumeMap.get(OntapStorageConstants.VOLUME_UUID), cloudStackVolumeMap.get(OntapStorageConstants.FILE_PATH));
}

return cloudStackVolume;
Expand Down
Loading