Updated Branches: refs/heads/master 9b81c91e3 -> d34b79c97
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. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d34b79c9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d34b79c9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d34b79c9 Branch: refs/heads/master Commit: d34b79c97058c2aeb77e42fdd57e6af77938dd92 Parents: 9b81c91 Author: Alena Prokharchyk <alena.prokharc...@citrix.com> Authored: Wed Sep 18 14:43:42 2013 -0700 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Wed Sep 18 14:43:42 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/network/IpAddressManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d34b79c9/server/src/com/cloud/network/IpAddressManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java index ed5cd1b..805821e 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); } }
