some suggestions applied and initial batch size in UI

Author: DaanHoogland

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -46,6 +46,7 @@ public class ApiConstants {
     public static final String BACKUP_OFFERING_NAME = "backupofferingname";
     public static final String BACKUP_OFFERING_ID = "backupofferingid";
     public static final String BASE64_IMAGE = "base64image";
+    public static final String BATCH_SIZE = "batchsize";
     public static final String BITS = "bits";
     public static final String BOOTABLE = "bootable";
     public static final String BIND_DN = "binddn";

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

@@ -517,6 +517,10 @@ public List<ManagedObjectReference> addHostToPodCluster(VmwareContext serviceCon
             if (mor.getType().equals("ComputeResource")) {
                 List<ManagedObjectReference> hosts = serviceContext.getVimClient().getDynamicProperty(mor, "host");
                 assert (CollectionUtils.isNullOrEmpty(hosts));
+                // For ESX host, we need to enable host firewall to allow VNC access
+                HostMO hostMo = new HostMO(serviceContext, hosts.get(0));
+
+                prepareHost(hostMo, privateTrafficLabel);
                 returnedHostList.add(hosts.get(0));
                 return returnedHostList;
             } else if (mor.getType().equals("ClusterComputeResource")) {

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

@@ -70,17 +70,14 @@ public class ListVmwareDcVmsCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "The password for specified username.")
     private String password;
 
-    @Parameter(name = ApiConstants.PAGE_SIZE, type = CommandType.INTEGER, description = "The maximum number of results to return.")
-    private Integer pageSize;
+    @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 `pagesize`) is exceeded, " +
                     " a token is returned. This token can be used in subsequent calls to retrieve more results")
     private String token;
 
-    @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, description = "force retrieving new results, ignoring any cached data.")
-    private Boolean forced;
-
     public String getVcenter() {
         return vcenter;
     }
@@ -93,6 +90,10 @@ public String getPassword() {
         return password;
     }
 
+    public Integer getBatchSize() {
+        return batchSize;
+    }
+
     public String getToken() {
         return token;
     }
@@ -122,7 +123,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
             if (CollectionUtils.isEmpty(pagingList)) {
                 pagingList = baseResponseList;
             }
-            VmwarRequestReponse<BaseResponse> response = new VmwarRequestReponse<>();
+            VmwareRequestReponse<BaseResponse> response = new VmwareRequestReponse<>();
             response.setResponses(pagingList, baseResponseList.size());
             response.setResponseName(getCommandName());
             response.setToken(results.first());
@@ -148,9 +149,4 @@ private void checkParameters() {
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
     }
-
-    @Override
-    public String getCommandName() {
-        return "listvmwaredcvmsresponse";
-    }
 }

plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/VmwarRequestReponse.java renamed to plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/VmwareRequestReponse.java

@@ -20,7 +20,7 @@
 import org.apache.cloudstack.api.ResponseObject;
 import org.apache.cloudstack.api.response.ListResponse;
 
-public class VmwarRequestReponse <T extends ResponseObject> extends ListResponse<T> {
+public class VmwareRequestReponse<T extends ResponseObject> extends ListResponse<T> {
     private transient String token;
 
     public String getToken() {

ui/src/views/tools/ManageInstances.vue

@@ -1408,11 +1408,31 @@ 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.unmanagedInstancesLoading = false
+      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

@@ -217,6 +217,7 @@ export default {
       } else {
         params.existingvcenterid = this.selectedExistingVcenterId
       }
+      params.batchsize = 2
       api('listVmwareDcVms', params).then(json => {
         const obj = {
           params: params,