From 3a72de6d760d54b7dc2cbc4e5bb97c916b21b963 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Mon, 16 Jan 2012 12:17:51 -0800
Subject: [PATCH] Bug 13085 - Traffic types of a deleted physical network
 should not be present in the "physical_network_traffic_types" table

Changes:
- Added deleteTrafficTypes while deleting a physical network.
---
 server/src/com/cloud/network/NetworkManagerImpl.java       | 4 ++++
 .../cloud/network/dao/PhysicalNetworkTrafficTypeDao.java   | 1 +
 .../network/dao/PhysicalNetworkTrafficTypeDaoImpl.java     | 7 +++++++
 3 files changed, 12 insertions(+)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index cd0a8f10ff7..f225ff39ff1 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -4513,6 +4513,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
 
         //delete service providers
         _pNSPDao.deleteProviders(physicalNetworkId);
+        
+        //delete traffic types
+        _pNTrafficTypeDao.deleteTrafficTypes(physicalNetworkId);
+        
 
         boolean success = _physicalNetworkDao.remove(physicalNetworkId);
 
diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java b/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java
index 660869e8ffb..01fd22b54f5 100644
--- a/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java
+++ b/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDao.java
@@ -28,4 +28,5 @@ public interface PhysicalNetworkTrafficTypeDao extends GenericDao<PhysicalNetwor
     boolean isTrafficTypeSupported(long physicalNetworkId, TrafficType trafficType);
     String getNetworkTag (long physicalNetworkId, TrafficType trafficType, HypervisorType hType);
     PhysicalNetworkTrafficTypeVO findBy(long physicalNetworkId, TrafficType trafficType);
+    void deleteTrafficTypes(long physicalNetworkId);
 }
diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
index 61fd50f6a06..ceaacaa5d90 100644
--- a/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
+++ b/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
@@ -120,4 +120,11 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNe
         sc.setParameters("trafficType", trafficType);
         return findOneBy(sc);
     }
+
+    @Override
+    public void deleteTrafficTypes(long physicalNetworkId) {
+        SearchCriteria<PhysicalNetworkTrafficTypeVO> sc = physicalNetworkSearch.create();
+        sc.setParameters("physicalNetworkId", physicalNetworkId);
+        remove(sc);        
+    }
 }