From 3e1f782eddb71156635d9406ae61a77a6ae82fca Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Thu, 30 Dec 2010 15:47:52 -0800
Subject: [PATCH] bug 7606: adding delete vlans and ip addresses during zone
 deletion status 7606: resolved fixed

---
 .../com/cloud/configuration/ConfigurationManagerImpl.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index bf3ccbf144d..89314916610 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -924,6 +924,12 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
                     _networkDao.remove(network.getId());
                 }
             }
+            
+            //delete vlans for this zone
+            List<VlanVO> vlans = _vlanDao.listByZone(zoneId);
+            for(VlanVO vlan : vlans) {
+            	_vlanDao.remove(vlan.getId());
+            }
     	} catch (Exception ex) {
     	    s_logger.error("Failed to delete zone " + zoneId);
     	    throw new CloudRuntimeException("Failed to delete zone " + zoneId);