Skip to content

Commit 9319777

Browse files
Locharla, SandeepLocharla, Sandeep
authored andcommitted
CSTACKEX-050: Fixed lint issues
1 parent 1809077 commit 9319777

File tree

2 files changed

+0
-57
lines changed

2 files changed

+0
-57
lines changed

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

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@
1818
*/
1919
package org.apache.cloudstack.storage.driver;
2020

21-
import com.cloud.agent.api.Answer;
22-
import com.cloud.agent.api.to.DataObjectType;
2321
import com.cloud.agent.api.to.DataStoreTO;
2422
import com.cloud.agent.api.to.DataTO;
25-
import com.cloud.exception.InvalidParameterValueException;
2623
import com.cloud.host.Host;
2724
import com.cloud.storage.Storage;
2825
import com.cloud.storage.StoragePool;
@@ -43,14 +40,11 @@
4340
import org.apache.cloudstack.storage.command.CommandResult;
4441
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
4542
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
46-
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
4743
import org.apache.cloudstack.storage.feign.model.OntapStorage;
4844
import org.apache.cloudstack.storage.provider.StorageProviderFactory;
4945
import org.apache.cloudstack.storage.service.StorageStrategy;
50-
import org.apache.cloudstack.storage.service.model.CloudStackVolume;
5146
import org.apache.cloudstack.storage.service.model.ProtocolType;
5247
import org.apache.cloudstack.storage.utils.Constants;
53-
import org.apache.cloudstack.storage.utils.Utility;
5448
import org.apache.logging.log4j.LogManager;
5549
import org.apache.logging.log4j.Logger;
5650

@@ -87,57 +81,7 @@ public DataStoreTO getStoreTO(DataStore store) {
8781

8882
@Override
8983
public void createAsync(DataStore dataStore, DataObject dataObject, AsyncCompletionCallback<CreateCmdResult> callback) {
90-
CreateCmdResult createCmdResult = null;
91-
String path = null;
92-
String errMsg = null;
93-
if (dataStore == null) {
94-
throw new InvalidParameterValueException("createAsync: dataStore should not be null");
95-
}
96-
if (dataObject == null) {
97-
throw new InvalidParameterValueException("createAsync: dataObject should not be null");
98-
}
99-
if (callback == null) {
100-
throw new InvalidParameterValueException("createAsync: callback should not be null");
101-
}
102-
try {
103-
s_logger.info("createAsync: Started for data store [{}] and data object [{}] of type [{}]",
104-
dataStore, dataObject, dataObject.getType());
105-
if (dataObject.getType() == DataObjectType.VOLUME) {
106-
path = createCloudStackVolumeForTypeVolume(dataStore, dataObject);
107-
createCmdResult = new CreateCmdResult(path, new Answer(null, true, null));
108-
} else {
109-
errMsg = "Invalid DataObjectType (" + dataObject.getType() + ") passed to createAsync";
110-
s_logger.error(errMsg);
111-
throw new CloudRuntimeException(errMsg);
112-
}
113-
} catch (Exception e) {
114-
errMsg = e.getMessage();
115-
s_logger.error("createAsync: Failed for dataObject [{}]: {}", dataObject, errMsg);
116-
createCmdResult = new CreateCmdResult(null, new Answer(null, false, errMsg));
117-
createCmdResult.setResult(e.toString());
118-
} finally {
119-
callback.complete(createCmdResult);
120-
}
121-
}
12284

123-
private String createCloudStackVolumeForTypeVolume(DataStore dataStore, DataObject dataObject) {
124-
StoragePoolVO storagePool = storagePoolDao.findById(dataStore.getId());
125-
if(storagePool == null) {
126-
s_logger.error("createCloudStackVolume : Storage Pool not found for id: " + dataStore.getId());
127-
throw new CloudRuntimeException("createCloudStackVolume : Storage Pool not found for id: " + dataStore.getId());
128-
}
129-
Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(dataStore.getId());
130-
StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);
131-
s_logger.info("createCloudStackVolumeForTypeVolume: Connection to Ontap SVM [{}] successful, preparing CloudStackVolumeRequest", details.get(Constants.SVM_NAME));
132-
CloudStackVolume cloudStackVolumeRequest = Utility.createCloudStackVolumeRequestByProtocol(storagePool, details, dataObject);
133-
CloudStackVolume cloudStackVolume = storageStrategy.createCloudStackVolume(cloudStackVolumeRequest);
134-
if (ProtocolType.ISCSI.name().equalsIgnoreCase(details.get(Constants.PROTOCOL)) && cloudStackVolume.getLun() != null && cloudStackVolume.getLun().getName() != null) {
135-
return cloudStackVolume.getLun().getName();
136-
} else {
137-
String errMsg = "createCloudStackVolumeForTypeVolume: Volume creation failed. Lun or Lun Path is null for dataObject: " + dataObject;
138-
s_logger.error(errMsg);
139-
throw new CloudRuntimeException(errMsg);
140-
}
14185
}
14286

14387
@Override

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SANFeignClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import feign.Headers;
2828
import feign.Param;
2929
import feign.RequestLine;
30-
import java.net.URI;
3130
import java.util.Map;
3231

3332
//TODO: Proper URLs should be added in the RequestLine annotations below

0 commit comments

Comments
 (0)