Fix more bad logging in vpnmanager

Change-Id: If437bcf5a27cd9f66e256143a7d6623407b25c33
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java
index 0acd60eff9d68c337879d06e48d07a1958768b4c..ef7e051e17b0ea64b82c528b4aa39fc6b6a56263 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java
@@ -326,11 +326,10 @@ public class InterfaceStateChangeListener
         @Override
         public void onFailure(Throwable throwable) {
             if (add) {
-                LOG.error("InterfaceStateChangeListener: VrfEntries for {} failed to store into destination {}"
-                        + " with exception: {}", interfaceName, txnDestination, throwable);
+                LOG.error("InterfaceStateChangeListener: VrfEntries for {} failed to store into destination {}",
+                        interfaceName, txnDestination, throwable);
             } else {
-                LOG.error("InterfaceStateChangeListener: VrfEntries for {} removal failed with exception: {}",
-                        interfaceName, throwable);
+                LOG.error("InterfaceStateChangeListener: VrfEntries for {} removal failed", interfaceName, throwable);
                 VpnUtil.unsetScheduledToRemoveForVpnInterface(dataBroker, interfaceName);
             }
         }

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java
index 45e59c6e0f2a2fbb5579099237b21bdcd3c341d1..a427fedb39086b6f1a50801e1f754ba63e4a3f25 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java
@@ -102,7 +102,7 @@ public class SubnetRouteInterfaceStateChangeListener extends AsyncDataTreeChange
                                     dpnId = InterfaceUtils.getDpIdFromInterface(intrf);
                                 } catch (Exception e) {
                                     LOG.error("{} add: Unable to obtain dpnId for interface {} in subnet {},"
-                                            + " subnetroute inclusion for this interface failed with exception {}",
+                                            + " subnetroute inclusion for this interface failed",
                                             LOGGING_PREFIX, interfaceName, subnetId, e);
                                 }
                                 InstanceIdentifier<VpnInterface> id = VpnUtil
@@ -150,7 +150,7 @@ public class SubnetRouteInterfaceStateChangeListener extends AsyncDataTreeChange
                                 dpnId = InterfaceUtils.getDpIdFromInterface(intrf);
                             } catch (Exception e) {
                                 LOG.error("{} remove: Unable to retrieve dpnId for interface {} in subnet {}. "
-                                                + "Fetching from vpn interface itself due to exception {}",
+                                                + "Fetching from vpn interface itself",
                                         LOGGING_PREFIX, intrf.getName(), subnetId, e);
                             }
                             InstanceIdentifier<VpnInterface> id = VpnUtil
@@ -219,7 +219,7 @@ public class SubnetRouteInterfaceStateChangeListener extends AsyncDataTreeChange
                                 dpnId = InterfaceUtils.getDpIdFromInterface(update);
                             } catch (Exception e) {
                                 LOG.error("{} remove: Unable to retrieve dpnId for interface {} in subnet  {}. "
-                                                + "Fetching from vpn interface itself due to exception {}",
+                                                + "Fetching from vpn interface itself",
                                         LOGGING_PREFIX, update.getName(), subnetId, e);
                             }
                             InstanceIdentifier<VpnInterface> id = VpnUtil

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
index 7eb7a207969f71e1b90878016b1b5179fa25c99f..fb733562f9c4f7ccb9b59bbdc3b8333018f7cb15 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java
@@ -143,8 +143,8 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener {
                     if (elanTag == 0L) {
                         VpnManagerCounters.subnet_route_packet_failed.inc();
                         LOG.error("{} onPacketReceived: elanTag value from metadata found to be 0, for IPv4 "
-                                + " Packet received with Target IP {} src Ip vpnId", LOGGING_PREFIX, dstIpStr, srcIp,
-                                vpnId);
+                                + " Packet received with Target IP {} src Ip {} vpnId {}",
+                                LOGGING_PREFIX, dstIpStr, srcIp, vpnId);
                         return;
                     }
 
