Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form

Author: harikrishna-patnala

api/src/main/java/org/apache/cloudstack/api/response/DiskOfferingResponse.java

@@ -157,7 +157,7 @@ public class DiskOfferingResponse extends BaseResponse {
 
     @SerializedName("disksizestrictness")
     @Param(description = "To allow or disallow the resize operation on the disks created from this disk offering, if the flag is true then resize is not allowed", since = "4.16")
-    private String diskSizeStrictness;
+    private Boolean diskSizeStrictness;
 
     public Boolean getDisplayOffering() {
         return displayOffering;
@@ -368,11 +368,11 @@ public void setVsphereStoragePolicy(String vsphereStoragePolicy) {
         this.vsphereStoragePolicy = vsphereStoragePolicy;
     }
 
-    public String getDiskSizeStrictness() {
+    public Boolean getDiskSizeStrictness() {
         return diskSizeStrictness;
     }
 
-    public void setDiskSizeStrictness(String diskSizeStrictness) {
+    public void setDiskSizeStrictness(Boolean diskSizeStrictness) {
         this.diskSizeStrictness = diskSizeStrictness;
     }
 }

server/src/main/java/com/cloud/api/query/vo/DiskOfferingJoinVO.java

@@ -162,7 +162,7 @@ public class DiskOfferingJoinVO extends BaseViewVO implements InternalIdentity,
     String vsphereStoragePolicy;
 
     @Column(name = "disk_size_strictness")
-    String diskSizeStrictness;
+    boolean diskSizeStrictness;
 
     public DiskOfferingJoinVO() {
     }
@@ -353,7 +353,7 @@ public String getVsphereStoragePolicy() {
         return vsphereStoragePolicy;
     }
 
-    public String getDiskSizeStrictness() {
+    public boolean getDiskSizeStrictness() {
         return diskSizeStrictness;
     }
 }

ui/public/locales/en.json

@@ -812,6 +812,8 @@
 "label.duration.in.sec": "Duration (in sec)",
 "label.dynamicscalingenabled": "Dynamic Scaling Enabled",
 "label.dynamicscalingenabled.tooltip": "VM can dynamically scale only when dynamic scaling is enabled on template, service offering and global setting",
+"label.diskofferingstrictness": "Disk Offering Strictness",
+"label.disksizestrictness": "Disk Size Strictness",
 "label.edit": "Edit",
 "label.edit.acl.list": "Edit ACL List",
 "label.edit.acl.rule": "Edit ACL rule",

ui/src/config/section/offering.js

@@ -31,7 +31,7 @@ export default {
       params: { isrecursive: 'true' },
       columns: ['name', 'displaytext', 'cpunumber', 'cpuspeed', 'memory', 'domain', 'zone', 'order'],
       details: () => {
-        var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created', 'dynamicscalingenabled']
+        var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness']
         if (store.getters.apis.createServiceOffering &&
           store.getters.apis.createServiceOffering.params.filter(x => x.name === 'storagepolicy').length > 0) {
           fields.splice(6, 0, 'vspherestoragepolicy')
@@ -87,7 +87,7 @@ export default {
       permission: ['listServiceOfferings', 'listInfrastructure'],
       params: { issystem: 'true', isrecursive: 'true' },
       columns: ['name', 'systemvmtype', 'cpunumber', 'cpuspeed', 'memory', 'storagetype', 'order'],
-      details: ['name', 'id', 'displaytext', 'systemvmtype', 'provisioningtype', 'storagetype', 'iscustomized', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created', 'dynamicscalingenabled'],
+      details: ['name', 'id', 'displaytext', 'systemvmtype', 'provisioningtype', 'storagetype', 'iscustomized', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created', 'dynamicscalingenabled', 'diskofferingstrictness'],
       actions: [{
         api: 'createServiceOffering',
         icon: 'plus',
@@ -124,7 +124,7 @@ export default {
       params: { isrecursive: 'true' },
       columns: ['name', 'displaytext', 'disksize', 'domain', 'zone', 'order'],
       details: () => {
-        var fields = ['name', 'id', 'displaytext', 'disksize', 'provisioningtype', 'storagetype', 'iscustomized', 'tags', 'domain', 'zone', 'created']
+        var fields = ['name', 'id', 'displaytext', 'disksize', 'provisioningtype', 'storagetype', 'iscustomized', 'disksizestrictness', 'tags', 'domain', 'zone', 'created']
         if (store.getters.apis.createDiskOffering &&
           store.getters.apis.createDiskOffering.params.filter(x => x.name === 'storagepolicy').length > 0) {
           fields.splice(6, 0, 'vspherestoragepolicy')

ui/src/views/offering/AddComputeOffering.vue

@@ -541,6 +541,15 @@
           </span>
           <a-switch v-decorator="['dynamicscalingenabled', {initialValue: dynamicscalingenabled}]" :checked="dynamicscalingenabled" @change="val => { dynamicscalingenabled = val }"/>
         </a-form-item>
+        <a-form-item>
+          <span slot="label">
+            {{ $t('label.diskofferingstrictness') }}
+            <a-tooltip :title="apiParams.diskofferingstrictness.description">
+              <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+            </a-tooltip>
+          </span>
+          <a-switch v-decorator="['diskofferingstrictness', {initialValue: diskofferingstrictness}]" :checked="diskofferingstrictness" @change="val => { diskofferingstrictness = val }"/>
+        </a-form-item>
         <a-form-item v-if="this.isAdmin()">
           <span slot="label">
             {{ $t('label.hosttags') }}
@@ -807,7 +816,8 @@ export default {
       vGpuVisible: false,
       vGpuTypes: [],
       loading: false,
-      dynamicscalingenabled: true
+      dynamicscalingenabled: true,
+      diskofferingstrictness: false
     }
   },
   beforeCreate () {
@@ -970,7 +980,8 @@ export default {
           customized: values.offeringtype !== 'fixed',
           offerha: values.offerha === true,
           limitcpuuse: values.limitcpuuse === true,
-          dynamicscalingenabled: values.dynamicscalingenabled
+          dynamicscalingenabled: values.dynamicscalingenabled,
+          diskofferingstrictness: values.diskofferingstrictness
         }
 
         // custom fields (begin)

ui/src/views/offering/AddDiskOffering.vue

@@ -94,6 +94,15 @@
             </a-radio-button>
           </a-radio-group>
         </a-form-item>
+        <a-form-item>
+          <span slot="label">
+            {{ $t('label.disksizestrictness') }}
+            <a-tooltip :title="apiParams.disksizestrictness.description">
+              <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+            </a-tooltip>
+          </span>
+          <a-switch v-decorator="['disksizestrictness', { initialValue: this.disksizestrictness }]" :checked="this.disksizestrictness" @change="val => { this.disksizestrictness = val }" />
+        </a-form-item>
         <a-form-item>
           <span slot="label">
             {{ $t('label.customdisksize') }}
@@ -462,7 +471,8 @@ export default {
       domainLoading: false,
       zones: [],
       zoneLoading: false,
-      loading: false
+      loading: false,
+      disksizestrictness: false
     }
   },
   beforeCreate () {
@@ -579,7 +589,8 @@ export default {
           storageType: values.storagetype,
           cacheMode: values.writecachetype,
           provisioningType: values.provisioningtype,
-          customized: values.customdisksize
+          customized: values.customdisksize,
+          disksizestrictness: values.disksizestrictness
         }
         if (values.customdisksize !== true) {
           params.disksize = values.disksize