From 5d888a44ba97687a42d87eeb35357bb6c5afdb2e Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 25 May 2012 10:17:11 -0700 Subject: [PATCH] CS-15082: changed search criteria for Running vms in Network. Ip4 Address for guest network can be null for nic in Basic zone when vm originally fails to start. Reviewed-by: Frank --- server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java index 5d4be394573..594986c226c 100644 --- a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java +++ b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java @@ -529,7 +529,6 @@ public class VMInstanceDaoImpl extends GenericDaoBase implem NicDao _nicDao = ComponentLocator.getLocator("management-server").getDao(NicDao.class); SearchBuilder nicSearch = _nicDao.createSearchBuilder(); nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ); - nicSearch.and("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL); NetworkTypeSearch = createSearchBuilder(); NetworkTypeSearch.and("types", NetworkTypeSearch.entity().getType(), SearchCriteria.Op.IN);