api,ui: allow filtering vms by arch

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java

@@ -149,6 +149,11 @@ public class ListVMsCmd extends BaseListRetrieveOnlyResourceCountCmd implements
     @Parameter(name = ApiConstants.USER_DATA, type = CommandType.BOOLEAN, description = "Whether to return the VMs' user data or not. By default, user data will not be returned.", since = "4.18.0.0")
     private Boolean showUserData;
 
+    @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING,
+            description = "CPU arch of the VM",
+            since = "4.20.1")
+    private String arch;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -284,6 +289,10 @@ public Boolean getVnf() {
         return isVnf;
     }
 
+    public String getArch() {
+        return arch;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

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

@@ -31,13 +31,13 @@
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponseWithTagInformation;
 import org.apache.cloudstack.api.EntityReference;
+import org.apache.commons.collections.CollectionUtils;
 
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.serializer.Param;
 import com.cloud.uservm.UserVm;
 import com.cloud.vm.VirtualMachine;
 import com.google.gson.annotations.SerializedName;
-import org.apache.commons.collections.CollectionUtils;
 
 @SuppressWarnings("unused")
 @EntityReference(value = {VirtualMachine.class, UserVm.class, VirtualRouter.class})
@@ -396,6 +396,10 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
     @Param(description = "User VM type", since = "4.20.0")
     private String vmType;
 
+    @SerializedName(ApiConstants.ARCH)
+    @Param(description = "CPU arch of the VM", since = "4.20.1")
+    private String arch;
+
     public UserVmResponse() {
         securityGroupList = new LinkedHashSet<>();
         nics = new TreeSet<>(Comparator.comparingInt(x -> Integer.parseInt(x.getDeviceId())));
@@ -1169,4 +1173,12 @@ public String getVmType() {
     public void setIpAddress(String ipAddress) {
         this.ipAddress = ipAddress;
     }
+
+    public String getArch() {
+        return arch;
+    }
+
+    public void setArch(String arch) {
+        this.arch = arch;
+    }
 }

engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql

@@ -83,6 +83,7 @@ SELECT
     `iso`.`uuid` AS `iso_uuid`,
     `iso`.`name` AS `iso_name`,
     `iso`.`display_text` AS `iso_display_text`,
+    `vm_template`.`arch` AS `arch`,
     `service_offering`.`id` AS `service_offering_id`,
     `service_offering`.`uuid` AS `service_offering_uuid`,
     `disk_offering`.`uuid` AS `disk_offering_uuid`,

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -1298,6 +1298,7 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {
         StoragePoolVO pool = null;
         Long userId = cmd.getUserId();
         Map<String, String> tags = cmd.getTags();
+        final String arch = cmd.getArch();
 
         boolean isAdmin = false;
         boolean isRootAdmin = false;
@@ -1521,8 +1522,10 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {
         }
 
         Boolean isVnf = cmd.getVnf();
-        if (isVnf != null) {
+        boolean templateJoinNeeded = isVnf != null || StringUtils.isNoneBlank(arch);
+        if (templateJoinNeeded) {
             SearchBuilder<VMTemplateVO> templateSearch = _templateDao.createSearchBuilder();
+            templateSearch.and("templateArch", templateSearch.entity().getArch(), Op.EQ);
             templateSearch.and("templateTypeEQ", templateSearch.entity().getTemplateType(), Op.EQ);
             templateSearch.and("templateTypeNEQ", templateSearch.entity().getTemplateType(), Op.NEQ);
 
@@ -1647,6 +1650,9 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {
                 userVmSearchCriteria.setJoinParameters("vmTemplate", "templateTypeNEQ", TemplateType.VNF);
             }
         }
+        if (StringUtils.isNotBlank(arch)) {
+            userVmSearchCriteria.setJoinParameters("vmTemplate", "templateArch", arch);
+        }
 
         if (isRootAdmin) {
             if (podId != null) {

server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java

@@ -188,6 +188,7 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
             userVmResponse.setInstanceName(userVm.getInstanceName());
             userVmResponse.setHostId(userVm.getHostUuid());
             userVmResponse.setHostName(userVm.getHostName());
+            userVmResponse.setArch(userVm.getArch());
         }
         if (userVm.getHostStatus() != null) {
             userVmResponse.setHostControlState(ControlState.getControlState(userVm.getHostStatus(), userVm.getHostResourceState()).toString());

server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java

@@ -439,6 +439,9 @@ public class UserVmJoinVO extends BaseViewWithTagInformationVO implements Contro
     @Column(name = "delete_protection")
     protected Boolean deleteProtection;
 
+    @Column(name = "arch")
+    protected String arch;
+
 
     public UserVmJoinVO() {
         // Empty constructor
@@ -977,4 +980,8 @@ public String getUserDataPolicy() {
     public String getUserDataDetails() {
         return userDataDetails;
     }
+
+    public String getArch() {
+        return arch;
+    }
 }

ui/src/config/section/compute.js

@@ -77,7 +77,7 @@ export default {
         fields.push('zonename')
         return fields
       },
-      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
+      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'arch', 'tags'],
       details: () => {
         var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename',
           'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account',