Updated Branches: refs/heads/4.2 c93c321b3 -> b5f33ae0d
CLOUDSTACK-2991: [PortableIPRange] CS should not allow portable IP with sourceNAT service on it if a portable ip is first IP associated with a non-VPC network, then its being considered as source nat IP. This fix adds exemption for portable IP not to be considred for source nat. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b5f33ae0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b5f33ae0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b5f33ae0 Branch: refs/heads/4.2 Commit: b5f33ae0d8fcb0380f76de796013d18501b83423 Parents: c93c321 Author: Murali Reddy <[email protected]> Authored: Tue Jul 30 15:34:04 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Tue Jul 30 15:34:04 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5f33ae0/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index f77955e..61cff4a 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -954,7 +954,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L boolean isSourceNat = false; if (!sharedSourceNat) { if (getExistingSourceNatInNetwork(owner.getId(), networkId) == null) { - if (network.getGuestType() == GuestType.Isolated && network.getVpcId() == null) { + if (network.getGuestType() == GuestType.Isolated && network.getVpcId() == null && + !ipToAssoc.isPortable()) { isSourceNat = true; } }
