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

bug 10435: use "hostName" instead of "name" as a search filed in listSystemVms 

status 10435: resolved fixed
This commit is contained in:
alena 2011-09-14 10:45:57 -07:00
parent b7f45cfbd6
commit 5f9246114b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3939,7 +3939,7 @@ public class ManagementServerImpl implements ManagementServer {
SearchBuilder<VMInstanceVO> sb = _vmInstanceDao.createSearchBuilder();
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("name", sb.entity().getHostName(), SearchCriteria.Op.LIKE);
sb.and("hostName", sb.entity().getHostName(), SearchCriteria.Op.LIKE);
sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
sb.and("dataCenterId", sb.entity().getDataCenterIdToDeployIn(), SearchCriteria.Op.EQ);
sb.and("podId", sb.entity().getPodIdToDeployIn(), SearchCriteria.Op.EQ);
@ -3951,10 +3951,10 @@ public class ManagementServerImpl implements ManagementServer {
if (keyword != null) {
SearchCriteria<VMInstanceVO> ssc = _vmInstanceDao.createSearchCriteria();
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("hostName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("state", SearchCriteria.Op.LIKE, "%" + keyword + "%");
sc.addAnd("name", SearchCriteria.Op.SC, ssc);
sc.addAnd("hostName", SearchCriteria.Op.SC, ssc);
}
if (id != null) {
@ -3962,7 +3962,7 @@ public class ManagementServerImpl implements ManagementServer {
}
if (name != null) {
sc.setParameters("name", name);
sc.setParameters("hostName", name);
}
if (state != null) {
sc.setParameters("state", state);