From 458de9321d5399fe073ac7c6568c9c1896c349aa Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelveny@gmail.com>
Date: Wed, 31 Jul 2013 17:58:15 -0700
Subject: [PATCH] More fixes found in test cases when JVM assertion check is
 turned on

---
 engine/schema/src/com/cloud/host/dao/HostDaoImpl.java | 2 +-
 engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
index 41ee7a7a2dd..b373737ee2b 100755
--- a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
@@ -396,7 +396,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
     @Override
     public List<HostVO> listByDataCenterId(long id) {
         SearchCriteria<HostVO> sc = DcSearch.create();
-        sc.setParameters("dcId", id);
+        sc.setParameters("dc", id);
         sc.setParameters("status", Status.Up);
         sc.setParameters("type", Host.Type.Routing);
         sc.setParameters("resourceState", ResourceState.Enabled);
diff --git a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
index 8e9f7fab047..a7b7625e39c 100644
--- a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
@@ -66,6 +66,7 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
         AllFieldsSearch.and("broadcastUri", AllFieldsSearch.entity().getBroadcastUri(), Op.EQ);
         AllFieldsSearch.and("secondaryip", AllFieldsSearch.entity().getSecondaryIp(), Op.EQ);
         AllFieldsSearch.and("nicid", AllFieldsSearch.entity().getId(), Op.EQ);
+        AllFieldsSearch.and("strategy", AllFieldsSearch.entity().getReservationStrategy(), Op.EQ);
         AllFieldsSearch.done();
 
         IpSearch = createSearchBuilder(String.class);