From 2feda05ecd15d7fe63bd986868de2844340acec6 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Wed, 13 Mar 2013 17:17:12 +0530 Subject: [PATCH] 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) --- .../src/com/cloud/network/element/NetscalerElement.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 8f902df703f..c1c735aa270 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; }