From 307a35a618b4e7233368d176ec0e6bbc93aac31b Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Mon, 27 Oct 2014 16:46:01 -0700 Subject: [PATCH] CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone In basic network, the correct network id associate with IP is source network id rather than network id. --- server/src/com/cloud/network/NetworkModelImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index a838efb67bd..1dc81bd945b 100755 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -2165,7 +2165,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { List vlans = _vlanDao.listVlansForPod(podId); for (Vlan vlan : vlans) { if (nic.getIp4Address() != null) { - IpAddress ip = _ipAddressDao.findByIpAndNetworkId(network.getId(), nic.getIp4Address()); + IpAddress ip = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), nic.getIp4Address()); if (ip != null && ip.getVlanId() == vlan.getId()) { return nic; }