From 39e1343853917e890af08a5f0650643d7f7cd84e Mon Sep 17 00:00:00 2001 From: JS Choi <77760789+jschoiRR@users.noreply.github.com> Date: Wed, 7 May 2025 13:23:01 +0900 Subject: [PATCH 1/3] =?UTF-8?q?VM=20xml=20product=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EA=B0=92=EC=9D=B4=20=EB=B9=88=20=EA=B2=BD=EC=9A=B0=20"ABLESTAC?= =?UTF-8?q?K=20CELL=20Hypervisor"=20=EA=B0=92=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EA=B5=AC=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index 86ca9db45a28..3c352d3fe663 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/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; } From 56670f234a77043ae4e7740ece11f79e9c8cec8b Mon Sep 17 00:00:00 2001 From: JS Choi <77760789+jschoiRR@users.noreply.github.com> Date: Wed, 7 May 2025 13:23:55 +0900 Subject: [PATCH 2/3] =?UTF-8?q?boot=20order=20=EA=B8=B0=EB=B3=B8=EA=B0=92?= =?UTF-8?q?=201.=20hd,=202.=20cdrom=20=EC=88=9C=EC=9C=BC=EB=A1=9C=20=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 41953347a79f..74ebb93e6232 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/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,7 +3823,6 @@ 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")) { @@ -3831,7 +3830,7 @@ public synchronized String attachOrDetachConfigDriveISO(final Connect conn, fina 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)) { From 94adccdd08e5c73803ed7009836199e07daace32 Mon Sep 17 00:00:00 2001 From: JS Choi <77760789+jschoiRR@users.noreply.github.com> Date: Wed, 7 May 2025 17:35:27 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B0=80=EC=83=81=EB=A8=B8=EC=8B=A0=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=8B=9C=20=EB=94=94=EC=8A=A4=ED=81=AC=20?= =?UTF-8?q?=EC=98=A4=ED=8D=BC=EB=A7=81=20=EA=B2=80=EC=83=89=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/compute/wizard/DiskOfferingSelection.vue | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/ui/src/views/compute/wizard/DiskOfferingSelection.vue b/ui/src/views/compute/wizard/DiskOfferingSelection.vue index 43d27a05360f..e5e2c5b421f3 100644 --- a/ui/src/views/compute/wizard/DiskOfferingSelection.vue +++ b/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)