fix UI and cleanup

Author: DaanHoogland

api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java

@@ -152,7 +152,7 @@ public class HostResponse extends BaseResponseWithAnnotations {
     @Deprecated
     @SerializedName("memoryallocated")
     @Param(description = "the amount of the host's memory currently allocated")
-    private long memoryAllocated;
+    private Long memoryAllocated;
 
     @SerializedName("memoryallocatedpercentage")
     @Param(description = "the amount of the host's memory currently allocated in percentage")
@@ -395,7 +395,7 @@ public void setMemWithOverprovisioning(String memWithOverprovisioning){
         this.memWithOverprovisioning=memWithOverprovisioning;
     }
 
-    public void setMemoryAllocated(long memoryAllocated) {
+    public void setMemoryAllocated(Long memoryAllocated) {
         this.memoryAllocated = memoryAllocated;
     }
 
@@ -659,8 +659,8 @@ public Long getMemoryTotal() {
         return memoryTotal;
     }
 
-    public long getMemoryAllocated() {
-        return memoryAllocated;
+    public Long getMemoryAllocated() {
+        return memoryAllocated == null ? 0 : memoryAllocated;
     }
 
     public void setMemoryAllocatedPercentage(String memoryAllocatedPercentage) {

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

@@ -1567,9 +1567,6 @@ public List<StoragePool> listVsphereStoragePolicyCompatibleStoragePools(ListVsph
 
     @Override
     public List<HostMO> listHostsInDatacenter(ListVmwareDcHostsCmd cmd) {
-        Integer maxObjects = cmd.getBatchSize();
-        String token = cmd.getToken();
-
         VcenterData vmwaredc = getVcenterData(cmd);
 
         try {

plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java

@@ -75,15 +75,6 @@ public class ListVmwareDcHostsCmd extends BaseCmd implements ListVmwareDcItems {
     @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "The password for specified username.")
     private String password;
 
-    @Parameter(name = ApiConstants.BATCH_SIZE, type = CommandType.INTEGER, description = "The maximum number of results to return.")
-    private Integer batchSize;
-
-    @Parameter(name = ApiConstants.TOKEN, type = CommandType.STRING,
-            description = "For listVmwareDcVms, if the maximum number of results (the `batchsize`) is exceeded, " +
-                    " a token is returned. This token can be used in subsequent calls to retrieve more results." +
-                    " As long as a token is returned, more results can be retrieved.")
-    private String token;
-
     public String getVcenter() {
         return vcenter;
     }
@@ -96,14 +87,6 @@ public String getPassword() {
         return password;
     }
 
-    public Integer getBatchSize() {
-        return batchSize;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
     public String getDatacenterName() {
         return datacenterName;
     }

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 => {
@@ -1408,31 +1409,10 @@ export default {
         })
       }
     },
-    async fetchMoreVms (obj) {
-      var params = obj.params
-      params.token = obj.response.token
-      api('listVmwareDcVms', params).then(json => {
-        const obj = {
-          params: params,
-          response: json.listvmwaredcvmsresponse
-        }
-        this.unmanagedInstances.append(obj.response.unmanagedinstance)
-        this.checkForMoreVms(obj)
-      })
-    },
     onListUnmanagedInstancesFromVmware (obj) {
       this.selectedVmwareVcenter = obj.params
       this.unmanagedInstances = obj.response.unmanagedinstance
       this.itemCount.unmanaged = obj.response.count
-      this.checkForMoreVms(obj)
-    },
-    checkForMoreVms (obj) {
-      if (obj.response.token) {
-        this.fetchMoreVms(obj)
-      // keep loading, for now this means the API called was api('listVmwareDcVms', params)
-      } else {
-        this.unmanagedInstancesLoading = false
-      }
     },
     updateVmwareVcenterType (type) {
       this.vmwareVcenterType = type

ui/src/views/tools/SelectVmwareVcenter.vue

@@ -120,7 +120,7 @@
         </a-form-item>
       </div>
       <div v-if="selectedExistingVcenterId">
-        <a-form-item ref="host" name="host" v-if="hosts.length > 0">
+        <a-form-item :label="$t('label.vcenter.host')" ref="host" name="host" v-if="hosts.length > 0">
           <a-select
             v-model:value="form.host"
             :loading="loading"
@@ -130,8 +130,8 @@
             }"
             :placeholder="$t('label.vcenter.host')"
             @change="onSelectExistingVmwareHost">
-            <a-select-option v-for="opt in hosts" :key="opt.id">
-                {{ 'ESXi: ' + opt.host + ' - DC: ' + opt.name }}
+            <a-select-option v-for="opt in hosts" :key="opt.name">
+                {{ 'ESXi: ' + opt.name }}
             </a-select-option>
           </a-select>
         </a-form-item>
@@ -239,7 +239,7 @@ export default {
       } else {
         params.existingvcenterid = this.selectedExistingVcenterId
       }
-      params.host = this.selectedhost
+      params.host = this.selectedHost
       api('listVmwareDcVms', params).then(json => {
         const obj = {
           params: params,
@@ -290,8 +290,8 @@ export default {
         params.existingvcenterid = this.selectedExistingVcenterId
       }
       api('listVmwareDcHosts', params).then(response => {
-        if (response.listvmwaredchostsresponse.VMwareDC && response.listvmwaredchostsresponse.VMwareDC.length > 0) {
-          this.hosts = response.listvmwaredchostsresponse.hosts
+        if (response.listvmwaredchostsresponse.host && response.listvmwaredchostsresponse.host.length > 0) {
+          this.hosts = response.listvmwaredchostsresponse.host
         }
       }).catch(error => {
         this.$notifyError(error)