Clean up logging
[ovsdb.git] / openstack / net-virt-providers / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / providers / openflow13 / OF13Provider.java
index 389aef1d1733dcdaa1547e1df2486c0a6e88b885..2c8f0a1ee7889794c64399c65cea0b759305be5b 100644 (file)
@@ -110,7 +110,7 @@ import java.util.concurrent.ExecutionException;
 // The patterns need to be preserved even though not all parameters are used in all methods
 @SuppressWarnings("UnusedParameters")
 public class OF13Provider implements ConfigInterface, NetworkingProvider {
-    private static final Logger logger = LoggerFactory.getLogger(OF13Provider.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OF13Provider.class);
     private static final short TABLE_0_DEFAULT_INGRESS = 0;
     private static final short TABLE_1_ISOLATE_TENANT = 10;
     private static final short TABLE_2_LOCAL_FORWARD = 20;
@@ -155,17 +155,17 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
     private Status getTunnelReadinessStatus (Node node, String tunnelKey) {
         InetAddress srcTunnelEndPoint = configurationService.getTunnelEndPoint(node);
         if (srcTunnelEndPoint == null) {
-            logger.error("Tunnel Endpoint not configured for Node {}", node);
+            LOG.error("Tunnel Endpoint not configured for Node {}", node);
             return new Status(StatusCode.NOTFOUND, "Tunnel Endpoint not configured for "+ node);
         }
 
         if (!bridgeConfigurationManager.isNodeNeutronReady(node)) {
-            logger.error(node+" is not Overlay ready");
+            LOG.error("{} is not Overlay ready", node);
             return new Status(StatusCode.NOTACCEPTABLE, node+" is not Overlay ready");
         }
 
         if (!tenantNetworkManager.isTenantNetworkPresentInNode(node, tunnelKey)) {
-            logger.debug(node + " has no VM corresponding to segment " + tunnelKey);
+            LOG.debug("{} has no VM corresponding to segment {}", node, tunnelKey);
             return new Status(StatusCode.NOTACCEPTABLE, node+" has no VM corresponding to segment "+ tunnelKey);
         }
         return new Status(StatusCode.SUCCESS);
@@ -178,10 +178,10 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
     private boolean addTunnelPort (Node node, String tunnelType, InetAddress src, InetAddress dst) {
         String tunnelBridgeName = configurationService.getIntegrationBridgeName();
         String portName = getTunnelName(tunnelType, dst);
-        logger.info("addTunnelPort enter: portName: {}", portName);
+        LOG.info("addTunnelPort enter: portName: {}", portName);
         if (southbound.extractTerminationPointAugmentation(node, portName) != null
                 || southbound.isTunnelTerminationPointExist(node, tunnelBridgeName, portName)) {
-            logger.info("Tunnel {} is present in {} of {}", portName, tunnelBridgeName, node.getNodeId().getValue());
+            LOG.info("Tunnel {} is present in {} of {}", portName, tunnelBridgeName, node.getNodeId().getValue());
             return true;
         }
 
@@ -191,11 +191,11 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
         options.put("remote_ip", dst.getHostAddress());
 
         if (!southbound.addTunnelTerminationPoint(node, tunnelBridgeName, portName, tunnelType, options)) {
-            logger.error("Failed to insert Tunnel port {} in {}", portName, tunnelBridgeName);
+            LOG.error("Failed to insert Tunnel port {} in {}", portName, tunnelBridgeName);
             return false;
         }
 
-            logger.info("addTunnelPort exit: portName: {}", portName);
+            LOG.info("addTunnelPort exit: portName: {}", portName);
         return true;
     }
 
@@ -693,7 +693,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
     private long getDpid(Node node) {
         long dpid = southbound.getDataPathId(node);
         if (dpid == 0) {
-            logger.warn("getDpid: dpid not found: {}", node);
+            LOG.warn("getDpid: dpid not found: {}", node);
         }
         return dpid;
     }
@@ -731,35 +731,35 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
 
     private void programLocalRules (String networkType, String segmentationId, Node node,
                                     OvsdbTerminationPointAugmentation intf) {
-        logger.debug("programLocalRules: node: {}, intf: {}, networkType: {}, segmentationId: {}",
+        LOG.debug("programLocalRules: node: {}, intf: {}, networkType: {}, segmentationId: {}",
                 node.getNodeId(), intf.getName(), networkType, segmentationId);
         try {
             long dpid = getIntegrationBridgeOFDPID(node);
             if (dpid == 0L) {
-                logger.debug("programLocalRules: Openflow Datapath-ID not set for the integration bridge in {}",
+                LOG.debug("programLocalRules: Openflow Datapath-ID not set for the integration bridge in {}",
                         node);
                 return;
             }
 
             long localPort = southbound.getOFPort(intf);
             if (localPort == 0) {
-                logger.info("programLocalRules: could not find ofPort for Port {} on Node {}",intf.getName(), node.getNodeId());
+                LOG.info("programLocalRules: could not find ofPort for Port {} on Node {}", intf.getName(), node.getNodeId());
                 return;
             }
 
             String attachedMac = southbound.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
             if (attachedMac == null) {
-                logger.warn("No AttachedMac seen in {}", intf);
+                LOG.warn("No AttachedMac seen in {}", intf);
                 return;
             }
 
             /* Program local rules based on network type */
             if (isVlan(networkType)) {
-                logger.debug("Program local vlan rules for interface {}", intf.getName());
+                LOG.debug("Program local vlan rules for interface {}", intf.getName());
                 programLocalVlanRules(node, dpid, segmentationId, attachedMac, localPort);
             }
             if ((isTunnel(networkType)|| isVlan(networkType))) {
-                logger.debug("programLocalRules: Program fixed security group rules for interface {}", intf.getName());
+                LOG.debug("programLocalRules: Program fixed security group rules for interface {}", intf.getName());
                 // Get the DHCP port for the subnet to which  the interface belongs to.
                 NeutronPort dhcpPort = securityServicesManager.getDHCPServerPort(intf);
                 if (null != dhcpPort) {
@@ -771,7 +771,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                         isLastPortinSubnet = securityServicesManager.isLastPortinSubnet(node, intf);
                         srcAddressList = securityServicesManager.getIpAddress(node, intf);
                         if (null == srcAddressList) {
-                            logger.warn("programLocalRules: No Ip address assigned {}", intf);
+                            LOG.warn("programLocalRules: No Ip address assigned {}", intf);
                             return;
                         }
                     }
@@ -780,17 +780,17 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                     egressAclProvider.programFixedSecurityACL(dpid, segmentationId, attachedMac, localPort,
                                                               srcAddressList, isLastPortinBridge, isComputePort,true);
                 } else {
-                    logger.warn("programLocalRules: No DCHP port seen in  network of {}", intf);
+                    LOG.warn("programLocalRules: No DCHP port seen in  network of {}", intf);
                 }
             }
             /* If the network type is tunnel based (VXLAN/GRRE/etc) with Neutron Port Security ACLs */
             /* TODO SB_MIGRATION */
             /*if ((networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE) || networkType.equalsIgnoreCase
                     (NetworkHandler.NETWORK_TYPE_VXLAN)) && securityServicesManager.isPortSecurityReady(intf)) {
-                logger.debug("Neutron port has a Port Security Group");
+                LOG.debug("Neutron port has a Port Security Group");
                 // Retrieve the security group UUID from the Neutron Port
                 NeutronSecurityGroup securityGroupInPort = securityServicesManager.getSecurityGroupInPort(intf);
-                logger.debug("Program Local rules for networkType: {} does contain a Port Security Group: {} " +
+                LOG.debug("Program Local rules for networkType: {} does contain a Port Security Group: {} " +
                         "to be installed on DPID: {}", networkType, securityGroupInPort, dpid);
                 ingressAclProvider.programPortSecurityACL(dpid, segmentationId, attachedMac, localPort,
                         securityGroupInPort);
@@ -798,54 +798,54 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                         securityGroupInPort);
             }*/
             if (isTunnel(networkType)) {
-                logger.debug("Program local bridge rules for interface {}, "
-                        + "dpid: {}, segmentationId: {}, attachedMac: {}, localPort: {}",
+                LOG.debug("Program local bridge rules for interface {}, "
+                                + "dpid: {}, segmentationId: {}, attachedMac: {}, localPort: {}",
                         intf.getName(), dpid, segmentationId, attachedMac, localPort);
                 programLocalBridgeRules(node, dpid, segmentationId, attachedMac, localPort);
             }
         } catch (Exception e) {
-            logger.error("Exception in programming Local Rules for "+intf+" on "+node, e);
+            LOG.error("Exception in programming Local Rules for " + intf + " on " + node, e);
         }
     }
 
     private void removeLocalRules (String networkType, String segmentationId, Node node,
                                    OvsdbTerminationPointAugmentation intf) {
-        logger.debug("removeLocalRules: node: {}, intf: {}, networkType: {}, segmentationId: {}",
+        LOG.debug("removeLocalRules: node: {}, intf: {}, networkType: {}, segmentationId: {}",
                 node.getNodeId(), intf.getName(), networkType, segmentationId);
         try {
             long dpid = getIntegrationBridgeOFDPID(node);
             if (dpid == 0L) {
-                logger.debug("removeLocalRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
+                LOG.debug("removeLocalRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
                 return;
             }
 
             long localPort = southbound.getOFPort(intf);
             if (localPort == 0) {
-                logger.info("removeLocalRules: could not find ofPort");
+                LOG.info("removeLocalRules: could not find ofPort");
                 return;
             }
 
             String attachedMac = southbound.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
             if (attachedMac == null) {
-                logger.warn("No AttachedMac seen in {}", intf);
+                LOG.warn("No AttachedMac seen in {}", intf);
                 return;
             }
 
             /* Program local rules based on network type */
             if (isVlan(networkType)) {
-                logger.debug("Remove local vlan rules for interface {}", intf.getName());
+                LOG.debug("Remove local vlan rules for interface {}", intf.getName());
                 removeLocalVlanRules(node, dpid, segmentationId, attachedMac, localPort);
             } else if (isTunnel(networkType)) {
-                logger.debug("Remove local bridge rules for interface {}", intf.getName());
+                LOG.debug("Remove local bridge rules for interface {}", intf.getName());
                 removeLocalBridgeRules(node, dpid, segmentationId, attachedMac, localPort);
             }
             if (isTunnel(networkType)|| isVlan(networkType)) {
-                logger.debug("removeLocalRules: Remove fixed security group rules for interface {}", intf.getName());
+                LOG.debug("removeLocalRules: Remove fixed security group rules for interface {}", intf.getName());
                 NeutronPort dhcpPort = securityServicesManager.getDHCPServerPort(intf);
                 if (null != dhcpPort) {
                     List<Neutron_IPs> srcAddressList = securityServicesManager.getIpAddress(node, intf);
                     if (null == srcAddressList) {
-                        logger.warn("removeLocalRules: No Ip address assigned {}", intf);
+                        LOG.warn("removeLocalRules: No Ip address assigned {}", intf);
                         return;
                     }
                     boolean isLastPortinBridge = securityServicesManager.isLastPortinBridge(node, intf);
@@ -860,11 +860,11 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                     egressAclProvider.programFixedSecurityACL(dpid, segmentationId,    attachedMac, localPort,
                                                               srcAddressList, isLastPortinBridge, isComputePort, false);
                 }else{
-                    logger.warn("removeLocalRules: No DCHP port seen in  network of {}", intf);
+                    LOG.warn("removeLocalRules: No DCHP port seen in  network of {}", intf);
                 }
             }
         } catch (Exception e) {
-            logger.error("Exception in removing Local Rules for "+intf+" on "+node, e);
+            LOG.error("Exception in removing Local Rules for " + intf + " on " + node, e);
         }
     }
 
@@ -874,25 +874,25 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
     // so we don't see those updates in this case - we only see the new nodes interface updates.
     private void programTunnelRules (String tunnelType, String segmentationId, InetAddress dst, Node node,
                                      OvsdbTerminationPointAugmentation intf, boolean local) {
-        logger.debug("programTunnelRules: node: {}, intf: {}, local: {}, tunnelType: {}, "
-                + "segmentationId: {}, dstAddr: {}",
+        LOG.debug("programTunnelRules: node: {}, intf: {}, local: {}, tunnelType: {}, "
+                        + "segmentationId: {}, dstAddr: {}",
                 node.getNodeId(), intf.getName(), local, tunnelType, segmentationId, dst.getHostAddress());
         try {
             long dpid = getIntegrationBridgeOFDPID(node);
             if (dpid == 0L) {
-                logger.debug("programTunnelRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
+                LOG.debug("programTunnelRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
                 return;
             }
 
             long localPort = southbound.getOFPort(intf);
             if (localPort == 0) {
-                logger.info("programTunnelRules: could not find ofPort for Port {} on Node{}",intf.getName(),node.getNodeId());
+                LOG.info("programTunnelRules: could not find ofPort for Port {} on Node{}", intf.getName(), node.getNodeId());
                 return;
             }
 
             String attachedMac = southbound.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
             if (attachedMac == null) {
-                logger.warn("programTunnelRules: No AttachedMac seen in {}", intf);
+                LOG.warn("programTunnelRules: No AttachedMac seen in {}", intf);
                 return;
             }
 
@@ -900,52 +900,52 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
             if(tunnelPort != null){
                 long tunnelOFPort = southbound.getOFPort(tunnelPort);
                 if (tunnelOFPort == 0) {
-                    logger.error("programTunnelRules: Could not Identify Tunnel port {} -> OF ({}) on {}",
+                    LOG.error("programTunnelRules: Could not Identify Tunnel port {} -> OF ({}) on {}",
                             tunnelPort.getName(), tunnelOFPort, node);
                     return;
                 }
-                logger.debug("programTunnelRules: Identified Tunnel port {} -> OF ({}) on {}",
+                LOG.debug("programTunnelRules: Identified Tunnel port {} -> OF ({}) on {}",
                         tunnelPort.getName(), tunnelOFPort, node);
 
                 if (!local) {
-                    logger.trace("programTunnelRules: program remote egress tunnel rules: node {}, intf {}",
-                        node.getNodeId().getValue(), intf.getName());
+                    LOG.trace("programTunnelRules: program remote egress tunnel rules: node {}, intf {}",
+                            node.getNodeId().getValue(), intf.getName());
                     programRemoteEgressTunnelBridgeRules(node, dpid, segmentationId, attachedMac,
                             tunnelOFPort, localPort);
                 } else {
-                    logger.trace("programTunnelRules: program local ingress tunnel rules: node {}, intf {}",
+                    LOG.trace("programTunnelRules: program local ingress tunnel rules: node {}, intf {}",
                             node.getNodeId().getValue(), intf.getName());
                     programLocalIngressTunnelBridgeRules(node, dpid, segmentationId, attachedMac,
                             tunnelOFPort, localPort);
                 }
             }
         } catch (Exception e) {
-            logger.trace("", e);
+            LOG.trace("", e);
         }
     }
 
     private void removeTunnelRules (String tunnelType, String segmentationId, InetAddress dst, Node node,
                                     OvsdbTerminationPointAugmentation intf,
                                     boolean local, boolean isLastInstanceOnNode) {
-        logger.debug("removeTunnelRules: node: {}, intf: {}, local: {}, tunnelType: {}, "
+        LOG.debug("removeTunnelRules: node: {}, intf: {}, local: {}, tunnelType: {}, "
                         + "segmentationId: {}, dstAddr: {}, isLastinstanceOnNode: {}",
                 node.getNodeId(), intf.getName(), local, tunnelType, segmentationId, dst, isLastInstanceOnNode);
         try {
             long dpid = getIntegrationBridgeOFDPID(node);
             if (dpid == 0L) {
-                logger.debug("removeTunnelRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
+                LOG.debug("removeTunnelRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
                 return;
             }
 
             long localPort = southbound.getOFPort(intf);
             if (localPort == 0) {
-                logger.info("removeTunnelRules: could not find ofPort");
+                LOG.info("removeTunnelRules: could not find ofPort");
                 return;
             }
 
             String attachedMac = southbound.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
             if (attachedMac == null) {
-                logger.error("removeTunnelRules: No AttachedMac seen in {}", intf);
+                LOG.error("removeTunnelRules: No AttachedMac seen in {}", intf);
                 return;
             }
 
@@ -954,11 +954,11 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 if (tunIntf.getName().equals(getTunnelName(tunnelType, dst))) {
                     long tunnelOFPort = southbound.getOFPort(tunIntf);
                     if (tunnelOFPort == 0) {
-                        logger.error("Could not Identify Tunnel port {} -> OF ({}) on {}",
+                        LOG.error("Could not Identify Tunnel port {} -> OF ({}) on {}",
                                 tunIntf.getName(), tunnelOFPort, node);
                         return;
                     }
-                    logger.debug("Identified Tunnel port {} -> OF ({}) on {}",
+                    LOG.debug("Identified Tunnel port {} -> OF ({}) on {}",
                             tunIntf.getName(), tunnelOFPort, node);
 
                     if (!local) {
@@ -972,28 +972,28 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 }
             }
         } catch (Exception e) {
-            logger.error("", e);
+            LOG.error("", e);
         }
     }
 
     private void programVlanRules (NeutronNetwork network, Node node, OvsdbTerminationPointAugmentation intf) {
-        logger.debug("programVlanRules: node: {}, network: {}, intf: {}",
+        LOG.debug("programVlanRules: node: {}, network: {}, intf: {}",
                 node.getNodeId(), network.getNetworkUUID(), intf.getName());
         long dpid = getIntegrationBridgeOFDPID(node);
         if (dpid == 0L) {
-            logger.debug("programVlanRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
+            LOG.debug("programVlanRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
             return;
         }
 
         long localPort = southbound.getOFPort(intf);
         if (localPort == 0) {
-            logger.debug("programVlanRules: could not find ofPort for {}", intf.getName());
+            LOG.debug("programVlanRules: could not find ofPort for {}", intf.getName());
             return;
         }
 
         String attachedMac = southbound.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
         if (attachedMac == null) {
-            logger.debug("programVlanRules: No AttachedMac seen in {}", intf);
+            LOG.debug("programVlanRules: No AttachedMac seen in {}", intf);
             return;
         }
 
@@ -1001,10 +1001,10 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 bridgeConfigurationManager.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
         long ethOFPort = southbound.getOFPort(node, phyIfName);
         if (ethOFPort == 0) {
-            logger.warn("programVlanRules: could not find ofPort for physical port {}", phyIfName);
+            LOG.warn("programVlanRules: could not find ofPort for physical port {}", phyIfName);
             return;
         }
-        logger.debug("programVlanRules: Identified eth port {} -> ofPort ({}) on {}",
+        LOG.debug("programVlanRules: Identified eth port {} -> ofPort ({}) on {}",
                 phyIfName, ethOFPort, node);
         // TODO: add logic to only add rule on remote nodes
         programRemoteEgressVlanRules(node, dpid, network.getProviderSegmentationID(),
@@ -1015,23 +1015,23 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
 
     private void removeVlanRules (NeutronNetwork network, Node node, OvsdbTerminationPointAugmentation intf,
                                   boolean isLastInstanceOnNode) {
-        logger.debug("removeVlanRules: node: {}, network: {}, intf: {}, isLastInstanceOnNode",
+        LOG.debug("removeVlanRules: node: {}, network: {}, intf: {}, isLastInstanceOnNode",
                 node.getNodeId(), network.getNetworkUUID(), intf.getName(), isLastInstanceOnNode);
         long dpid = getIntegrationBridgeOFDPID(node);
         if (dpid == 0L) {
-            logger.debug("removeVlanRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
+            LOG.debug("removeVlanRules: Openflow Datapath-ID not set for the integration bridge in {}", node);
             return;
         }
 
         long localPort = southbound.getOFPort(intf);
         if (localPort == 0) {
-            logger.debug("removeVlanRules: programVlanRules: could not find ofPort for {}", intf.getName());
+            LOG.debug("removeVlanRules: programVlanRules: could not find ofPort for {}", intf.getName());
             return;
         }
 
         String attachedMac = southbound.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
         if (attachedMac == null) {
-            logger.debug("removeVlanRules: No AttachedMac seen in {}", intf);
+            LOG.debug("removeVlanRules: No AttachedMac seen in {}", intf);
             return;
         }
 
@@ -1039,10 +1039,10 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 bridgeConfigurationManager.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
         long ethOFPort = southbound.getOFPort(node, phyIfName);
         if (ethOFPort == 0) {
-            logger.warn("removeVlanRules: could not find ofPort for physical port {}", phyIfName);
+            LOG.warn("removeVlanRules: could not find ofPort for physical port {}", phyIfName);
             return;
         }
-        logger.debug("removeVlanRules: Identified eth port {} -> ofPort ({}) on {}",
+        LOG.debug("removeVlanRules: Identified eth port {} -> ofPort ({}) on {}",
                 phyIfName, ethOFPort, node);
 
         removeRemoteEgressVlanRules(node, dpid, network.getProviderSegmentationID(),
@@ -1090,7 +1090,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                         programTunnelRules(networkType, segmentationId, src, dstBridgeNode, intf, false);
                     }
                 } else {
-                    logger.warn("Tunnel end-point configuration missing. Please configure it in OpenVSwitch Table. "
+                    LOG.warn("Tunnel end-point configuration missing. Please configure it in OpenVSwitch Table. "
                                     + "Check source {} or destination {}",
                             src != null ? src.getHostAddress() : "null",
                             dst != null ? dst.getHostAddress() : "null");
@@ -1102,20 +1102,20 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
     }
 
     private void triggerInterfaceUpdates(Node node) {
-        logger.debug("enter triggerInterfaceUpdates for {}", node.getNodeId());
+        LOG.debug("enter triggerInterfaceUpdates for {}", node.getNodeId());
         List<OvsdbTerminationPointAugmentation> ports = southbound.extractTerminationPointAugmentations(node);
         if (ports != null && !ports.isEmpty()) {
             for (OvsdbTerminationPointAugmentation port : ports) {
                 NeutronNetwork neutronNetwork = tenantNetworkManager.getTenantNetwork(port);
                 if (neutronNetwork != null) {
-                    logger.warn("Trigger Interface update for {}", port);
+                    LOG.warn("Trigger Interface update for {}", port);
                     handleInterfaceUpdate(neutronNetwork, node, port);
                 }
             }
         } else {
-            logger.warn("triggerInterfaceUpdates: tps are null");
+            LOG.warn("triggerInterfaceUpdates: tps are null");
         }
-        logger.debug("exit triggerInterfaceUpdates for {}", node.getNodeId());
+        LOG.debug("exit triggerInterfaceUpdates for {}", node.getNodeId());
     }
 
     @Override
@@ -1125,7 +1125,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 nodeCacheManager.getOvsdbNodes();
         nodes.remove(southbound.extractBridgeOvsdbNodeId(srcNode));
 
-        logger.info("Delete intf " + intf.getName() + " isLastInstanceOnNode " + isLastInstanceOnNode);
+        LOG.info("Delete intf " + intf.getName() + " isLastInstanceOnNode " + isLastInstanceOnNode);
         List<String> phyIfName = bridgeConfigurationManager.getAllPhysicalInterfaceNames(srcNode);
         if (southbound.isTunnel(intf)) {
             // Delete tunnel port
@@ -1138,7 +1138,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                         MdsalHelper.createOvsdbInterfaceType(intf.getInterfaceType()),
                         src, dst);
             } catch (Exception e) {
-                logger.error(e.getMessage(), e);
+                LOG.error(e.getMessage(), e);
             }
         } else if (phyIfName.contains(intf.getName())) {
             deletePhysicalPort(srcNode, intf.getName());
@@ -1155,21 +1155,21 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                     InetAddress src = configurationService.getTunnelEndPoint(srcNode);
                     InetAddress dst = configurationService.getTunnelEndPoint(dstNode);
                     if ((src != null) && (dst != null)) {
-                        logger.info("Remove tunnel rules for interface "
+                        LOG.info("Remove tunnel rules for interface "
                                 + intf.getName() + " on srcNode " + srcNode.getNodeId().getValue());
                         removeTunnelRules(tunnelType, network.getProviderSegmentationID(),
                                 dst, srcNode, intf, true, isLastInstanceOnNode);
                         Node dstBridgeNode = southbound.getBridgeNode(dstNode, Constants.INTEGRATION_BRIDGE);
                         if(dstBridgeNode != null){
-                            logger.info("Remove tunnel rules for interface "
+                            LOG.info("Remove tunnel rules for interface "
                                     + intf.getName() + " on dstNode " + dstNode.getNodeId().getValue());
                             removeTunnelRules(tunnelType, network.getProviderSegmentationID(),
                                     src, dstBridgeNode, intf, false, isLastInstanceOnNode);
                         }
                     } else {
-                        logger.warn("Tunnel end-point configuration missing. Please configure it in "
-                                + "OpenVSwitch Table. "
-                                + "Check source {} or destination {}",
+                        LOG.warn("Tunnel end-point configuration missing. Please configure it in "
+                                        + "OpenVSwitch Table. "
+                                        + "Check source {} or destination {}",
                                 src != null ? src.getHostAddress() : "null",
                                 dst != null ? dst.getHostAddress() : "null");
                     }
@@ -1189,11 +1189,11 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
     private void initializeFlowRules(Node node, String bridgeName) {
         Long dpid = southbound.getDataPathId(node);
         String datapathId = southbound.getDatapathId(node);
-        logger.info("initializeFlowRules: bridgeName: {}, dpid: {} - {}",
+        LOG.info("initializeFlowRules: bridgeName: {}, dpid: {} - {}",
                 bridgeName, dpid, datapathId);
 
         if (dpid == 0L) {
-            logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
+            LOG.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
             return;
         }
 
@@ -1510,10 +1510,10 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 return data.get();
             }
         } catch (InterruptedException|ExecutionException e) {
-            logger.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
         }
 
-        logger.debug("Cannot find data for Group " + groupBuilder.getGroupName());
+        LOG.debug("Cannot find data for Group " + groupBuilder.getGroupName());
         return null;
     }
 
@@ -1527,9 +1527,9 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
         CheckedFuture<Void, TransactionCommitFailedException> commitFuture = modification.submit();
         try {
             commitFuture.get();  // TODO: Make it async (See bug 1362)
-            logger.debug("Transaction success for write of Group "+groupBuilder.getGroupName());
+            LOG.debug("Transaction success for write of Group " + groupBuilder.getGroupName());
         } catch (InterruptedException|ExecutionException e) {
-            logger.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
         }
     }
 
@@ -1543,9 +1543,9 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
 
         try {
             commitFuture.get();  // TODO: Make it async (See bug 1362)
-            logger.debug("Transaction success for deletion of Group "+groupBuilder.getGroupName());
+            LOG.debug("Transaction success for deletion of Group " + groupBuilder.getGroupName());
         } catch (InterruptedException|ExecutionException e) {
-            logger.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
         }
     }
 
@@ -1565,9 +1565,9 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
         CheckedFuture<Void, TransactionCommitFailedException> commitFuture = modification.submit();
         try {
             commitFuture.get();  // TODO: Make it async (See bug 1362)
-            logger.debug("Transaction success for write of Flow "+flowBuilder.getFlowName());
+            LOG.debug("Transaction success for write of Flow " + flowBuilder.getFlowName());
         } catch (InterruptedException|ExecutionException e) {
-            logger.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
         }
     }
 
@@ -1586,7 +1586,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
             Long dpidLong, Long port ,
             List<Instruction> instructions) {
         NodeConnectorId ncid = new NodeConnectorId(Constants.OPENFLOW_NODE_PREFIX + dpidLong + ":" + port);
-        logger.debug("createOutputGroupInstructions() Node Connector ID is - Type=openflow: DPID={} port={} existingInstructions={}", dpidLong, port, instructions);
+        LOG.debug("createOutputGroupInstructions() Node Connector ID is - Type=openflow: DPID={} port={} existingInstructions={}", dpidLong, port, instructions);
 
         List<Action> actionList = Lists.newArrayList();
         ActionBuilder ab = new ActionBuilder();
@@ -1608,7 +1608,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
         OutputActionBuilder oab = new OutputActionBuilder();
         oab.setOutputNodeConnector(ncid);
         ab.setAction(new OutputActionCaseBuilder().setOutputAction(oab.build()).build());
-        logger.debug("createOutputGroupInstructions(): output action {}", ab.build());
+        LOG.debug("createOutputGroupInstructions(): output action {}", ab.build());
         boolean addNew = true;
         boolean groupActionAdded = false;
 
@@ -1626,19 +1626,19 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 groupBuilder.setGroupType(GroupTypes.GroupAll);
                 groupBuilder.setKey(key);
                 group = getGroup(groupBuilder, nodeBuilder);
-                logger.debug("createOutputGroupInstructions: group {}", group);
+                LOG.debug("createOutputGroupInstructions: group {}", group);
                 break;
             }
         }
 
-        logger.debug("createOutputGroupInstructions: groupActionAdded {}", groupActionAdded);
+        LOG.debug("createOutputGroupInstructions: groupActionAdded {}", groupActionAdded);
         if (groupActionAdded) {
             /* modify the action bucket in group */
             groupBuilder = new GroupBuilder(group);
             Buckets buckets = groupBuilder.getBuckets();
             for (Bucket bucket : buckets.getBucket()) {
                 List<Action> bucketActions = bucket.getAction();
-                logger.debug("createOutputGroupInstructions: bucketActions {}", bucketActions);
+                LOG.debug("createOutputGroupInstructions: bucketActions {}", bucketActions);
                 for (Action action : bucketActions) {
                     if (action.getAction() instanceof OutputActionCase) {
                         OutputActionCase opAction = (OutputActionCase)action.getAction();
@@ -1650,7 +1650,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                     }
                 }
             }
-            logger.debug("createOutputGroupInstructions: addNew {}", addNew);
+            LOG.debug("createOutputGroupInstructions: addNew {}", addNew);
             if (addNew) {
                 /* the new output action is not in the bucket, add to bucket */
                 if (!buckets.getBucket().isEmpty()) {
@@ -1672,7 +1672,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                     bucketList.add(bucketBuilder.build());
                     bucketsBuilder.setBucket(bucketList);
                     groupBuilder.setBuckets(bucketsBuilder.build());
-                    logger.debug("createOutputGroupInstructions: bucketList {}", bucketList);
+                    LOG.debug("createOutputGroupInstructions: bucketList {}", bucketList);
                 }
             }
         } else {
@@ -1714,8 +1714,8 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
 
             groupId++;
         }
-        logger.debug("createOutputGroupInstructions: group {}", groupBuilder.build());
-        logger.debug("createOutputGroupInstructions: actionList {}", actionList);
+        LOG.debug("createOutputGroupInstructions: group {}", groupBuilder.build());
+        LOG.debug("createOutputGroupInstructions: actionList {}", actionList);
 
         if (addNew) {
             /* rewrite the group to group table */
@@ -1744,7 +1744,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
             Long dpidLong, Long port , List<Instruction> instructions) {
 
         NodeConnectorId ncid = new NodeConnectorId(Constants.OPENFLOW_NODE_PREFIX + dpidLong + ":" + port);
-        logger.debug("removeOutputPortFromGroup() Node Connector ID is - Type=openflow: DPID={} port={} existingInstructions={}", dpidLong, port, instructions);
+        LOG.debug("removeOutputPortFromGroup() Node Connector ID is - Type=openflow: DPID={} port={} existingInstructions={}", dpidLong, port, instructions);
 
         List<Action> actionList = Lists.newArrayList();
         ActionBuilder ab;
@@ -1835,7 +1835,7 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
                 bucketList.add(bucketBuilder.build());
                 bucketsBuilder.setBucket(bucketList);
                 groupBuilder.setBuckets(bucketsBuilder.build());
-                logger.debug("removeOutputPortFromGroup: bucketList {}", bucketList);
+                LOG.debug("removeOutputPortFromGroup: bucketList {}", bucketList);
 
                 writeGroup(groupBuilder, nodeBuilder);
                 ApplyActionsBuilder aab = new ApplyActionsBuilder();
@@ -1856,15 +1856,15 @@ public class OF13Provider implements ConfigInterface, NetworkingProvider {
     @Override
     public void initializeOFFlowRules(Node openflowNode) {
         String bridgeName = southbound.getBridgeName(openflowNode);
-        logger.info("initializeOFFlowRules: bridgeName: {}", bridgeName);
+        LOG.info("initializeOFFlowRules: bridgeName: {}", bridgeName);
         if (bridgeName.equals(configurationService.getIntegrationBridgeName())) {
             initializeFlowRules(openflowNode, configurationService.getIntegrationBridgeName());
             triggerInterfaceUpdates(openflowNode);
         } else if (bridgeName.equals(configurationService.getExternalBridgeName())) {
             initializeFlowRules(openflowNode, configurationService.getExternalBridgeName());
-            logger.info("initializeOFFlowRules after writeFlow: bridgeName: {}", bridgeName);
+            LOG.info("initializeOFFlowRules after writeFlow: bridgeName: {}", bridgeName);
             triggerInterfaceUpdates(openflowNode);
-            logger.info("initializeOFFlowRules after triggerUpdates: bridgeName: {}", bridgeName);
+            LOG.info("initializeOFFlowRules after triggerUpdates: bridgeName: {}", bridgeName);
         }
     }