More elan Blueprint clean-up

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

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java
index 8754656d5e04b5c969dc229e42d19769b6465c66..a827fc44dde0f588a979a05407673ad12b1e140f 100755 (executable)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("deprecation")
 public class ElanPacketInHandler implements PacketProcessingListener {
 
-    private static final Logger logger = LoggerFactory.getLogger(ElanPacketInHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ElanPacketInHandler.class);
 
     private final DataBroker broker;
     private final IInterfaceManager interfaceManager;
@@ -76,15 +76,15 @@ public class ElanPacketInHandler implements PacketProcessingListener {
 
                 Optional<IfIndexInterface> interfaceInfoOp = elanUtils.getInterfaceInfoByInterfaceTag(portTag);
                 if (!interfaceInfoOp.isPresent()) {
-                    logger.warn("There is no interface for given portTag {}", portTag);
+                    LOG.warn("There is no interface for given portTag {}", portTag);
                     return;
                 }
                 String interfaceName = interfaceInfoOp.get().getInterfaceName();
-                logger.debug("Received a packet with srcMac: {} ElanTag: {} PortTag: {} InterfaceName: {}", macAddress,
+                LOG.debug("Received a packet with srcMac: {} ElanTag: {} PortTag: {} InterfaceName: {}", macAddress,
                         elanTag, portTag, interfaceName);
                 ElanTagName elanTagName = elanUtils.getElanInfoByElanTag(elanTag);
                 if (elanTagName == null) {
-                    logger.warn("not able to find elanTagName in elan-tag-name-map for elan tag {}", elanTag);
+                    LOG.warn("not able to find elanTagName in elan-tag-name-map for elan tag {}", elanTag);
                     return;
                 }
                 String elanName = elanTagName.getName();
@@ -141,7 +141,7 @@ public class ElanPacketInHandler implements PacketProcessingListener {
                         physAddress);
                 MDSALUtil.syncWrite(broker, LogicalDatastoreType.OPERATIONAL, elanMacEntryId,
                         macEntry);
-                ElanInstance elanInstance = elanUtils.getElanInstanceByName(elanName);
+                ElanInstance elanInstance = ElanUtils.getElanInstanceByName(broker, elanName);
                 WriteTransaction flowWritetx = broker.newWriteOnlyTransaction();
                 elanUtils.setupMacFlows(elanInstance,
                         interfaceManager.getInterfaceInfo(interfaceName),
@@ -152,7 +152,7 @@ public class ElanPacketInHandler implements PacketProcessingListener {
                 elanL2GatewayUtils.scheduleAddDpnMacInExtDevices(elanInstance.getElanInstanceName(), dpId,
                         Arrays.asList(physAddress));
             } catch (Exception e) {
-                logger.trace("Failed to decode packet: {}", e);
+                LOG.trace("Failed to decode packet: {}", e);
             }
         }
 
@@ -164,16 +164,16 @@ public class ElanPacketInHandler implements PacketProcessingListener {
      * Static MAC having been added on a wrong ELAN.
      */
     private void tryAndRemoveInvalidMacEntry(String elanName, MacEntry macEntry) {
-        ElanInstance elanInfo = elanUtils.getElanInstanceByName(elanName);
+        ElanInstance elanInfo = ElanUtils.getElanInstanceByName(broker, elanName);
         if (elanInfo == null) {
-            logger.warn(String.format("MAC %s is been added (either statically or dynamically) for an invalid Elan %s. "
+            LOG.warn(String.format("MAC %s is been added (either statically or dynamically) for an invalid Elan %s. "
                     + "Manual cleanup may be necessary", macEntry.getMacAddress(), elanName));
             return;
         }
 
         InterfaceInfo oldInterfaceLport = interfaceManager.getInterfaceInfo(macEntry.getInterface());
         if (oldInterfaceLport == null) {
-            logger.warn(
+            LOG.warn(
                     String.format(
                             "MAC %s is been added (either statically or dynamically) on an invalid Logical Port %s. "
                                     + "Manual cleanup may be necessary",