From cf8a16020e2beb992e12e84387d2060a0d17c81f Mon Sep 17 00:00:00 2001 From: Faseela K Date: Thu, 8 Mar 2018 17:53:46 +0530 Subject: [PATCH 1/1] logging issues in elanmanager Change-Id: I9209c3be150064bf230f5b56663a5a0ba8c311d0 Signed-off-by: Faseela K --- .../netvirt/elan/cache/ElanInterfaceCache.java | 3 ++- .../org/opendaylight/netvirt/elan/cli/ElanAdd.java | 4 ++-- .../opendaylight/netvirt/elan/cli/ElanDelete.java | 2 +- .../org/opendaylight/netvirt/elan/cli/ElanGet.java | 2 +- .../netvirt/elan/cli/ElanInterfaceAdd.java | 4 ++-- .../netvirt/elan/cli/ElanInterfaceDelete.java | 2 +- .../netvirt/elan/cli/ElanInterfaceGet.java | 3 +-- .../netvirt/elan/cli/ElanInterfaceUpdate.java | 4 ++-- .../netvirt/elan/cli/ElanMacTableFlush.java | 2 +- .../netvirt/elan/cli/ElanMacTableGet.java | 2 +- .../opendaylight/netvirt/elan/cli/ElanUpdate.java | 3 ++- .../netvirt/elan/cli/StaticMacAdd.java | 4 ++-- .../netvirt/elan/cli/StaticMacDelete.java | 4 ++-- .../netvirt/elan/cli/etree/EtreeAdd.java | 4 ++-- .../netvirt/elan/cli/etree/EtreeDelete.java | 2 +- .../netvirt/elan/cli/etree/EtreeGet.java | 2 +- .../netvirt/elan/cli/etree/EtreeInterfaceAdd.java | 5 +++-- .../elan/cli/etree/EtreeInterfaceDelete.java | 2 +- .../netvirt/elan/cli/etree/EtreeInterfaceGet.java | 3 +-- .../netvirt/elan/evpn/utils/EvpnUtils.java | 6 +++--- .../netvirt/elan/internal/ElanBridgeManager.java | 2 +- .../ElanDpnInterfaceClusteredListener.java | 2 +- .../netvirt/elan/internal/ElanInstanceManager.java | 2 +- .../elan/internal/ElanInterfaceManager.java | 7 +++---- .../ElanInterfaceStateClusteredListener.java | 2 +- .../netvirt/elan/internal/ElanServiceProvider.java | 9 ++++----- .../elan/internal/ElanSmacFlowEventListener.java | 2 +- .../netvirt/elan/l2gw/ha/HwvtepHAUtil.java | 2 +- .../l2gw/ha/handlers/NodeConnectedHandler.java | 2 +- .../netvirt/elan/l2gw/ha/handlers/NodeCopier.java | 12 +++++++----- .../l2gw/ha/listeners/HAConfigNodeListener.java | 5 +++++ .../elan/l2gw/ha/listeners/HAJobScheduler.java | 2 +- .../l2gw/ha/listeners/HAOpClusteredListener.java | 4 ++-- .../elan/l2gw/ha/listeners/HAOpNodeListener.java | 4 ++++ .../l2gw/ha/listeners/HwvtepNodeBaseListener.java | 10 +++------- .../elan/l2gw/ha/listeners/ManagerListener.java | 2 +- .../l2gw/ha/merge/MergeCommandsAggregator.java | 2 +- .../netvirt/elan/l2gw/listeners/ChildListener.java | 2 +- .../listeners/HwvtepPhysicalSwitchListener.java | 4 ++-- .../elan/l2gw/listeners/LocalUcastMacListener.java | 3 +++ .../elan/l2gw/utils/ElanL2GatewayUtils.java | 10 +++++----- .../netvirt/elan/utils/ElanDmacUtils.java | 2 +- .../elan/utils/ElanForwardingEntriesHandler.java | 14 ++++++-------- .../netvirt/elan/utils/ElanItmUtils.java | 2 +- .../opendaylight/netvirt/elan/utils/ElanUtils.java | 10 +++++----- .../elan/utils/TransportZoneNotificationUtil.java | 8 ++++---- 46 files changed, 98 insertions(+), 91 deletions(-) diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java index 546d238ea3..98e40df57d 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java @@ -36,7 +36,8 @@ import org.slf4j.LoggerFactory; */ @Singleton public class ElanInterfaceCache extends DataObjectCache { - private static final Logger LOG = LoggerFactory.getLogger(ElanInterface.class); + + private static final Logger LOG = LoggerFactory.getLogger(ElanInterfaceCache.class); private final Map> elanInstanceToInterfacesCache = new ConcurrentHashMap<>(); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java index b0f7703d88..59d5420765 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java @@ -37,8 +37,8 @@ public class ElanAdd extends OsgiCommandSupport { macTimeOut = 30; } - LOG.debug("Executing create ElanInstance command" + "\t" + elanName + "\t" + macTimeOut + "\t" + elanDescr - + "\t"); + LOG.debug("Executing create ElanInstance command for elanName : {}, macTimeOut : {}, elanDescr : {}", + elanName, macTimeOut, elanDescr); if (elanName.length() <= MAX_LENGTH) { boolean isSuccess = elanProvider.createElanInstance(elanName, macTimeOut, elanDescr); if (isSuccess) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java index 6939ac24d1..046e8e28bf 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java @@ -29,7 +29,7 @@ public class ElanDelete extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing the Deletion of ElanInstance command" + "\t" + elanName + "\t"); + LOG.debug("Executing the Deletion of ElanInstance command for elanName: {}", elanName); boolean isSuccess = elanProvider.deleteElanInstance(elanName); if (isSuccess) { session.getConsole().println("Elan Instance deleted successfully"); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java index 293efd4490..9e80f213bb 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java @@ -32,7 +32,7 @@ public class ElanGet extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing Get ElanInstance command" + "\t" + elanName + "\t"); + LOG.debug("Executing Get ElanInstance command for elanName: {}", elanName); if (elanName != null) { ElanInstance elanInstance = elanProvider.getElanInstance(elanName); if (elanInstance == null) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java index ba8fe75203..6627903752 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java @@ -37,8 +37,8 @@ public class ElanInterfaceAdd extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing create ElanInterface command" + "\t" + elanName + "\t" + interfaceName + "\t" - + staticMacAddresses + "\t" + elanInterfaceDescr + "\t"); + LOG.debug("Executing create ElanInterface command for elanName:{}, interfaceName:{}, staticMacAddresses:{}," + + "elanInterfaceDescr:{}",elanName, interfaceName, staticMacAddresses, elanInterfaceDescr); elanProvider.addElanInterface(elanName, interfaceName, staticMacAddresses, elanInterfaceDescr); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java index 7cbf0f68bb..6536095529 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java @@ -30,7 +30,7 @@ public class ElanInterfaceDelete extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Deleting ElanInterface command" + "\t" + elanName + "\t" + interfaceName + "\t"); + LOG.debug("Deleting ElanInterface command for elanName:{}, interfaceName:{}", elanName, interfaceName); elanProvider.deleteElanInterface(interfaceName); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java index 34e66fac32..60b858f5b5 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java @@ -39,8 +39,7 @@ public class ElanInterfaceGet extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing Get ElanInterface command for the corresponding Elan Instance" - + "\t" + elanName + "\t"); + LOG.debug("Executing Get ElanInterface command for the corresponding Elan Instance for {}", elanName); if (elanName != null) { ElanInstance elanInstance = elanProvider.getElanInstance(elanName); List elanInterfaces = elanProvider.getElanInterfaces(elanName); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java index b5f33e2fa6..2405cd0434 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java @@ -37,8 +37,8 @@ public class ElanInterfaceUpdate extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing updating ElanInterface command" + "\t" + elanName + "\t" + interfaceName + "\t" - + staticMacAddresses + "\t" + elanInterfaceDescr + "\t"); + LOG.debug("Executing elanInterface update command for elanName:{}, interfaceName:{}, staticMacAddresses:{}," + + "elanInterfaceDescr:{}", elanName, interfaceName, staticMacAddresses, elanInterfaceDescr); elanProvider.updateElanInterface(elanName, interfaceName, staticMacAddresses, elanInterfaceDescr); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java index 25ebd45f5f..ba603f567e 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java @@ -29,7 +29,7 @@ public class ElanMacTableFlush extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing create ElanInstance command" + "\t" + elanName + "\t"); + LOG.debug("Executing mac table flush command for {}", elanName); elanProvider.flushMACTable(elanName); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java index 2510a758fd..516af9339d 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java @@ -34,7 +34,7 @@ public class ElanMacTableGet extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing updating ElanInterface command" + "\t"); + LOG.debug("Executing elan mac table get command for {}", elanName); Collection macTables = elanProvider.getElanMacTable(elanName); if (!macTables.isEmpty()) { SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yy:HH:mm:ss"); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java index 091073ac0b..57f2ecfc8a 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java @@ -32,7 +32,8 @@ public class ElanUpdate extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Updating the ElanInstance command" + "\t" + elanName + "\t" + macTimeOut + "\t" + elanDescr + "\t"); + LOG.debug("Updating elanInstance update command for elanName:{}, macTimeOut:{}, elanDescr:{}", + elanName, macTimeOut, elanDescr); elanProvider.updateElanInstance(elanName, macTimeOut, elanDescr); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java index f18a6a37aa..22aeedae41 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java @@ -33,8 +33,8 @@ public class StaticMacAdd extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing create ElanInterface command" + "\t" + elanName + "\t" + interfaceName + "\t" - + staticMacAddress + "\t"); + LOG.debug("Executing static mac add command for elanName:{}, interfaceName:{}, staticMacAddress:{}", + elanName, interfaceName, staticMacAddress); elanProvider.addStaticMacAddress(interfaceName, staticMacAddress); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java index eaa487ead0..aab6bec29b 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java @@ -33,8 +33,8 @@ public class StaticMacDelete extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing create ElanInterface command" + "\t" + elanName + "\t" + interfaceName + "\t" - + staticMacAddress + "\t"); + LOG.debug("Executing static mac delete command for elanName:{}, interfaceName:{}, staticMacAddress:{}", + elanName, interfaceName, staticMacAddress); elanProvider.deleteStaticMacAddress(interfaceName, staticMacAddress); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java index 8fbd7e7c1f..1c71ec5ae5 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java @@ -37,8 +37,8 @@ public class EtreeAdd extends OsgiCommandSupport { macTimeOut = 30; } - LOG.debug("Executing create EtreeInstance command" + "\t" + etreeName + "\t" + macTimeOut + "\t" - + etreeDescr + "\t"); + LOG.debug("Executing create EtreeInstance command etreeName:{}, macTimeOut:{}, etreeDescr:{}", + etreeName, macTimeOut, etreeDescr); if (etreeName.length() <= MAX_LENGTH) { boolean isSuccess = elanProvider.createEtreeInstance(etreeName, macTimeOut, etreeDescr); if (isSuccess) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java index 5a2d43cc40..02d91d6773 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java @@ -29,7 +29,7 @@ public class EtreeDelete extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing the Deletion of EtreeInstance command" + "\t" + etreeName + "\t"); + LOG.debug("Executing the Deletion of EtreeInstance command {}", etreeName); boolean isSuccess = elanProvider.deleteEtreeInstance(etreeName); if (isSuccess) { session.getConsole().println("Etree Instance deleted successfully"); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java index b0206b78cd..1e6c7abfa2 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java @@ -33,7 +33,7 @@ public class EtreeGet extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing Get EtreeInstance command" + "\t" + etreeName + "\t"); + LOG.debug("Executing Get EtreeInstance command for {}", etreeName); if (etreeName != null) { ElanInstance elanInstance = elanProvider.getElanInstance(etreeName); if (elanInstance == null || elanInstance.getAugmentation(EtreeInstance.class) == null) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java index 7e08dce88c..8fa054386a 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java @@ -65,8 +65,9 @@ public class EtreeInterfaceAdd extends OsgiCommandSupport { } } - LOG.debug("Executing create EtreeInterface command" + "\t" + elanName + "\t" + interfaceName + "\t" - + interfaceType + "\t" + staticMacAddresses + "\t" + elanInterfaceDescr + "\t"); + LOG.debug("Executing create EtreeInterface command elanName:{}, interfaceName:{}, interfaceType:{}," + + "staticMacAddresses:{}, elanInterfaceDescr:{}", elanName, interfaceName, interfaceType, + staticMacAddresses, elanInterfaceDescr); elanProvider.addEtreeInterface(elanName, interfaceName, inputType, staticMacAddresses, elanInterfaceDescr); session.getConsole().println("Created etree interface successfully"); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java index b4a7a27cbe..474c4f44d3 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java @@ -32,7 +32,7 @@ public class EtreeInterfaceDelete extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Deleting EtreeInterface command" + "\t" + etreeName + "\t" + interfaceName + "\t"); + LOG.debug("Deleting EtreeInterface command etreeName:{}, interfaceName:{}", etreeName, interfaceName); ElanInterface existingInterface = elanProvider.getElanInterfaceByElanInterfaceName(interfaceName); if (existingInterface == null || existingInterface.getAugmentation(EtreeInterface.class) == null) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java index 97c6719be7..459a4a4cfd 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java @@ -41,8 +41,7 @@ public class EtreeInterfaceGet extends OsgiCommandSupport { @Override protected Object doExecute() { - LOG.debug("Executing Get EtreeInterface command for the corresponding Etree Instance" + "\t" + etreeName - + "\t"); + LOG.debug("Executing Get EtreeInterface command for the corresponding Etree Instance {}", etreeName); if (etreeName != null) { ElanInstance elanInstance = elanProvider.getElanInstance(etreeName); if (elanInstance == null || elanInstance.getAugmentation(EtreeInstance.class) == null) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java index 2539146ff3..415dd536eb 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java @@ -151,10 +151,10 @@ public class EvpnUtils { try { rpcResult = result.get(); } catch (InterruptedException e) { - LOG.error("getnextHopIpFromRpcOutput : InterruptedException for dpnid {}", e, dpnId); + LOG.error("getnextHopIpFromRpcOutput : InterruptedException for dpnid {}", dpnId, e); return null; } catch (ExecutionException e) { - LOG.error("getnextHopIpFromRpcOutput : ExecutionException for dpnid {}", e, dpnId); + LOG.error("getnextHopIpFromRpcOutput : ExecutionException for dpnid {}", dpnId, e); return null; } if (!rpcResult.isSuccessful()) { @@ -268,7 +268,7 @@ public class EvpnUtils { String evpnName = evpnAugmentation.getEvpnName(); String rd = vpnManager.getVpnRd(broker, evpnName); if (rd == null) { - LOG.debug("withdrawEvpnRT2Routes : rd is null ", elanName); + LOG.debug("withdrawEvpnRT2Routes : rd is null for {}", elanName); return; } List macEntries = elanUtils.getElanMacEntries(elanName); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java index ce331b1261..0585e17516 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java @@ -160,7 +160,7 @@ public class ElanBridgeManager implements IElanBridgeManager { try { createIntegrationBridgeConfig(node, generateIntBridgeMac); } catch (RuntimeException e) { - LOG.error("Error creating bridge on " + node, e); + LOG.error("Error creating bridge on {}", node, e); } } return; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java index 0d2f7dfb13..5d4f4f7023 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java @@ -77,7 +77,7 @@ public class ElanDpnInterfaceClusteredListener void handleUpdate(InstanceIdentifier id, DpnInterfaces dpnInterfaces) { final String elanName = getElanName(id); if (ElanL2GwCacheUtils.getInvolvedL2GwDevices(elanName).isEmpty()) { - LOG.debug("dpnInterface updation, no external l2 devices to update for elan {} with Dp Id:", elanName, + LOG.debug("dpnInterface updation, no external l2 devices to update for elan {} with Dp Id {}", elanName, dpnInterfaces.getDpId()); return; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java index c68b0651fb..d6ebdd7b0d 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java @@ -151,7 +151,7 @@ public class ElanInstanceManager extends AsyncDataTreeChangeListenerBase { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java index d0fc9fa14c..67f04fc508 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; public final class HwvtepHAUtil { - static Logger LOG = LoggerFactory.getLogger(HwvtepHAUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(HwvtepHAUtil.class); //TODO reuse HWvtepSouthboundConstants public static final String HA_ENABLED = "ha_enabled"; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java index 0d33e9d41d..7c646c6c45 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; public class NodeConnectedHandler { - static Logger LOG = LoggerFactory.getLogger(NodeConnectedHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(NodeConnectedHandler.class); GlobalAugmentationMerger globalAugmentationMerger = GlobalAugmentationMerger.getInstance(); PSAugmentationMerger psAugmentationMerger = PSAugmentationMerger.getInstance(); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java index 81df859482..2eecca0685 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; @Singleton public class NodeCopier implements INodeCopier { - static Logger LOG = LoggerFactory.getLogger(NodeCopier.class); + private static final Logger LOG = LoggerFactory.getLogger(NodeCopier.class); GlobalAugmentationMerger globalAugmentationMerger = GlobalAugmentationMerger.getInstance(); PSAugmentationMerger psAugmentationMerger = PSAugmentationMerger.getInstance(); @@ -57,11 +57,12 @@ public class NodeCopier implements INodeCopier { this.db = db; } + @Override public void copyGlobalNode(Optional srcGlobalNodeOptional, - InstanceIdentifier srcPath, - InstanceIdentifier dstPath, - LogicalDatastoreType logicalDatastoreType, - ReadWriteTransaction tx) throws ReadFailedException { + InstanceIdentifier srcPath, + InstanceIdentifier dstPath, + LogicalDatastoreType logicalDatastoreType, + ReadWriteTransaction tx) throws ReadFailedException { if (!srcGlobalNodeOptional.isPresent() && logicalDatastoreType == CONFIGURATION) { Futures.addCallback(tx.read(logicalDatastoreType, srcPath), new FutureCallback>() { @Override @@ -139,6 +140,7 @@ public class NodeCopier implements INodeCopier { } } + @Override public void copyPSNode(Optional srcPsNodeOptional, InstanceIdentifier srcPsPath, InstanceIdentifier dstPsPath, diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java index 622e5e7ed6..489ed1cf3a 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java @@ -25,9 +25,14 @@ import org.opendaylight.netvirt.elan.l2gw.ha.handlers.IHAEventHandler; import org.opendaylight.netvirt.elan.l2gw.ha.handlers.NodeCopier; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Singleton public class HAConfigNodeListener extends HwvtepNodeBaseListener { + + private static final Logger LOG = LoggerFactory.getLogger(HAConfigNodeListener.class); + private final IHAEventHandler haEventHandler; private final NodeCopier nodeCopier; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java index f543f684b2..0d6774b610 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; public final class HAJobScheduler implements Thread.UncaughtExceptionHandler { - private static final Logger LOG = LoggerFactory.getLogger(HAOpClusteredListener.class); + private static final Logger LOG = LoggerFactory.getLogger(HAJobScheduler.class); ExecutorService executorService; static HAJobScheduler instance = new HAJobScheduler(); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java index 33033e4500..23583fff41 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java @@ -112,9 +112,9 @@ public class HAOpClusteredListener extends HwvtepNodeBaseListener implements Clu if (!wasHAChild && isHAChild) { - LOG.debug(getNodeId(childPath) + " " + "became ha_child"); + LOG.debug("{} became ha_child", getNodeId(childPath)); } else if (wasHAChild && !isHAChild) { - LOG.debug(getNodeId(childPath) + " " + "unbecome ha_child"); + LOG.debug("{} unbecome ha_child", getNodeId(childPath)); } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java index f2fcb9f549..edefaf07fc 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java @@ -33,10 +33,14 @@ import org.opendaylight.netvirt.elan.l2gw.ha.handlers.NodeCopier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Singleton public class HAOpNodeListener extends HwvtepNodeBaseListener { + private static final Logger LOG = LoggerFactory.getLogger(HAOpNodeListener.class); + static BiPredicate> IS_PS_CHILD_TO_GLOBAL_NODE = (globalNodeId, iid) -> { String psNodeId = iid.firstKeyOf(Node.class).getNodeId().getValue(); return psNodeId.startsWith(globalNodeId) && psNodeId.contains("physicalswitch"); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java index ba7581a18d..6122644bf5 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; public abstract class HwvtepNodeBaseListener implements DataTreeChangeListener, AutoCloseable { - public static final Logger LOG = LoggerFactory.getLogger(HwvtepNodeBaseListener.class); + private static final Logger LOG = LoggerFactory.getLogger(HwvtepNodeBaseListener.class); private static final int STARTUP_LOOP_TICK = 500; private static final int STARTUP_LOOP_MAX_RETRIES = 8; @@ -65,12 +65,8 @@ public abstract class HwvtepNodeBaseListener implements DataTreeChangeListener { - private static final Logger LOG = LoggerFactory.getLogger(HAOpClusteredListener.class); + private static final Logger LOG = LoggerFactory.getLogger(ManagerListener.class); private final DataBroker dataBroker; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java index 235994bca9..8e22a4f29e 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; public abstract class MergeCommandsAggregator { - public static final Logger LOG = LoggerFactory.getLogger(MergeCommandsAggregator.class); + private static final Logger LOG = LoggerFactory.getLogger(MergeCommandsAggregator.class); protected Map, MergeCommand> commands = new HashMap<>(); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java index 1985830b29..b4eba7e305 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; public abstract class ChildListener

