apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Alena Prokharchyk 2013-09-18 14:43:42 -07:00
parent 9b81c91e31
commit d34b79c970
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/network/IpAddressManagerImpl.java
View File

@ -820,7 +820,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
addr.getUuid()); addr.getUuid());
} }
// don't increment resource count for direct and dedicated ip addresses // 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); _resourceLimitMgr.incrementResourceCount(owner.getId(), ResourceType.public_ip);
} }
} }