Move new configs to the respective service classes.

Author: abh1sar

api/src/main/java/org/apache/cloudstack/backup/BackupManager.java

@@ -57,38 +57,86 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
             "false",
             "Enable volume attach/detach operations for VMs that are assigned to Backup Offerings.", true);
 
-    static final ConfigKey<Integer> BackupHourlyMax = new ConfigKey<Integer>("Advanced", Integer.class,
+    ConfigKey<Integer> BackupHourlyMax = new ConfigKey<Integer>("Advanced", Integer.class,
             "backup.max.hourly",
             "8",
             "Maximum recurring hourly backups to be retained for an instance. If the limit is reached, early backups from the start of the hour are deleted so that newer ones can be saved. This limit does not apply to manual backups. If set to 0, recurring hourly backups can not be scheduled.",
             false,
             ConfigKey.Scope.Global,
             null);
 
-    static final ConfigKey<Integer> BackupDailyMax = new ConfigKey<Integer>("Advanced", Integer.class,
+    ConfigKey<Integer> BackupDailyMax = new ConfigKey<Integer>("Advanced", Integer.class,
             "backup.max.daily",
             "8",
             "Maximum recurring daily backups to be retained for an instance. If the limit is reached, backups from the start of the day are deleted so that newer ones can be saved. This limit does not apply to manual backups. If set to 0, recurring daily backups can not be scheduled.",
             false,
             ConfigKey.Scope.Global,
             null);
 
-    static final ConfigKey<Integer> BackupWeeklyMax = new ConfigKey<Integer>("Advanced", Integer.class,
+    ConfigKey<Integer> BackupWeeklyMax = new ConfigKey<Integer>("Advanced", Integer.class,
             "backup.max.weekly",
             "8",
             "Maximum recurring weekly backups to be retained for an instance. If the limit is reached, backups from the beginning of the week are deleted so that newer ones can be saved. This limit does not apply to manual backups. If set to 0, recurring weekly backups can not be scheduled.",
             false,
             ConfigKey.Scope.Global,
             null);
 
-    static final ConfigKey<Integer> BackupMonthlyMax = new ConfigKey<Integer>("Advanced", Integer.class,
+    ConfigKey<Integer> BackupMonthlyMax = new ConfigKey<Integer>("Advanced", Integer.class,
             "backup.max.monthly",
             "8",
             "Maximum recurring monthly backups to be retained for an instance. If the limit is reached, backups from the beginning of the month are deleted so that newer ones can be saved. This limit does not apply to manual backups. If set to 0, recurring monthly backups can not be scheduled.",
             false,
              ConfigKey.Scope.Global,
             null);
 
+    ConfigKey<Long> DefaultMaxAccountBackups = new ConfigKey<Long>("Account Defaults", Long.class,
+            "max.account.backups",
+            "20",
+            "The default maximum number of backups that can be created for an account",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxAccountBackupStorage = new ConfigKey<Long>("Account Defaults", Long.class,
+            "max.account.backup.storage",
+            "400",
+            "The default maximum backup storage space (in GiB) that can be used for an account",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxProjectBackups = new ConfigKey<Long>("Project Defaults", Long.class,
+            "max.project.backups",
+            "20",
+            "The default maximum number of backups that can be created for a project",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxProjectBackupStorage = new ConfigKey<Long>("Project Defaults", Long.class,
+            "max.project.backup.storage",
+            "400",
+            "The default maximum backup storage space (in GiB) that can be used for a project",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxDomainBackups = new ConfigKey<Long>("Domain Defaults", Long.class,
+            "max.domain.backups",
+            "40",
+            "The default maximum number of backups that can be created for a domain",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxDomainBackupStorage = new ConfigKey<Long>("Domain Defaults", Long.class,
+            "max.domain.backup.storage",
+            "800",
+            "The default maximum backup storage space (in GiB) that can be used for a domain",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
     /**
      * List backup provider offerings
      * @param zoneId zone id

api/src/main/java/org/apache/cloudstack/storage/object/BucketApiService.java

@@ -22,10 +22,59 @@
 import com.cloud.user.Account;
 import org.apache.cloudstack.api.command.user.bucket.CreateBucketCmd;
 import org.apache.cloudstack.api.command.user.bucket.UpdateBucketCmd;
+import org.apache.cloudstack.framework.config.ConfigKey;
 
 public interface BucketApiService {
 
 
+    ConfigKey<Long> DefaultMaxAccountBuckets = new ConfigKey<Long>("Account Defaults", Long.class,
+            "max.account.buckets",
+            "20",
+            "The default maximum number of buckets that can be created for an account",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxAccountObjectStorage = new ConfigKey<Long>("Account Defaults", Long.class,
+            "max.account.object.storage",
+            "400",
+            "The default maximum object storage space (in GiB) that can be used for an account",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxProjectBuckets = new ConfigKey<Long>("Project Defaults", Long.class,
+            "max.project.buckets",
+            "20",
+            "The default maximum number of buckets that can be created for a project",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxProjectObjectStorage = new ConfigKey<Long>("Project Defaults", Long.class,
+            "max.project.object.storage",
+            "400",
+            "The default maximum object storage space (in GiB) that can be used for a project",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxDomainBuckets = new ConfigKey<Long>("Domain Defaults", Long.class,
+            "max.domain.buckets",
+            "20",
+            "The default maximum number of buckets that can be created for a domain",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
+    ConfigKey<Long> DefaultMaxDomainObjectStorage = new ConfigKey<Long>("Domain Defaults", Long.class,
+            "max.domain.object.storage",
+            "400",
+            "The default maximum object storage space (in GiB) that can be used for a domain",
+            false,
+            ConfigKey.Scope.Global,
+            null);
+
     /**
      * Creates the database object for a Bucket based on the given criteria
      *

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

@@ -1317,22 +1317,6 @@ public enum Config {
             "20",
             "The default maximum number of snapshots that can be created for an account",
             null),
-    DefaultMaxAccountBackups(
-            "Account Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.account.backups",
-            "20",
-            "The default maximum number of backups that can be created for an account",
-            null),
-    DefaultMaxAccountBackupStorage(
-            "Account Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.account.backup.storage",
-            "400",
-            "The default maximum backup storage space (in GiB) that can be used for an account",
-            null),
     DefaultMaxAccountVolumes(
             "Account Defaults",
             ManagementServer.class,
@@ -1389,22 +1373,6 @@ public enum Config {
                 "10",
                 "The default maximum number of projects that can be created for an account",
                 null),
-    DefaultMaxAccountBuckets(
-            "Account Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.account.buckets",
-            "20",
-            "The default maximum number of buckets that can be created for an account",
-            null),
-    DefaultMaxAccountObjectStorage(
-            "Account Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.account.object.storage",
-            "400",
-            "The default maximum object storage space (in GiB) that can be used for an account",
-            null),
 
     //disabling lb as cluster sync does not work with distributed cluster
     SubDomainNetworkAccess(
@@ -1447,8 +1415,6 @@ 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", "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,8 +1423,6 @@ 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),
-    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",
@@ -1492,23 +1456,6 @@ public enum Config {
             "20",
             "The default maximum number of snapshots that can be created for a project",
             null),
-    // Move to configkey?
-    DefaultMaxProjectBackups(
-            "Project Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.project.backups",
-            "20",
-            "The default maximum number of backups that can be created for a project",
-            null),
-    DefaultMaxProjectBackupStorage(
-            "Project Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.project.backup.storage",
-            "400",
-            "The default maximum backup storage space (in GiB) that can be used for a project",
-            null),
     DefaultMaxProjectVolumes(
             "Project Defaults",
             ManagementServer.class,
@@ -1557,22 +1504,6 @@ public enum Config {
             "200",
             "The default maximum primary storage space (in GiB) that can be used for an project",
             null),
-    DefaultMaxProjectBuckets(
-            "Project Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.project.buckets",
-            "20",
-            "The default maximum number of buckets that can be created for a project",
-            null),
-    DefaultMaxProjectObjectStorage(
-            "Project Defaults",
-            ManagementServer.class,
-            Long.class,
-            "max.project.object.storage",
-            "400",
-            "The default maximum object storage space (in GiB) that can be used for a project",
-            null),
 
     ProjectInviteRequired(
             "Project Defaults",