etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10848: Change function signatures to accept capacity type as an object..

This commit is contained in:
Nitin 2011-10-12 16:07:00 +05:30
parent b050120303
commit 823b80a92e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/capacity/dao/CapacityDao.java
View File

@ -28,7 +28,7 @@ public interface CapacityDao extends GenericDao<CapacityVO, Long> {
CapacityVO findByHostIdType(Long hostId, short capacityType);
List<Long> listClustersInZoneOrPodByHostCapacities(long id, int requiredCpu, long requiredRam, short capacityTypeForOrdering, boolean isZone, float cpuOverprovisioningFactor);
List<Long> listHostsWithEnoughCapacity(int requiredCpu, long requiredRam, Long clusterId, String hostType, float cpuOverprovisioningFactor);
List<SummedCapacity> findCapacityByType(short capacityType, Long zoneId, Long podId,
List<SummedCapacity> findCapacityByType(Integer capacityType, Long zoneId, Long podId,
Long clusterId, Long startIndex, Long pageSize);
boolean removeBy(Short capacityType, Long zoneId, Long podId, Long clusterId);
List<SummedCapacity> findByClusterPodZone(Long zoneId, Long podId, Long clusterId);

13
server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
View File

@ -94,7 +94,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
}
@Override
public List<SummedCapacity> findCapacityByType(short capacityType, Long zoneId, Long podId, Long clusterId, Long startIndex, Long pageSize){
public List<SummedCapacity> findCapacityByType(Integer capacityType, Long zoneId, Long podId, Long clusterId, Long startIndex, Long pageSize){
SummedCapacitySearch = createSearchBuilder(SummedCapacity.class);
SummedCapacitySearch.select("sumUsed", Func.SUM, SummedCapacitySearch.entity().getUsedCapacity());
@ -103,8 +103,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
SummedCapacitySearch.select("podId", Func.NATIVE, SummedCapacitySearch.entity().getPodId());
SummedCapacitySearch.and("dcId", SummedCapacitySearch.entity().getDataCenterId(), Op.EQ);
SummedCapacitySearch.and("capacityType", SummedCapacitySearch.entity().getCapacityType(), Op.EQ);
SummedCapacitySearch.groupBy(SummedCapacitySearch.entity().getClusterId());
SummedCapacitySearch.groupBy(SummedCapacitySearch.entity().getClusterId(), SummedCapacitySearch.entity().getCapacityType());
if (podId != null){
SummedCapacitySearch.and("podId", SummedCapacitySearch.entity().getPodId(), Op.EQ);
@ -112,18 +111,24 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements
if (clusterId != null){
SummedCapacitySearch.and("clusterId", SummedCapacitySearch.entity().getClusterId(), Op.EQ);
}
if (capacityType != null){
SummedCapacitySearch.and("capacityType", SummedCapacitySearch.entity().getCapacityType(), Op.EQ);
}
SummedCapacitySearch.done();
SearchCriteria<SummedCapacity> sc = SummedCapacitySearch.create();
sc.setParameters("dcId", zoneId);
sc.setParameters("capacityType", capacityType);
if (podId != null){
sc.setParameters("podId", podId);
}
if (clusterId != null){
sc.setParameters("clusterId", clusterId);
}
if (capacityType != null){
sc.setParameters("capacityType", capacityType);
}
Filter filter = new Filter(CapacityVO.class, null, true, startIndex, pageSize);
List<SummedCapacity> results = customSearchIncludingRemoved(sc, filter);

2
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -2465,7 +2465,7 @@ public class ManagementServerImpl implements ManagementServer {
@Override
public List<CapacityVO> listCapacityByType(ListCapacityByTypeCmd cmd) {
List<SummedCapacity> results = _capacityDao.findCapacityByType(cmd.getType().shortValue(), cmd.getZoneId(), cmd.getPodId(), cmd.getClusterId(), cmd.getStartIndex(), cmd.getPageSizeVal());
List<SummedCapacity> results = _capacityDao.findCapacityByType(cmd.getType(), cmd.getZoneId(), cmd.getPodId(), cmd.getClusterId(), cmd.getStartIndex(), cmd.getPageSizeVal());
for (SummedCapacity sum : results){
s_logger.info("Total - " +sum.sumTotal+ " Used - " +sum.sumUsed+ " cluster " +sum.clusterId+ " pod " +sum.podId);
}