diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDao.java b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDao.java index 7f1ec4d40da..e5843b69499 100644 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDao.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDao.java @@ -43,6 +43,8 @@ public interface DataCenterIpAddressDao extends GenericDao AllFieldsSearch; private final GenericSearchBuilder AllIpCount; private final GenericSearchBuilder AllAllocatedIpCount; + private final GenericSearchBuilder AllAllocatedIpCountForDc; @Override @DB @@ -221,6 +222,20 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase sc; + if (onlyCountAllocated) { + sc = AllAllocatedIpCountForDc.create(); + } else { + sc = AllIpCount.create(); + } + + sc.setParameters("data_center_id", dcId); + List count = customSearch(sc, null); + return count.get(0); + } + public DataCenterIpAddressDaoImpl() { super(); @@ -244,5 +259,11 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase