apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Start VM with deploy-as-is template having multiple disk (SCSI) controller types. (#5311)

Browse Source
This commit is contained in:
sureshanaparti 2021-08-31 06:22:24 +05:30 committed by GitHub
parent 46ca853e55
commit e50a40ea08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -2603,7 +2603,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
s_logger.debug("Mapping spec disks information to cloned VM disks for VM " + vmInternalCSName);
if (vmMo != null && ArrayUtils.isNotEmpty(specDisks)) {
List<VirtualDisk> vmDisks = vmMo.getVirtualDisks();
List<VirtualDisk> vmDisks = vmMo.getVirtualDisksOrderedByKey();
List<VirtualDisk> rootDisks = new ArrayList<>();
List<DiskTO> sortedRootDisksFromSpec = Arrays.asList(sortVolumesByDeviceId(specDisks))
.stream()

14
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
View File

@ -2785,6 +2785,20 @@ public class VirtualMachineMO extends BaseMO {
return virtualDisks;
}
public List<VirtualDisk> getVirtualDisksOrderedByKey() throws Exception {
List<VirtualDisk> virtualDisks = getVirtualDisks();
Collections.sort(virtualDisks, new Comparator<VirtualDisk>() {
@Override
public int compare(VirtualDisk disk1, VirtualDisk disk2) {
Integer disk1Key = disk1.getKey();
Integer disk2Key = disk2.getKey();
return disk1Key.compareTo(disk2Key);
}
});
return virtualDisks;
}
public List<String> detachAllDisksExcept(String vmdkBaseName, String deviceBusName) throws Exception {
List<VirtualDevice> devices = _context.getVimClient().getDynamicProperty(_mor, "config.hardware.device");