Skip to content

Commit a4e61e8

Browse files
Don't keep url in details
1 parent 49de5cc commit a4e61e8

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

engine/schema/src/main/resources/META-INF/db/schema-41920to41930.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
-- Schema upgrade from 4.19.2.0 to 4.19.3.0
2020
--;
2121

22-
-- Updated display to false for password detail of the storage pool details
22+
-- Updated display to false for password/token detail of the storage pool details
2323
UPDATE `cloud`.`storage_pool_details` SET display = 0 WHERE name LIKE '%password%';
24+
UPDATE `cloud`.`storage_pool_details` SET display = 0 WHERE name LIKE '%token%';

engine/storage/src/main/java/org/apache/cloudstack/storage/volume/datastore/PrimaryDataStoreHelper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ public class PrimaryDataStoreHelper {
8585
DataStoreProviderManager dataStoreProviderMgr;
8686

8787
public DataStore createPrimaryDataStore(PrimaryDataStoreParameters params) {
88-
if(params == null)
89-
{
88+
if (params == null) {
9089
throw new InvalidParameterValueException("createPrimaryDataStore: Input params is null, please check");
9190
}
9291
StoragePoolVO dataStoreVO = dataStoreDao.findPoolByUUID(params.getUuid());

plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ public DataStore initialize(Map<String, Object> dsInfos) {
139139
Long clusterId = (Long)dsInfos.get("clusterId");
140140
Long podId = (Long)dsInfos.get("podId");
141141
Long zoneId = (Long)dsInfos.get("zoneId");
142-
String url = (String)dsInfos.get("url");
143142
String providerName = (String)dsInfos.get("providerName");
144143
HypervisorType hypervisorType = (HypervisorType)dsInfos.get("hypervisorType");
145144
if (clusterId != null && podId == null) {

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,9 +1020,6 @@ public PrimaryDataStoreInfo createPool(CreateStoragePoolCmd cmd) throws Resource
10201020

10211021
Map<String, String> details = extractApiParamAsMap(cmd.getDetails());
10221022
checkNFSMountOptionsForCreate(details, hypervisorType, uriParams.get("scheme"));
1023-
if (StringUtils.isNotBlank(cmd.getUrl())) {
1024-
details.put("url", cmd.getUrl());
1025-
}
10261023

10271024
DataCenterVO zone = _dcDao.findById(cmd.getZoneId());
10281025
if (zone == null) {

0 commit comments

Comments
 (0)