From d34b79c97058c2aeb77e42fdd57e6af77938dd92 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Wed, 18 Sep 2013 14:43:42 -0700
Subject: [PATCH] CLOUDSTACK-4573: fixed resource limit check when acquire
 public IP in VPC - update resource count for VPC public ip even when
 network_id is not set yet.

---
 server/src/com/cloud/network/IpAddressManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index ed5cd1b9f85..805821e4f2f 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -820,7 +820,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
                     addr.getUuid());
             }
             // don't increment resource count for direct and dedicated ip addresses
-            if (addr.getAssociatedWithNetworkId() != null && !isIpDedicated(addr)) {
+            if ((addr.getAssociatedWithNetworkId() != null || addr.getVpcId() != null) && !isIpDedicated(addr)) {
                 _resourceLimitMgr.incrementResourceCount(owner.getId(), ResourceType.public_ip);
             }
         }