Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jschoiRR merged 3 commits into from
May 7, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39e1343
VM xml product 설정값이 빈 경우 "ABLESTACK CELL Hypervisor" 값으로 구성
jschoiRR May 7, 2025
56670f2
boot order 기본값 1. hd, 2. cdrom 순으로 변경
jschoiRR May 7, 2025
94adccd
가상머신 생성시 디스크 오퍼링 검색 버그 수정
jschoiRR May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...rvisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
14 changes: 2 additions & 12 deletions ui/src/views/compute/wizard/DiskOfferingSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down Expand Up @@ -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)
Expand Down
Loading