Merge pull request #547 from sjyu1/ablestack-diplo

[Mold API] ABLESTACK 인스턴스 가져오기 기능에서 볼륨이 rbd일경우 오류수정

Author: jschoiRR

server/src/main/java/com/cloud/template/TemplateManagerImpl.java

@@ -2043,7 +2043,7 @@ public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account t
         Boolean isPublic = cmd.isPublic();
         Boolean featured = cmd.isFeatured();
         int bitsValue = ((bits == null) ? 64 : bits.intValue());
-        boolean requiresHvmValue = ((requiresHvm == null) ? true : requiresHvm.booleanValue());
+        boolean requiresHvmValue = ((requiresHvm == null) ? false : requiresHvm.booleanValue());
         boolean passwordEnabledValue = ((passwordEnabled == null) ? false : passwordEnabled.booleanValue());
         boolean sshKeyEnabledValue = ((sshKeyEnabled == null) ? false : sshKeyEnabled.booleanValue());
         if (isPublic == null) {

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

@@ -558,6 +558,11 @@ private StoragePool getStoragePool(final UnmanagedInstanceTO.Disk disk, final Da
             pools.addAll(primaryDataStoreDao.listByDataCenterId(zone.getId()));
             for (StoragePool pool : pools) {
                 String searchPoolParam = StringUtils.isNotBlank(dsPath) ? dsPath : dsName;
+                if (Storage.StoragePoolType.RBD.equals(pool.getPoolType())) {
+                    String[] rbdPath = dsName.split("/");
+                    searchPoolParam = rbdPath[2];
+                }
+
                 if (StringUtils.contains(pool.getPath(), searchPoolParam)) {
                     storagePool = pool;
                     break;

ui/src/views/network/UpdateNetwork.vue

@@ -132,14 +132,7 @@
           </template>
           <a-input
             v-model:value="form.guestvmcidr"
-            :placeholder="apiParams.guestvmcidr.description"
-            @change="(e) => { cidrChanged = e.target.value !== resource.cidr }" />
-        </a-form-item>
-        <a-form-item name="changecidr" ref="changecidr" v-if="cidrChanged">
-          <template #label>
-            <tooltip-label :title="$t('label.changecidr')" :tooltip="apiParams.changecidr.description"/>
-          </template>
-          <a-switch v-model:checked="form.changecidr" />
+            :placeholder="apiParams.guestvmcidr.description"/>
         </a-form-item>
         <a-form-item name="networkdomain" ref="networkdomain" v-if="isUpdatingIsolatedNetwork">
           <template #label>

ui/src/views/tools/ImportUnmanagedInstance.vue

@@ -222,7 +222,7 @@
                   :cpuNumberInputDecorator="cpuNumberKey"
                   :cpuSpeedInputDecorator="cpuSpeedKey"
                   :memoryInputDecorator="memoryKey"
-                  :computeOfferingId="computeOffering.id"
+                  :serviceofferingId="computeOffering.id"
                   :preFillContent="dataPreFill"
                   :isConstrained="'serviceofferingdetails' in computeOffering"
                   :minCpu="getMinCpu()"
@@ -715,6 +715,7 @@ export default {
       this.rules = reactive({
         displayname: [{ required: true, message: this.$t('message.error.input.value') }],
         templateid: [{ required: this.templateType !== 'auto', message: this.$t('message.error.input.value') }],
+        serviceofferingid: [{ required: true, message: this.$t('message.error.input.value') }],
         rootdiskid: [{ required: this.templateType !== 'auto', message: this.$t('message.error.input.value') }]
       })
     },
@@ -852,7 +853,7 @@ export default {
       this.form[name] = value
     },
     updateComputeOffering (id) {
-      this.updateFieldValue('computeofferingid', id)
+      this.updateFieldValue('serviceofferingid', id)
       this.computeOffering = this.computeOfferings.filter(x => x.id === id)[0]
       if (this.computeOffering && !this.computeOffering.iscustomizediops) {
         this.updateFieldValue(this.minIopsKey, undefined)
@@ -879,6 +880,7 @@ export default {
       this.rules = reactive({
         displayname: [{ required: true, message: this.$t('message.error.input.value') }],
         templateid: [{ required: this.templateType !== 'auto', message: this.$t('message.error.input.value') }],
+        serviceofferingid: [{ required: true, message: this.$t('message.error.input.value') }],
         rootdiskid: [{ required: this.templateType !== 'auto', message: this.$t('message.error.input.value') }]
       })
     },
@@ -1040,7 +1042,7 @@ export default {
           })
           return
         }
-        params.serviceofferingid = values.computeofferingid
+        params.serviceofferingid = values.serviceofferingid
         if (this.computeOffering.iscustomized) {
           var details = [this.cpuNumberKey, this.cpuSpeedKey, this.memoryKey]
           for (var detail of details) {
@@ -1188,6 +1190,7 @@ export default {
               successMethod: result => {
                 this.$emit('refresh-data')
                 resolve(result)
+                this.closeAction()
               },
               errorMethod: (result) => {
                 this.updateLoading(false)
@@ -1198,7 +1201,7 @@ export default {
             this.updateLoading(false)
             this.$notifyError(error)
           }).finally(() => {
-            this.closeAction()
+            // this.closeAction()
             this.updateLoading(false)
           })
         })
@@ -1211,7 +1214,7 @@ export default {
       this.$emit('loading-changed', value)
     },
     resetForm () {
-      var fields = ['displayname', 'hostname', 'domainid', 'account', 'projectid', 'computeofferingid']
+      var fields = ['displayname', 'hostname', 'domainid', 'account', 'projectid', 'serviceofferingid']
       for (var field of fields) {
         this.updateFieldValue(field, undefined)
       }