diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 971d409c5d2..0263abd255d 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -3135,6 +3135,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q SearchCriteria cpuSearchCriteria = _srvOfferingJoinDao.createSearchCriteria(); cpuSearchCriteria.addOr("minCpu", Op.NULL); cpuSearchCriteria.addOr("constraints", Op.SC, cpuConstraintSearchCriteria); + cpuSearchCriteria.addOr("minCpu", Op.GTEQ, cpuNumber); sc.addAnd("cpuConstraints", SearchCriteria.Op.SC, cpuSearchCriteria); } @@ -3147,6 +3148,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q SearchCriteria memSearchCriteria = _srvOfferingJoinDao.createSearchCriteria(); memSearchCriteria.addOr("minMemory", Op.NULL); memSearchCriteria.addOr("memconstraints", Op.SC, memoryConstraintSearchCriteria); + memSearchCriteria.addOr("minMemory", Op.GTEQ, memory); sc.addAnd("memoryConstraints", SearchCriteria.Op.SC, memSearchCriteria); } @@ -3154,7 +3156,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q if (cpuSpeed != null) { SearchCriteria cpuSpeedSearchCriteria = _srvOfferingJoinDao.createSearchCriteria(); cpuSpeedSearchCriteria.addOr("speed", Op.NULL); - cpuSpeedSearchCriteria.addOr("speed", Op.EQ, cpuSpeed); + cpuSpeedSearchCriteria.addOr("speed", Op.GTEQ, cpuSpeed); sc.addAnd("cpuspeedconstraints", SearchCriteria.Op.SC, cpuSpeedSearchCriteria); } diff --git a/ui/src/views/compute/wizard/ComputeOfferingSelection.vue b/ui/src/views/compute/wizard/ComputeOfferingSelection.vue index f1a6128872e..af026491aca 100644 --- a/ui/src/views/compute/wizard/ComputeOfferingSelection.vue +++ b/ui/src/views/compute/wizard/ComputeOfferingSelection.vue @@ -157,11 +157,11 @@ export default { (item.iscustomized === true && maxCpuNumber < this.minimumCpunumber))) { disabled = true } - if (disabled === false && this.minimumCpuspeed > 0 && maxCpuSpeed && maxCpuSpeed !== this.minimumCpuspeed) { + if (disabled === false && this.minimumCpuspeed > 0 && maxCpuSpeed && maxCpuSpeed < this.minimumCpuspeed) { disabled = true } if (disabled === false && maxMemory && this.minimumMemory > 0 && - ((item.iscustomized === false && maxMemory !== this.minimumMemory) || + ((item.iscustomized === false && maxMemory < this.minimumMemory) || (item.iscustomized === true && maxMemory < this.minimumMemory))) { disabled = true }