From b5f33ae0d8fcb0380f76de796013d18501b83423 Mon Sep 17 00:00:00 2001
From: Murali Reddy <muralimmreddy@gmail.com>
Date: Tue, 30 Jul 2013 15:34:04 +0530
Subject: [PATCH] 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.
---
 server/src/com/cloud/network/NetworkManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index f77955e6891..61cff4a6dd9 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;
                 }
             }