From 5f9246114b8fd9703ba85b61269a7dcb4ea6cf6e Mon Sep 17 00:00:00 2001 From: alena Date: Wed, 14 Sep 2011 10:45:57 -0700 Subject: [PATCH] bug 10435: use "hostName" instead of "name" as a search filed in listSystemVms status 10435: resolved fixed --- server/src/com/cloud/server/ManagementServerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index b9f681daf34..bb562f0dece 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -3939,7 +3939,7 @@ public class ManagementServerImpl implements ManagementServer { SearchBuilder 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 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);