Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0338311303 for ; Fri, 13 Jun 2014 11:35:52 +0000 (UTC) Received: (qmail 92198 invoked by uid 500); 13 Jun 2014 11:35:51 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 92170 invoked by uid 500); 13 Jun 2014 11:35:51 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 92163 invoked by uid 99); 13 Jun 2014 11:35:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jun 2014 11:35:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9205A932ECC; Fri, 13 Jun 2014 11:35:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Message-Id: <6c1115d52a084ce6b6d772037e8db4fb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 515ef0d Date: Fri, 13 Jun 2014 11:35:51 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master cdb3dc97b -> 515ef0de4 CLOUDSTACK-6832: [OVS]vnet is not released even the network is deleted fix ensures allocated VNET is released during network shutdown Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/515ef0de Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/515ef0de Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/515ef0de Branch: refs/heads/master Commit: 515ef0de4f0d08eb70c1411160606a0822859463 Parents: cdb3dc9 Author: Murali Reddy Authored: Fri Jun 13 17:03:28 2014 +0530 Committer: Murali Reddy Committed: Fri Jun 13 17:05:44 2014 +0530 ---------------------------------------------------------------------- .../ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/515ef0de/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java index de74108..3ca25f7 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java @@ -189,7 +189,12 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru { return; } - super.shutdown(profile, offering); + if (profile.getBroadcastDomainType() == BroadcastDomainType.Vswitch ) { + s_logger.debug("Releasing vnet for the network id=" + profile.getId()); + _dcDao.releaseVnet(BroadcastDomainType.getValue(profile.getBroadcastUri()), profile.getDataCenterId(), profile.getPhysicalNetworkId(), + profile.getAccountId(), profile.getReservationId()); + } + profile.setBroadcastUri(null); } @Override