You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/05/07 07:15:45 UTC

git commit: updated refs/heads/object_store to 26424ff

Updated Branches:
  refs/heads/object_store e7f633320 -> 26424ff2a


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

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26424ff2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26424ff2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26424ff2

Branch: refs/heads/object_store
Commit: 26424ff2a8b74b514cec1b513093b9893659dbfc
Parents: e7f6333
Author: Min Chen <mi...@citrix.com>
Authored: Mon May 6 22:14:49 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Mon May 6 22:14:49 2013 -0700

----------------------------------------------------------------------
 .../command/admin/storage/AddImageStoreCmd.java    |    2 +-
 .../storage/image/datastore/ImageStoreHelper.java  |    5 ++++-
 .../lifecycle/S3ImageStoreLifeCycleImpl.java       |    2 ++
 .../lifecycle/SwiftImageStoreLifeCycleImpl.java    |    1 -
 server/src/com/cloud/storage/s3/S3ManagerImpl.java |    8 ++++----
 5 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26424ff2/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
index 8349774..08112f0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
@@ -44,7 +44,7 @@ public class AddImageStoreCmd extends BaseCmd {
     //////////////// 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;
 
     @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26424ff2/engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java b/engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java
index fe6e94f..d0dfd55 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageStoreHelper.java
@@ -70,7 +70,6 @@ public class ImageStoreHelper {
             return store;
         }
         store = new ImageStoreVO();
-        store.setName((String)params.get("name"));
         store.setProtocol((String)params.get("protocol"));
         store.setProviderName((String)params.get("providerName"));
         store.setScope((ScopeType)params.get("scope"));
@@ -82,6 +81,10 @@ public class ImageStoreHelper {
             store.setUuid(UUID.randomUUID().toString());
         }
         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 = imageStoreDao.persist(store);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26424ff2/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java b/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java
index 05c9e37..1b5e2d5 100644
--- a/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java
+++ b/plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java
@@ -91,6 +91,7 @@ public class S3ImageStoreLifeCycleImpl implements ImageStoreLifeCycle {
 
         s_logger.info("Trying to add a S3 store in data center " + dcId);
 
+        /*
         try{
         // verify S3 parameters
         _s3Mgr.verifyS3Fields(details);
@@ -98,6 +99,7 @@ public class S3ImageStoreLifeCycleImpl implements ImageStoreLifeCycle {
         catch (DiscoveryException ex){
             throw new InvalidParameterValueException("failed to verify S3 parameters!");
         }
+        */
 
         Map<String, Object> imageStoreParameters = new HashMap<String, Object>();
         imageStoreParameters.put("name", url);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26424ff2/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java b/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java
index 20e0939..411e052 100644
--- a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java
+++ b/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/lifecycle/SwiftImageStoreLifeCycleImpl.java
@@ -90,7 +90,6 @@ public class SwiftImageStoreLifeCycleImpl implements ImageStoreLifeCycle {
 
         // just need to insert an entry in DB
         Map<String, Object> imageStoreParameters = new HashMap<String, Object>();
-        imageStoreParameters.put("name", url);
         imageStoreParameters.put("zoneId", dcId);
         imageStoreParameters.put("url", url);
         imageStoreParameters.put("protocol", "http");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26424ff2/server/src/com/cloud/storage/s3/S3ManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/s3/S3ManagerImpl.java b/server/src/com/cloud/storage/s3/S3ManagerImpl.java
index 1e8ad4f..2edf232 100644
--- a/server/src/com/cloud/storage/s3/S3ManagerImpl.java
+++ b/server/src/com/cloud/storage/s3/S3ManagerImpl.java
@@ -258,10 +258,10 @@ public class S3ManagerImpl extends ManagerBase implements S3Manager {
                 params.get(ApiConstants.S3_SECRET_KEY),
                 params.get(ApiConstants.S3_END_POINT),
                 params.get(ApiConstants.S3_BUCKET_NAME),
-                Boolean.valueOf(params.get(ApiConstants.S3_HTTPS_FLAG)),
-                Integer.valueOf(params.get(ApiConstants.S3_CONNECTION_TIMEOUT)),
-                Integer.valueOf(params.get(ApiConstants.S3_MAX_ERROR_RETRY)),
-                Integer.valueOf(params.get(ApiConstants.S3_SOCKET_TIMEOUT)), now());
+                params.get(ApiConstants.S3_HTTPS_FLAG) == null ? false : Boolean.valueOf(params.get(ApiConstants.S3_HTTPS_FLAG)),
+                params.get(ApiConstants.S3_CONNECTION_TIMEOUT) == null ? null : Integer.valueOf(params.get(ApiConstants.S3_CONNECTION_TIMEOUT)),
+                params.get(ApiConstants.S3_MAX_ERROR_RETRY) == null ? null : Integer.valueOf(params.get(ApiConstants.S3_MAX_ERROR_RETRY)),
+                params.get(ApiConstants.S3_SOCKET_TIMEOUT) == null ? null : Integer.valueOf(params.get(ApiConstants.S3_SOCKET_TIMEOUT)), now());
 
         this.validateFields(s3VO);