Merge pull request #637 from jschoiRR/mold-main#2025

[Mold API, Agent] VM BootOrder 순 변경(hd > cdrom), 가상머신 생성시 디스크 오퍼링 검색 버그 수정

Author: jschoiRR

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -3196,8 +3196,8 @@ protected GuestDef createGuestFromSpec(VirtualMachineTO vmTO, LibvirtVMDef vm, S
             }
         }
         guest.setUuid(uuid);
-        guest.setBootOrder(GuestDef.BootOrder.CDROM);
         guest.setBootOrder(GuestDef.BootOrder.HARDISK);
+        guest.setBootOrder(GuestDef.BootOrder.CDROM);
         return guest;
     }
 
@@ -3823,15 +3823,14 @@ public void detachAndAttachConfigDriveISO(final Connect conn, final String vmNam
 
     public synchronized String attachOrDetachConfigDriveISO(final Connect conn, final String vmName, VirtualMachineTO to, String cdPath, final boolean isAttach, final Integer diskSeq) throws LibvirtException, URISyntaxException,
             InternalErrorException {
-        String isoPath = "";
         DiskTO configDriveDisk = null;
         for (DiskTO disk : to.getDisks()) {
             if (disk.getPath() != null && disk.getPath().contains("configdrive")) {
                 configDriveDisk = disk;
                 break;
             }
         }
-        isoPath = getVolumePath(conn, configDriveDisk, to.isConfigDriveOnHostCache());
+        String isoPath = getVolumePath(conn, configDriveDisk, to.isConfigDriveOnHostCache());
         DiskDef iso = new DiskDef();
         if (isAttach && StringUtils.isNotBlank(isoPath) && configDriveDisk !=null && isoPath.lastIndexOf("/") > 0) {
             if (isoPath.startsWith(getConfigPath() + "/" + ConfigDrive.CONFIGDRIVEDIR) && isoPath.contains(vmName)) {

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

@@ -159,7 +159,7 @@ public void setManufacturer(String manufacturer) {
 
         public String getProduct() {
             if (StringUtils.isEmpty(product)) {
-                return "CloudStack KVM Hypervisor";
+                return "ABLESTACK CELL Hypervisor";
             }
             return product;
         }

ui/src/views/compute/wizard/DiskOfferingSelection.vue

@@ -143,16 +143,6 @@ export default {
   },
   created () {
     this.initDataItem()
-    if (this.items) {
-      var diskFilter = this.items
-      if (this.preFillContent.kvdoenable && this.preFillContent.kvdoenable !== undefined) {
-        diskFilter = this.items.filter(items => items.kvdoenable)
-      } else if (!this.preFillContent.kvdoenable && this.preFillContent.kvdoenable !== undefined) {
-        diskFilter = this.items.filter(items => !items.kvdoenable)
-      }
-      this.rowCountNum = diskFilter.length
-      this.dataItems = this.dataItems.concat(diskFilter)
-    }
   },
   computed: {
     tableSource () {
@@ -189,9 +179,9 @@ export default {
         if (newData) {
           var diskFilter = newData
           if (this.preFillContent.kvdoenable && this.preFillContent.kvdoenable !== undefined) {
-            diskFilter = newData.filter(newData => newData.kvdoenable)
+            diskFilter = newData.filter(data => data.kvdoenable)
           } else if (!this.preFillContent.kvdoenable && this.preFillContent.kvdoenable !== undefined) {
-            diskFilter = this.newData.filter(newData => !newData.kvdoenable)
+            diskFilter = newData.filter(data => !data.kvdoenable)
           }
           this.rowCountNum = diskFilter.length
           this.dataItems = this.dataItems.concat(diskFilter)