Allow updating Object Storage Details

api/src/main/java/com/cloud/server/ResourceTag.java

@@ -71,7 +71,7 @@ public enum ResourceObjectType {
         NetworkOffering(false, true),
         VpcOffering(true, false),
         Domain(false, false, true),
-        ObjectStore(false, false, true);
+        ObjectStore(false, true, true);
 
 
         ResourceObjectType(boolean resourceTagsSupport, boolean resourceMetadataSupport) {

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

@@ -18,6 +18,10 @@
 package org.apache.cloudstack.api.command.admin.storage;
 
 import org.apache.cloudstack.storage.object.ObjectStore;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -41,9 +45,17 @@
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name for the object store")
     private String name;
 
+    @Parameter(name = ApiConstants.PROVIDER, type = CommandType.STRING, description = "the object store provider name")
+    private String providerName;
+
     @Parameter(name = ApiConstants.URL, type = CommandType.STRING, description = "the url for the object store")
     private String url;
 
+    @Parameter(name = ApiConstants.DETAILS,
+               type = CommandType.MAP,
+               description = "the details for the object store. Example: details[0].key=accesskey&details[0].value=s389ddssaa&details[1].key=secretkey&details[1].value=8dshfsss")
+    private Map details;
+
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -61,6 +73,24 @@
         return url;
     }
 
+    public String getProviderName() {
+        return providerName;
+    }
+
+    public Map<String, String> getDetails() {
+        Map<String, String> detailsMap = null;
+        if (details != null && !details.isEmpty()) {
+            detailsMap = new HashMap<>();
+            for (Object prop : details.values()) {
+                HashMap<String, String> detail = (HashMap<String, String>) prop;
+                String key = detail.get(ApiConstants.KEY);
+                String value = detail.get(ApiConstants.VALUE);
+                detailsMap.put(key, value);
+            }
+        }
+        return detailsMap;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -69,7 +99,7 @@
     public void execute() {
         ObjectStore result = _storageService.updateObjectStore(getId(), this);
 
-        ObjectStoreResponse storeResponse = null;
+        ObjectStoreResponse storeResponse;
         if (result != null) {
             storeResponse = _responseGenerator.createObjectStoreResponse(result);
             storeResponse.setResponseName(getCommandName());

api/src/test/java/org/apache/cloudstack/api/command/admin/storage/UpdateObjectStoragePoolCmdTest.java

@@ -19,11 +19,13 @@
 package org.apache.cloudstack.api.command.admin.storage;
 
 import com.cloud.storage.StorageService;
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.apache.cloudstack.api.response.ObjectStoreResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.storage.object.ObjectStore;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -32,6 +34,9 @@
 import org.mockito.Spy;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.mockito.ArgumentMatchers.any;
 
 public class UpdateObjectStoragePoolCmdTest {
@@ -83,4 +88,32 @@ public void testUpdateObjectStore() {
                 .updateObjectStore(1L, updateObjectStoragePoolCmd);
     }
 
+    @Test
+    public void testGetDetailsNone() {
+        Assert.assertNull(updateObjectStoragePoolCmd.getDetails());
+    }
+
+    @Test
+    public void testGetDetails() {
+        // test setup
+        // Build the "details" Map which has the following format:
+        // {0={value=value0, key=key0}, 1={value=value1, key=key1}, ...}
+        Map<String, Object> details = new HashMap<>();
+        Map<String, String> map0 = new HashMap<>();
+        map0.put(ApiConstants.KEY, "key0");
+        map0.put(ApiConstants.VALUE, "value0");
+        details.put("0", map0);
+        Map<String, String> map1 = new HashMap<>();
+        map1.put(ApiConstants.KEY, "key1");
+        map1.put(ApiConstants.VALUE, "value1");
+        details.put("1", map1);
+        ReflectionTestUtils.setField(updateObjectStoragePoolCmd, "details", details);
+
+        // Test: getDetails() should return a simple map
+        Map<String, String> outDetails = updateObjectStoragePoolCmd.getDetails();
+        Assert.assertNotNull(outDetails);
+        Assert.assertEquals(2, outDetails.size());
+        Assert.assertEquals("value0", outDetails.get("key0"));
+        Assert.assertEquals("value1", outDetails.get("key1"));
+    }
 }

engine/api/src/main/java/org/apache/cloudstack/storage/object/ObjectStoreEntity.java

@@ -29,6 +29,8 @@ public interface ObjectStoreEntity extends DataStore, ObjectStore {
 
     List<Bucket> listBuckets();
 
+    void verifyServiceConnectivity();
+
     boolean createUser(long accountId);
 
     boolean deleteBucket(BucketTO bucket);

engine/storage/object/src/main/java/org/apache/cloudstack/storage/object/store/ObjectStoreImpl.java

@@ -160,6 +160,11 @@
         return driver.listBuckets(objectStoreVO.getId());
     }
 
+    @Override
+    public void verifyServiceConnectivity() {
+        driver.verifyServiceConnectivity(objectStoreVO.getId());
+    }
+
     /*
     Create user if not exists
      */

engine/storage/src/main/java/org/apache/cloudstack/storage/object/ObjectStoreDriver.java

@@ -21,6 +21,7 @@
 import com.amazonaws.services.s3.model.AccessControlList;
 import com.amazonaws.services.s3.model.BucketPolicy;
 import com.cloud.agent.api.to.BucketTO;
+import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
 
 import java.util.List;
@@ -31,6 +32,13 @@ public interface ObjectStoreDriver extends DataStoreDriver {
 
     List<Bucket> listBuckets(long storeId);
 
+    /**
+     * Verify Service Connectivity by testing the configuration.
+     * @param storeId identifies which store's configuration to verify.
+     * @throws CloudRuntimeException if there are any connectivity issues.
+     */
+    void verifyServiceConnectivity(long storeId);
+
     boolean deleteBucket(BucketTO bucket, long storeId);
 
     AccessControlList getBucketAcl(BucketTO bucket, long storeId);

plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImpl.java

@@ -138,6 +138,12 @@
         return bucketsList;
     }
 
+    @Override
+    public void verifyServiceConnectivity(long storeId) {
+        // ideally just ping the storage using credentials. listBuckets() for now.
+        listBuckets(storeId);
+    }
+
     @Override
     public boolean deleteBucket(BucketTO bucket, long storeId) {
         RgwAdmin rgwAdmin = getRgwAdminClient(storeId);