Allow only resize to higher disk size from UI

Author: harikrishna-patnala

engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java

@@ -53,4 +53,6 @@ List<ServiceOfferingVO> createSystemServiceOfferings(String name, String uniqueN
     ServiceOfferingVO findDefaultSystemOffering(String offeringName, Boolean useLocalStorage);
 
     List<ServiceOfferingVO> listPublicByCpuAndMemory(Integer cpus, Integer memory);
+
+    ServiceOfferingVO findServiceOfferingByComputeOnlyDiskOffering(long diskOfferingId);
 }

engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java

@@ -56,6 +56,7 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Lo
     protected final SearchBuilder<ServiceOfferingVO> UniqueNameSearch;
     protected final SearchBuilder<ServiceOfferingVO> ServiceOfferingsByKeywordSearch;
     protected final SearchBuilder<ServiceOfferingVO> PublicCpuRamSearch;
+    protected final SearchBuilder<ServiceOfferingVO> SearchComputeOfferingByComputeOnlyDiskOffering;
 
     public ServiceOfferingDaoImpl() {
         super();
@@ -75,6 +76,10 @@ public ServiceOfferingDaoImpl() {
         PublicCpuRamSearch.and("ram", PublicCpuRamSearch.entity().getRamSize(), SearchCriteria.Op.EQ);
         PublicCpuRamSearch.and("system_use", PublicCpuRamSearch.entity().isSystemUse(), SearchCriteria.Op.EQ);
         PublicCpuRamSearch.done();
+
+        SearchComputeOfferingByComputeOnlyDiskOffering = createSearchBuilder();
+        SearchComputeOfferingByComputeOnlyDiskOffering.and("disk_offering_id", SearchComputeOfferingByComputeOnlyDiskOffering.entity().getDiskOfferingId(), SearchCriteria.Op.EQ);
+        SearchComputeOfferingByComputeOnlyDiskOffering.done();
     }
 
     @Override
@@ -277,4 +282,15 @@ public List<ServiceOfferingVO> listPublicByCpuAndMemory(Integer cpus, Integer me
         sc.setParameters("system_use", false);
         return listBy(sc);
     }
+
+    @Override
+    public ServiceOfferingVO findServiceOfferingByComputeOnlyDiskOffering(long diskOfferingId) {
+        SearchCriteria<ServiceOfferingVO> sc = SearchComputeOfferingByComputeOnlyDiskOffering.create();
+        sc.setParameters("disk_offering_id", diskOfferingId);
+        List<ServiceOfferingVO> vos = listBy(sc);
+        if (vos.size() == 0) {
+            return null;
+        }
+        return vos.get(0);
+    }
 }

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

@@ -1043,6 +1043,14 @@ public static String findClusterDetails(long clusterId, String name) {
         return null;
     }
 
+    public static DiskOfferingVO findComputeOnlyDiskOfferingById(Long diskOfferingId) {
+        DiskOfferingVO off = s_diskOfferingDao.findByIdIncludingRemoved(diskOfferingId);
+        if (off.isComputeOnly()) {
+            return off;
+        }
+        return null;
+    }
+
     public static DiskOfferingVO findDiskOfferingById(Long diskOfferingId) {
         DiskOfferingVO off = s_diskOfferingDao.findByIdIncludingRemoved(diskOfferingId);
         if (!off.isComputeOnly()) {
@@ -1051,6 +1059,10 @@ public static DiskOfferingVO findDiskOfferingById(Long diskOfferingId) {
         return null;
     }
 
+    public static ServiceOfferingVO findServiceOfferingByComputeOnlyDiskOffering(Long diskOfferingId) {
+        ServiceOfferingVO off = s_serviceOfferingDao.findServiceOfferingByComputeOnlyDiskOffering(diskOfferingId);
+        return off;
+    }
     public static DomainVO findDomainById(Long domainId) {
         return s_domainDao.findByIdIncludingRemoved(domainId);
     }

server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java

@@ -21,6 +21,7 @@
 
 import javax.inject.Inject;
 
+import com.cloud.offering.DiskOffering;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
@@ -178,10 +179,12 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
         ApiResponseHelper.populateOwner(volResponse, volume);
 
         if (volume.getDiskOfferingId() > 0) {
-            if (ApiDBUtils.findServiceOfferingByUuid(volume.getDiskOfferingUuid()) != null) {
-                volResponse.setServiceOfferingId(volume.getDiskOfferingUuid());
-                volResponse.setServiceOfferingName(volume.getDiskOfferingName());
-                volResponse.setServiceOfferingDisplayText(volume.getDiskOfferingDisplayText());
+            DiskOffering computeOnlyDiskOffering  = ApiDBUtils.findComputeOnlyDiskOfferingById(volume.getDiskOfferingId());
+            if (computeOnlyDiskOffering != null) {
+                ServiceOffering serviceOffering = ApiDBUtils.findServiceOfferingByComputeOnlyDiskOffering(volume.getDiskOfferingId());
+                volResponse.setServiceOfferingId(String.valueOf(serviceOffering.getId()));
+                volResponse.setServiceOfferingName(serviceOffering.getName());
+                volResponse.setServiceOfferingDisplayText(serviceOffering.getDisplayText());
             } else {
                 volResponse.setDiskOfferingId(volume.getDiskOfferingUuid());
                 volResponse.setDiskOfferingName(volume.getDiskOfferingName());

ui/src/views/compute/ScaleVM.vue

@@ -57,14 +57,6 @@
       ></a-checkbox>
     </a-form-item>
 
-    <a-form-item :label="$t('label.shrinkok')">
-      <a-checkbox
-        :checked="shrinkOk"
-        v-decorator="['shrinkOk']"
-        @change="handleShrinkOkCheckChange"
-      ></a-checkbox>
-    </a-form-item>
-
     <div :span="24" class="action-button">
       <a-button @click="closeAction">{{ this.$t('label.cancel') }}</a-button>
       <a-button :loading="loading" ref="submit" type="primary" @click="handleSubmit">{{ this.$t('label.ok') }}</a-button>
@@ -96,7 +88,6 @@ export default {
       offerings: [],
       selectedOffering: {},
       autoMigrate: true,
-      shrinkOk: false,
       total: 0,
       params: { id: this.resource.id },
       loading: false,
@@ -169,14 +160,10 @@ export default {
       this.params.serviceofferingid = id
       this.selectedOffering = this.offeringsMap[id]
       this.params.automigrate = this.autoMigrate
-      this.params.shrinkok = this.shrinkOk
     },
     handleAutoMigrateCheckChange (e) {
       this.autoMigrate = e.target.checked
     },
-    handleShrinkOkCheckChange (e) {
-      this.shrinkOk = e.target.checked
-    },
     updateFieldValue (name, value) {
       this.params[name] = value
     },