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 CC4E410BD3 for ; Sun, 22 Dec 2013 16:59:07 +0000 (UTC) Received: (qmail 78099 invoked by uid 500); 22 Dec 2013 16:59:01 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 77871 invoked by uid 500); 22 Dec 2013 16:59:00 -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 77820 invoked by uid 99); 22 Dec 2013 16:58:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Dec 2013 16:58:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1864B82B8AC; Sun, 22 Dec 2013 16:58:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajeshbattala@apache.org To: commits@cloudstack.apache.org Date: Sun, 22 Dec 2013 16:59:00 -0000 Message-Id: <6a668c366a81438e97a7e585147d10be@git.apache.org> In-Reply-To: <611524b4a94a45c2be150e94b3c07798@git.apache.org> References: <611524b4a94a45c2be150e94b3c07798@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/7] git commit: updated refs/heads/4.3 to 58aaf67 CLOUDSTACK-5340 [Hyper-V] Control IPs are not getting released when VRs are in stopped state Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c5563ad Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c5563ad Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c5563ad Branch: refs/heads/4.3 Commit: 7c5563adb75c8f8ab62861650ef640bc95a97e8f Parents: 0ef953f Author: Rajesh Battala Authored: Sun Dec 22 17:08:42 2013 +0530 Committer: Rajesh Battala Committed: Sun Dec 22 20:24:16 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/guru/ControlNetworkGuru.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c5563ad/server/src/com/cloud/network/guru/ControlNetworkGuru.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java index a5b7c88..26caa61 100755 --- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java @@ -168,8 +168,8 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu @Override public boolean release(NicProfile nic, VirtualMachineProfile vm, String reservationId) { assert nic.getTrafficType() == TrafficType.Control; - - if (vm.getHypervisorType() == HypervisorType.VMware && isRouterVm(vm)) { + HypervisorType hType = vm.getHypervisorType(); + if ( ( (hType == HypervisorType.VMware) || (hType == HypervisorType.Hyperv) )&& isRouterVm(vm)) { long dcId = vm.getVirtualMachine().getDataCenterId(); DataCenterVO dcVo = _dcDao.findById(dcId); if(dcVo.getNetworkType() != NetworkType.Basic) {