Skip to content

[VMware] Start VM with deploy-as-is template having multiple controller types #5311

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
nvazquez merged 1 commit into from
Aug 31, 2021
Merged

[VMware] Start VM with deploy-as-is template having multiple controller types #5311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2603,7 +2603,8 @@ private void mapSpecDisksToClonedDisksAndTearDownDatadisks(VirtualMachineMO vmMo
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()
Expand Down
14 changes: 14 additions & 0 deletions vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2785,6 +2785,20 @@ public List<VirtualDisk> getVirtualDisks() throws Exception {
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");

Expand Down