Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AB4B6D99F for ; Tue, 16 Oct 2012 23:51:08 +0000 (UTC) Received: (qmail 95855 invoked by uid 500); 16 Oct 2012 23:51:08 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 95833 invoked by uid 500); 16 Oct 2012 23:51:08 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 95826 invoked by uid 99); 16 Oct 2012 23:51:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Oct 2012 23:51:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0DABA47C05; Tue, 16 Oct 2012 23:51:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: CLOUDSTACK-348: decrement resource count when the network gets removed Message-Id: <20121016235108.0DABA47C05@tyr.zones.apache.org> Date: Tue, 16 Oct 2012 23:51:08 +0000 (UTC) Updated Branches: refs/heads/master c762830fb -> a9fab0526 CLOUDSTACK-348: decrement resource count when the network gets removed Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a9fab052 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a9fab052 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a9fab052 Branch: refs/heads/master Commit: a9fab0526b466fffa398c522e876a558554e793e Parents: c762830 Author: Alena Prokharchyk Authored: Tue Oct 16 16:09:49 2012 -0700 Committer: Alena Prokharchyk Committed: Tue Oct 16 16:18:36 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a9fab052/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 cf5b6e3..2eff189 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2726,8 +2726,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag s_logger.warn("Only guest networks can be created using this method"); return null; } - - boolean updateResourceCount = (!ntwkOff.getSpecifyVlan() && aclType == ACLType.Account); + + boolean updateResourceCount = resourceCountNeedsUpdate(ntwkOff, aclType); //check resource limits if (updateResourceCount) { _resourceLimitMgr.checkResourceLimit(owner, ResourceType.network); @@ -3587,6 +3587,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag network.setState(Network.State.Destroy); _networksDao.update(network.getId(), network); _networksDao.remove(network.getId()); + + NetworkOffering ntwkOff = _configMgr.getNetworkOffering(network.getNetworkOfferingId()); + boolean updateResourceCount = resourceCountNeedsUpdate(ntwkOff, network.getAclType()); + if (updateResourceCount) { + _resourceLimitMgr.decrementResourceCount(owner.getId(), ResourceType.network); + } txn.commit(); } } @@ -3594,6 +3600,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag return success; } + private boolean resourceCountNeedsUpdate(NetworkOffering ntwkOff, ACLType aclType) { + boolean updateResourceCount = (!ntwkOff.getSpecifyVlan() && aclType == ACLType.Account); + return updateResourceCount; + } + protected boolean deleteVlansInNetwork(long networkId, long userId, Account callerAccount) { //cleanup Public vlans