Skip to content

Commit 815af83

Browse files
Gupta, SuryaGupta, Surya
Gupta, Surya
authored and
Gupta, Surya
committed
CSTACKEX-46 Resolve review bot comments
1 parent 54a7eef commit 815af83

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ private void grantAccessForVolume(StoragePoolVO storagePool, VolumeVO volumeVO,
281281
}
282282
}
283283
private boolean hostInitiatorFoundInIgroup(String hostInitiator, Igroup igroup) {
284-
if(igroup != null || igroup.getInitiators() != null || hostInitiator != null || !hostInitiator.isEmpty()) {
284+
if(igroup != null && igroup.getInitiators() != null && hostInitiator != null && !hostInitiator.isEmpty()) {
285285
for(Initiator initiator : igroup.getInitiators()) {
286286
if(initiator.getName().equalsIgnoreCase(hostInitiator)) {
287287
return true;

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public CloudStackVolume createCloudStackVolume(CloudStackVolume cloudstackVolume
8080
createdCloudStackVolume.setLun(lun);
8181
return createdCloudStackVolume;
8282
} catch (Exception e) {
83-
s_logger.error("Exception occurred while creating LUN: {}. Exception: {}", cloudstackVolume.getLun().getName(), e.getMessage());
83+
s_logger.error("Exception occurred while creating LUN: {}, Exception: {}", cloudstackVolume.getLun().getName(), e.getMessage());
8484
throw new CloudRuntimeException("Failed to create Lun: " + e.getMessage());
8585
}
8686
}
@@ -98,16 +98,16 @@ void deleteCloudStackVolume(CloudStackVolume cloudstackVolume) {
9898

9999
@Override
100100
public CloudStackVolume getCloudStackVolume(Map<String, String> values) {
101-
s_logger.info("getCloudStackVolume : fetching Igroup with params {} ", values);
101+
s_logger.info("getCloudStackVolume : fetching Lun with params {} ", values);
102102
if (values == null || values.isEmpty()) {
103-
s_logger.error("getCloudStackVolume: get Igroup failed. Invalid request: {}", values);
104-
throw new CloudRuntimeException("getCloudStackVolume : get Igroup Failed, invalid request");
103+
s_logger.error("getCloudStackVolume: get Lun failed. Invalid request: {}", values);
104+
throw new CloudRuntimeException("getCloudStackVolume : get Lun Failed, invalid request");
105105
}
106106
String svmName = values.get(Constants.SVM_DOT_NAME);
107107
String lunName = values.get(Constants.NAME);
108108
if(svmName == null || lunName == null || svmName.isEmpty() || lunName.isEmpty()) {
109-
s_logger.error("getCloudStackVolume: get Igroup failed. Invalid svm:{} or igroup name: {}", svmName, lunName);
110-
throw new CloudRuntimeException("getCloudStackVolume : Fget Igroup failed, invalid request");
109+
s_logger.error("getCloudStackVolume: get Lun failed. Invalid svm:{} or igroup name: {}", svmName, lunName);
110+
throw new CloudRuntimeException("getCloudStackVolume : Failed to get Lun, invalid request");
111111
}
112112
try {
113113
// Get AuthHeader
@@ -116,8 +116,8 @@ public CloudStackVolume getCloudStackVolume(Map<String, String> values) {
116116
Map<String, Object> queryParams = Map.of(Constants.SVM_DOT_NAME, svmName, Constants.NAME, lunName);
117117
OntapResponse<Lun> lunResponse = sanFeignClient.getLunResponse(authHeader, queryParams);
118118
if (lunResponse == null || lunResponse.getRecords() == null || lunResponse.getRecords().size() == 0) {
119-
s_logger.error("getCloudStackVolume: Failed to fetch Igroup");
120-
throw new CloudRuntimeException("getCloudStackVolume: Failed to fetch Igroup");
119+
s_logger.error("getCloudStackVolume: Failed to fetch Lun");
120+
throw new CloudRuntimeException("getCloudStackVolume: Failed to fetch Lun");
121121
}
122122
Lun lun = lunResponse.getRecords().get(0);
123123
s_logger.debug("getCloudStackVolume: Lun Details : {}", lun);
@@ -127,7 +127,7 @@ public CloudStackVolume getCloudStackVolume(Map<String, String> values) {
127127
cloudStackVolume.setLun(lun);
128128
return cloudStackVolume;
129129
} catch (Exception e) {
130-
s_logger.error("Exception occurred while fetching Lun. Exception: {}", e.getMessage());
130+
s_logger.error("Exception occurred while fetching Lun, Exception: {}", e.getMessage());
131131
throw new CloudRuntimeException("Failed to fetch Lun details: " + e.getMessage());
132132
}
133133
}
@@ -156,7 +156,7 @@ public AccessGroup createAccessGroup(AccessGroup accessGroup) {
156156
createdAccessGroup.setIgroup(igroup);
157157
return createdAccessGroup;
158158
} catch (Exception e) {
159-
s_logger.error("Exception occurred while creating Igroup: {}. Exception: {}", accessGroup.getIgroup().getName(), e.getMessage());
159+
s_logger.error("Exception occurred while creating Igroup: {}, Exception: {}", accessGroup.getIgroup().getName(), e.getMessage());
160160
throw new CloudRuntimeException("Failed to create Igroup: " + e.getMessage());
161161
}
162162
}
@@ -202,7 +202,7 @@ public AccessGroup getAccessGroup(Map<String, String> values) {
202202
accessGroup.setIgroup(igroup);
203203
return accessGroup;
204204
} catch (Exception e) {
205-
s_logger.error("Exception occurred while fetching Igroup. Exception: {}", e.getMessage());
205+
s_logger.error("Exception occurred while fetching Igroup, Exception: {}", e.getMessage());
206206
throw new CloudRuntimeException("Failed to fetch Igroup details: " + e.getMessage());
207207
}
208208
}
@@ -227,10 +227,10 @@ public void enableLogicalAccess(Map<String, String> values) {
227227
throw new CloudRuntimeException("Failed to perform LunMap for Lun: " +lunName+ " and igroup: " + igroupName);
228228
}
229229
LunMap lunMap = createdLunMap.getRecords().get(0);
230-
s_logger.debug("enableLogicalAccess: LunMap created successfully. LunMap: {}", lunMap);
230+
s_logger.debug("enableLogicalAccess: LunMap created successfully, LunMap: {}", lunMap);
231231
s_logger.info("enableLogicalAccess: LunMap created successfully.");
232232
} catch (Exception e) {
233-
s_logger.error("Exception occurred while creating LunMap: {}. Exception: {}", e.getMessage(), e);
233+
s_logger.error("Exception occurred while creating LunMap: {}, Exception: {}", e.getMessage(), e);
234234
throw new CloudRuntimeException("Failed to create LunMap: " + e.getMessage());
235235
}
236236
}
@@ -250,7 +250,7 @@ public void disableLogicalAccess(Map<String, String> values) {
250250
sanFeignClient.deleteLunMap(authHeader, lunUUID, igroupUUID);
251251
s_logger.info("disableLogicalAccess: LunMap deleted successfully.");
252252
} catch (Exception e) {
253-
s_logger.error("Exception occurred while deleting LunMap: {}. Exception: {}", e.getMessage(), e);
253+
s_logger.error("Exception occurred while deleting LunMap: {}, Exception: {}", e.getMessage(), e);
254254
throw new CloudRuntimeException("Failed to delete LunMap: " + e.getMessage());
255255
}
256256
}

0 commit comments

Comments
 (0)