Merge "HwVTEP JUNITs, and fixing show:vxlan CLI"

[vpnservice.git] / elanmanager / elanmanager-impl / src / main / java / org / opendaylight / vpnservice / elan / internal / ElanForwardingEntriesHandler.java

diff --git a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanForwardingEntriesHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanForwardingEntriesHandler.java
index 4acb68d1b994fc905f63220b38dd4b149e606844..9be6b79be91038588933768a99eb44618e5cd553 100644 (file)
--- a/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanForwardingEntriesHandler.java
+++ b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/vpnservice/elan/internal/ElanForwardingEntriesHandler.java
@@ -32,24 +32,14 @@ import org.slf4j.LoggerFactory;
 
 
 public class ElanForwardingEntriesHandler extends AbstractDataChangeListener<ElanInterface> implements AutoCloseable {
-    private DataBroker broker;
-    private ListenerRegistration<DataChangeListener> listenerRegistration;
-
-    private IMdsalApiManager mdsalManager;
-
-    private IITMProvider itmManager;
 
     private static final Logger logger = LoggerFactory.getLogger(ElanForwardingEntriesHandler.class);
+    private DataBroker broker;
+    private ListenerRegistration<DataChangeListener> listenerRegistration;
 
-
-    public ElanForwardingEntriesHandler(DataBroker db, IMdsalApiManager mdsalManager){
+    public ElanForwardingEntriesHandler(DataBroker db){
         super(ElanInterface.class);
         this.broker = db;
-        this.mdsalManager = mdsalManager;
-    }
-
-    public void setIITMManager(IITMProvider itmManager) {
-        this.itmManager = itmManager;
     }
 
     private InstanceIdentifier<?> getWildCardPath() {
@@ -117,6 +107,7 @@ public class ElanForwardingEntriesHandler extends AbstractDataChangeListener<Ela
     public void deleteElanInterfaceForwardingEntries(ElanInstance elanInfo, InterfaceInfo interfaceInfo, MacEntry macEntry) {
         InstanceIdentifier<MacEntry> macEntryId = ElanUtils.getMacEntryOperationalDataPath(elanInfo.getElanInstanceName(), macEntry.getMacAddress());
         ElanUtils.delete(broker, LogicalDatastoreType.OPERATIONAL, macEntryId);
+        deleteElanInterfaceForwardingTablesList(interfaceInfo.getInterfaceName(), macEntry);
         ElanUtils.deleteMacFlows(elanInfo, interfaceInfo, macEntry);
     }