Set default values for domain limits

Author: abh1sar

api/src/main/java/org/apache/cloudstack/api/command/user/bucket/UpdateBucketCmd.java

@@ -56,7 +56,7 @@ public class UpdateBucketCmd extends BaseCmd {
     @Parameter(name = ApiConstants.POLICY, type = CommandType.STRING, description = "Bucket Access Policy")
     private String policy;
 
-    @Parameter(name = ApiConstants.QUOTA, type = CommandType.INTEGER,description = "Bucket Quota in GiB")
+    @Parameter(name = ApiConstants.QUOTA, type = CommandType.INTEGER, description = "Bucket Quota in GiB")
     private Integer quota;
 
     /////////////////////////////////////////////////////

server/src/main/java/com/cloud/configuration/Config.java

@@ -1447,8 +1447,8 @@ public enum Config {
     DefaultMaxDomainPublicIPs("Domain Defaults", ManagementServer.class, Long.class, "max.domain.public.ips", "40", "The default maximum number of public IPs that can be consumed by a domain", null),
     DefaultMaxDomainTemplates("Domain Defaults", ManagementServer.class, Long.class, "max.domain.templates", "40", "The default maximum number of templates that can be deployed for a domain", null),
     DefaultMaxDomainSnapshots("Domain Defaults", ManagementServer.class, Long.class, "max.domain.snapshots", "40", "The default maximum number of snapshots that can be created for a domain", null),
-    DefaultMaxDomainBackups("Domain Defaults", ManagementServer.class, Long.class, "max.domain.backups", "-1", "The default maximum number of backups that can be created for a domain", null),
-    DefaultMaxDomainBackupStorage("Domain Defaults", ManagementServer.class, Long.class, "max.domain.backup.storage", "-1", "The default maximum backup storage space (in GiB) that can be used for a domain", null),
+    DefaultMaxDomainBackups("Domain Defaults", ManagementServer.class, Long.class, "max.domain.backups", "40", "The default maximum number of backups that can be created for a domain", null),
+    DefaultMaxDomainBackupStorage("Domain Defaults", ManagementServer.class, Long.class, "max.domain.backup.storage", "800", "The default maximum backup storage space (in GiB) that can be used for a domain", null),
     DefaultMaxDomainVolumes("Domain Defaults", ManagementServer.class, Long.class, "max.domain.volumes", "40", "The default maximum number of volumes that can be created for a domain", null),
     DefaultMaxDomainNetworks("Domain Defaults", ManagementServer.class, Long.class, "max.domain.networks", "40", "The default maximum number of networks that can be created for a domain", null),
     DefaultMaxDomainVpcs("Domain Defaults", ManagementServer.class, Long.class, "max.domain.vpcs", "40", "The default maximum number of vpcs that can be created for a domain", null),
@@ -1457,9 +1457,8 @@ public enum Config {
     DefaultMaxDomainPrimaryStorage("Domain Defaults", ManagementServer.class, Long.class, "max.domain.primary.storage", "400", "The default maximum primary storage space (in GiB) that can be used for a domain", null),
     DefaultMaxDomainSecondaryStorage("Domain Defaults", ManagementServer.class, Long.class, "max.domain.secondary.storage", "800", "The default maximum secondary storage space (in GiB) that can be used for a domain", null),
     DefaultMaxDomainProjects("Domain Defaults",ManagementServer.class,Long.class,"max.domain.projects","50","The default maximum number of projects that can be created for a domain",null),
-    // Move to configkey?
-    DefaultMaxDomainBuckets("Domain Defaults", ManagementServer.class, Long.class, "max.domain.buckets", "-1", "The default maximum number of buckets that can be created for a domain", null),
-    DefaultMaxDomainObjectStorage("Domain Defaults", ManagementServer.class, Long.class, "max.domain.object.storage", "-1", "The default maximum object storage space (in GiB) that can be used for a domain", null),
+    DefaultMaxDomainBuckets("Domain Defaults", ManagementServer.class, Long.class, "max.domain.buckets", "40", "The default maximum number of buckets that can be created for a domain", null),
+    DefaultMaxDomainObjectStorage("Domain Defaults", ManagementServer.class, Long.class, "max.domain.object.storage", "800", "The default maximum object storage space (in GiB) that can be used for a domain", null),
 
     DefaultMaxProjectUserVms(
             "Project Defaults",

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -618,7 +618,7 @@ public boolean createBackup(final Long vmId, final Long scheduleId) throws Resou
         final BackupProvider backupProvider = getBackupProvider(offering.getProvider());
         if (backupProvider != null) {
             Pair<Boolean, Backup> result = backupProvider.takeBackup(vm);
-            if (result.first() == false) {
+            if (!result.first()) {
                 throw new CloudRuntimeException("Failed to create VM backup");
             }
             Backup backup = result.second();