Add zoneId parameter to S3 image store commands

Author: Daman Arora

api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java

@@ -46,6 +46,7 @@
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ImageStoreResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
 
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.DiscoveryException;
@@ -61,6 +62,9 @@ public final class AddImageStoreS3CMD extends BaseCmd implements ClientOptions {
 
     private static final String s_name = "addImageStoreS3Response";
 
+    @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "The Zone ID for the S3 image store")
+    private Long zoneId;
+
     @Parameter(name = S3_ACCESS_KEY, type = STRING, required = true, description = "S3 access key")
     private String accessKey;
 
@@ -128,7 +132,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
         }
 
         try{
-            ImageStore result = _storageService.discoverImageStore(null, null, "S3", null, dm);
+            ImageStore result = _storageService.discoverImageStore(null, null, "S3", zoneId, dm);
             ImageStoreResponse storeResponse;
             if (result != null) {
                 storeResponse = _responseGenerator.createImageStoreResponse(result);

plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/S3ImageStoreLifeCycleImpl.java

@@ -72,6 +72,7 @@ public S3ImageStoreLifeCycleImpl() {
     @Override
     public DataStore initialize(Map<String, Object> dsInfos) {
 
+        Long dcId = (Long)dsInfos.get("zoneId");
         String url = (String)dsInfos.get("url");
         String name = (String)dsInfos.get("name");
         String providerName = (String)dsInfos.get("providerName");
@@ -83,6 +84,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
 
         Map<String, Object> imageStoreParameters = new HashMap();
         imageStoreParameters.put("name", name);
+        imageStoreParameters.put("zoneId", dcId);
         imageStoreParameters.put("url", url);
         String protocol = "http";
         String useHttps = details.get(ApiConstants.S3_HTTPS_FLAG);
@@ -93,7 +95,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         if (scope != null) {
             imageStoreParameters.put("scope", scope);
         } else {
-            imageStoreParameters.put("scope", ScopeType.REGION);
+            imageStoreParameters.put("scope", ScopeType.ZONE);
         }
         imageStoreParameters.put("providerName", providerName);
         imageStoreParameters.put("role", role);

plugins/storage/image/s3/src/main/java/org/apache/cloudstack/storage/datastore/provider/S3ImageStoreProviderImpl.java

@@ -90,9 +90,7 @@ public Set<DataStoreProviderType> getTypes() {
 
     @Override
     public boolean isScopeSupported(ScopeType scope) {
-        if (scope == ScopeType.REGION)
-            return true;
-        return false;
+        return scope == ScopeType.ZONE || scope == ScopeType.REGION;
     }
 
     @Override

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

@@ -3537,16 +3537,6 @@ public ImageStore discoverImageStore(String name, String url, String providerNam
             throw new InvalidParameterValueException("Image store provider " + providerName + " does not support scope " + scopeType);
         }
 
-        // check if we have already image stores from other different providers,
-        // we currently are not supporting image stores from different
-        // providers co-existing
-        List<ImageStoreVO> imageStores = _imageStoreDao.listImageStores();
-        for (ImageStoreVO store : imageStores) {
-            if (!store.getProviderName().equalsIgnoreCase(providerName)) {
-                throw new InvalidParameterValueException("You can only add new image stores from the same provider " + store.getProviderName() + " already added");
-            }
-        }
-
         if (zoneId != null) {
             // Check if the zone exists in the system
             DataCenterVO zone = _dcDao.findById(zoneId);