honour and show object store total size

Author: abh1sar

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

@@ -44,7 +44,7 @@ public class UpdateObjectStoragePoolCmd extends BaseCmd {
     @Parameter(name = ApiConstants.URL, type = CommandType.STRING, description = "the url for the object store")
     private String url;
 
-    @Parameter(name = ApiConstants.SIZE, type = CommandType.LONG, description = "the total size of the object store in GiB. Used for tracking capacity and sending alerts", since = "4.21")
+    @Parameter(name = ApiConstants.SIZE, type = CommandType.LONG, description = "the total size of the object store in GiB. Used for tracking capacity and sending alerts. Set to 0 to stop tracking.", since = "4.21")
     private Long size;
 
     /////////////////////////////////////////////////////

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ObjectStoreDaoImpl.java

@@ -146,7 +146,7 @@ public ObjectStoreResponse newObjectStoreResponse(ObjectStoreVO store) {
         ObjectStoreResponse osResponse = new ObjectStoreResponse();
         osResponse.setId(store.getUuid());
         osResponse.setName(store.getName());
-        if (store.getTotalSize() != null) {
+        if (store.getTotalSize() != null && store.getTotalSize() != 0L) {
             osResponse.setStorageTotal(store.getTotalSize());
         }
         if (store.getUsedSize() == null) {

server/src/main/java/org/apache/cloudstack/storage/object/BucketApiServiceImpl.java

@@ -173,6 +173,14 @@ public Bucket createBucket(CreateBucketCmd cmd) {
             if (cmd.getQuota() != null) {
                 objectStore.setQuota(bucketTO, cmd.getQuota());
                 resourceLimitManager.incrementResourceCount(bucket.getAccountId(), Resource.ResourceType.object_storage, (cmd.getQuota() * Resource.ResourceType.bytesToGiB));
+                if (objectStoreVO.getTotalSize() != null && objectStoreVO.getTotalSize() != 0 && objectStoreVO.getAllocatedSize() != null) {
+                    Long allocatedSize = objectStoreVO.getAllocatedSize() / Resource.ResourceType.bytesToGiB;
+                    Long totalSize = objectStoreVO.getTotalSize() / Resource.ResourceType.bytesToGiB;
+                    if (cmd.getQuota() + objectStoreVO.getAllocatedSize() > objectStoreVO.getTotalSize()) {
+                        logger.error("Object store {}'s allocated size has reached the total size limit of {}GiB.", objectStoreVO.getName(), (objectStoreVO.getTotalSize() / Resource.ResourceType.bytesToGiB));
+                        throw new CloudRuntimeException("Not enough space in object store to create the bucket");
+                    }
+                }
             }
 
             if (cmd.getPolicy() != null) {

server/src/test/java/org/apache/cloudstack/storage/object/BucketApiServiceImplTest.java

@@ -110,6 +110,7 @@ public void testCreateBucket() {
 
         ObjectStoreVO objectStoreVO = Mockito.mock(ObjectStoreVO.class);
         Mockito.when(objectStoreVO.getId()).thenReturn(objectStoreId);
+        Mockito.when(objectStoreVO.getTotalSize()).thenReturn(20000000L);
         Mockito.when(objectStoreDao.findById(poolId)).thenReturn(objectStoreVO);
         ObjectStoreEntity objectStore = Mockito.mock(ObjectStoreEntity.class);
         Mockito.when(dataStoreMgr.getDataStore(objectStoreId, DataStoreRole.Object)).thenReturn(objectStore);

ui/public/locales/en.json

@@ -2185,6 +2185,9 @@
 "label.srx.firewall": "Juniper SRX firewall",
 "label.ssh.key.pairs": "SSH key pairs",
 "label.storageaccessgroups": "Storage Access Groups",
+"label.storageallocated": "Allocated size",
+"label.storagetotal": "Total size",
+"label.storageused": "Used size",
 "label.clusterstorageaccessgroups": "Cluster Storage Access Groups",
 "label.podstorageaccessgroups": "Pod Storage Access Groups",
 "label.zonestorageaccessgroups": "Zone Storage Access Groups",

ui/src/config/section/infra/objectStorages.js

@@ -29,7 +29,7 @@ export default {
     return fields
   },
   details: () => {
-    var fields = ['name', 'id', 'url', 'providername']
+    var fields = ['name', 'id', 'url', 'providername', 'storagetotal', 'storageallocated', 'storageused']
     return fields
   },
   resourceType: 'ObjectStorage',

ui/src/views/infra/AddObjectStorage.vue

@@ -166,7 +166,8 @@ export default {
         const values = this.handleRemoveFields(formRaw)
 
         var data = {
-          name: values.name
+          name: values.name,
+          size: values.size
         }
         var provider = values.provider