From b9a6e60ea996fe651d74d19b21db3de080f94cdc Mon Sep 17 00:00:00 2001
From: Murali Reddy <Murali.Reddy@citrix.com>
Date: Mon, 20 Aug 2012 19:39:17 +0530
Subject: [PATCH] bug CS-16068: Restart Guestnetwork which has netscaler failed

On restart network with out clean-up option, no need to re-implement the network on then backend NetScaler device.
---
 ...ExternalLoadBalancerDeviceManagerImpl.java | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
index fc0d56819d9..63331055f45 100644
--- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
@@ -902,11 +902,17 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
         HostVO externalLoadBalancer = null;
 
         if (add) {
-            ExternalLoadBalancerDeviceVO lbDeviceVO = allocateLoadBalancerForNetwork(guestConfig);
-            if (lbDeviceVO == null) {
-                String msg = "failed to alloacate a external load balancer for the network " + guestConfig.getId();
-                s_logger.error(msg);
-                throw new InsufficientNetworkCapacityException(msg, DataCenter.class, guestConfig.getDataCenterId());
+            ExternalLoadBalancerDeviceVO lbDeviceVO = null;
+	        // on restart network, device could have been allocated already, skip allocation if a device is assigned
+            lbDeviceVO = getExternalLoadBalancerForNetwork(guestConfig);
+            if (lbDeviceVO == null) {
+		    // allocate a load balancer device for the network
+	            lbDeviceVO = allocateLoadBalancerForNetwork(guestConfig);
+	            if (lbDeviceVO == null) {
+	                String msg = "failed to alloacate a external load balancer for the network " + guestConfig.getId();
+	                s_logger.error(msg);
+	                throw new InsufficientNetworkCapacityException(msg, DataCenter.class, guestConfig.getDataCenterId());
+	            }
             }
             externalLoadBalancer = _hostDao.findById(lbDeviceVO.getHostId());
             s_logger.debug("Allocated external load balancer device:" + lbDeviceVO.getId() + " for the network: " + guestConfig.getId());
@@ -930,6 +936,12 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
         Integer networkRate = _networkMgr.getNetworkRate(guestConfig.getId(), null);
 
         if (add) {
+		    // on restart network, network could have already been implemented. If already implemented then return
+            NicVO selfipNic = getPlaceholderNic(guestConfig);
+            if (selfipNic != null) {
+		    return true;
+            }
+
             // Acquire a self-ip address from the guest network IP address range
             selfIp = _networkMgr.acquireGuestIpAddress(guestConfig, null);
             if (selfIp == null) {