Change disk offering preset variable class name

Author: Lucas Martins

framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/DiskOffering.java renamed to framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/DiskOfferingPresetVariables.java

@@ -17,7 +17,7 @@
 
 package org.apache.cloudstack.quota.activationrule.presetvariables;
 
-public class DiskOffering extends GenericPresetVariable {
+public class DiskOfferingPresetVariables extends GenericPresetVariable {
 
     @PresetVariableDefinition(description = "A long informing the bytes read rate of the disk offering.")
     private Long bytesReadRate;

framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java

@@ -511,11 +511,11 @@ protected void loadPresetVariableValueForVolume(UsageVO usageRecord, Value value
         }
     }
 
-    protected DiskOffering getPresetVariableValueDiskOffering(Long diskOfferingId) {
+    protected DiskOfferingPresetVariables getPresetVariableValueDiskOffering(Long diskOfferingId) {
         DiskOfferingVO diskOfferingVo = diskOfferingDao.findByIdIncludingRemoved(diskOfferingId);
         validateIfObjectIsNull(diskOfferingVo, diskOfferingId, "disk offering");
 
-        DiskOffering diskOffering = new DiskOffering();
+        DiskOfferingPresetVariables diskOffering = new DiskOfferingPresetVariables();
         diskOffering.setId(diskOfferingVo.getUuid());
         diskOffering.setName(diskOfferingVo.getName());
         diskOffering.setBytesReadRate(diskOfferingVo.getBytesReadRate());

framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java

@@ -76,7 +76,7 @@ public class Value extends GenericPresetVariable {
     private GenericPresetVariable template;
 
     @PresetVariableDefinition(description = "Disk offering of the volume.", supportedTypes = {QuotaTypes.VOLUME})
-    private DiskOffering diskOffering;
+    private DiskOfferingPresetVariables diskOffering;
 
     @PresetVariableDefinition(description = "Storage where the volume or snapshot is. While handling with snapshots, this value can be from the primary storage if the global " +
             "setting 'snapshot.backup.to.secondary' is false, otherwise it will be from secondary storage.", supportedTypes = {QuotaTypes.VOLUME, QuotaTypes.SNAPSHOT})
@@ -199,11 +199,11 @@ public void setTemplate(GenericPresetVariable template) {
         fieldNamesToIncludeInToString.add("template");
     }
 
-    public DiskOffering getDiskOffering() {
+    public DiskOfferingPresetVariables getDiskOffering() {
         return diskOffering;
     }
 
-    public void setDiskOffering(DiskOffering diskOffering) {
+    public void setDiskOffering(DiskOfferingPresetVariables diskOffering) {
         this.diskOffering = diskOffering;
         fieldNamesToIncludeInToString.add("diskOffering");
     }

framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java

@@ -310,8 +310,8 @@ private BackupOffering getBackupOfferingForTests() {
         return backupOffering;
     }
 
-    private DiskOffering getDiskOfferingForTests() {
-        DiskOffering diskOffering = new DiskOffering();
+    private DiskOfferingPresetVariables getDiskOfferingForTests() {
+        DiskOfferingPresetVariables diskOffering = new DiskOfferingPresetVariables();
         diskOffering.setId("disk_offering_id");
         diskOffering.setName("disk_offering_name");
         return diskOffering;
@@ -785,7 +785,7 @@ public void getPresetVariableValueDiskOfferingTestSetValuesAndReturnObject() {
         Mockito.doReturn(diskOfferingVoMock).when(diskOfferingDaoMock).findByIdIncludingRemoved(Mockito.anyLong());
         mockMethodValidateIfObjectIsNull();
 
-        DiskOffering expected = getDiskOfferingForTests();
+        DiskOfferingPresetVariables expected = getDiskOfferingForTests();
         Mockito.doReturn(expected.getId()).when(diskOfferingVoMock).getUuid();
         Mockito.doReturn(expected.getName()).when(diskOfferingVoMock).getName();