Updated Branches: refs/heads/4.1 48fdbd4ea -> 84fbc7e9a
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/84fbc7e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/84fbc7e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/84fbc7e9 Branch: refs/heads/4.1 Commit: 84fbc7e9a24d379604c56e2723f1fc2f8f8f8cf9 Parents: 48fdbd4 Author: Murali Reddy <[email protected]> Authored: Wed Mar 13 17:17:12 2013 +0530 Committer: David Nalley <[email protected]> Committed: Wed Mar 13 11:50:45 2013 -0400 ---------------------------------------------------------------------- .../cloud/network/element/NetscalerElement.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/84fbc7e9/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; }
