You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/03/13 18:13:56 UTC
[34/35] git commit: refs/heads/ui-multiple-nics - CLOUDSTACK-1427:
Failed to delete Guestnetwork which has LB with Netscaler
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/ui-multiple-nics
Commit: 2feda05ecd15d7fe63bd986868de2844340acec6
Parents: b4bab5a
Author: Murali Reddy <mu...@citrix.com>
Authored: Wed Mar 13 17:17:12 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
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;
}