diff --git a/server/src/com/cloud/user/dao/AccountDao.java b/server/src/com/cloud/user/dao/AccountDao.java index 895b74ba94c..c2a5ca7cbe0 100644 --- a/server/src/com/cloud/user/dao/AccountDao.java +++ b/server/src/com/cloud/user/dao/AccountDao.java @@ -39,5 +39,6 @@ public interface AccountDao extends GenericDao { List findNewAccounts(Long minAccountId, Filter filter); List findCleanups(); List findAdminAccountsForDomain(Long domainId); - void markForCleanup(long accountId); + void markForCleanup(long accountId); + List listAccounts(String accountName, Long domainId); } diff --git a/server/src/com/cloud/user/dao/AccountDaoImpl.java b/server/src/com/cloud/user/dao/AccountDaoImpl.java index ab8b3c33683..f3cb174c93b 100644 --- a/server/src/com/cloud/user/dao/AccountDaoImpl.java +++ b/server/src/com/cloud/user/dao/AccountDaoImpl.java @@ -129,6 +129,13 @@ public class AccountDaoImpl extends GenericDaoBase implements A SearchCriteria sc = AccountNameSearch.create("accountName", accountName); sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId); return findOneIncludingRemovedBy(sc); + } + + @Override + public List listAccounts(String accountName, Long domainId) { + SearchCriteria sc = AccountNameSearch.create("accountName", accountName); + sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId); + return listIncludingRemovedBy(sc); } @Override