From f64a52a3f99e99cf03a378731b6df0026771af0b Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 2 Aug 2012 18:49:18 +0530 Subject: [PATCH] bug CS-15654 Restarting guest network fails with exception in basic zone when NetScaler is providing EIP and ELB services, NetscalerElement should have no action to take on implement and shutdown of the network --- .../com/cloud/network/element/NetscalerElement.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/src/com/cloud/network/element/NetscalerElement.java b/server/src/com/cloud/network/element/NetscalerElement.java index eb4f39530bf..63d9b654189 100644 --- a/server/src/com/cloud/network/element/NetscalerElement.java +++ b/server/src/com/cloud/network/element/NetscalerElement.java @@ -161,6 +161,11 @@ StaticNatServiceProvider { return false; } + if (isBasicZoneNetwok(guestConfig)) { + // in basic zone there is nothing to be implemented/shutdown on the NetScaler appliance + return true; + } + try { return manageGuestNetworkWithExternalLoadBalancer(true, guestConfig); } catch (InsufficientCapacityException capacityException) { @@ -185,6 +190,11 @@ StaticNatServiceProvider { return false; } + if (isBasicZoneNetwok(guestConfig)) { + // in basic zone there is nothing to be implemented/shutdown on the NetScaler appliance + return true; + } + try { return manageGuestNetworkWithExternalLoadBalancer(false, guestConfig); } catch (InsufficientCapacityException capacityException) {