Repository: cloudstack Updated Branches: refs/heads/4.5 1b535e20e -> dd7026b20
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. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd7026b2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd7026b2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd7026b2 Branch: refs/heads/4.5 Commit: dd7026b20e83ab55b4a25e90595b47f64456a389 Parents: 1b535e2 Author: Sheng Yang <[email protected]> Authored: Mon Oct 27 16:46:01 2014 -0700 Committer: Sheng Yang <[email protected]> Committed: Mon Oct 27 16:49:30 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkModelImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd7026b2/server/src/com/cloud/network/NetworkModelImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index a838efb..1dc81bd 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<? extends Vlan> 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; }
