Infrautils DiagStatus Integration For ELAN

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

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java
index 1ae32fde5ef038e61f86298662d10701e86c7437..a863610ee0d72d1bfa9cc0bb6f8ec643bd9c894d 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java
@@ -5,18 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netvirt.elan.utils;
 
-
-
 import com.google.common.base.Optional;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.elan._interface.StaticMacEntries;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntryKey;
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
+@Singleton
 public class ElanForwardingEntriesHandler {
 
     private static final Logger LOG = LoggerFactory.getLogger(ElanForwardingEntriesHandler.class);
@@ -32,6 +32,7 @@ public class ElanForwardingEntriesHandler {
     private final DataBroker broker;
     private ElanUtils elanUtils;
 
+    @Inject
     public ElanForwardingEntriesHandler(DataBroker dataBroker) {
         this.broker = dataBroker;
     }
@@ -64,9 +65,12 @@ public class ElanForwardingEntriesHandler {
     }
 
     public void addElanInterfaceForwardingTableList(ElanInstance elanInstance, String interfaceName,
-            PhysAddress physAddress, WriteTransaction tx) {
-        MacEntry macEntry = new MacEntryBuilder().setIsStaticAddress(true).setMacAddress(physAddress)
-                .setInterface(interfaceName).setKey(new MacEntryKey(physAddress)).build();
+                                                    StaticMacEntries staticMacEntries, WriteTransaction tx) {
+        MacEntry macEntry = new MacEntryBuilder().setIsStaticAddress(true)
+                .setMacAddress(staticMacEntries.getMacAddress())
+                .setIpPrefix(staticMacEntries.getIpPrefix())
+                .setInterface(interfaceName).setKey(new MacEntryKey(staticMacEntries.getMacAddress())).build();
+
         createElanForwardingTablesList(elanInstance.getElanInstanceName(), macEntry, tx);
         createElanInterfaceForwardingTablesList(interfaceName, macEntry, tx);
     }
@@ -87,10 +91,11 @@ public class ElanForwardingEntriesHandler {
         MacEntry existingInterfaceMacEntry = elanUtils
                 .getInterfaceMacEntriesOperationalDataPathFromId(existingMacEntryId);
         if (existingInterfaceMacEntry == null) {
-            MacEntry macEntry = new MacEntryBuilder().setMacAddress(mac.getMacAddress()).setInterface(interfaceName)
+            MacEntry macEntry = new MacEntryBuilder().setMacAddress(mac.getMacAddress()).setIpPrefix(mac.getIpPrefix())
+                    .setInterface(interfaceName)
                     .setIsStaticAddress(true).setKey(new MacEntryKey(mac.getMacAddress())).build();
-            tx.put(LogicalDatastoreType.OPERATIONAL, existingMacEntryId, macEntry);
-
+            tx.put(LogicalDatastoreType.OPERATIONAL, existingMacEntryId, macEntry,
+                    WriteTransaction.CREATE_MISSING_PARENTS);
         }
     }
 
@@ -99,11 +104,10 @@ public class ElanForwardingEntriesHandler {
         InstanceIdentifier<MacEntry> macEntryId = ElanUtils.getMacEntryOperationalDataPath(elanName,
                 mac.getMacAddress());
         MacEntry existingMacEntry = elanUtils.getMacEntryFromElanMacId(macEntryId);
-        if (existingMacEntry != null) {
-            // Fix for TR HU71400.
-            // ElanUtils.delete(broker, LogicalDatastoreType.OPERATIONAL, macEntryId);
+        if (existingMacEntry != null && elanUtils.getElanMacTable(elanName) != null) {
             MacEntry newMacEntry = new MacEntryBuilder().setInterface(interfaceName).setIsStaticAddress(true)
-                    .setMacAddress(mac.getMacAddress()).setKey(new MacEntryKey(mac.getMacAddress())).build();
+                    .setMacAddress(mac.getMacAddress()).setIpPrefix(mac.getIpPrefix())
+                    .setKey(new MacEntryKey(mac.getMacAddress())).build();
             tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, newMacEntry);
         }
     }
@@ -111,9 +115,9 @@ public class ElanForwardingEntriesHandler {
     private void createElanForwardingTablesList(String elanName, MacEntry macEntry, WriteTransaction tx) {
         InstanceIdentifier<MacEntry> macEntryId = ElanUtils.getMacEntryOperationalDataPath(elanName,
                 macEntry.getMacAddress());
-        Optional<MacEntry> existingMacEntry = elanUtils.read(broker, LogicalDatastoreType.OPERATIONAL, macEntryId);
-        if (!existingMacEntry.isPresent()) {
-            tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, macEntry);
+        Optional<MacEntry> existingMacEntry = ElanUtils.read(broker, LogicalDatastoreType.OPERATIONAL, macEntryId);
+        if (!existingMacEntry.isPresent() && elanUtils.getElanMacTable(elanName) != null) {
+            tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, macEntry, WriteTransaction.CREATE_MISSING_PARENTS);
         }
     }