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 229679D04 for ; Wed, 13 Mar 2013 12:01:06 +0000 (UTC) Received: (qmail 58551 invoked by uid 500); 13 Mar 2013 12:01:06 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 55268 invoked by uid 500); 13 Mar 2013 12:00:59 -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 55245 invoked by uid 99); 13 Mar 2013 12:00:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Mar 2013 12:00:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8CE21DA03; Wed, 13 Mar 2013 12:00:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: refs/heads/master - CLOUDSTACK-1427: Failed to delete Guestnetwork which has LB with Netscaler Message-Id: <20130313120058.8CE21DA03@tyr.zones.apache.org> Date: Wed, 13 Mar 2013 12:00:58 +0000 (UTC) Updated Branches: refs/heads/master b4bab5a15 -> 2feda05ec CLOUDSTACK-1427: Failed to delete Guestnetwork which has LB with Netscaler There is no need for getIpDeployer to depend on the fact a NetScaler device is allocated (network is implemented state) or not-allocated (network is in shutdown state) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2feda05e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2feda05e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2feda05e Branch: refs/heads/master Commit: 2feda05ecd15d7fe63bd986868de2844340acec6 Parents: b4bab5a Author: Murali Reddy Authored: Wed Mar 13 17:17:12 2013 +0530 Committer: Murali Reddy Committed: Wed Mar 13 17:30:15 2013 +0530 ---------------------------------------------------------------------- .../cloud/network/element/NetscalerElement.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2feda05e/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 8f902df..c1c735a 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -638,14 +638,11 @@ StaticNatServiceProvider { @Override public IpDeployer getIpDeployer(Network network) { - ExternalLoadBalancerDeviceVO lbDevice = getExternalLoadBalancerForNetwork(network); - if (lbDevice == null) { - s_logger.error("Cannot find external load balanacer for network " + network.getName()); - return null; - } + if (_networkMgr.isNetworkInlineMode(network)) { return getIpDeployerForInlineMode(network); } + return this; }