@@ -277,7 +277,7 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener {
                                 throws UnknownHostException {
         String routerId = VpnUtil.getAssociatedExternalRouter(dataBroker, srcIpStr);
         if (null == routerId) {
-            LOG.debug("The ip is not associated with any external router", srcIpStr);
+            LOG.debug("This ip is not associated with any external router: {}", srcIpStr);
         }
         handlePacketToExternalNetwork(new Uuid(vpnIdVpnInstanceName), routerId, dstIp, elanTag);
     }
@@ -333,7 +333,8 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener {
         Optional<NetworkMap> optionalNetworkMap = VpnUtil.read(broker, LogicalDatastoreType.CONFIGURATION,
                 VpnUtil.buildNetworkMapIdentifier(new Uuid(elanInfo.getName())));
         if (!optionalNetworkMap.isPresent()) {
-            LOG.debug("{} getTargetDpnForPacketOut: No network map found for elan info {}", elanInfo.getName());
+            LOG.debug("{} getTargetDpnForPacketOut: No network map found for elan info {}", LOGGING_PREFIX,
+                    elanInfo.getName());
             return null;
         }
 

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java
index 1c52b40ca7184bd8e308e97c9696be85f5c44ef8..3b84424c4561de2d0cd2f6d0cccf72b330f4b782 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java
@@ -84,8 +84,7 @@ public class TunnelEndPointChangeListener
 
         List<VpnInstance> vpnInstances = VpnHelper.getAllVpnInstances(broker);
         if (vpnInstances == null || vpnInstances.isEmpty()) {
-            LOG.warn("add: dpnId: {}: tep: tep.getInterfaceName(): No VPN instances defined",
-                dpnId, tep.getInterfaceName());
+            LOG.warn("add: dpnId: {}: tep: {}: No VPN instances defined", dpnId, tep.getInterfaceName());
             return;
         }
 
@@ -125,8 +124,8 @@ public class TunnelEndPointChangeListener
                     }
                 }
             } else {
-                LOG.error("add: Ignoring addition of tunnel interface{} dpn {} for vpnInstance {} with primaryRd {},"
-                        + " as the VPN is already marked for deletion", tep.getInterfaceName(),
+                LOG.error("add: Ignoring addition of tunnel interface {} dpn {} for vpnInstance {} with primaryRd {},"
+                        + " as the VPN is already marked for deletion", tep.getInterfaceName(), dpnId,
                         vpnName, primaryRd);
             }
         }

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
index 509e553b08b0832dd468809094e5a6019ae2a9ad..5c02581a1b242ef3ef252083b2d6c8f45f5ddf29 100755 (executable)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
@@ -1760,7 +1760,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase<VpnInte
                 List<Adjacency> adjacencies = optAdjacencies.get().getAdjacency();
 
                 if (!adjacencies.isEmpty()) {
-                    LOG.trace("delAdjFromVpnInterface: Adjacencies are " + adjacencies);
+                    LOG.trace("delAdjFromVpnInterface: Adjacencies are {}", adjacencies);
                     Iterator<Adjacency> adjIt = adjacencies.iterator();
                     while (adjIt.hasNext()) {
                         Adjacency adjElem = adjIt.next();
@@ -2202,11 +2202,10 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase<VpnInte
         @Override
         public void onFailure(Throwable throwable) {
             if (add) {
-                LOG.error("VpnInterfaceManager: VrfEntries for {} failed to store into destination {}"
-                        + " with exception: {}", interfaceName, txnDestination, throwable);
+                LOG.error("VpnInterfaceManager: VrfEntries for {} failed to store into destination {}",
+                        interfaceName, txnDestination, throwable);
             } else {
-                LOG.error("VpnInterfaceManager: VrfEntries for {} removal failed with exception: {}", interfaceName,
-                        throwable);
+                LOG.error("VpnInterfaceManager: VrfEntries for {} removal failed", interfaceName, throwable);
                 VpnUtil.unsetScheduledToRemoveForVpnInterface(dataBroker, interfaceName);
             }
         }