address config comment, refactor, add arch to sysvm, routers

shwstppr · shwstppr · commit affd3d804d39 · 2025-03-19T18:45:20.000+05:30
Signed-off-by: Abhishek Kumar &lt;abhishek.mrt22@gmail.com&gt;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
@@ -28,7 +27,9 @@
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.commons.lang3.StringUtils;
 
+import com.cloud.cpu.CPU;
 import com.cloud.org.Cluster;
 import com.cloud.utils.Pair;
 
@@ -117,8 +118,8 @@ public Boolean getShowCapacities() {
         return showCapacities;
     }
 
-    public String getArch() {
-        return arch;
+    public CPU.CPUArch getArch() {
+        return StringUtils.isBlank(arch) ? null : CPU.CPUArch.fromType(arch);
     }
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -34,7 +33,9 @@
 import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.commons.lang3.StringUtils;
 
+import com.cloud.cpu.CPU;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.host.Host;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -192,8 +193,8 @@ public String getHostOutOfBandManagementPowerState() {
         return outOfBandManagementPowerState;
     }
 
-    public String getArch() {
-        return arch;
+    public CPU.CPUArch getArch() {
+        return StringUtils.isBlank(arch) ? null : CPU.CPUArch.fromType(arch);
     }
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
@@ -16,8 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.router;
 
-import org.apache.commons.lang.BooleanUtils;
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -32,7 +30,10 @@
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.VpcResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 
+import com.cloud.cpu.CPU;
 import com.cloud.network.router.VirtualRouter.Role;
 import com.cloud.vm.VirtualMachine;
 
@@ -86,6 +87,11 @@ public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd {
             description = "if true is passed for this parameter, also fetch last executed health check results for the router. Default is false")
     private Boolean fetchHealthCheckResults;
 
+    @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING,
+            description = "CPU arch of the router",
+            since = "4.20.1")
+    private String arch;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -146,6 +152,10 @@ public boolean shouldFetchHealthCheckResults() {
         return BooleanUtils.isTrue(fetchHealthCheckResults);
     }
 
+    public CPU.CPUArch getArch() {
+        return StringUtils.isBlank(arch) ? null : CPU.CPUArch.fromType(arch);
+    }
+
 
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -31,7 +30,9 @@
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.SystemVmResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.commons.lang3.StringUtils;
 
+import com.cloud.cpu.CPU;
 import com.cloud.utils.Pair;
 import com.cloud.vm.VirtualMachine;
 
@@ -74,6 +75,11 @@ public class ListSystemVMsCmd extends BaseListCmd {
                since = "3.0.1")
     private Long storageId;
 
+    @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING,
+            description = "CPU arch of the system VM",
+            since = "4.20.1")
+    private String arch;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -110,6 +116,10 @@ public Long getStorageId() {
         return storageId;
     }
 
