diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 879e74da271..615e207d1a4 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -2508,7 +2508,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sdc.addOr("accountId", SearchCriteria.Op.EQ, account.getId()); sdc.addOr("accountId", SearchCriteria.Op.NULL); - sc.addAnd("account", SearchCriteria.Op.SC, sdc); + sc.addAnd("accountId", SearchCriteria.Op.SC, sdc); } } else if (account.getType() == Account.ACCOUNT_TYPE_NORMAL) { @@ -2537,7 +2537,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { SearchCriteria sdc = _dcJoinDao.createSearchCriteria(); sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); sdc.addOr("domainId", SearchCriteria.Op.NULL); - sc.addAnd("domain", SearchCriteria.Op.SC, sdc); + sc.addAnd("domainId", SearchCriteria.Op.SC, sdc); // remove disabled zones sc.addAnd("allocationState", SearchCriteria.Op.NEQ, Grouping.AllocationState.Disabled); @@ -2548,7 +2548,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sdc2.addOr("accountId", SearchCriteria.Op.EQ, account.getId()); sdc2.addOr("accountId", SearchCriteria.Op.NULL); - sc.addAnd("account", SearchCriteria.Op.SC, sdc2); + sc.addAnd("accountId", SearchCriteria.Op.SC, sdc2); // remove Dedicated zones not dedicated to this domainId or // subdomainId @@ -2588,7 +2588,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { SearchCriteria sdc = _dcJoinDao.createSearchCriteria(); sdc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); sdc.addOr("domainId", SearchCriteria.Op.NULL); - sc.addAnd("domain", SearchCriteria.Op.SC, sdc); + sc.addAnd("domainId", SearchCriteria.Op.SC, sdc); // remove disabled zones sc.addAnd("allocationState", SearchCriteria.Op.NEQ, Grouping.AllocationState.Disabled); @@ -2617,7 +2617,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (dcIds.size() == 0) { return new Pair, Integer>(new ArrayList(), 0); } else { - sc.addAnd("idIn", SearchCriteria.Op.IN, dcIds.toArray()); + sc.addAnd("id", SearchCriteria.Op.IN, dcIds.toArray()); } }