Merge pull request #514 from jschoiRR/mold-diplo-2024-main

[Mold API] 가상머신 생성시 전달되는 customParameters null 체크방식 변경 및 containsKey 방식으로 volumeId 키 존재 여부 확인

Author: jschoiRR

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -511,7 +511,7 @@ public void allocate(final String vmInstanceName, final VirtualMachineTemplate t
 
             logger.debug("Allocating disks for {}",  persistedVm);
 
-            if (customParameters.get("volumeId") != null){
+            if (!MapUtils.isEmpty(customParameters) && customParameters.containsKey("volumeId")){
                 VolumeVO volVO =_volsDao.findById(Long.parseLong(customParameters.get("volumeId")));
                 volVO.setInstanceId(vm.getId());
                 _volsDao.update(volVO.getId(), volVO);

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.vm;
 
+import static com.cloud.configuration.ConfigurationManager.VM_USERDATA_MAX_LENGTH;
 import static com.cloud.configuration.ConfigurationManagerImpl.VM_USERDATA_MAX_LENGTH;
 import static com.cloud.storage.Volume.IOPS_LIMIT;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
@@ -3992,7 +3993,7 @@ private UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffe
             throw new PermissionDeniedException("The owner of vm to deploy is disabled: " + owner);
         }
         VMTemplateVO template = _templateDao.findById(tmplt.getId());
-        if (customParameters.get("volumeId") != null) {
+        if (!MapUtils.isEmpty(customParameters) && customParameters.containsKey("volumeId")){
             template = _templateDao.findByIdIncludingRemoved(tmplt.getId());
         }
 
@@ -4074,7 +4075,7 @@ private UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffe
             throw new InvalidParameterValueException("Root volume encryption is not supported for hypervisor type " + hypervisorType);
         }
 
-        if (customParameters.get("volumeId") != null) {
+        if (!MapUtils.isEmpty(customParameters) && customParameters.containsKey("volumeId")){
             Long volumeId = Long.valueOf(customParameters.get("volumeId"));
             VolumeVO volume = _volsDao.findById(volumeId);
             // Compute the size of the volume
@@ -4498,14 +4499,14 @@ protected long configureCustomRootDiskSize(Map<String, String> customParameters,
             _volumeService.validateVolumeSizeInBytes(rootDiskSize);
             return rootDiskSize;
         } else {
-            if (customParameters.get("volumeId") == null) {
-            // For baremetal, size can be 0 (zero)
-            Long templateSize = _templateDao.findById(template.getId()).getSize();
-            if (templateSize != null) {
-                return templateSize;
+            if (!MapUtils.isEmpty(customParameters) && !customParameters.containsKey("volumeId")){
+                // For baremetal, size can be 0 (zero)
+                Long templateSize = _templateDao.findById(template.getId()).getSize();
+                if (templateSize != null) {
+                    return templateSize;
+                }
             }
         }
-    }
         return 0;
     }
 
@@ -4562,7 +4563,7 @@ private UserVmVO commitUserVm(final boolean isImport, final DataCenter zone, fin
                 offering.getLimitCpuUse(), owner.getDomainId(), owner.getId(), userId, offering.getId(), userData, userDataId, userDataDetails, hostName);
         vm.setUuid(uuidName);
         vm.setDynamicallyScalable(dynamicScalingEnabled);
-        if (customParameters.get("volumeId") != null) {
+        if (!MapUtils.isEmpty(customParameters) && customParameters.containsKey("volumeId")){
             template = _templateDao.findByIdIncludingRemoved(template.getId());
         }
         Map<String, String> details = template.getDetails();
@@ -4596,7 +4597,7 @@ private UserVmVO commitUserVm(final boolean isImport, final DataCenter zone, fin
 
         Long rootDiskSize = null;
         // custom root disk size, resizes base template to larger size
-        if (customParameters.containsKey(VmDetailConstants.ROOT_DISK_SIZE) && customParameters.get("volumeId") == null) {
+        if (customParameters.containsKey(VmDetailConstants.ROOT_DISK_SIZE) && !customParameters.containsKey("volumeId")) {
             // already verified for positive number
             rootDiskSize = Long.parseLong(customParameters.get(VmDetailConstants.ROOT_DISK_SIZE));
 
@@ -4606,7 +4607,6 @@ private UserVmVO commitUserVm(final boolean isImport, final DataCenter zone, fin
                 ipve.add(VirtualMachine.class, vm.getUuid());
                 throw ipve;
             }
-
             validateRootDiskResize(hypervisorType, rootDiskSize, templateVO, vm, customParameters);
         }
 
@@ -9341,10 +9341,10 @@ public UserVm createVirtualMachineVolume(DeployVMVolumeCmd cmd) throws Insuffici
         Map<String, String> userVmOVFProperties = cmd.getVmProperties();
         Map<String, String> customParameters = cmd.getDetails();
         Long volumeId = cmd.getVolumeId();
-        if (cmd.getVolumeId() != null) {
+        if (volumeId != null) {
             customParameters.put("volumeId", String.valueOf(volumeId));
         }
-        VolumeVO volVO =_volsDao.findById(Long.parseLong(customParameters.get("volumeId")));
+        VolumeVO volVO =_volsDao.findById(volumeId);
         volVO.setDeviceId(0L);
         volVO.setTemplateId(template.getId());
         _volsDao.update(volVO.getId(), volVO);

ui/public/config.json

@@ -10,7 +10,7 @@
   "docBase": "http://docs.ablecloud.io/latest",
   "appTitle": "Mold-ABLESTACK",
   "footer": "Copyright (c) 2021-2024, ABLECLOUD.Co.Ltd",
-  "buildVersion": "Diplo-v4.0.0-20240305",
+  "buildVersion": "ABLESTACK V4.0-4.0.15",
   "loginFooter": "",
   "logo": "assets/ablestack-logo.png",
   "minilogo": "assets/mini-ablestack-logo.png",