From b526affe01e0daa8ba77f25696af5880c53857aa Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Thu, 2 Aug 2012 15:53:31 -0700
Subject: [PATCH] Revert "CS-15398: Fix for dns issue in multiple pods"

This reverts commit dd4e19c16f159282fa7907c89a9ab3d409713bc9.
---
 .../router/VirtualNetworkApplianceManagerImpl.java     |  2 +-
 server/src/com/cloud/vm/dao/NicDao.java                |  2 +-
 server/src/com/cloud/vm/dao/NicDaoImpl.java            | 10 ----------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 15ce1e98f4f..2d36e751a31 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2375,7 +2375,7 @@ VirtualMachineGuru<DomainRouterVO>, Listener {
         }
 
         //find domR's nic in the network
-        NicVO domrDefaultNic = _nicDao.findByNetworkIdTypeAndGateway(defaultNic.getNetworkId(), VirtualMachine.Type.DomainRouter, defaultNic.getGateway());
+        NicVO domrDefaultNic = _nicDao.findByNetworkIdAndType(defaultNic.getNetworkId(), VirtualMachine.Type.DomainRouter);
         return domrDefaultNic.getIp4Address();
     }
 
diff --git a/server/src/com/cloud/vm/dao/NicDao.java b/server/src/com/cloud/vm/dao/NicDao.java
index 21cdf3d7e6c..6b8ea3069ac 100644
--- a/server/src/com/cloud/vm/dao/NicDao.java
+++ b/server/src/com/cloud/vm/dao/NicDao.java
@@ -33,8 +33,8 @@ public interface NicDao extends GenericDao<NicVO, Long> {
     void removeNicsForInstance(long instanceId);
     
     NicVO findByNetworkIdAndType(long networkId, VirtualMachine.Type vmType);
+    
     NicVO findByIp4AddressAndNetworkId(String ip4Address, long networkId);
-    NicVO findByNetworkIdTypeAndGateway(long networkId, VirtualMachine.Type vmType, String gateway);
     
     NicVO findDefaultNicForVM(long instanceId);
 
diff --git a/server/src/com/cloud/vm/dao/NicDaoImpl.java b/server/src/com/cloud/vm/dao/NicDaoImpl.java
index b78c7986ee6..dd568e555f2 100644
--- a/server/src/com/cloud/vm/dao/NicDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/NicDaoImpl.java
@@ -41,7 +41,6 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("instance", AllFieldsSearch.entity().getInstanceId(), Op.EQ);
         AllFieldsSearch.and("network", AllFieldsSearch.entity().getNetworkId(), Op.EQ);
-        AllFieldsSearch.and("gateway", AllFieldsSearch.entity().getGateway(), Op.EQ);
         AllFieldsSearch.and("vmType", AllFieldsSearch.entity().getVmType(), Op.EQ);
         AllFieldsSearch.and("address", AllFieldsSearch.entity().getIp4Address(), Op.EQ);
         AllFieldsSearch.and("isDefault", AllFieldsSearch.entity().isDefaultNic(), Op.EQ);
@@ -127,15 +126,6 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
         return findOneBy(sc);
     }
     
-    @Override
-    public NicVO findByNetworkIdTypeAndGateway(long networkId, VirtualMachine.Type vmType, String gateway) {
-        SearchCriteria<NicVO> sc = AllFieldsSearch.create();
-        sc.setParameters("network", networkId);
-        sc.setParameters("vmType", vmType);
-        sc.setParameters("gateway", gateway);
-        return findOneBy(sc);
-    }
-    
     @Override
     public NicVO findByIp4AddressAndNetworkId(String ip4Address, long networkId) {
         SearchCriteria<NicVO> sc = AllFieldsSearch.create();