You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2012/08/22 13:19:00 UTC
git commit: Fix for dns issue in multiple pods Signed-off-by:
Abhinandan Prateek
Updated Branches:
refs/heads/master eb4e09ec5 -> a5248f1cf
Fix for dns issue in multiple pods
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a5248f1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a5248f1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a5248f1c
Branch: refs/heads/master
Commit: a5248f1cfc20faab30c6a6b02f55d9b697ffbe1d
Parents: eb4e09e
Author: Jayapal <ja...@citrix.com>
Authored: Wed Aug 22 16:45:23 2012 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Wed Aug 22 16:48:41 2012 +0530
----------------------------------------------------------------------
.../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, 13 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5248f1c/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 730ce28..5528f79 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2414,7 +2414,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
}
//find domR's nic in the network
- NicVO domrDefaultNic = _nicDao.findByNetworkIdAndType(defaultNic.getNetworkId(), VirtualMachine.Type.DomainRouter);
+ NicVO domrDefaultNic = _nicDao.findByNetworkIdTypeAndGateway(defaultNic.getNetworkId(), VirtualMachine.Type.DomainRouter, defaultNic.getGateway());
return domrDefaultNic.getIp4Address();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5248f1c/server/src/com/cloud/vm/dao/NicDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/dao/NicDao.java b/server/src/com/cloud/vm/dao/NicDao.java
index 53ece75..762048b 100644
--- a/server/src/com/cloud/vm/dao/NicDao.java
+++ b/server/src/com/cloud/vm/dao/NicDao.java
@@ -33,6 +33,8 @@ public interface NicDao extends GenericDao<NicVO, Long> {
NicVO findByInstanceIdAndNetworkId(long networkId, long instanceId);
NicVO findByInstanceIdAndNetworkIdIncludingRemoved(long networkId, long instanceId);
+
+ NicVO findByNetworkIdTypeAndGateway(long networkId, VirtualMachine.Type vmType, String gateway);
void removeNicsForInstance(long instanceId);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5248f1c/server/src/com/cloud/vm/dao/NicDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/dao/NicDaoImpl.java b/server/src/com/cloud/vm/dao/NicDaoImpl.java
index 30f8855..3cd7fa6 100644
--- a/server/src/com/cloud/vm/dao/NicDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/NicDaoImpl.java
@@ -45,6 +45,7 @@ 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);
@@ -131,6 +132,15 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
}
@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();
sc.setParameters("address", ip4Address);