Fixes and improvements

Author: nvazquez

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java

@@ -1117,6 +1117,7 @@ public List<Class<?>> 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<UnmanagedInstanceTO> listVMsInDatacenter(ListVmwareDcVmsCmd cmd) {
             List<VirtualMachineMO> 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();

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 => {

ui/src/views/tools/SelectVmwareVcenter.vue

@@ -89,7 +89,6 @@
           <a-input
             v-model:value="vcenter"
             :placeholder="apiParams.vcenter.description"
-            @change="onSelectExternalVmwareDatacenter"
             @blur="onSelectExternalVmwareDatacenter"
             @pressEnter="onSelectExternalVmwareDatacenter"
           />
@@ -101,7 +100,6 @@
           <a-input
             v-model:value="datacenter"
             :placeholder="apiParams.datacentername.description"
-            @change="onSelectExternalVmwareDatacenter"
             @blur="onSelectExternalVmwareDatacenter"
             @pressEnter="onSelectExternalVmwareDatacenter"
           />
@@ -113,7 +111,6 @@
           <a-input
             v-model:value="username"
             :placeholder="apiParams.username.description"
-            @change="onSelectExternalVmwareDatacenter"
             @blur="onSelectExternalVmwareDatacenter"
             @pressEnter="onSelectExternalVmwareDatacenter"
           />
@@ -125,7 +122,6 @@
           <a-input-password
             v-model:value="password"
             :placeholder="apiParams.password.description"
-            @change="onSelectExternalVmwareDatacenter"
             @blur="onSelectExternalVmwareDatacenter"
             @pressEnter="onSelectExternalVmwareDatacenter"
           />
@@ -157,8 +153,8 @@
       <div class="card-footer">
         <a-button
           v-if="vcenterSelectedOption == 'existing' || vcenterSelectedOption == 'new'"
-          :disabled="(vcenterSelectedOption === 'new' && (vcenter === '' || datacentername === '' || username === '' || password === '')) ||
-            (vcenterSelectedOption === 'existing' && selectedExistingVcenterId === '') && host === ''"
+          :disabled="(vcenterSelectedOption === 'new' && (vcenter === '' || datacentername === '' || username === '' || password === '' || selectedHost === '')) ||
+            (vcenterSelectedOption === 'existing' && selectedExistingVcenterId === '' && selectedHost === '')"
           :loading="loading"
           type="primary"
           @click="listVmwareDatacenterVms">{{ $t('label.list.vmware.vcenter.vms') }}</a-button>
@@ -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)
     }
   }

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java

@@ -582,6 +582,27 @@ private boolean isUserVMInternalCSName(String vmInternalCSName) {
         }
     }
 
+    public List<VirtualMachineMO> listAllVmsInHost() throws Exception {
+        List<VirtualMachineMO> 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");