implements DataTreeChangeListener

, AutoCloseable { - public static final Logger LOG = LoggerFactory.getLogger(ChildListener.class); + private static final Logger LOG = LoggerFactory.getLogger(ChildListener.class); private static final long STARTUP_LOOP_TICK = 500; private static final int STARTUP_LOOP_MAX_RETRIES = 8; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java index d7a5079744..f43258472b 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java @@ -293,7 +293,7 @@ public class HwvtepPhysicalSwitchListener LOG.trace("Updating cache for node {}", globalNodeIid); L2GatewayDevice l2GwDevice = l2GatewayCache.get(psName); if (childConnectedAfterParent.test(l2GwDevice, globalNodeIid)) { - LOG.trace("Device {} {} is already Connected by ", + LOG.trace("Device {} {} is already Connected by {}", psName, globalNodeId, l2GwDevice.getHwvtepNodeId()); return; } @@ -358,7 +358,7 @@ public class HwvtepPhysicalSwitchListener l2GwDevice.getL2GatewayIds(), psName, tunnelIpAddr); l2gwServiceProvider.provisionItmAndL2gwConnection(l2GwDevice, psName, hwvtepNodeId, tunnelIpAddr); } else { - LOG.info("l2gw.provision.skip {}", hwvtepNodeId, psName); + LOG.info("l2gw.provision.skip {}:{}", hwvtepNodeId, psName); } } elanClusterUtils.runOnlyInOwnerNode("Stale entry cleanup", () -> { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java index 831d81dd0f..99dc2947d5 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java @@ -46,11 +46,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hw import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Singleton public class LocalUcastMacListener extends ChildListener implements ClusteredDataTreeChangeListener { + private static final Logger LOG = LoggerFactory.getLogger(LocalUcastMacListener.class); public static final String NODE_CHECK = "physical"; private static final Predicate> IS_PS_NODE_IID = diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java index 5373249cdd..74d4881e69 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java @@ -546,7 +546,7 @@ public class ElanL2GatewayUtils { @Override public void onFailure(Throwable throwable) { - LOG.error("Failed to read config topology node ", nodeIid); + LOG.error("Failed to read config topology node {}", nodeIid); } }, MoreExecutors.directExecutor()); } @@ -584,8 +584,8 @@ public class ElanL2GatewayUtils { @Override public void onFailure(Throwable error) { - LOG.warn(String.format("Failed during batch delete of elan [%s] macs from l2gw device [%s]. " - + "Retrying with sequential deletes.", elanName, hwvtepNodeId), error); + LOG.warn("Failed during batch delete of elan {} macs from l2gw device {}. " + + "Retrying with sequential deletes.", elanName, hwvtepNodeId, error); if (lstElanMacs != null && !lstElanMacs.isEmpty()) { for (MacAddress mac : lstElanMacs) { HwvtepUtils.deleteRemoteUcastMac(broker, new NodeId(hwvtepNodeId), logicalSwitch, mac); @@ -783,7 +783,7 @@ public class ElanL2GatewayUtils { dpId = rpcResult.getResult().getDpid(); } } catch (InterruptedException | ExecutionException e) { - LOG.error("Failed to get the DPN ID for interface {}: {} ", interfaceName, e); + LOG.error("Failed to get the DPN ID for interface {}", interfaceName, e); } return dpId; } @@ -989,7 +989,7 @@ public class ElanL2GatewayUtils { if (rpcResult.isSuccessful()) { LOG.info("Created ITM tunnels for {}", hwvtepId); } else { - LOG.error("Failed to create ITM Tunnels: ", rpcResult.getErrors()); + LOG.error("Failed to create ITM Tunnels: {}", rpcResult.getErrors()); } } catch (InterruptedException | ExecutionException e) { LOG.error("RPC to create ITM tunnels failed", e); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java index 8b508be52c..5e84530890 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java @@ -88,7 +88,7 @@ public class ElanDmacUtils { elanItmUtils.getExternalTunnelItmEgressAction(dpId, new NodeId(extDeviceNodeId), vni); mkInstructions.add(MDSALUtil.buildApplyActionsInstruction(actions)); } catch (Exception e) { - LOG.error("Could not get Egress Actions for DpId=" + dpId + ", externalNode=" + extDeviceNodeId, e); + LOG.error("Could not get Egress Actions for DpId {} externalNode {}", dpId, extDeviceNodeId, e); } return MDSALUtil.buildFlowNew(NwConstants.ELAN_DMAC_TABLE, diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java index 05ee64fb3d..2bdb2e7d72 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java @@ -49,18 +49,16 @@ public class ElanForwardingEntriesHandler { public void updateElanInterfaceForwardingTablesList(String elanInstanceName, String interfaceName, String existingInterfaceName, MacEntry mac, WriteTransaction tx) { if (existingInterfaceName.equals(interfaceName)) { - LOG.error(String.format( - "Static MAC address %s has already been added for the same ElanInstance " - + "%s on the same Logical Interface Port %s." + LOG.error("Static MAC address {} has already been added for the same ElanInstance " + + "{} on the same Logical Interface Port {}." + " No operation will be done.", - mac.getMacAddress().toString(), elanInstanceName, interfaceName)); + mac.getMacAddress().toString(), elanInstanceName, interfaceName); } else { - LOG.warn(String.format( - "Static MAC address %s had already been added for ElanInstance %s on Logical Interface Port %s. " + LOG.warn("Static MAC address {} had already been added for ElanInstance {} on Logical Interface Port {}. " + "This would be considered as MAC movement scenario and old static mac will be removed " + "and new static MAC will be added" - + "for ElanInstance %s on Logical Interface Port %s", - mac.getMacAddress().toString(), elanInstanceName, interfaceName, elanInstanceName, interfaceName)); + + "for ElanInstance {} on Logical Interface Port {}", + mac.getMacAddress().toString(), elanInstanceName, interfaceName, elanInstanceName, interfaceName); //Update the ElanInterface Forwarding Container & ElanForwarding Container deleteElanInterfaceForwardingTablesList(existingInterfaceName, mac, tx); createElanInterfaceForwardingTablesList(interfaceName, mac, tx); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java index 64a784edcf..f4aeb82586 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java @@ -275,7 +275,7 @@ public class ElanItmUtils { LOG.warn("RPC call to ITM.GetExternalTunnelInterfaceName failed with error: {}", rpcResult.getErrors()); } } catch (NullPointerException | InterruptedException | ExecutionException e) { - LOG.error("Failed to get external tunnel interface name for sourceNode: {} and dstNode: {}: {} ", + LOG.error("Failed to get external tunnel interface name for sourceNode: {} and dstNode: {}", sourceNode, dstNode, e); } return tunnelInterfaceName; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java index fec60d8e96..554f7ba60a 100755 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java @@ -960,8 +960,8 @@ public class ElanUtils { if (etreeInterface != null && etreeInterface.getEtreeInterfaceType() == EtreeInterfaceType.Root) { EtreeLeafTagName etreeTagName = elanEtreeUtils.getEtreeLeafTagByElanTag(elanTag); if (etreeTagName == null) { - LOG.warn("Interface " + interfaceName - + " seems like it belongs to Etree but etreeTagName from elanTag " + elanTag + " is null."); + LOG.warn("Interface {} seems like it belongs to Etree but etreeTagName from elanTag {} is null.", + interfaceName, elanTag); } else { flowEntity = buildRemoteDmacFlowEntry(srcDpId, destDpId, lportTagOrVni, etreeTagName.getEtreeLeafTag().getValue(), macAddress, displayName, elanInstance); @@ -1016,8 +1016,8 @@ public class ElanUtils { } mkInstructions.add(MDSALUtil.buildApplyActionsInstruction(actions)); } catch (Exception e) { - LOG.error("Could not get egress actions to add to flow for srcDpId=" + srcDpId + ", destDpId=" + destDpId - + ", lportTag/VNI=" + lportTagOrVni, e); + LOG.error("Could not get egress actions to add to flow for srcDpId {}, destDpId {}, lportTag/VNI {}", + srcDpId, destDpId, lportTagOrVni, e); } Flow flow = MDSALUtil.buildFlowNew(NwConstants.ELAN_DMAC_TABLE, @@ -1250,7 +1250,7 @@ public class ElanUtils { } } catch (InterruptedException | ExecutionException e) { LOG.error("Error in RPC call removeTerminatingServiceActions for ELAN with serviceId {} on " - + "dpn {}: {}", serviceId, destDpId, e); + + "dpn {}", serviceId, destDpId, e); } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java index 687c76dafe..2266cba718 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java @@ -112,7 +112,7 @@ public class TransportZoneNotificationUtil { elanInstanceCache.get(elanInt.getElanInstanceName()).orNull())) { return true; } else { - LOG.debug("Non-VXLAN elanInstance: " + elanInt.getElanInstanceName()); + LOG.debug("Non-VXLAN elanInstance: {}", elanInt.getElanInstanceName()); } } @@ -439,7 +439,7 @@ public class TransportZoneNotificationUtil { String localIp = southBoundUtils.getOpenvswitchOtherConfig(node.get(), LOCAL_IP); if (localIp == null) { LOG.error("missing local_ip key in ovsdb:openvswitch-other-configs in operational" - + " network-topology for node: " + node.get().getNodeId().getValue()); + + " network-topology for node: {}", node.get().getNodeId().getValue()); } else { return localIp; } @@ -465,7 +465,7 @@ public class TransportZoneNotificationUtil { Optional optionalBridgeRefEntry = tx.read(LogicalDatastoreType.OPERATIONAL, bridgeRefInfoPath).checkedGet(); if (!optionalBridgeRefEntry.isPresent()) { - LOG.error("no bridge ref entry found for dpnId: " + dpnId); + LOG.error("no bridge ref entry found for dpnId {}", dpnId); return Optional.absent(); } @@ -475,7 +475,7 @@ public class TransportZoneNotificationUtil { // FIXME: Read this through a cache Optional optionalNode = tx.read(LogicalDatastoreType.OPERATIONAL, nodeId).checkedGet(); if (!optionalNode.isPresent()) { - LOG.error("missing node for dpnId: " + dpnId); + LOG.error("missing node for dpnId {}", dpnId); } return optionalNode; } -- 2.36.6