cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject git commit: refs/heads/master - CLOUDSTACK-1427: Failed to delete Guestnetwork which has LB with Netscaler
Date Wed, 13 Mar 2013 12:00:58 GMT
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 <murali.reddy@citrix.com>
Authored: Wed Mar 13 17:17:12 2013 +0530
Committer: Murali Reddy <murali.reddy@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;
     }
 


Mime
View raw message