apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make url in AddImageStoreCmd not required since S3 does not have url.

Browse Source
This commit is contained in:
Min Chen 2013-05-06 22:14:49 -07:00
parent e7f6333209
commit 26424ff2a8
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
View File

@ -44,7 +44,7 @@ public class AddImageStoreCmd extends BaseCmd {
//////////////// API parameters ///////////////////// //////////////// API parameters /////////////////////
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
@Parameter(name=ApiConstants.URL, type=CommandType.STRING, required=true, description="the URL for the image store") @Parameter(name=ApiConstants.URL, type=CommandType.STRING, description="the URL for the image store")
private String url; private String url;
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class, @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class,

5
engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java
View File

@ -70,7 +70,6 @@ public class ImageStoreHelper {
return store; return store;
} }
store = new ImageStoreVO(); store = new ImageStoreVO();
store.setName((String)params.get("name"));
store.setProtocol((String)params.get("protocol")); store.setProtocol((String)params.get("protocol"));
store.setProviderName((String)params.get("providerName")); store.setProviderName((String)params.get("providerName"));
store.setScope((ScopeType)params.get("scope")); store.setScope((ScopeType)params.get("scope"));
@ -82,6 +81,10 @@ public class ImageStoreHelper {
store.setUuid(UUID.randomUUID().toString()); store.setUuid(UUID.randomUUID().toString());
} }
store.setUrl((String)params.get("url")); store.setUrl((String)params.get("url"));
store.setName((String)params.get("name"));
if ( store.getName() == null ){
store.setName(store.getUuid());
}
store.setRole((DataStoreRole)params.get("role")); store.setRole((DataStoreRole)params.get("role"));
store = imageStoreDao.persist(store); store = imageStoreDao.persist(store);

2
plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java
View File

@ -91,6 +91,7 @@ public class S3ImageStoreLifeCycleImpl implements ImageStoreLifeCycle {
s_logger.info("Trying to add a S3 store in data center " + dcId); s_logger.info("Trying to add a S3 store in data center " + dcId);
/*
try{ try{
// verify S3 parameters // verify S3 parameters
_s3Mgr.verifyS3Fields(details); _s3Mgr.verifyS3Fields(details);
@ -98,6 +99,7 @@ public class S3ImageStoreLifeCycleImpl implements ImageStoreLifeCycle {
catch (DiscoveryException ex){ catch (DiscoveryException ex){
throw new InvalidParameterValueException("failed to verify S3 parameters!"); throw new InvalidParameterValueException("failed to verify S3 parameters!");
} }
*/
Map<String, Object> imageStoreParameters = new HashMap<String, Object>(); Map<String, Object> imageStoreParameters = new HashMap<String, Object>();
imageStoreParameters.put("name", url); imageStoreParameters.put("name", url);

1
plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java
View File

@ -90,7 +90,6 @@ public class SwiftImageStoreLifeCycleImpl implements ImageStoreLifeCycle {
// just need to insert an entry in DB // just need to insert an entry in DB
Map<String, Object> imageStoreParameters = new HashMap<String, Object>(); Map<String, Object> imageStoreParameters = new HashMap<String, Object>();
imageStoreParameters.put("name", url);
imageStoreParameters.put("zoneId", dcId); imageStoreParameters.put("zoneId", dcId);
imageStoreParameters.put("url", url); imageStoreParameters.put("url", url);
imageStoreParameters.put("protocol", "http"); imageStoreParameters.put("protocol", "http");

8
server/src/com/cloud/storage/s3/S3ManagerImpl.java
View File

@ -258,10 +258,10 @@ public class S3ManagerImpl extends ManagerBase implements S3Manager {
params.get(ApiConstants.S3_SECRET_KEY), params.get(ApiConstants.S3_SECRET_KEY),
params.get(ApiConstants.S3_END_POINT), params.get(ApiConstants.S3_END_POINT),
params.get(ApiConstants.S3_BUCKET_NAME), params.get(ApiConstants.S3_BUCKET_NAME),
Boolean.valueOf(params.get(ApiConstants.S3_HTTPS_FLAG)), params.get(ApiConstants.S3_HTTPS_FLAG) == null ? false : Boolean.valueOf(params.get(ApiConstants.S3_HTTPS_FLAG)),
Integer.valueOf(params.get(ApiConstants.S3_CONNECTION_TIMEOUT)), params.get(ApiConstants.S3_CONNECTION_TIMEOUT) == null ? null : Integer.valueOf(params.get(ApiConstants.S3_CONNECTION_TIMEOUT)),
Integer.valueOf(params.get(ApiConstants.S3_MAX_ERROR_RETRY)), params.get(ApiConstants.S3_MAX_ERROR_RETRY) == null ? null : Integer.valueOf(params.get(ApiConstants.S3_MAX_ERROR_RETRY)),
Integer.valueOf(params.get(ApiConstants.S3_SOCKET_TIMEOUT)), now()); params.get(ApiConstants.S3_SOCKET_TIMEOUT) == null ? null : Integer.valueOf(params.get(ApiConstants.S3_SOCKET_TIMEOUT)), now());
this.validateFields(s3VO); this.validateFields(s3VO);