Clean up logging

[netvirt.git] / openstack / net-virt / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / LBaaSPoolHandler.java

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java
index 0d1cd37bc4aaa03b7ccd7f7bf0001d6901f6cba9..9f8c70647919a5fb1cb04e71dc1cacfe33996506 100755 (executable)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java
@@ -46,7 +46,7 @@ import com.google.common.collect.Lists;
 public class LBaaSPoolHandler extends AbstractHandler
         implements INeutronLoadBalancerPoolAware, ConfigInterface {
 
-    private static final Logger logger = LoggerFactory.getLogger(LBaaSPoolHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LBaaSPoolHandler.class);
 
     // The implementation for each of these services is resolved by the OSGi Service Manager
     private volatile INeutronLoadBalancerCRUD neutronLBCache;
@@ -72,7 +72,7 @@ public class LBaaSPoolHandler extends AbstractHandler
 
     @Override
     public void neutronLoadBalancerPoolCreated(NeutronLoadBalancerPool neutronLBPool) {
-        logger.debug("Neutron LB Pool Creation : {}", neutronLBPool.toString());
+        LOG.debug("Neutron LB Pool Creation : {}", neutronLBPool.toString());
         enqueueEvent(new NorthboundEvent(neutronLBPool, Action.ADD));
     }
 
@@ -86,16 +86,15 @@ public class LBaaSPoolHandler extends AbstractHandler
         List<LoadBalancerConfiguration> lbConfigList = extractLBConfiguration(neutronLBPool);
         final List<Node> nodes = nodeCacheManager.getBridgeNodes();
         if (lbConfigList == null) {
-            logger.debug("Neutron LB configuration invalid for pool {} ", neutronLBPool.getLoadBalancerPoolID());
+            LOG.debug("Neutron LB configuration invalid for pool {} ", neutronLBPool.getLoadBalancerPoolID());
         } else if (lbConfigList.size() == 0) {
-            logger.debug("No Neutron LB VIP not created yet for pool {} ", neutronLBPool.getLoadBalancerPoolID());
+            LOG.debug("No Neutron LB VIP not created yet for pool {} ", neutronLBPool.getLoadBalancerPoolID());
         } else if (nodes.isEmpty()) {
-            logger.debug("Noop with LB pool {} creation because no nodes available.", neutronLBPool.getLoadBalancerPoolID());
+            LOG.debug("Noop with LB pool {} creation because no nodes available.", neutronLBPool.getLoadBalancerPoolID());
         } else {
             for (LoadBalancerConfiguration lbConfig: lbConfigList) {
                 if (!lbConfig.isValid()) {
-                    logger.debug("Neutron LB pool configuration invalid for {} ", lbConfig.getName());
-                    continue;
+                    LOG.debug("Neutron LB pool configuration invalid for {} ", lbConfig.getName());
                 } else {
                     for (Node node : nodes) {
                         loadBalancerProvider.programLoadBalancerRules(node, lbConfig, Action.ADD);
@@ -112,7 +111,7 @@ public class LBaaSPoolHandler extends AbstractHandler
 
     @Override
     public void neutronLoadBalancerPoolUpdated(NeutronLoadBalancerPool neutronLBPool) {
-        logger.debug("Neutron LB Pool Update : {}", neutronLBPool.toString());
+        LOG.debug("Neutron LB Pool Update : {}", neutronLBPool.toString());
         enqueueEvent(new NorthboundEvent(neutronLBPool, Action.UPDATE));
     }
 
@@ -132,7 +131,7 @@ public class LBaaSPoolHandler extends AbstractHandler
 
     @Override
     public void neutronLoadBalancerPoolDeleted(NeutronLoadBalancerPool neutronLBPool) {
-        logger.debug("Neutron LB Pool Deletion : {}", neutronLBPool.toString());
+        LOG.debug("Neutron LB Pool Deletion : {}", neutronLBPool.toString());
         enqueueEvent(new NorthboundEvent(neutronLBPool, Action.DELETE));
     }
 
@@ -142,16 +141,15 @@ public class LBaaSPoolHandler extends AbstractHandler
         List<LoadBalancerConfiguration> lbConfigList = extractLBConfiguration(neutronLBPool);
         final List<Node> nodes = nodeCacheManager.getBridgeNodes();
         if (lbConfigList == null) {
-            logger.debug("Neutron LB configuration invalid for pool {} ", neutronLBPool.getLoadBalancerPoolID());
+            LOG.debug("Neutron LB configuration invalid for pool {} ", neutronLBPool.getLoadBalancerPoolID());
         } else if (lbConfigList.size() == 0) {
-            logger.debug("No Neutron LB VIP not created yet for pool {} ", neutronLBPool.getLoadBalancerPoolID());
+            LOG.debug("No Neutron LB VIP not created yet for pool {} ", neutronLBPool.getLoadBalancerPoolID());
         } else if (nodes.isEmpty()) {
-            logger.debug("Noop with LB pool {} deletion because no nodes available.", neutronLBPool.getLoadBalancerPoolID());
+            LOG.debug("Noop with LB pool {} deletion because no nodes available.", neutronLBPool.getLoadBalancerPoolID());
         } else {
             for (LoadBalancerConfiguration lbConfig: lbConfigList) {
                 if (!lbConfig.isValid()) {
-                    logger.debug("Neutron LB pool configuration invalid for {} ", lbConfig.getName());
-                    continue;
+                    LOG.debug("Neutron LB pool configuration invalid for {} ", lbConfig.getName());
                 } else {
                     for (Node node : nodes) {
                         loadBalancerProvider.programLoadBalancerRules(node, lbConfig, Action.DELETE);
@@ -169,9 +167,9 @@ public class LBaaSPoolHandler extends AbstractHandler
      */
     @Override
     public void processEvent(AbstractEvent abstractEvent) {
-        logger.debug("Processing Loadbalancer Pool event " + abstractEvent);
+        LOG.debug("Processing Loadbalancer Pool event {}", abstractEvent);
         if (!(abstractEvent instanceof NorthboundEvent)) {
-            logger.error("Unable to process abstract event " + abstractEvent);
+            LOG.error("Unable to process abstract event {}", abstractEvent);
             return;
         }
         NorthboundEvent ev = (NorthboundEvent) abstractEvent;
@@ -187,10 +185,10 @@ public class LBaaSPoolHandler extends AbstractHandler
                  * Typical upgrade involves changing algorithm. Right now
                  * we do not support this flexibility. TODO
                  */
-                logger.warn("Load balancer pool update is not supported");
+                LOG.warn("Load balancer pool update is not supported");
                 break;
             default:
-                logger.warn("Unable to process event action " + ev.getAction());
+                LOG.warn("Unable to process event action {}", ev.getAction());
                 break;
         }
     }
@@ -211,7 +209,7 @@ public class LBaaSPoolHandler extends AbstractHandler
 
         List<NeutronLoadBalancerPoolMember> poolMembers = neutronLBPool.getLoadBalancerPoolMembers();
         if (poolMembers.size() == 0) {
-            logger.debug("Neutron LB pool is empty: {}", neutronLBPool);
+            LOG.debug("Neutron LB pool is empty: {}", neutronLBPool);
             return null;
         }
 
@@ -249,7 +247,7 @@ public class LBaaSPoolHandler extends AbstractHandler
                     memberIP = neutronLBPoolMember.getPoolMemberAddress();
                     memberPort = neutronLBPoolMember.getPoolMemberProtoPort();
                     if (memberSubnetID == null || memberID == null || memberIP == null || memberPort == null) {
-                        logger.debug("Neutron LB pool member details incomplete: {}", neutronLBPoolMember);
+                        LOG.debug("Neutron LB pool member details incomplete: {}", neutronLBPoolMember);
                         continue;
                     }
                     memberMAC = NeutronCacheUtils.getMacAddress(neutronPortCache, memberSubnetID, memberIP);