From b770d27db0324a3b452808b08fcd186f4d2f86fa Mon Sep 17 00:00:00 2001 From: nvazquez Date: Tue, 22 Apr 2025 12:36:19 -0300 Subject: [PATCH 01/12] Improve Vmware VMs retrieval --- .../vmware/VmwareDatacenterService.java | 4 + .../vmware/manager/VmwareManagerImpl.java | 100 ++++++++++--- .../admin/zone/ListVmwareDcHostsCmd.java | 138 ++++++++++++++++++ .../command/admin/zone/ListVmwareDcItems.java | 29 ++++ .../admin/zone/ListVmwareDcVmsCmd.java | 9 +- ui/src/views/tools/ManageInstances.vue | 1 + ui/src/views/tools/SelectVmwareVcenter.vue | 64 +++++++- .../hypervisor/vmware/mo/DatacenterMO.java | 10 +- .../hypervisor/vmware/util/VmwareHelper.java | 28 ++++ 9 files changed, 355 insertions(+), 28 deletions(-) create mode 100644 plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java create mode 100644 plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java index bbac78b879a4..92d8af6b5f26 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java @@ -22,11 +22,13 @@ import com.cloud.dc.VsphereStoragePolicy; import com.cloud.exception.DiscoveryException; import com.cloud.exception.ResourceInUseException; +import com.cloud.hypervisor.vmware.mo.HostMO; import com.cloud.storage.StoragePool; import com.cloud.utils.component.PluggableService; import com.cloud.utils.exception.CloudRuntimeException; import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd; import org.apache.cloudstack.api.command.admin.zone.ImportVsphereStoragePoliciesCmd; +import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcHostsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcVmsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVsphereStoragePoliciesCmd; @@ -54,4 +56,6 @@ public interface VmwareDatacenterService extends PluggableService { List listVsphereStoragePolicyCompatibleStoragePools(ListVsphereStoragePolicyCompatiblePoolsCmd cmd); List listVMsInDatacenter(ListVmwareDcVmsCmd cmd); + + List listHostsInDatacenter(ListVmwareDcHostsCmd cmd); } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 61a949f42d3e..5611c0928c2d 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -43,9 +43,12 @@ import javax.naming.ConfigurationException; import javax.persistence.EntityExistsException; +import com.cloud.hypervisor.vmware.mo.VirtualMachineMO; import com.cloud.hypervisor.vmware.util.VmwareClient; import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd; import org.apache.cloudstack.api.command.admin.zone.ImportVsphereStoragePoliciesCmd; +import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcHostsCmd; +import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcItems; import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcVmsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVsphereStoragePoliciesCmd; @@ -1587,14 +1590,26 @@ public List listVsphereStoragePolicyCompatibleStoragePools(ListVsph return compatiblePools; } - @Override - public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { + private static class VcenterData { + public final String vcenter; + public final String datacenterName; + public final String username; + public final String password; + + public VcenterData(String vcenter, String datacenterName, String username, String password) { + this.vcenter = vcenter; + this.datacenterName = datacenterName; + this.username = username; + this.password = password; + } + } + + private VcenterData getVcenterData(ListVmwareDcItems cmd) { String vcenter = cmd.getVcenter(); String datacenterName = cmd.getDatacenterName(); String username = cmd.getUsername(); String password = cmd.getPassword(); Long existingVcenterId = cmd.getExistingVcenterId(); - String keyword = cmd.getKeyword(); if ((existingVcenterId == null && StringUtils.isBlank(vcenter)) || (existingVcenterId != null && StringUtils.isNotBlank(vcenter))) { @@ -1615,26 +1630,75 @@ public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { username = vmwareDc.getUser(); password = vmwareDc.getPassword(); } + VcenterData vmwaredc = new VcenterData(vcenter, datacenterName, username, password); + return vmwaredc; + } + + private VmwareContext getVmwareContext(String vcenter, String username, String password) throws Exception { + s_logger.debug(String.format("Connecting to the VMware vCenter %s", vcenter)); + String serviceUrl = String.format("https://%s/sdk/vimService", vcenter); + VmwareClient vimClient = new VmwareClient(vcenter); + vimClient.connect(serviceUrl, username, password); + return new VmwareContext(vimClient, vcenter); + } + + @Override + public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { + VcenterData vmwareDC = getVcenterData(cmd); + String vcenter = vmwareDC.vcenter; + String username = vmwareDC.username; + String password = vmwareDC.password; + String datacenterName = vmwareDC.datacenterName; + String keyword = cmd.getKeyword(); + String esxiHostName = cmd.getHostName(); try { - s_logger.debug(String.format("Connecting to the VMware datacenter %s at vCenter %s to retrieve VMs", - datacenterName, vcenter)); - String serviceUrl = String.format("https://%s/sdk/vimService", vcenter); - VmwareClient vimClient = new VmwareClient(vcenter); - vimClient.connect(serviceUrl, username, password); - VmwareContext context = new VmwareContext(vimClient, vcenter); - - DatacenterMO dcMo = new DatacenterMO(context, datacenterName); - ManagedObjectReference dcMor = dcMo.getMor(); - if (dcMor == null) { - String msg = String.format("Unable to find VMware datacenter %s in vCenter %s", - datacenterName, vcenter); - s_logger.error(msg); - throw new InvalidParameterValueException(msg); + VmwareContext context = getVmwareContext(vcenter, username, password); + DatacenterMO dcMo = getDatacenterMO(context, vcenter, datacenterName); + + List vms; + if (StringUtils.isNotBlank(esxiHostName)) { + // List VMs in a specific ESXi Host + HostMO hostMO = VmwareHelper.getHostMOFromHostName(context, esxiHostName); + vms = hostMO.listVmsOnHyperHostWithHypervisorName(null); + } else { + // Long lasting method, not recommended - retrieves all the VMs in a datacenter + vms = dcMo.getAllVmsOnDatacenter(); } - List instances = dcMo.getAllVmsOnDatacenter(); + + List instances = VmwareHelper.getUnmanagedInstancesList(vms); return StringUtils.isBlank(keyword) ? instances : instances.stream().filter(x -> x.getName().toLowerCase().contains(keyword.toLowerCase())).collect(Collectors.toList()); + } catch (Exception e) { + String errorMsg = String.format("Error retrieving VMs from the VMware VC %s datacenter %s: %s", + vcenter, datacenterName, e.getMessage()); + s_logger.error(errorMsg, e); + throw new CloudRuntimeException(errorMsg); + } + } + + private static DatacenterMO getDatacenterMO(VmwareContext context, String vcenter, String datacenterName) throws Exception { + DatacenterMO dcMo = new DatacenterMO(context, datacenterName); + ManagedObjectReference dcMor = dcMo.getMor(); + if (dcMor == null) { + String msg = String.format("Unable to find VMware datacenter %s in vCenter %s", datacenterName, vcenter); + s_logger.error(msg); + throw new InvalidParameterValueException(msg); + } + return dcMo; + } + + @Override + public List listHostsInDatacenter(ListVmwareDcHostsCmd cmd) { + VcenterData vmwareDC = getVcenterData(cmd); + String vcenter = vmwareDC.vcenter; + String username = vmwareDC.username; + String password = vmwareDC.password; + String datacenterName = vmwareDC.datacenterName; + try { + VmwareContext context = getVmwareContext(vcenter, username, password); + DatacenterMO dcMo = getDatacenterMO(context, vcenter, datacenterName); + return dcMo.getAllHostsOnDatacenter(); } catch (Exception e) { String errorMsg = String.format("Error retrieving stopped VMs from the VMware VC %s datacenter %s: %s", vcenter, datacenterName, e.getMessage()); diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java new file mode 100644 index 000000000000..c07fd96d7a02 --- /dev/null +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java @@ -0,0 +1,138 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.admin.zone; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.hypervisor.Hypervisor; +import com.cloud.hypervisor.vmware.VmwareDatacenterService; +import com.cloud.hypervisor.vmware.mo.HostMO; +import com.cloud.user.Account; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.VmwareDatacenterResponse; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; + +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; + +@APICommand(name = "listVmwareDcHosts", responseObject = HostResponse.class, + description = "Lists the Hosts in a Vmware Datacenter", + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) +public class ListVmwareDcHostsCmd extends BaseListCmd implements ListVmwareDcItems { + + @Inject + public VmwareDatacenterService _vmwareDatacenterService; + + @Parameter(name = ApiConstants.EXISTING_VCENTER_ID, + type = CommandType.UUID, + entityType = VmwareDatacenterResponse.class, + description = "UUID of a linked existing vCenter") + private Long existingVcenterId; + + @Parameter(name = ApiConstants.VCENTER, + type = CommandType.STRING, + description = "The name/ip of vCenter. Make sure it is IP address or full qualified domain name for host running vCenter server.") + private String vcenter; + + @Parameter(name = ApiConstants.DATACENTER_NAME, type = CommandType.STRING, description = "Name of Vmware datacenter.") + private String datacenterName; + + @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, description = "The Username required to connect to resource.") + private String username; + + @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "The password for specified username.") + private String password; + + public String getVcenter() { + return vcenter; + } + + public String getUsername() { + return username; + } + + public String getPassword() { + return password; + } + + public String getDatacenterName() { + return datacenterName; + } + + public Long getExistingVcenterId() { + return existingVcenterId; + } + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { + checkParameters(); + try { + List hosts = _vmwareDatacenterService.listHostsInDatacenter(this); + ListResponse response = new ListResponse<>(); + List baseResponseList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(hosts)) { + for (HostMO vmwareHost : hosts) { + HostResponse resp = createHostResponse(vmwareHost); + baseResponseList.add(resp); + } + } + response.setResponses(baseResponseList, baseResponseList.size()); + response.setResponseName(getCommandName()); + setResponseObject(response); + } catch (Exception e) { + String errorMsg = String.format("Error retrieving VMs from Vmware VC: %s", e.getMessage()); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, errorMsg); + } + } + + private HostResponse createHostResponse(HostMO hostInstance) throws Exception { + HostResponse response = new HostResponse(); + response.setHypervisor(Hypervisor.HypervisorType.VMware.toString()); + response.setName(hostInstance.getHostName()); + response.setObjectName("host"); + return response; + } + + private void checkParameters() { + if ((existingVcenterId == null && vcenter == null) || (existingVcenterId != null && vcenter != null)) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, + "Please provide an existing vCenter ID or a vCenter IP/Name, parameters are mutually exclusive"); + } + if (existingVcenterId == null && StringUtils.isAnyBlank(vcenter, datacenterName, username, password)) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, + "Please set all the information for a vCenter IP/Name, datacenter, username and password"); + } + } + + @Override + public long getEntityOwnerId() { + return Account.ACCOUNT_ID_SYSTEM; + } +} diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java new file mode 100644 index 000000000000..580fb3bad9bd --- /dev/null +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java @@ -0,0 +1,29 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.admin.zone; + +public interface ListVmwareDcItems { + String getVcenter(); + + String getDatacenterName(); + + String getUsername(); + + String getPassword(); + + Long getExistingVcenterId(); +} diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java index 4dd1b4beb091..ea4bbb3994fa 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java @@ -45,7 +45,7 @@ @APICommand(name = "listVmwareDcVms", responseObject = UnmanagedInstanceResponse.class, description = "Lists the VMs in a VMware Datacenter", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class ListVmwareDcVmsCmd extends BaseListCmd { +public class ListVmwareDcVmsCmd extends BaseListCmd implements ListVmwareDcItems { @Inject public VmwareDatacenterService _vmwareDatacenterService; @@ -64,6 +64,9 @@ public class ListVmwareDcVmsCmd extends BaseListCmd { @Parameter(name = ApiConstants.DATACENTER_NAME, type = CommandType.STRING, description = "Name of VMware datacenter.") private String datacenterName; + @Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, description = "Get only the VMs from the specified host.") + private String hostName; + @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, description = "The Username required to connect to resource.") private String username; @@ -86,6 +89,10 @@ public String getDatacenterName() { return datacenterName; } + public String getHostName() { + return hostName; + } + public Long getExistingVcenterId() { return existingVcenterId; } diff --git a/ui/src/views/tools/ManageInstances.vue b/ui/src/views/tools/ManageInstances.vue index 2ff9052d8b98..27ad4cc96960 100644 --- a/ui/src/views/tools/ManageInstances.vue +++ b/ui/src/views/tools/ManageInstances.vue @@ -1184,6 +1184,7 @@ export default { } else { params.existingvcenterid = this.selectedVmwareVcenter.existingvcenterid } + params.host = this.selectedVmwareVcenter.host } api(apiName, params).then(json => { diff --git a/ui/src/views/tools/SelectVmwareVcenter.vue b/ui/src/views/tools/SelectVmwareVcenter.vue index 806186557190..976e7e81d8a2 100644 --- a/ui/src/views/tools/SelectVmwareVcenter.vue +++ b/ui/src/views/tools/SelectVmwareVcenter.vue @@ -89,6 +89,7 @@ @@ -100,6 +101,7 @@ @@ -111,6 +113,7 @@ @@ -122,6 +125,7 @@ @@ -129,11 +133,32 @@   +
+ + + + {{ 'ESXi: ' + opt.name }} + + + +
+ {{ $t('message.list.zone.vmware.hosts.empty') }} +
+
{{ $t('label.list.vmware.vcenter.vms') }} @@ -164,6 +189,8 @@ export default { zones: {}, vcenterSelectedOption: '', existingvcenter: [], + hosts: [], + selectedHost: '', selectedExistingVcenterId: '', selectedPoweredOnVm: false, vmwareDcVms: [], @@ -227,6 +254,7 @@ export default { } else { params.existingvcenterid = this.selectedExistingVcenterId } + params.host = this.selectedHost api('listVmwareDcVms', params).then(json => { const obj = { params: params, @@ -256,8 +284,29 @@ export default { listZoneVmwareDcs () { this.loading = true api('listVmwareDcs', { zoneid: this.sourcezoneid }).then(response => { - if (response.listvmwaredcsresponse.VMwareDC && response.listvmwaredcsresponse.VMwareDC.length > 0) { - this.existingvcenter = response.listvmwaredcsresponse.VMwareDC + if (response.listvmwaredcsresponse.vmwaredc && response.listvmwaredcsresponse.vmwaredc.length > 0) { + this.existingvcenter = response.listvmwaredcsresponse.vmwaredc + } + }).catch(error => { + this.$notifyError(error) + }).finally(() => { + this.loading = false + }) + }, + listZoneVmwareDcHosts () { + this.loading = true + const params = {} + if (this.vcenterSelectedOption === 'new') { + params.datacentername = this.datacenter + params.vcenter = this.vcenter + params.username = this.username + params.password = this.password + } else { + params.existingvcenterid = this.selectedExistingVcenterId + } + api('listVmwareDcHosts', params).then(response => { + if (response.listvmwaredchostsresponse.host && response.listvmwaredchostsresponse.host.length > 0) { + this.hosts = response.listvmwaredchostsresponse.host } }).catch(error => { this.$notifyError(error) @@ -267,6 +316,15 @@ export default { }, onSelectExistingVmwareDatacenter (value) { this.selectedExistingVcenterId = value + this.listZoneVmwareDcHosts() + }, + onSelectExternalVmwareDatacenter (value) { + if (this.vcenterSelectedOption === 'new' && !(this.vcenter === '' || this.datacentername === '' || this.username === '' || this.password === '')) { + this.listZoneVmwareDcHosts() + } + }, + onSelectExistingVmwareHost (value) { + this.selectedHost = value }, onVcenterTypeChange () { this.$emit('onVcenterTypeChanged', this.vcenterSelectedOption) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java index d8c7e8a61ea6..da9dff2f4335 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java @@ -161,8 +161,8 @@ public VirtualMachineMO checkIfVmAlreadyExistsInVcenter(String vmNameOnVcenter, return null; } - public List getAllVmsOnDatacenter() throws Exception { - List vms = new ArrayList<>(); + public List getAllVmsOnDatacenter() throws Exception { + List vms = new ArrayList<>(); List ocs = getVmPropertiesOnDatacenterVmFolder(new String[] {"name"}); if (ocs != null) { for (ObjectContent oc : ocs) { @@ -171,12 +171,10 @@ public List getAllVmsOnDatacenter() throws Exception { VirtualMachineMO vmMo = new VirtualMachineMO(_context, vmMor); try { if (!vmMo.isTemplate()) { - HostMO hostMO = vmMo.getRunningHost(); - UnmanagedInstanceTO unmanagedInstance = VmwareHelper.getUnmanagedInstance(hostMO, vmMo); - vms.add(unmanagedInstance); + vms.add(vmMo); } } catch (Exception e) { - s_logger.debug(String.format("Unexpected error checking unmanaged instance %s, excluding it: %s", vmMo.getVmName(), e.getMessage()), e); + s_logger.debug(String.format("Unexpected error checking instance %s, excluding it: %s", vmMo.getVmName(), e.getMessage()), e); } } } diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java index b273688c1629..46de739738d1 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java @@ -795,6 +795,34 @@ public static HostMO getHostMOFromHostName(final VmwareContext context, final St return host; } + public static List getUnmanagedInstancesList(List vmMos) { + List vms = new ArrayList<>(); + int incorrectVmsCount = 0; + for (VirtualMachineMO vmMo : vmMos) { + + String vmName = ""; + try { + vmName = vmMo.getName(); + } catch (Exception e) { + incorrectVmsCount++; + continue; + } + + try { + HostMO hostMO = vmMo.getRunningHost(); + vms.add(VmwareHelper.getUnmanagedInstance(hostMO, vmMo)); + } catch (Exception e) { + s_logger.debug(String.format("Error getting unmanaged instance %s, excluding it", vmName), e); + } + } + if (incorrectVmsCount > 0) { + s_logger.warn(String.format("Retrieving %s unmanaged VMs from the list of %s VMs on vCenter," + + "information from %s VMs could not be properly obtained and were excluded from the returned list", + vms.size(), vmMos.size(), incorrectVmsCount)); + } + return vms; + } + public static UnmanagedInstanceTO getUnmanagedInstance(VmwareHypervisorHost hyperHost, VirtualMachineMO vmMo) { UnmanagedInstanceTO instance = null; try { From 8cac95358cb7d68869debbe12e95986772ddb3a5 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Tue, 22 Apr 2025 16:10:24 -0300 Subject: [PATCH 02/12] Fix imports --- .../main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java index da9dff2f4335..66b32a23600f 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java @@ -21,8 +21,6 @@ import java.util.Arrays; import java.util.List; -import com.cloud.hypervisor.vmware.util.VmwareHelper; -import org.apache.cloudstack.vm.UnmanagedInstanceTO; import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; From 16eab4debce74ed741798aee262ad39cfefced2e Mon Sep 17 00:00:00 2001 From: nvazquez Date: Wed, 23 Apr 2025 04:21:50 -0300 Subject: [PATCH 03/12] Fixes and improvements --- .../vmware/manager/VmwareManagerImpl.java | 13 ++++++++--- ui/src/views/tools/ManageInstances.vue | 2 +- ui/src/views/tools/SelectVmwareVcenter.vue | 22 +++++++++++-------- .../cloud/hypervisor/vmware/mo/HostMO.java | 21 ++++++++++++++++++ 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 5611c0928c2d..213deb6f3411 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -1117,6 +1117,7 @@ public List> getCommands() { cmdList.add(ListVsphereStoragePoliciesCmd.class); cmdList.add(ListVsphereStoragePolicyCompatiblePoolsCmd.class); cmdList.add(ListVmwareDcVmsCmd.class); + cmdList.add(ListVmwareDcHostsCmd.class); return cmdList; } @@ -1634,7 +1635,7 @@ private VcenterData getVcenterData(ListVmwareDcItems cmd) { return vmwaredc; } - private VmwareContext getVmwareContext(String vcenter, String username, String password) throws Exception { + private static VmwareContext getVmwareContext(String vcenter, String username, String password) throws Exception { s_logger.debug(String.format("Connecting to the VMware vCenter %s", vcenter)); String serviceUrl = String.format("https://%s/sdk/vimService", vcenter); VmwareClient vimClient = new VmwareClient(vcenter); @@ -1659,8 +1660,14 @@ public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { List vms; if (StringUtils.isNotBlank(esxiHostName)) { // List VMs in a specific ESXi Host - HostMO hostMO = VmwareHelper.getHostMOFromHostName(context, esxiHostName); - vms = hostMO.listVmsOnHyperHostWithHypervisorName(null); + ManagedObjectReference hostMor = dcMo.findHost(esxiHostName); + if (hostMor == null) { + String errorMsg = String.format("Cannot find a host with name %s on vcenter %s", esxiHostName, vcenter); + s_logger.error(errorMsg); + throw new CloudRuntimeException(errorMsg); + } + HostMO hostMO = new HostMO(context, hostMor); + vms = hostMO.listAllVmsInHost(); } else { // Long lasting method, not recommended - retrieves all the VMs in a datacenter vms = dcMo.getAllVmsOnDatacenter(); diff --git a/ui/src/views/tools/ManageInstances.vue b/ui/src/views/tools/ManageInstances.vue index 27ad4cc96960..aadd2545e4ba 100644 --- a/ui/src/views/tools/ManageInstances.vue +++ b/ui/src/views/tools/ManageInstances.vue @@ -1184,7 +1184,7 @@ export default { } else { params.existingvcenterid = this.selectedVmwareVcenter.existingvcenterid } - params.host = this.selectedVmwareVcenter.host + params.hostname = this.selectedVmwareVcenter.host } api(apiName, params).then(json => { diff --git a/ui/src/views/tools/SelectVmwareVcenter.vue b/ui/src/views/tools/SelectVmwareVcenter.vue index 976e7e81d8a2..0388e86a1db4 100644 --- a/ui/src/views/tools/SelectVmwareVcenter.vue +++ b/ui/src/views/tools/SelectVmwareVcenter.vue @@ -89,7 +89,6 @@ @@ -101,7 +100,6 @@ @@ -113,7 +111,6 @@ @@ -125,7 +122,6 @@ @@ -157,8 +153,8 @@
{{ $t('label.list.vmware.vcenter.vms') }} @@ -254,7 +250,7 @@ export default { } else { params.existingvcenterid = this.selectedExistingVcenterId } - params.host = this.selectedHost + params.hostname = this.selectedHost api('listVmwareDcVms', params).then(json => { const obj = { params: params, @@ -284,8 +280,8 @@ export default { listZoneVmwareDcs () { this.loading = true api('listVmwareDcs', { zoneid: this.sourcezoneid }).then(response => { - if (response.listvmwaredcsresponse.vmwaredc && response.listvmwaredcsresponse.vmwaredc.length > 0) { - this.existingvcenter = response.listvmwaredcsresponse.vmwaredc + if (response.listvmwaredcsresponse.VMwareDC && response.listvmwaredcsresponse.VMwareDC.length > 0) { + this.existingvcenter = response.listvmwaredcsresponse.VMwareDC } }).catch(error => { this.$notifyError(error) @@ -327,6 +323,14 @@ export default { this.selectedHost = value }, onVcenterTypeChange () { + if (this.vcenterSelectedOption === 'new') { + this.hosts = [] + } else if (this.vcenterSelectedOption === 'existing') { + this.form.sourcezoneid = null + this.selectedExistingVcenterId = '' + this.selectedHost = '' + this.form.vmwaredatacenter = null + } this.$emit('onVcenterTypeChanged', this.vcenterSelectedOption) } } diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java index 3b96e7e19990..524667058384 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java @@ -582,6 +582,27 @@ private boolean isUserVMInternalCSName(String vmInternalCSName) { } } + public List listAllVmsInHost() throws Exception { + List vms = new ArrayList<>(); + ObjectContent[] ocs = getVmPropertiesOnHyperHost(new String[] {"name"}); + if (ocs != null) { + for (ObjectContent oc : ocs) { + ManagedObjectReference mor = oc.getObj(); + if (mor != null) { + VirtualMachineMO vmMo = new VirtualMachineMO(_context, mor); + try { + if (!vmMo.isTemplate()) { + vms.add(vmMo); + } + } catch (Exception e) { + s_logger.debug(String.format("Unexpected error checking instance %s, excluding it: %s", vmMo.getVmName(), e.getMessage()), e); + } + } + } + } + return vms; + } + private void loadVmCache() throws Exception { if (s_logger.isDebugEnabled()) s_logger.debug("load VM cache on host"); From c4a2224ad6d4d5116c7fde1266b55aefb2c36bdb Mon Sep 17 00:00:00 2001 From: dahn Date: Fri, 25 Apr 2025 15:20:57 +0200 Subject: [PATCH 04/12] Update plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java Co-authored-by: Suresh Kumar Anaparti --- .../cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java index c07fd96d7a02..7d87dad731c0 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java @@ -107,7 +107,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE response.setResponseName(getCommandName()); setResponseObject(response); } catch (Exception e) { - String errorMsg = String.format("Error retrieving VMs from Vmware VC: %s", e.getMessage()); + String errorMsg = String.format("Error retrieving Hosts from VMware VC: %s", e.getMessage()); throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, errorMsg); } } From a7cfdb6ffc5b0203642fc7fedeeb6db7b4e67ad9 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Mon, 5 May 2025 17:47:36 -0300 Subject: [PATCH 05/12] Refactor to improve listing --- .../vmware/VmwareDatacenterService.java | 4 - .../vmware/manager/VmwareManagerImpl.java | 42 ++---- .../admin/zone/ListVmwareDcHostsCmd.java | 138 ------------------ .../command/admin/zone/ListVmwareDcItems.java | 29 ---- .../admin/zone/ListVmwareDcVmsCmd.java | 20 ++- ui/src/views/tools/ManageInstances.vue | 29 +++- ui/src/views/tools/SelectVmwareVcenter.vue | 69 +-------- .../cloud/hypervisor/vmware/mo/BaseMO.java | 77 ++++++++++ .../hypervisor/vmware/mo/DatacenterMO.java | 24 +-- .../cloud/hypervisor/vmware/mo/HostMO.java | 21 --- .../hypervisor/vmware/util/VmwareHelper.java | 28 ---- 11 files changed, 141 insertions(+), 340 deletions(-) delete mode 100644 plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java delete mode 100644 plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java index 92d8af6b5f26..bbac78b879a4 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java @@ -22,13 +22,11 @@ import com.cloud.dc.VsphereStoragePolicy; import com.cloud.exception.DiscoveryException; import com.cloud.exception.ResourceInUseException; -import com.cloud.hypervisor.vmware.mo.HostMO; import com.cloud.storage.StoragePool; import com.cloud.utils.component.PluggableService; import com.cloud.utils.exception.CloudRuntimeException; import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd; import org.apache.cloudstack.api.command.admin.zone.ImportVsphereStoragePoliciesCmd; -import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcHostsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcVmsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVsphereStoragePoliciesCmd; @@ -56,6 +54,4 @@ public interface VmwareDatacenterService extends PluggableService { List listVsphereStoragePolicyCompatibleStoragePools(ListVsphereStoragePolicyCompatiblePoolsCmd cmd); List listVMsInDatacenter(ListVmwareDcVmsCmd cmd); - - List listHostsInDatacenter(ListVmwareDcHostsCmd cmd); } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 213deb6f3411..b8d663bcd815 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -47,8 +47,6 @@ import com.cloud.hypervisor.vmware.util.VmwareClient; import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd; import org.apache.cloudstack.api.command.admin.zone.ImportVsphereStoragePoliciesCmd; -import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcHostsCmd; -import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcItems; import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcVmsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd; import org.apache.cloudstack.api.command.admin.zone.ListVsphereStoragePoliciesCmd; @@ -1117,7 +1115,6 @@ public List> getCommands() { cmdList.add(ListVsphereStoragePoliciesCmd.class); cmdList.add(ListVsphereStoragePolicyCompatiblePoolsCmd.class); cmdList.add(ListVmwareDcVmsCmd.class); - cmdList.add(ListVmwareDcHostsCmd.class); return cmdList; } @@ -1605,7 +1602,7 @@ public VcenterData(String vcenter, String datacenterName, String username, Strin } } - private VcenterData getVcenterData(ListVmwareDcItems cmd) { + private VcenterData getVcenterData(ListVmwareDcVmsCmd cmd) { String vcenter = cmd.getVcenter(); String datacenterName = cmd.getDatacenterName(); String username = cmd.getUsername(); @@ -1652,14 +1649,14 @@ public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { String datacenterName = vmwareDC.datacenterName; String keyword = cmd.getKeyword(); String esxiHostName = cmd.getHostName(); + String virtualMachineName = cmd.getVirtualMachineName(); try { VmwareContext context = getVmwareContext(vcenter, username, password); DatacenterMO dcMo = getDatacenterMO(context, vcenter, datacenterName); - List vms; - if (StringUtils.isNotBlank(esxiHostName)) { - // List VMs in a specific ESXi Host + List instances; + if (StringUtils.isNotBlank(esxiHostName) && StringUtils.isNotBlank(virtualMachineName)) { ManagedObjectReference hostMor = dcMo.findHost(esxiHostName); if (hostMor == null) { String errorMsg = String.format("Cannot find a host with name %s on vcenter %s", esxiHostName, vcenter); @@ -1667,15 +1664,13 @@ public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { throw new CloudRuntimeException(errorMsg); } HostMO hostMO = new HostMO(context, hostMor); - vms = hostMO.listAllVmsInHost(); + VirtualMachineMO vmMo = hostMO.findVmOnHyperHost(virtualMachineName); + instances = Collections.singletonList(VmwareHelper.getUnmanagedInstance(hostMO, vmMo)); + // instances = hostMO.listAllVmsInHost(keyword); } else { - // Long lasting method, not recommended - retrieves all the VMs in a datacenter - vms = dcMo.getAllVmsOnDatacenter(); + instances = dcMo.getAllVmsOnDatacenter(keyword); } - - List instances = VmwareHelper.getUnmanagedInstancesList(vms); - return StringUtils.isBlank(keyword) ? instances : - instances.stream().filter(x -> x.getName().toLowerCase().contains(keyword.toLowerCase())).collect(Collectors.toList()); + return instances; } catch (Exception e) { String errorMsg = String.format("Error retrieving VMs from the VMware VC %s datacenter %s: %s", vcenter, datacenterName, e.getMessage()); @@ -1695,25 +1690,6 @@ private static DatacenterMO getDatacenterMO(VmwareContext context, String vcente return dcMo; } - @Override - public List listHostsInDatacenter(ListVmwareDcHostsCmd cmd) { - VcenterData vmwareDC = getVcenterData(cmd); - String vcenter = vmwareDC.vcenter; - String username = vmwareDC.username; - String password = vmwareDC.password; - String datacenterName = vmwareDC.datacenterName; - try { - VmwareContext context = getVmwareContext(vcenter, username, password); - DatacenterMO dcMo = getDatacenterMO(context, vcenter, datacenterName); - return dcMo.getAllHostsOnDatacenter(); - } catch (Exception e) { - String errorMsg = String.format("Error retrieving stopped VMs from the VMware VC %s datacenter %s: %s", - vcenter, datacenterName, e.getMessage()); - s_logger.error(errorMsg, e); - throw new CloudRuntimeException(errorMsg); - } - } - @Override public boolean hasNexusVSM(Long clusterId) { ClusterVSMMapVO vsmMapVo = null; diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java deleted file mode 100644 index 7d87dad731c0..000000000000 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java +++ /dev/null @@ -1,138 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package org.apache.cloudstack.api.command.admin.zone; - -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.hypervisor.Hypervisor; -import com.cloud.hypervisor.vmware.VmwareDatacenterService; -import com.cloud.hypervisor.vmware.mo.HostMO; -import com.cloud.user.Account; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.HostResponse; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.api.response.VmwareDatacenterResponse; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.List; - -@APICommand(name = "listVmwareDcHosts", responseObject = HostResponse.class, - description = "Lists the Hosts in a Vmware Datacenter", - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class ListVmwareDcHostsCmd extends BaseListCmd implements ListVmwareDcItems { - - @Inject - public VmwareDatacenterService _vmwareDatacenterService; - - @Parameter(name = ApiConstants.EXISTING_VCENTER_ID, - type = CommandType.UUID, - entityType = VmwareDatacenterResponse.class, - description = "UUID of a linked existing vCenter") - private Long existingVcenterId; - - @Parameter(name = ApiConstants.VCENTER, - type = CommandType.STRING, - description = "The name/ip of vCenter. Make sure it is IP address or full qualified domain name for host running vCenter server.") - private String vcenter; - - @Parameter(name = ApiConstants.DATACENTER_NAME, type = CommandType.STRING, description = "Name of Vmware datacenter.") - private String datacenterName; - - @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, description = "The Username required to connect to resource.") - private String username; - - @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "The password for specified username.") - private String password; - - public String getVcenter() { - return vcenter; - } - - public String getUsername() { - return username; - } - - public String getPassword() { - return password; - } - - public String getDatacenterName() { - return datacenterName; - } - - public Long getExistingVcenterId() { - return existingVcenterId; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { - checkParameters(); - try { - List hosts = _vmwareDatacenterService.listHostsInDatacenter(this); - ListResponse response = new ListResponse<>(); - List baseResponseList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(hosts)) { - for (HostMO vmwareHost : hosts) { - HostResponse resp = createHostResponse(vmwareHost); - baseResponseList.add(resp); - } - } - response.setResponses(baseResponseList, baseResponseList.size()); - response.setResponseName(getCommandName()); - setResponseObject(response); - } catch (Exception e) { - String errorMsg = String.format("Error retrieving Hosts from VMware VC: %s", e.getMessage()); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, errorMsg); - } - } - - private HostResponse createHostResponse(HostMO hostInstance) throws Exception { - HostResponse response = new HostResponse(); - response.setHypervisor(Hypervisor.HypervisorType.VMware.toString()); - response.setName(hostInstance.getHostName()); - response.setObjectName("host"); - return response; - } - - private void checkParameters() { - if ((existingVcenterId == null && vcenter == null) || (existingVcenterId != null && vcenter != null)) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, - "Please provide an existing vCenter ID or a vCenter IP/Name, parameters are mutually exclusive"); - } - if (existingVcenterId == null && StringUtils.isAnyBlank(vcenter, datacenterName, username, password)) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, - "Please set all the information for a vCenter IP/Name, datacenter, username and password"); - } - } - - @Override - public long getEntityOwnerId() { - return Account.ACCOUNT_ID_SYSTEM; - } -} diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java deleted file mode 100644 index 580fb3bad9bd..000000000000 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java +++ /dev/null @@ -1,29 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package org.apache.cloudstack.api.command.admin.zone; - -public interface ListVmwareDcItems { - String getVcenter(); - - String getDatacenterName(); - - String getUsername(); - - String getPassword(); - - Long getExistingVcenterId(); -} diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java index ea4bbb3994fa..1bc1ba97f00e 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java @@ -45,7 +45,7 @@ @APICommand(name = "listVmwareDcVms", responseObject = UnmanagedInstanceResponse.class, description = "Lists the VMs in a VMware Datacenter", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class ListVmwareDcVmsCmd extends BaseListCmd implements ListVmwareDcItems { +public class ListVmwareDcVmsCmd extends BaseListCmd { @Inject public VmwareDatacenterService _vmwareDatacenterService; @@ -64,15 +64,18 @@ public class ListVmwareDcVmsCmd extends BaseListCmd implements ListVmwareDcItems @Parameter(name = ApiConstants.DATACENTER_NAME, type = CommandType.STRING, description = "Name of VMware datacenter.") private String datacenterName; - @Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, description = "Get only the VMs from the specified host.") - private String hostName; - @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, description = "The Username required to connect to resource.") private String username; @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "The password for specified username.") private String password; + @Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, description = "Name of the host on vCenter. Must be set along with the virtualmachinename parameter") + private String hostName; + + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_NAME, type = CommandType.STRING, description = "Name of the VM on vCenter. Must be set along with the hostname parameter") + private String virtualMachineName; + public String getVcenter() { return vcenter; } @@ -97,6 +100,10 @@ public Long getExistingVcenterId() { return existingVcenterId; } + public String getVirtualMachineName() { + return virtualMachineName; + } + @Override public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { checkParameters(); @@ -132,6 +139,11 @@ private void checkParameters() { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Please set all the information for a vCenter IP/Name, datacenter, username and password"); } + if ((StringUtils.isNotBlank(virtualMachineName) && StringUtils.isBlank(hostName)) || + (StringUtils.isBlank(virtualMachineName) && StringUtils.isNotBlank(hostName))) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, + "Please set the hostname parameter along with the virtualmachinename parameter"); + } } @Override diff --git a/ui/src/views/tools/ManageInstances.vue b/ui/src/views/tools/ManageInstances.vue index aadd2545e4ba..d8e17d66ace1 100644 --- a/ui/src/views/tools/ManageInstances.vue +++ b/ui/src/views/tools/ManageInstances.vue @@ -1184,7 +1184,6 @@ export default { } else { params.existingvcenterid = this.selectedVmwareVcenter.existingvcenterid } - params.hostname = this.selectedVmwareVcenter.host } api(apiName, params).then(json => { @@ -1303,6 +1302,31 @@ export default { this.fetchInstances() } }, + fetchVmwareInstanceForKVMMigration (vmname, hostname) { + const params = {} + if (this.isMigrateFromVmware && this.selectedVmwareVcenter) { + if (this.selectedVmwareVcenter.vcenter) { + params.datacentername = this.selectedVmwareVcenter.datacentername + params.vcenter = this.selectedVmwareVcenter.vcenter + params.username = this.selectedVmwareVcenter.username + params.password = this.selectedVmwareVcenter.password + } else { + params.existingvcenterid = this.selectedVmwareVcenter.existingvcenterid + } + } + params.virtualmachinename = vmname + params.hostname = hostname + api('listVmwareDcVms', params).then(json => { + const response = json.listvmwaredcvmsresponse + this.selectedUnmanagedInstance = response.unmanagedinstance[0] + this.selectedUnmanagedInstance.ostypename = this.selectedUnmanagedInstance.osdisplayname + this.selectedUnmanagedInstance.state = this.selectedUnmanagedInstance.powerstate + }).catch(error => { + this.$notifyError(error) + }).finally(() => { + this.loading = false + }) + }, onManageInstanceAction () { this.selectedUnmanagedInstance = {} if (this.unmanagedInstances.length > 0 && @@ -1320,6 +1344,9 @@ export default { } }) this.showUnmanageForm = false + } else if (this.isMigrateFromVmware) { + this.fetchVmwareInstanceForKVMMigration(this.selectedUnmanagedInstance.name, this.selectedUnmanagedInstance.hostname) + this.showUnmanageForm = true } else { this.showUnmanageForm = true } diff --git a/ui/src/views/tools/SelectVmwareVcenter.vue b/ui/src/views/tools/SelectVmwareVcenter.vue index 0388e86a1db4..d742e72f9e08 100644 --- a/ui/src/views/tools/SelectVmwareVcenter.vue +++ b/ui/src/views/tools/SelectVmwareVcenter.vue @@ -129,32 +129,11 @@  
-
- - - - {{ 'ESXi: ' + opt.name }} - - - -
- {{ $t('message.list.zone.vmware.hosts.empty') }} -
-
{{ $t('label.list.vmware.vcenter.vms') }} @@ -185,8 +164,6 @@ export default { zones: {}, vcenterSelectedOption: '', existingvcenter: [], - hosts: [], - selectedHost: '', selectedExistingVcenterId: '', selectedPoweredOnVm: false, vmwareDcVms: [], @@ -250,7 +227,8 @@ export default { } else { params.existingvcenterid = this.selectedExistingVcenterId } - params.hostname = this.selectedHost + params.page = 1 + params.pagesize = 10 api('listVmwareDcVms', params).then(json => { const obj = { params: params, @@ -289,48 +267,15 @@ export default { this.loading = false }) }, - listZoneVmwareDcHosts () { - this.loading = true - const params = {} - if (this.vcenterSelectedOption === 'new') { - params.datacentername = this.datacenter - params.vcenter = this.vcenter - params.username = this.username - params.password = this.password - } else { - params.existingvcenterid = this.selectedExistingVcenterId - } - api('listVmwareDcHosts', params).then(response => { - if (response.listvmwaredchostsresponse.host && response.listvmwaredchostsresponse.host.length > 0) { - this.hosts = response.listvmwaredchostsresponse.host - } - }).catch(error => { - this.$notifyError(error) - }).finally(() => { - this.loading = false - }) - }, - onSelectExistingVmwareDatacenter (value) { - this.selectedExistingVcenterId = value - this.listZoneVmwareDcHosts() - }, onSelectExternalVmwareDatacenter (value) { if (this.vcenterSelectedOption === 'new' && !(this.vcenter === '' || this.datacentername === '' || this.username === '' || this.password === '')) { - this.listZoneVmwareDcHosts() + this.listVmwareDatacenterVms() } }, - onSelectExistingVmwareHost (value) { - this.selectedHost = value + onSelectExistingVmwareDatacenter (value) { + this.selectedExistingVcenterId = value }, onVcenterTypeChange () { - if (this.vcenterSelectedOption === 'new') { - this.hosts = [] - } else if (this.vcenterSelectedOption === 'existing') { - this.form.sourcezoneid = null - this.selectedExistingVcenterId = '' - this.selectedHost = '' - this.form.vmwaredatacenter = null - } this.$emit('onVcenterTypeChanged', this.vcenterSelectedOption) } } diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java index 88f6c871fbde..c1c458336c0d 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java @@ -16,6 +16,12 @@ // under the License. package com.cloud.hypervisor.vmware.mo; +import com.cloud.utils.Pair; +import com.vmware.vim25.DynamicProperty; +import com.vmware.vim25.ObjectContent; +import com.vmware.vim25.VirtualMachinePowerState; +import org.apache.cloudstack.vm.UnmanagedInstanceTO; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import com.vmware.vim25.CustomFieldDef; @@ -24,12 +30,21 @@ import com.cloud.hypervisor.vmware.util.VmwareContext; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class BaseMO { private static final Logger s_logger = Logger.getLogger(BaseMO.class); protected VmwareContext _context; protected ManagedObjectReference _mor; + protected static String[] propertyPathsForUnmanagedVmsThinListing = new String[] {"name", "config.template", + "runtime.powerState", "config.guestId", "config.guestFullName", "runtime.host"}; + private String _name; public BaseMO(VmwareContext context, ManagedObjectReference mor) { @@ -153,4 +168,66 @@ public int getCustomFieldKey(String morType, String fieldName) throws Exception return cfmMo.getCustomFieldKey(morType, fieldName); } + + private static UnmanagedInstanceTO.PowerState convertPowerState(VirtualMachinePowerState powerState) { + return powerState == VirtualMachinePowerState.POWERED_ON ? UnmanagedInstanceTO.PowerState.PowerOn : + powerState == VirtualMachinePowerState.POWERED_OFF ? UnmanagedInstanceTO.PowerState.PowerOff : UnmanagedInstanceTO.PowerState.PowerUnknown; + } + + protected List convertVmsObjectContentsToUnmanagedInstances(List ocs, String keyword) throws Exception { + Map> hostClusterNamesMap = new HashMap<>(); + List vms = new ArrayList<>(); + if (ocs != null) { + for (ObjectContent oc : ocs) { + List objProps = oc.getPropSet(); + UnmanagedInstanceTO vm = new UnmanagedInstanceTO(); + if (objProps != null) { + boolean isTemplate = false; + boolean excludeByKeyword = false; + String vmName; + for (DynamicProperty objProp : objProps) { + if (objProp.getName().equals("name")) { + vmName = (String) objProp.getVal(); + if (StringUtils.isNotBlank(keyword) && !vmName.contains(keyword)) { + excludeByKeyword = true; + } + vm.setName(vmName); + } else if (objProp.getName().equals("config.template")) { + isTemplate = (Boolean) objProp.getVal(); + } else if (objProp.getName().equals("runtime.powerState")) { + VirtualMachinePowerState powerState = (VirtualMachinePowerState) objProp.getVal(); + vm.setPowerState(convertPowerState(powerState)); + } else if (objProp.getName().equals("config.guestFullName")) { + vm.setOperatingSystem((String) objProp.getVal()); + } else if (objProp.getName().equals("config.guestId")) { + vm.setOperatingSystemId((String) objProp.getVal()); + } else if (objProp.getName().equals("runtime.host")) { + ManagedObjectReference hostMor = (ManagedObjectReference) objProp.getVal(); + if (hostMor != null && StringUtils.isNotBlank(hostMor.getValue())) { + String hostMorValue = hostMor.getValue(); + Pair hostClusterPair; + if (hostClusterNamesMap.containsKey(hostMorValue)) { + hostClusterPair = hostClusterNamesMap.get(hostMorValue); + } else { + HostMO hostMO = new HostMO(_context, hostMor); + ClusterMO clusterMO = new ClusterMO(_context, hostMO.getHyperHostCluster()); + hostClusterPair = new Pair<>(hostMO.getHostName(), clusterMO.getName()); + hostClusterNamesMap.put(hostMorValue, hostClusterPair); + } + vm.setHostName(hostClusterPair.first()); + vm.setClusterName(hostClusterPair.second()); + } + } + } + if (!isTemplate && !excludeByKeyword) { + vms.add(vm); + } + } + } + } + if (vms.size() > 0) { + vms.sort(Comparator.comparing(UnmanagedInstanceTO::getName)); + } + return vms; + } } diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java index 66b32a23600f..7aa18276d441 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.List; +import org.apache.cloudstack.vm.UnmanagedInstanceTO; import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; @@ -159,26 +160,9 @@ public VirtualMachineMO checkIfVmAlreadyExistsInVcenter(String vmNameOnVcenter, return null; } - public List getAllVmsOnDatacenter() throws Exception { - List vms = new ArrayList<>(); - List ocs = getVmPropertiesOnDatacenterVmFolder(new String[] {"name"}); - if (ocs != null) { - for (ObjectContent oc : ocs) { - ManagedObjectReference vmMor = oc.getObj(); - if (vmMor != null) { - VirtualMachineMO vmMo = new VirtualMachineMO(_context, vmMor); - try { - if (!vmMo.isTemplate()) { - vms.add(vmMo); - } - } catch (Exception e) { - s_logger.debug(String.format("Unexpected error checking instance %s, excluding it: %s", vmMo.getVmName(), e.getMessage()), e); - } - } - } - } - - return vms; + public List getAllVmsOnDatacenter(String keyword) throws Exception { + List ocs = getVmPropertiesOnDatacenterVmFolder(propertyPathsForUnmanagedVmsThinListing); + return convertVmsObjectContentsToUnmanagedInstances(ocs, keyword); } public List getAllHostsOnDatacenter() throws Exception { diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java index 524667058384..3b96e7e19990 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java @@ -582,27 +582,6 @@ private boolean isUserVMInternalCSName(String vmInternalCSName) { } } - public List listAllVmsInHost() throws Exception { - List vms = new ArrayList<>(); - ObjectContent[] ocs = getVmPropertiesOnHyperHost(new String[] {"name"}); - if (ocs != null) { - for (ObjectContent oc : ocs) { - ManagedObjectReference mor = oc.getObj(); - if (mor != null) { - VirtualMachineMO vmMo = new VirtualMachineMO(_context, mor); - try { - if (!vmMo.isTemplate()) { - vms.add(vmMo); - } - } catch (Exception e) { - s_logger.debug(String.format("Unexpected error checking instance %s, excluding it: %s", vmMo.getVmName(), e.getMessage()), e); - } - } - } - } - return vms; - } - private void loadVmCache() throws Exception { if (s_logger.isDebugEnabled()) s_logger.debug("load VM cache on host"); diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java index 46de739738d1..b273688c1629 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java @@ -795,34 +795,6 @@ public static HostMO getHostMOFromHostName(final VmwareContext context, final St return host; } - public static List getUnmanagedInstancesList(List vmMos) { - List vms = new ArrayList<>(); - int incorrectVmsCount = 0; - for (VirtualMachineMO vmMo : vmMos) { - - String vmName = ""; - try { - vmName = vmMo.getName(); - } catch (Exception e) { - incorrectVmsCount++; - continue; - } - - try { - HostMO hostMO = vmMo.getRunningHost(); - vms.add(VmwareHelper.getUnmanagedInstance(hostMO, vmMo)); - } catch (Exception e) { - s_logger.debug(String.format("Error getting unmanaged instance %s, excluding it", vmName), e); - } - } - if (incorrectVmsCount > 0) { - s_logger.warn(String.format("Retrieving %s unmanaged VMs from the list of %s VMs on vCenter," + - "information from %s VMs could not be properly obtained and were excluded from the returned list", - vms.size(), vmMos.size(), incorrectVmsCount)); - } - return vms; - } - public static UnmanagedInstanceTO getUnmanagedInstance(VmwareHypervisorHost hyperHost, VirtualMachineMO vmMo) { UnmanagedInstanceTO instance = null; try { From ab29fd8aa9460fcb4ee4bf22ba9a880a7829da48 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Mon, 5 May 2025 22:26:43 -0300 Subject: [PATCH 06/12] Remove commented line --- .../com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index b8d663bcd815..a151b6086ed4 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -1666,7 +1666,6 @@ public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { HostMO hostMO = new HostMO(context, hostMor); VirtualMachineMO vmMo = hostMO.findVmOnHyperHost(virtualMachineName); instances = Collections.singletonList(VmwareHelper.getUnmanagedInstance(hostMO, vmMo)); - // instances = hostMO.listAllVmsInHost(keyword); } else { instances = dcMo.getAllVmsOnDatacenter(keyword); } From 065cd736257701604bb253ffd53bf9e1dc9f6ace Mon Sep 17 00:00:00 2001 From: nvazquez Date: Fri, 9 May 2025 20:54:22 -0300 Subject: [PATCH 07/12] Refactor parameter names --- .../vmware/manager/VmwareManagerImpl.java | 4 ++-- .../admin/zone/ListVmwareDcVmsCmd.java | 20 +++++++++---------- ui/src/views/tools/ManageInstances.vue | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index a151b6086ed4..01b728a38e2e 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -1648,8 +1648,8 @@ public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { String password = vmwareDC.password; String datacenterName = vmwareDC.datacenterName; String keyword = cmd.getKeyword(); - String esxiHostName = cmd.getHostName(); - String virtualMachineName = cmd.getVirtualMachineName(); + String esxiHostName = cmd.getHost(); + String virtualMachineName = cmd.getInstanceName(); try { VmwareContext context = getVmwareContext(vcenter, username, password); diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java index 1bc1ba97f00e..37eedafdf786 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java @@ -70,11 +70,11 @@ public class ListVmwareDcVmsCmd extends BaseListCmd { @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "The password for specified username.") private String password; - @Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, description = "Name of the host on vCenter. Must be set along with the virtualmachinename parameter") - private String hostName; + @Parameter(name = ApiConstants.HOST, type = CommandType.STRING, description = "Name of the host on vCenter. Must be set along with the instancename parameter") + private String host; - @Parameter(name = ApiConstants.VIRTUAL_MACHINE_NAME, type = CommandType.STRING, description = "Name of the VM on vCenter. Must be set along with the hostname parameter") - private String virtualMachineName; + @Parameter(name = ApiConstants.INSTANCE_NAME, type = CommandType.STRING, description = "Name of the VM on vCenter. Must be set along with the host parameter") + private String instanceName; public String getVcenter() { return vcenter; @@ -92,16 +92,16 @@ public String getDatacenterName() { return datacenterName; } - public String getHostName() { - return hostName; + public String getHost() { + return host; } public Long getExistingVcenterId() { return existingVcenterId; } - public String getVirtualMachineName() { - return virtualMachineName; + public String getInstanceName() { + return instanceName; } @Override @@ -139,8 +139,8 @@ private void checkParameters() { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Please set all the information for a vCenter IP/Name, datacenter, username and password"); } - if ((StringUtils.isNotBlank(virtualMachineName) && StringUtils.isBlank(hostName)) || - (StringUtils.isBlank(virtualMachineName) && StringUtils.isNotBlank(hostName))) { + if ((StringUtils.isNotBlank(instanceName) && StringUtils.isBlank(host)) || + (StringUtils.isBlank(instanceName) && StringUtils.isNotBlank(host))) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Please set the hostname parameter along with the virtualmachinename parameter"); } diff --git a/ui/src/views/tools/ManageInstances.vue b/ui/src/views/tools/ManageInstances.vue index d8e17d66ace1..54dcf49c83c8 100644 --- a/ui/src/views/tools/ManageInstances.vue +++ b/ui/src/views/tools/ManageInstances.vue @@ -1313,9 +1313,9 @@ export default { } else { params.existingvcenterid = this.selectedVmwareVcenter.existingvcenterid } + params.instancename = vmname + params.host = hostname } - params.virtualmachinename = vmname - params.hostname = hostname api('listVmwareDcVms', params).then(json => { const response = json.listvmwaredcvmsresponse this.selectedUnmanagedInstance = response.unmanagedinstance[0] From 4f83ca81aa9cbff899f1f9600ca49f8769d4c9fd Mon Sep 17 00:00:00 2001 From: nvazquez Date: Mon, 12 May 2025 11:38:14 -0300 Subject: [PATCH 08/12] Refactor method --- .../cloud/hypervisor/vmware/mo/BaseMO.java | 96 +++++++++++-------- 1 file changed, 57 insertions(+), 39 deletions(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java index c1c458336c0d..80bdd73bd183 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java @@ -180,46 +180,10 @@ protected List convertVmsObjectContentsToUnmanagedInstances if (ocs != null) { for (ObjectContent oc : ocs) { List objProps = oc.getPropSet(); - UnmanagedInstanceTO vm = new UnmanagedInstanceTO(); if (objProps != null) { - boolean isTemplate = false; - boolean excludeByKeyword = false; - String vmName; - for (DynamicProperty objProp : objProps) { - if (objProp.getName().equals("name")) { - vmName = (String) objProp.getVal(); - if (StringUtils.isNotBlank(keyword) && !vmName.contains(keyword)) { - excludeByKeyword = true; - } - vm.setName(vmName); - } else if (objProp.getName().equals("config.template")) { - isTemplate = (Boolean) objProp.getVal(); - } else if (objProp.getName().equals("runtime.powerState")) { - VirtualMachinePowerState powerState = (VirtualMachinePowerState) objProp.getVal(); - vm.setPowerState(convertPowerState(powerState)); - } else if (objProp.getName().equals("config.guestFullName")) { - vm.setOperatingSystem((String) objProp.getVal()); - } else if (objProp.getName().equals("config.guestId")) { - vm.setOperatingSystemId((String) objProp.getVal()); - } else if (objProp.getName().equals("runtime.host")) { - ManagedObjectReference hostMor = (ManagedObjectReference) objProp.getVal(); - if (hostMor != null && StringUtils.isNotBlank(hostMor.getValue())) { - String hostMorValue = hostMor.getValue(); - Pair hostClusterPair; - if (hostClusterNamesMap.containsKey(hostMorValue)) { - hostClusterPair = hostClusterNamesMap.get(hostMorValue); - } else { - HostMO hostMO = new HostMO(_context, hostMor); - ClusterMO clusterMO = new ClusterMO(_context, hostMO.getHyperHostCluster()); - hostClusterPair = new Pair<>(hostMO.getHostName(), clusterMO.getName()); - hostClusterNamesMap.put(hostMorValue, hostClusterPair); - } - vm.setHostName(hostClusterPair.first()); - vm.setClusterName(hostClusterPair.second()); - } - } - } - if (!isTemplate && !excludeByKeyword) { + UnmanagedInstanceTO vm = createUnmanagedInstanceTOFromThinListingDynamicProperties( + objProps, keyword, hostClusterNamesMap); + if (vm != null) { vms.add(vm); } } @@ -230,4 +194,58 @@ protected List convertVmsObjectContentsToUnmanagedInstances } return vms; } + + private UnmanagedInstanceTO createUnmanagedInstanceTOFromThinListingDynamicProperties(List objProps, + String keyword, + Map> hostClusterNamesMap) throws Exception { + UnmanagedInstanceTO vm = new UnmanagedInstanceTO(); + String vmName; + boolean isTemplate = false; + boolean excludeByKeyword = false; + + for (DynamicProperty objProp : objProps) { + if (objProp.getName().equals("name")) { + vmName = (String) objProp.getVal(); + if (StringUtils.isNotBlank(keyword) && !vmName.contains(keyword)) { + excludeByKeyword = true; + } + vm.setName(vmName); + } else if (objProp.getName().equals("config.template")) { + isTemplate = (Boolean) objProp.getVal(); + } else if (objProp.getName().equals("runtime.powerState")) { + VirtualMachinePowerState powerState = (VirtualMachinePowerState) objProp.getVal(); + vm.setPowerState(convertPowerState(powerState)); + } else if (objProp.getName().equals("config.guestFullName")) { + vm.setOperatingSystem((String) objProp.getVal()); + } else if (objProp.getName().equals("config.guestId")) { + vm.setOperatingSystemId((String) objProp.getVal()); + } else if (objProp.getName().equals("runtime.host")) { + ManagedObjectReference hostMor = (ManagedObjectReference) objProp.getVal(); + setUnmanagedInstanceTOHostAndCluster(vm, hostMor, hostClusterNamesMap); + } + } + if (isTemplate || excludeByKeyword) { + return null; + } + return vm; + } + + private void setUnmanagedInstanceTOHostAndCluster(UnmanagedInstanceTO vm, ManagedObjectReference hostMor, + Map> hostClusterNamesMap) throws Exception { + if (hostMor != null && StringUtils.isNotBlank(hostMor.getValue())) { + String hostMorValue = hostMor.getValue(); + Pair hostClusterPair; + if (hostClusterNamesMap.containsKey(hostMorValue)) { + hostClusterPair = hostClusterNamesMap.get(hostMorValue); + } else { + HostMO hostMO = new HostMO(_context, hostMor); + ClusterMO clusterMO = new ClusterMO(_context, hostMO.getHyperHostCluster()); + hostClusterPair = new Pair<>(hostMO.getHostName(), clusterMO.getName()); + hostClusterNamesMap.put(hostMorValue, hostClusterPair); + } + vm.setHostName(hostClusterPair.first()); + vm.setClusterName(hostClusterPair.second()); + } + } + } From 202f9d537a9f1f7a1c3e72535c4c5fcd71ee39a7 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Mon, 12 May 2025 12:47:39 -0300 Subject: [PATCH 09/12] Add secure boot to the instance response --- .../api/response/UnmanagedInstanceResponse.java | 12 ++++++++++++ .../apache/cloudstack/vm/UnmanagedInstanceTO.java | 10 ++++++++++ .../main/java/com/cloud/api/ApiResponseHelper.java | 1 + .../java/com/cloud/hypervisor/vmware/mo/BaseMO.java | 6 +++++- 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java index 7a26b1785919..3265ad219b1e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java @@ -79,6 +79,10 @@ public class UnmanagedInstanceResponse extends BaseResponse { @Param(description = "the operating system of the virtual machine") private String operatingSystem; + @SerializedName("securebootenabled") + @Param(description = "indicates if secure boot is enabled") + private Boolean secureBootEnabled; + @SerializedName(ApiConstants.DISK) @Param(description = "the list of disks associated with the virtual machine", responseObject = UnmanagedInstanceDiskResponse.class) private Set disks; @@ -211,4 +215,12 @@ public void setNics(Set nics) { public void addNic(NicResponse nic) { this.nics.add(nic); } + + public Boolean getSecureBootEnabled() { + return secureBootEnabled; + } + + public void setSecureBootEnabled(Boolean secureBootEnabled) { + this.secureBootEnabled = secureBootEnabled; + } } diff --git a/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java b/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java index 6f632853527d..9861dd9cccf5 100644 --- a/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java +++ b/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java @@ -61,6 +61,8 @@ public enum PowerState { private String vncPassword; + private Boolean secureBootEnabled; + public String getName() { return name; } @@ -189,6 +191,14 @@ public void setVncPassword(String vncPassword) { this.vncPassword = vncPassword; } + public Boolean getSecureBootEnabled() { + return secureBootEnabled; + } + + public void setSecureBootEnabled(Boolean secureBootEnabled) { + this.secureBootEnabled = secureBootEnabled; + } + public static class Disk { private String diskId; diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index ed7a51d215cc..02b3f85f25c5 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -5145,6 +5145,7 @@ public UnmanagedInstanceResponse createUnmanagedInstanceResponse(UnmanagedInstan response.setMemory(instance.getMemory()); response.setOperatingSystemId(instance.getOperatingSystemId()); response.setOperatingSystem(instance.getOperatingSystem()); + response.setSecureBootEnabled(instance.getSecureBootEnabled()); response.setObjectName("unmanagedinstance"); if (instance.getDisks() != null) { diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java index 80bdd73bd183..557a1127239b 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java @@ -19,6 +19,7 @@ import com.cloud.utils.Pair; import com.vmware.vim25.DynamicProperty; import com.vmware.vim25.ObjectContent; +import com.vmware.vim25.VirtualMachineBootOptions; import com.vmware.vim25.VirtualMachinePowerState; import org.apache.cloudstack.vm.UnmanagedInstanceTO; import org.apache.commons.lang3.StringUtils; @@ -43,7 +44,7 @@ public class BaseMO { protected ManagedObjectReference _mor; protected static String[] propertyPathsForUnmanagedVmsThinListing = new String[] {"name", "config.template", - "runtime.powerState", "config.guestId", "config.guestFullName", "runtime.host"}; + "runtime.powerState", "config.guestId", "config.guestFullName", "runtime.host", "config.bootOptions"}; private String _name; @@ -219,6 +220,9 @@ private UnmanagedInstanceTO createUnmanagedInstanceTOFromThinListingDynamicPrope vm.setOperatingSystem((String) objProp.getVal()); } else if (objProp.getName().equals("config.guestId")) { vm.setOperatingSystemId((String) objProp.getVal()); + } else if (objProp.getName().equals("config.bootOptions")) { + VirtualMachineBootOptions bootOptions = (VirtualMachineBootOptions) objProp.getVal(); + vm.setSecureBootEnabled(bootOptions.isEfiSecureBootEnabled()); } else if (objProp.getName().equals("runtime.host")) { ManagedObjectReference hostMor = (ManagedObjectReference) objProp.getVal(); setUnmanagedInstanceTOHostAndCluster(vm, hostMor, hostClusterNamesMap); From 456f3ace3ca026e4c18cfeffb4e4541119b6b9bc Mon Sep 17 00:00:00 2001 From: nvazquez Date: Mon, 12 May 2025 17:54:14 -0300 Subject: [PATCH 10/12] Include boot type and boot mode --- .../response/UnmanagedInstanceResponse.java | 26 ++++++++++++++----- .../cloudstack/vm/UnmanagedInstanceTO.java | 19 ++++++++++---- .../java/com/cloud/api/ApiResponseHelper.java | 3 ++- .../cloud/hypervisor/vmware/mo/BaseMO.java | 12 +++++++-- 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java index 3265ad219b1e..c1156f5f23a5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java @@ -79,9 +79,13 @@ public class UnmanagedInstanceResponse extends BaseResponse { @Param(description = "the operating system of the virtual machine") private String operatingSystem; - @SerializedName("securebootenabled") - @Param(description = "indicates if secure boot is enabled") - private Boolean secureBootEnabled; + @SerializedName(ApiConstants.BOOT_MODE) + @Param(description = "indicates the boot mode") + private String bootMode; + + @SerializedName(ApiConstants.BOOT_TYPE) + @Param(description = "indicates the boot type") + private String bootType; @SerializedName(ApiConstants.DISK) @Param(description = "the list of disks associated with the virtual machine", responseObject = UnmanagedInstanceDiskResponse.class) @@ -216,11 +220,19 @@ public void addNic(NicResponse nic) { this.nics.add(nic); } - public Boolean getSecureBootEnabled() { - return secureBootEnabled; + public String getBootMode() { + return bootMode; + } + + public void setBootMode(String bootMode) { + this.bootMode = bootMode; + } + + public String getBootType() { + return bootType; } - public void setSecureBootEnabled(Boolean secureBootEnabled) { - this.secureBootEnabled = secureBootEnabled; + public void setBootType(String bootType) { + this.bootType = bootType; } } diff --git a/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java b/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java index 9861dd9cccf5..f1027b74eca3 100644 --- a/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java +++ b/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java @@ -61,7 +61,8 @@ public enum PowerState { private String vncPassword; - private Boolean secureBootEnabled; + private String bootType; + private String bootMode; public String getName() { return name; @@ -191,12 +192,20 @@ public void setVncPassword(String vncPassword) { this.vncPassword = vncPassword; } - public Boolean getSecureBootEnabled() { - return secureBootEnabled; + public String getBootType() { + return bootType; } - public void setSecureBootEnabled(Boolean secureBootEnabled) { - this.secureBootEnabled = secureBootEnabled; + public void setBootType(String bootType) { + this.bootType = bootType; + } + + public String getBootMode() { + return bootMode; + } + + public void setBootMode(String bootMode) { + this.bootMode = bootMode; } public static class Disk { diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 02b3f85f25c5..77276090dae2 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -5145,7 +5145,8 @@ public UnmanagedInstanceResponse createUnmanagedInstanceResponse(UnmanagedInstan response.setMemory(instance.getMemory()); response.setOperatingSystemId(instance.getOperatingSystemId()); response.setOperatingSystem(instance.getOperatingSystem()); - response.setSecureBootEnabled(instance.getSecureBootEnabled()); + response.setBootMode(instance.getBootMode()); + response.setBootType(instance.getBootType()); response.setObjectName("unmanagedinstance"); if (instance.getDisks() != null) { diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java index 557a1127239b..0d380bd7ff7d 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/BaseMO.java @@ -44,7 +44,8 @@ public class BaseMO { protected ManagedObjectReference _mor; protected static String[] propertyPathsForUnmanagedVmsThinListing = new String[] {"name", "config.template", - "runtime.powerState", "config.guestId", "config.guestFullName", "runtime.host", "config.bootOptions"}; + "runtime.powerState", "config.guestId", "config.guestFullName", "runtime.host", + "config.bootOptions", "config.firmware"}; private String _name; @@ -222,7 +223,14 @@ private UnmanagedInstanceTO createUnmanagedInstanceTOFromThinListingDynamicPrope vm.setOperatingSystemId((String) objProp.getVal()); } else if (objProp.getName().equals("config.bootOptions")) { VirtualMachineBootOptions bootOptions = (VirtualMachineBootOptions) objProp.getVal(); - vm.setSecureBootEnabled(bootOptions.isEfiSecureBootEnabled()); + String bootMode = "LEGACY"; + if (bootOptions != null && bootOptions.isEfiSecureBootEnabled()) { + bootMode = "SECURE"; + } + vm.setBootMode(bootMode); + } else if (objProp.getName().equals("config.firmware")) { + String firmware = (String) objProp.getVal(); + vm.setBootType(firmware.equalsIgnoreCase("efi") ? "UEFI" : "BIOS"); } else if (objProp.getName().equals("runtime.host")) { ManagedObjectReference hostMor = (ManagedObjectReference) objProp.getVal(); setUnmanagedInstanceTOHostAndCluster(vm, hostMor, hostClusterNamesMap); From 81a9771261695990583defbb33141c14b4deb573 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Tue, 13 May 2025 07:06:18 -0300 Subject: [PATCH 11/12] Restore hostname parameter --- .../vmware/manager/VmwareManagerImpl.java | 2 +- .../command/admin/zone/ListVmwareDcVmsCmd.java | 16 ++++++++-------- ui/src/views/tools/ManageInstances.vue | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 01b728a38e2e..2bdd496dd922 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -1648,7 +1648,7 @@ public List listVMsInDatacenter(ListVmwareDcVmsCmd cmd) { String password = vmwareDC.password; String datacenterName = vmwareDC.datacenterName; String keyword = cmd.getKeyword(); - String esxiHostName = cmd.getHost(); + String esxiHostName = cmd.getHostName(); String virtualMachineName = cmd.getInstanceName(); try { diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java index 37eedafdf786..3c7b233f7c91 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java @@ -70,10 +70,10 @@ public class ListVmwareDcVmsCmd extends BaseListCmd { @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "The password for specified username.") private String password; - @Parameter(name = ApiConstants.HOST, type = CommandType.STRING, description = "Name of the host on vCenter. Must be set along with the instancename parameter") - private String host; + @Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, description = "Name of the host on vCenter. Must be set along with the instancename parameter") + private String hostName; - @Parameter(name = ApiConstants.INSTANCE_NAME, type = CommandType.STRING, description = "Name of the VM on vCenter. Must be set along with the host parameter") + @Parameter(name = ApiConstants.INSTANCE_NAME, type = CommandType.STRING, description = "Name of the VM on vCenter. Must be set along with the hostname parameter") private String instanceName; public String getVcenter() { @@ -92,8 +92,8 @@ public String getDatacenterName() { return datacenterName; } - public String getHost() { - return host; + public String getHostName() { + return hostName; } public Long getExistingVcenterId() { @@ -139,10 +139,10 @@ private void checkParameters() { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Please set all the information for a vCenter IP/Name, datacenter, username and password"); } - if ((StringUtils.isNotBlank(instanceName) && StringUtils.isBlank(host)) || - (StringUtils.isBlank(instanceName) && StringUtils.isNotBlank(host))) { + if ((StringUtils.isNotBlank(instanceName) && StringUtils.isBlank(hostName)) || + (StringUtils.isBlank(instanceName) && StringUtils.isNotBlank(hostName))) { throw new ServerApiException(ApiErrorCode.PARAM_ERROR, - "Please set the hostname parameter along with the virtualmachinename parameter"); + "Please set the hostname parameter along with the instancename parameter"); } } diff --git a/ui/src/views/tools/ManageInstances.vue b/ui/src/views/tools/ManageInstances.vue index 54dcf49c83c8..85b1deea9158 100644 --- a/ui/src/views/tools/ManageInstances.vue +++ b/ui/src/views/tools/ManageInstances.vue @@ -1314,7 +1314,7 @@ export default { params.existingvcenterid = this.selectedVmwareVcenter.existingvcenterid } params.instancename = vmname - params.host = hostname + params.hostname = hostname } api('listVmwareDcVms', params).then(json => { const response = json.listvmwaredcvmsresponse From 76604e91855fa0d9d70c20a319fb1a57b3fc1cff Mon Sep 17 00:00:00 2001 From: nvazquez Date: Tue, 13 May 2025 09:32:13 -0300 Subject: [PATCH 12/12] Include boot mode and boot type on individual VM response --- .../cloud/hypervisor/vmware/util/VmwareHelper.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java index b273688c1629..9311360cd12c 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java @@ -59,6 +59,8 @@ import com.vmware.vim25.VMwareDVSPortSetting; import com.vmware.vim25.VirtualDeviceFileBackingInfo; import com.vmware.vim25.VirtualIDEController; +import com.vmware.vim25.VirtualMachineBootOptions; +import com.vmware.vim25.VirtualMachineConfigInfo; import com.vmware.vim25.VirtualMachineConfigSummary; import com.vmware.vim25.VirtualMachineGuestOsIdentifier; import com.vmware.vim25.VirtualMachineToolsStatus; @@ -810,6 +812,17 @@ public static UnmanagedInstanceTO getUnmanagedInstance(VmwareHypervisorHost hype instance.setCpuSpeed(configSummary.getCpuReservation()); instance.setMemory(configSummary.getMemorySizeMB()); } + VirtualMachineConfigInfo configInfo = vmMo.getConfigInfo(); + if (configInfo != null) { + String firmware = configInfo.getFirmware(); + instance.setBootType(firmware.equalsIgnoreCase("efi") ? "UEFI" : "BIOS"); + VirtualMachineBootOptions bootOptions = configInfo.getBootOptions(); + String bootMode = "LEGACY"; + if (bootOptions != null && bootOptions.isEfiSecureBootEnabled()) { + bootMode = "SECURE"; + } + instance.setBootMode(bootMode); + } try { ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), hyperHost.getHyperHostCluster());