apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

[VMware] Fix service offerings listing on appliances deployment options (#5752)

Browse Source 
* Fix list service offerings for VMware deployment options

* UI fix to allow selecting offerings
This commit is contained in:
Nicolas Vazquez 2021-12-30 07:43:41 -03:00 committed by GitHub
parent dcdcd09058
commit c0ddda361a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View File

@ -3135,6 +3135,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
SearchCriteria<ServiceOfferingJoinVO> 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<ServiceOfferingJoinVO> 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<ServiceOfferingJoinVO> 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);
}

4
ui/src/views/compute/wizard/ComputeOfferingSelection.vue
View File

@ -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
}