Repository: cloudstack Updated Branches: refs/heads/master 4b4fb1ac9 -> 57e66ddaa
CLOUDSTACK-6853: Search for non-removed nics only when check if the running vm belongs to a certain network Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ed9b474 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ed9b474 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ed9b474 Branch: refs/heads/master Commit: 2ed9b474d8ffb9380e4b66d6c2bf83d6feb18092 Parents: 4b4fb1a Author: Alena Prokharchyk <[email protected]> Authored: Thu Jun 5 17:07:52 2014 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Thu Jun 5 17:09:32 2014 -0700 ---------------------------------------------------------------------- engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ed9b474/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java index c49aeca..f35135f 100755 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -301,6 +301,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use if (UserVmSearch == null) { SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder(); nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ); + nicSearch.and("removed", nicSearch.entity().getRemoved(), SearchCriteria.Op.NULL); nicSearch.and().op("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL); nicSearch.or("ip6Address", nicSearch.entity().getIp6Address(), SearchCriteria.Op.NNULL); nicSearch.cp();
