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

Merge remote-tracking branch 'apache/4.17' into main

Browse Source
This commit is contained in:
Abhishek Kumar 2022-08-16 17:51:09 +05:30
commit 7ae6fdf053
5 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5253,7 +5253,7 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
protected AttachIsoAnswer execute(AttachIsoCommand cmd) {
try {
VmwareHypervisorHost hyperHost = getHyperHost(getServiceContext());
VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(cmd.getVmName());
VirtualMachineMO vmMo = HypervisorHostHelper.findVmOnHypervisorHostOrPeer(hyperHost, cmd.getVmName());
if (vmMo == null) {
String msg = "Unable to find VM in vSphere to execute AttachIsoCommand, vmName: " + cmd.getVmName();
s_logger.error(msg);

2
plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
View File

@ -2341,7 +2341,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
try {
VmwareContext context = hostService.getServiceContext(null);
VmwareHypervisorHost hyperHost = hostService.getHyperHost(context, null);
VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(vmName);
VirtualMachineMO vmMo = HypervisorHostHelper.findVmOnHypervisorHostOrPeer(hyperHost, vmName);
if (vmMo == null) {
String msg = "Unable to find VM in vSphere to execute AttachIsoCommand, vmName: " + vmName;
s_logger.error(msg);

12
ui/src/components/view/DetailsTab.vue
View File

@ -98,6 +98,18 @@ export default {
loading: {
type: Boolean,
default: false
},
items: {
type: Object,
default: () => {}
},
bordered: {
type: Boolean,
default: false
},
tab: {
type: String,
default: ''
}
},
data () {

1
ui/src/views/compute/ScaleVM.vue
View File

@ -217,6 +217,7 @@ export default {
delete this.params[this.cpuNumberKey]
delete this.params[this.cpuSpeedKey]
delete this.params[this.memoryKey]
delete this.params[this.rootDiskSizeKey]
this.params.serviceofferingid = id
this.selectedOffering = this.offeringsMap[id]

11
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
View File

@ -2340,4 +2340,15 @@ public class HypervisorHostHelper {
}
return hardwareVersion;
}
public static VirtualMachineMO findVmOnHypervisorHostOrPeer(VmwareHypervisorHost hypervisorHost, String vmName) throws Exception {
VirtualMachineMO vmMo = hypervisorHost.findVmOnHyperHost(vmName);
if (vmMo == null) {
if (s_logger.isDebugEnabled()) {
s_logger.debug(String.format("Unable to find the VM on host %s, try within datacenter", hypervisorHost.getHyperHostName()));
}
vmMo = hypervisorHost.findVmOnPeerHyperHost(vmName);
}
return vmMo;
}
}