cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/master to 307a35a
Date Mon, 27 Oct 2014 23:47:00 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 4f43839da -> 307a35a61


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/307a35a6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/307a35a6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/307a35a6

Branch: refs/heads/master
Commit: 307a35a618b4e7233368d176ec0e6bbc93aac31b
Parents: 4f43839
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Mon Oct 27 16:46:01 2014 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Mon Oct 27 16:46:01 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/307a35a6/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;
                             }


Mime
View raw message