+    public CPU.CPUArch getArch() {
+        return StringUtils.isBlank(arch) ? null : CPU.CPUArch.fromType(arch);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -46,9 +46,11 @@
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.VpcResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 
+import com.cloud.cpu.CPU;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.server.ResourceIcon;
 import com.cloud.server.ResourceTag;
@@ -297,8 +299,8 @@ public Boolean getVnf() {
         return isVnf;
     }
 
-    public String getArch() {
-        return arch;
+    public CPU.CPUArch getArch() {
+        return StringUtils.isBlank(arch) ? null : CPU.CPUArch.fromType(arch);
     }
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java
@@ -245,6 +245,10 @@ public class DomainRouterResponse extends BaseResponseWithAnnotations implements
     @Param(description = "the version of the code / software in the router")
     private String softwareVersion;
 
+    @SerializedName(ApiConstants.ARCH)
+    @Param(description = "CPU arch of the router", since = "4.20.1")
+    private String arch;
+
     public DomainRouterResponse() {
         nics = new LinkedHashSet<NicResponse>();
     }
@@ -518,4 +522,8 @@ public String getSoftwareVersion() {
     public void setSoftwareVersion(String softwareVersion) {
         this.softwareVersion = softwareVersion;
     }
+
+    public void setArch(String arch) {
+        this.arch = arch;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java
@@ -186,6 +186,10 @@ public class SystemVmResponse extends BaseResponseWithAnnotations {
     @Param(description = "the name of the service offering of the system virtual machine.")
     private String serviceOfferingName;
 
+    @SerializedName(ApiConstants.ARCH)
+    @Param(description = "CPU arch of the system VM", since = "4.20.1")
+    private String arch;
+
     @Override
     public String getObjectId() {
         return this.getId();
@@ -490,4 +494,8 @@ public String getServiceOfferingName() {
     public void setServiceOfferingName(String serviceOfferingName) {
         this.serviceOfferingName = serviceOfferingName;
     }
+
+    public void setArch(String arch) {
+        this.arch = arch;
+    }
 }
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_router_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_router_view.sql
@@ -58,6 +58,7 @@ select
     host.resource_state host_resource_state,
     vm_template.id template_id,
     vm_template.uuid template_uuid,
+    vm_template.arch arch,
     service_offering.id service_offering_id,
     service_offering.uuid service_offering_uuid,
     service_offering.name service_offering_name,
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -1718,6 +1718,7 @@ public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {
             if (template != null) {
                 vmResponse.setTemplateId(template.getUuid());
                 vmResponse.setTemplateName(template.getName());
+                vmResponse.setArch(template.getArch().getType());
             }
             vmResponse.setCreated(vm.getCreated());
             vmResponse.setHypervisor(vm.getHypervisorType().getHypervisorDisplayName());
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -1298,7 +1298,7 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {
         Long userId = cmd.getUserId();
         Long userdataId = cmd.getUserdataId();
         Map<String, String> tags = cmd.getTags();
-        final String arch = cmd.getArch();
+        final CPU.CPUArch arch = cmd.getArch();
 
         boolean isAdmin = false;
         boolean isRootAdmin = false;
@@ -1526,7 +1526,7 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {
         }
 
         Boolean isVnf = cmd.getVnf();
-        boolean templateJoinNeeded = isVnf != null || StringUtils.isNoneBlank(arch);
+        boolean templateJoinNeeded = isVnf != null || arch != null;
         if (templateJoinNeeded) {
             SearchBuilder<VMTemplateVO> templateSearch = _templateDao.createSearchBuilder();
             templateSearch.and("templateArch", templateSearch.entity().getArch(), Op.EQ);
@@ -1658,7 +1658,7 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {
                 userVmSearchCriteria.setJoinParameters("vmTemplate", "templateTypeNEQ", TemplateType.VNF);
             }
         }
-        if (StringUtils.isNotBlank(arch)) {
+        if (arch != null) {
             userVmSearchCriteria.setJoinParameters("vmTemplate", "templateArch", arch);
         }
 
@@ -2361,7 +2361,7 @@ public Pair<List<Long>, Integer> searchForServerIdsAndCount(ListHostsCmd cmd) {
         Long startIndex = cmd.getStartIndex();
         Long pageSize = cmd.getPageSizeVal();
         Hypervisor.HypervisorType hypervisorType = cmd.getHypervisor();
-        String arch = cmd.getArch();
+        final CPU.CPUArch arch = cmd.getArch();
 
         Filter searchFilter = new Filter(HostVO.class, "id", Boolean.TRUE, startIndex, pageSize);
 
@@ -2458,7 +2458,7 @@ public Pair<List<Long>, Integer> searchForServerIdsAndCount(ListHostsCmd cmd) {
             sc.setParameters("hypervisor_type", hypervisorType);
         }
 
-        if (StringUtils.isNotBlank(arch)) {
+        if (arch != null) {
             sc.setParameters("arch", arch);
         }
 
diff --git a/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
@@ -88,6 +88,7 @@ public DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO router, A
         routerResponse.setZoneId(router.getDataCenterUuid());
         routerResponse.setName(router.getName());
         routerResponse.setTemplateId(router.getTemplateUuid());
+        routerResponse.setArch(router.getArch().getType());
         VMTemplateVO template = ApiDBUtils.findTemplateById(router.getTemplateId());
         if (template != null) {
             routerResponse.setTemplateName(template.getName());
diff --git a/server/src/main/java/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/DomainRouterJoinVO.java
@@ -27,6 +27,7 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import com.cloud.cpu.CPU;
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.network.Network.GuestType;
@@ -38,6 +39,8 @@
 import com.cloud.utils.db.GenericDao;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
+
+import org.apache.cloudstack.util.CPUArchConverter;
 import org.apache.cloudstack.util.HypervisorTypeConverter;
 
 @Entity
@@ -143,6 +146,10 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
     @Convert(converter = HypervisorTypeConverter.class)
     private Hypervisor.HypervisorType hypervisorType;
 
+    @Column(name="arch")
+    @Convert(converter = CPUArchConverter.class)
+    private CPU.CPUArch arch;
+
     @Column(name = "template_id", updatable = true, nullable = true, length = 17)
     private long templateId;
 
@@ -376,6 +383,10 @@ public Hypervisor.HypervisorType getHypervisorType() {
         return hypervisorType;
     }
 
+    public CPU.CPUArch getArch() {
+        return arch;
+    }
+
     public Long getClusterId() {
         return clusterId;
     }
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -44,7 +44,6 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.cpu.CPU;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
@@ -674,6 +673,7 @@
 import com.cloud.configuration.ConfigurationManagerImpl;
 import com.cloud.consoleproxy.ConsoleProxyManagementState;
 import com.cloud.consoleproxy.ConsoleProxyManager;
+import com.cloud.cpu.CPU;
 import com.cloud.dc.AccountVlanMapVO;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenterVO;
@@ -1274,7 +1274,7 @@ public Pair<List<? extends Cluster>, Integer> searchForClusters(final ListCluste
         final Object clusterType = cmd.getClusterType();
         final Object allocationState = cmd.getAllocationState();
         final String keyword = cmd.getKeyword();
-        final String arch = cmd.getArch();
+        final CPU.CPUArch arch = cmd.getArch();
         zoneId = _accountMgr.checkAccessAndSpecifyAuthority(CallContext.current().getCallingAccount(), zoneId);
 
         final Filter searchFilter = new Filter(ClusterVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
@@ -1327,7 +1327,7 @@ public Pair<List<? extends Cluster>, Integer> searchForClusters(final ListCluste
             sc.addAnd("name", SearchCriteria.Op.SC, ssc);
         }
 
-        if (StringUtils.isNotBlank(arch)) {
+        if (arch != null) {
             sc.setParameters("arch", arch);
         }
 
@@ -4193,6 +4193,7 @@ public Pair<List<? extends VirtualMachine>, Integer> searchForSystemVm(final Lis
         final Long podId = cmd.getPodId();
         final Long hostId = cmd.getHostId();
         final Long storageId = cmd.getStorageId();
+        final CPU.CPUArch arch = cmd.getArch();
 
         final Filter searchFilter = new Filter(VMInstanceVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
         final SearchBuilder<VMInstanceVO> sb = _vmInstanceDao.createSearchBuilder();
@@ -4219,6 +4220,13 @@ public Pair<List<? extends VirtualMachine>, Integer> searchForSystemVm(final Lis
             }
         }
 
+        boolean templateJoinNeeded = arch != null;
+        if (templateJoinNeeded) {
+            SearchBuilder<VMTemplateVO> templateSearch = templateDao.createSearchBuilder();
+            templateSearch.and("templateArch", templateSearch.entity().getArch(), SearchCriteria.Op.EQ);
+            sb.join("vmTemplate", templateSearch, templateSearch.entity().getId(), sb.entity().getTemplateId(), JoinBuilder.JoinType.INNER);
+        }
+
         final SearchCriteria<VMInstanceVO> sc = sb.create();
 
         if (keyword != null) {
@@ -4266,6 +4274,10 @@ public Pair<List<? extends VirtualMachine>, Integer> searchForSystemVm(final Lis
             }
         }
 
+        if (arch != null) {
+            sc.setJoinParameters("vmTemplate", "templateArch", arch);
+        }
+
         final Pair<List<VMInstanceVO>, Integer> result = _vmInstanceDao.searchAndCount(sc, searchFilter);
         return new Pair<>(result.first(), result.second());
     }
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
@@ -27,7 +27,7 @@
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.20.1.0-SNAPSHOT"
+VERSION = "4.20.1.0"
 
 setup(name="Marvin",
       version=VERSION,
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
@@ -81,7 +81,7 @@ export default {
       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',
+          'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'arch', 'boottype', 'bootmode', 'account',
           'domain', 'zonename', 'userdataid', 'userdataname', 'userdataparams', 'userdatadetails', 'userdatapolicy',
           'hostcontrolstate', 'deleteprotection']
         const listZoneHaveSGEnabled = store.getters.zones.filter(zone => zone.securitygroupsenabled === true)
diff --git a/ui/src/config/section/infra/routers.js b/ui/src/config/section/infra/routers.js
diff --git a/ui/src/config/section/infra/systemVms.js b/ui/src/config/section/infra/systemVms.js

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,10 @@ public class DomainRouterResponse extends BaseResponseWithAnnotations implements`
`245`	`245`	`@Param(description = "the version of the code / software in the router")`
`246`	`246`	`private String softwareVersion;`
`247`	`247`
	`248`	`+ @SerializedName(ApiConstants.ARCH)`
	`249`	`+ @Param(description = "CPU arch of the router", since = "4.20.1")`
	`250`	`+ private String arch;`
	`251`	`+`
`248`	`252`	`public DomainRouterResponse() {`
`249`	`253`	`nics = new LinkedHashSet<NicResponse>();`
`250`	`254`	`}`
`@@ -518,4 +522,8 @@ public String getSoftwareVersion() {`
`518`	`522`	`public void setSoftwareVersion(String softwareVersion) {`
`519`	`523`	`this.softwareVersion = softwareVersion;`
`520`	`524`	`}`
	`525`	`+`
	`526`	`+ public void setArch(String arch) {`
	`527`	`+ this.arch = arch;`
	`528`	`+ }`
`521`	`529`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1718,6 +1718,7 @@ public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {`
`1718`	`1718`	`if (template != null) {`
`1719`	`1719`	`vmResponse.setTemplateId(template.getUuid());`
`1720`	`1720`	`vmResponse.setTemplateName(template.getName());`
	`1721`	`+ vmResponse.setArch(template.getArch().getType());`
`1721`	`1722`	`}`
`1722`	`1723`	`vmResponse.setCreated(vm.getCreated());`
`1723`	`1724`	`vmResponse.setHypervisor(vm.getHypervisorType().getHypervisorDisplayName());`
Original file line number	Diff line number	Diff line change
`@@ -1298,7 +1298,7 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {`
`1298`	`1298`	`Long userId = cmd.getUserId();`
`1299`	`1299`	`Long userdataId = cmd.getUserdataId();`
`1300`	`1300`	`Map<String, String> tags = cmd.getTags();`
`1301`		`- final String arch = cmd.getArch();`
	`1301`	`+ final CPU.CPUArch arch = cmd.getArch();`
`1302`	`1302`
`1303`	`1303`	`boolean isAdmin = false;`
`1304`	`1304`	`boolean isRootAdmin = false;`
`@@ -1526,7 +1526,7 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {`
`1526`	`1526`	`}`
`1527`	`1527`
`1528`	`1528`	`Boolean isVnf = cmd.getVnf();`
`1529`		`- boolean templateJoinNeeded = isVnf != null \|\| StringUtils.isNoneBlank(arch);`
	`1529`	`+ boolean templateJoinNeeded = isVnf != null \|\| arch != null;`
`1530`	`1530`	`if (templateJoinNeeded) {`
`1531`	`1531`	`SearchBuilder<VMTemplateVO> templateSearch = _templateDao.createSearchBuilder();`
`1532`	`1532`	`templateSearch.and("templateArch", templateSearch.entity().getArch(), Op.EQ);`
`@@ -1658,7 +1658,7 @@ private Pair<List<Long>, Integer> searchForUserVMIdsAndCount(ListVMsCmd cmd) {`
`1658`	`1658`	`userVmSearchCriteria.setJoinParameters("vmTemplate", "templateTypeNEQ", TemplateType.VNF);`
`1659`	`1659`	`}`
`1660`	`1660`	`}`
`1661`		`- if (StringUtils.isNotBlank(arch)) {`
	`1661`	`+ if (arch != null) {`
`1662`	`1662`	`userVmSearchCriteria.setJoinParameters("vmTemplate", "templateArch", arch);`
`1663`	`1663`	`}`
`1664`	`1664`
`@@ -2361,7 +2361,7 @@ public Pair<List<Long>, Integer> searchForServerIdsAndCount(ListHostsCmd cmd) {`
`2361`	`2361`	`Long startIndex = cmd.getStartIndex();`
`2362`	`2362`	`Long pageSize = cmd.getPageSizeVal();`
`2363`	`2363`	`Hypervisor.HypervisorType hypervisorType = cmd.getHypervisor();`
`2364`		`- String arch = cmd.getArch();`
	`2364`	`+ final CPU.CPUArch arch = cmd.getArch();`
`2365`	`2365`
`2366`	`2366`	`Filter searchFilter = new Filter(HostVO.class, "id", Boolean.TRUE, startIndex, pageSize);`
`2367`	`2367`
`@@ -2458,7 +2458,7 @@ public Pair<List<Long>, Integer> searchForServerIdsAndCount(ListHostsCmd cmd) {`
`2458`	`2458`	`sc.setParameters("hypervisor_type", hypervisorType);`
`2459`	`2459`	`}`
`2460`	`2460`
`2461`		`- if (StringUtils.isNotBlank(arch)) {`
	`2461`	`+ if (arch != null) {`
`2462`	`2462`	`sc.setParameters("arch", arch);`
`2463`	`2463`	`}`
`2464`	`2464`