From 97c8a6961453727e929878b58399626485382a1f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 24 Jul 2020 13:46:39 +0200 Subject: [PATCH] Migrate ListenableFutures.addErrorLogging() users This method has a new place in LoggingFutures, use it from there. Change-Id: I54d66f7c797ca88d8c5eed7d70c5f2ffeda3463e Signed-off-by: Robert Varga --- .../dhcpservice/DhcpExternalTunnelManager.java | 6 +++--- .../dhcpservice/DhcpSubnetListener.java | 10 +++++----- .../netvirt/dhcpservice/NodeListener.java | 4 ++-- .../fibmanager/BaseVrfEntryHandler.java | 5 ++--- .../fibmanager/BgpRouteVrfEntryHandler.java | 6 +++--- .../netvirt/fibmanager/VrfEntryListener.java | 10 +++++----- .../netvirt/ipv6service/IfMgr.java | 8 ++++---- .../SnatCentralizedSwitchChangeListener.java | 10 +++++----- .../ha/WeightedCentralizedSwitchScheduler.java | 6 +++--- .../internal/AbstractSnatService.java | 4 ++-- .../internal/EvpnDnatFlowProgrammer.java | 12 ++++++------ .../internal/EvpnSnatFlowProgrammer.java | 4 ++-- .../internal/FloatingIPListener.java | 4 ++-- .../internal/NatRouterInterfaceListener.java | 10 +++++----- .../netvirt/natservice/internal/NatUtil.java | 4 ++-- .../internal/RouterDpnChangeListener.java | 6 +++--- .../internal/SnatExternalRoutersListener.java | 4 ++-- .../internal/VpnFloatingIpHandler.java | 5 ++--- .../neutronvpn/NeutronPortChangeListener.java | 12 ++++++------ .../neutronvpn/NeutronSubnetGwMacResolver.java | 5 ++--- .../netvirt/neutronvpn/NeutronvpnManager.java | 18 +++++++++--------- .../netvirt/neutronvpn/NeutronvpnUtils.java | 3 +-- .../evpn/utils/NeutronEvpnUtils.java | 4 ++-- .../netvirt/qosservice/QosAlertManager.java | 4 ++-- .../qosservice/QosPolicyChangeListener.java | 4 ++-- .../netvirt/statistics/StatisticsImpl.java | 10 +++++----- .../CentralizedSwitchChangeListener.java | 8 ++++---- .../netvirt/vpnmanager/FibEntriesListener.java | 6 +++--- .../vpnmanager/SubnetmapChangeListener.java | 4 ++-- .../VpnElanInterfaceChangeListener.java | 4 ++-- .../vpnmanager/VpnInstanceListener.java | 8 ++++---- .../vpnmanager/VpnInterfaceManager.java | 10 +++++----- .../netvirt/vpnmanager/VpnUtil.java | 6 +++--- .../intervpnlink/IVpnLinkServiceImpl.java | 4 ++-- .../intervpnlink/InterVpnLinkListener.java | 5 ++--- .../vpnmanager/iplearn/IpMonitorStopTask.java | 4 ++-- .../populator/impl/L3vpnPopulator.java | 2 +- 37 files changed, 117 insertions(+), 122 deletions(-) diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java index 810eece2e1..88d100ff16 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java @@ -52,7 +52,7 @@ import org.opendaylight.genius.utils.hwvtep.HwvtepSouthboundConstants; import org.opendaylight.genius.utils.hwvtep.HwvtepSouthboundUtils; import org.opendaylight.genius.utils.hwvtep.HwvtepUtils; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -362,7 +362,7 @@ public class DhcpExternalTunnelManager implements IDhcpExternalTunnelManager { } List vmMacs = getAllVmMacs(); LOG.trace("Installing drop actions to this new DPN {} VMs {}", dpId, vmMacs); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { for (String vmMacAddress : vmMacs) { installDhcpDropAction(dpId, vmMacAddress, tx); } @@ -448,7 +448,7 @@ public class DhcpExternalTunnelManager implements IDhcpExternalTunnelManager { if (setOfTunnelIpElanNamePairs == null || setOfTunnelIpElanNamePairs.isEmpty()) { LOG.trace("No tunnelIpElanName to handle for dpn {}. Returning", dpnId); } else { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { if (!dpnId.equals(DhcpMConstants.INVALID_DPID)) { List listOfVms = getAllVmMacs(); for (String vmMacAddress : listOfVms) { diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java index c371cd0e89..f08e49b63a 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java @@ -22,7 +22,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -132,11 +132,11 @@ public class DhcpSubnetListener extends AbstractClusteredAsyncDataTreeChangeList //check whether any changes have happened LOG.trace("DhcpSubnetListener installNeutronPortEntries dpId: {} vmMacAddress : {}", dpId, vmMacAddress); //Bind the dhcp service when enabled - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> DhcpServiceUtils.bindDhcpService(interfaceName, NwConstants.DHCP_TABLE, tx)), LOG, "Error writing to the datastore"); //install the entries - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> dhcpManager.installDhcpEntries(dpId, vmMacAddress, tx)), LOG, "Error writing to the datastore"); } @@ -154,12 +154,12 @@ public class DhcpSubnetListener extends AbstractClusteredAsyncDataTreeChangeList LOG.trace("DhcpSubnetListener uninstallNeutronPortEntries dpId: {} vmMacAddress : {}", dpId, vmMacAddress); //Unbind the dhcp service when disabled - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> DhcpServiceUtils.unbindDhcpService(interfaceName, tx)), LOG, "Error writing to the datastore"); //uninstall the entries - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> dhcpManager.unInstallDhcpEntries(dpId, vmMacAddress, tx)), LOG, "Error writing to the datastore"); } diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java index c47d8e3420..bab5f04db2 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java @@ -14,7 +14,7 @@ import org.opendaylight.genius.infra.Datastore; import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener; @@ -71,7 +71,7 @@ public class NodeListener extends AbstractAsyncDataTreeChangeListener { try { if (node[1] != null) { Uint64 dpId = Uint64.valueOf(node[1]); - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewWriteOnlyTransactionAndSubmit(Datastore.CONFIGURATION, tx -> dhcpManager.setupDefaultDhcpFlows(tx, dpId)), LOG, "Error handling node addition for {}", add); diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java index f01a326eca..f533f4b94b 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java @@ -56,7 +56,6 @@ import org.opendaylight.genius.mdsalutil.matches.MatchIpv6Destination; import org.opendaylight.genius.mdsalutil.matches.MatchMetadata; import org.opendaylight.genius.utils.batching.SubTransaction; import org.opendaylight.genius.utils.batching.SubTransactionImpl; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; @@ -244,7 +243,7 @@ public class BaseVrfEntryHandler implements AutoCloseable { @Nullable List instructions, int addOrRemove, WriteTransaction tx, @Nullable List subTxns) { if (tx == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( newTx -> makeConnectedRoute(dpId, vpnId, vrfEntry, rd, instructions, addOrRemove, newTx, subTxns)), LOG, "Error making connected route"); return; @@ -516,7 +515,7 @@ public class BaseVrfEntryHandler implements AutoCloseable { final VrfEntry vrfEntry, Optional extraRouteOptional, @Nullable WriteTransaction tx) { if (tx == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( newTx -> deleteRemoteRoute(localDpnId, remoteDpnId, vpnId, vrfTableKey, vrfEntry, extraRouteOptional, newTx)), LOG, "Error deleting remote route"); return; diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java index 4b012fdc68..db2a9758df 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java @@ -40,7 +40,7 @@ import org.opendaylight.genius.utils.batching.ActionableResources; import org.opendaylight.genius.utils.batching.ResourceBatchingManager; import org.opendaylight.genius.utils.batching.ResourceHandler; import org.opendaylight.genius.utils.batching.SubTransaction; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -330,7 +330,7 @@ public class BgpRouteVrfEntryHandler extends BaseVrfEntryHandler implements Reso WriteTransaction tx, List subTxns) { if (tx == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( newTx -> createRemoteFibEntry(remoteDpnId, vpnId, rd, vrfEntry, newTx, subTxns)), LOG, "Error creating remote FIB entry"); return; @@ -369,7 +369,7 @@ public class BgpRouteVrfEntryHandler extends BaseVrfEntryHandler implements Reso final VrfEntry vrfEntry, Optional extraRouteOptional, @Nullable WriteTransaction tx, List subTxns) { if (tx == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( newTx -> deleteRemoteRoute(localDpnId, remoteDpnId, vpnId, vrfTableKey, vrfEntry, extraRouteOptional, newTx)), LOG, "Error deleting remote route"); return; diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java index f5c555f9fd..10d646d8fb 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java @@ -72,7 +72,7 @@ import org.opendaylight.genius.utils.ServiceIndex; import org.opendaylight.genius.utils.batching.SubTransaction; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.elanmanager.api.IElanService; @@ -524,7 +524,7 @@ public class VrfEntryListener extends AbstractAsyncDataTreeChangeListener tx) { if (tx == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, newTx -> installSubnetRouteInFib(dpnId, elanTag, rd, vpnId, vrfEntry, newTx)), LOG, "Error installing subnet route in FIB"); return; @@ -1218,7 +1218,7 @@ public class VrfEntryListener extends AbstractAsyncDataTreeChangeListener tx) { if (tx == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, newTx -> createRemoteFibEntry(remoteDpnId, vpnId, rd, vrfEntry, newTx)), LOG, "Error creating remote FIB entry"); return; @@ -1675,7 +1675,7 @@ public class VrfEntryListener extends AbstractAsyncDataTreeChangeListener instructions, int priority, int addOrRemove, TypedWriteTransaction tx) { if (tx == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, newTx -> makeLFibTableEntry(dpId, label, instructions, priority, addOrRemove, newTx)), LOG, "Error making LFIB table entry"); return; @@ -2123,7 +2123,7 @@ public class VrfEntryListener extends AbstractAsyncDataTreeChangeListener { LOG.trace("Removing flow in FIB table for interVpnLink {}", interVpnLinkName); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { for (Uint64 dpId : targetDpns) { LOG.debug("Removing flow: VrfEntry=[prefix={} label={}] dpn {} for InterVpnLink {} in LFIB", vrfEntry.getDestPrefix(), label, dpId, interVpnLinkName); diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java index b1f8eb4c46..c8330fa767 100644 --- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java +++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java @@ -38,7 +38,7 @@ import org.opendaylight.genius.ipv6util.api.Ipv6Util; import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.netvirt.elanmanager.api.IElanService; import org.opendaylight.netvirt.ipv6service.api.ElementCache; @@ -1286,8 +1286,8 @@ public class IfMgr implements ElementCache, AutoCloseable { intf.getIntfUUID(), ndTargetAddr); //NITHI - //ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(Datastore.CONFIGURATION, + //LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit( + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(Datastore.CONFIGURATION, tx -> { /*Exact VM vNIC interface IPv6 and MAC address match flow */ ipv6ServiceUtils.instIcmpv6NsMatchFlow(NwConstants.IPV6_TABLE, dpnId, @@ -1312,7 +1312,7 @@ public class IfMgr implements ElementCache, AutoCloseable { return; } Long elanTag = getNetworkElanTag(routerPort.getNetworkID()); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(Datastore.CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(Datastore.CONFIGURATION, tx -> { ipv6ServiceUtils.installIcmpv6NsDefaultPuntFlow(NwConstants.IPV6_TABLE, dpnIfaceInfo.getDpId(), elanTag, ndTarget, diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java index f0a92e4834..eb7f0ebe12 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java @@ -22,7 +22,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.genius.infra.TypedReadWriteTransaction; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.natservice.api.SnatServiceManager; @@ -99,7 +99,7 @@ public class SnatCentralizedSwitchChangeListener Uint64 primarySwitchId = routerToNaptSwitch.getPrimarySwitchId(); Routers router = natDataUtil.getRouter(routerToNaptSwitch.getRouterName()); if (router != null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> snatServiceManger.notify(confTx, router, null, primarySwitchId, null, SnatServiceManager.Action.SNAT_ALL_SWITCH_DISBL)), LOG, "error handling SNAT centralized switch removal"); @@ -119,7 +119,7 @@ public class SnatCentralizedSwitchChangeListener } Uint64 origPrimarySwitchId = origRouterToNaptSwitch.getPrimarySwitchId(); Uint64 updatedPrimarySwitchId = updatedRouterToNaptSwitch.getPrimarySwitchId(); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> { Routers origRouter = NatUtil.getRoutersFromConfigDS(confTx, origRouterToNaptSwitch.getRouterName()); Routers updatedRouter = NatUtil.getRoutersFromConfigDS(confTx, updatedRouterToNaptSwitch.getRouterName()); if (!Objects.equals(origPrimarySwitchId, updatedPrimarySwitchId)) { @@ -186,7 +186,7 @@ public class SnatCentralizedSwitchChangeListener LOG.warn("VpnId not unavailable for router {} yet", routerName); eventCallbacks.onAddOrUpdate(LogicalDatastoreType.CONFIGURATION, NatUtil.getVpnInstanceToVpnIdIdentifier(routerName), (unused, newVpnId) -> { - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, innerConfTx -> handleAdd(innerConfTx, routerName, router, primarySwitchId, isEnableSnat)), LOG, @@ -195,7 +195,7 @@ public class SnatCentralizedSwitchChangeListener }, Duration.ofSeconds(5), iid -> LOG.error("VpnId not found for router {}", routerName)); return; } - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> handleAdd(confTx, routerName, router, primarySwitchId, isEnableSnat)), LOG, "Error handling router addition"); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java index 50461bb3f1..69d93ed215 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java @@ -27,7 +27,7 @@ import org.opendaylight.genius.datastoreutils.ExpectedDataObjectNotFoundExceptio import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker; import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; @@ -190,7 +190,7 @@ public class WeightedCentralizedSwitchScheduler implements CentralizedSwitchSche } return NatUtil.getPrimaryRd(routerName, tx); }).get(); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> { for (Uuid subnetUuid : addedSubnetIds) { Subnetmap subnetMapEntry = subnetMapEntries.get(subnetUuid); Uuid routerPortUuid = subnetMapEntry.getRouterInterfacePortId(); @@ -218,7 +218,7 @@ public class WeightedCentralizedSwitchScheduler implements CentralizedSwitchSche try { String primaryRd = txRunner.applyWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> NatUtil.getPrimaryRd(routerName, tx)).get(); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> { for (Uuid subnetUuid : deletedSubnetIds) { String routerPort = subnetIdToRouterPortMap.remove(subnetUuid.getValue()); if (routerPort == null) { diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java index c988289081..49c1c4891b 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java @@ -44,7 +44,7 @@ import org.opendaylight.genius.mdsalutil.matches.MatchEthernetType; import org.opendaylight.genius.mdsalutil.matches.MatchIpv4Destination; import org.opendaylight.genius.mdsalutil.matches.MatchMetadata; import org.opendaylight.genius.mdsalutil.matches.MatchTunnelId; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; @@ -477,7 +477,7 @@ public abstract class AbstractSnatService implements SnatServiceListener { eventCallbacks.onAddOrUpdate(LogicalDatastoreType.CONFIGURATION, NatUtil.getGroupInstanceId(dpnId, groupId), (unused, newGroupId) -> { LOG.info("group {} is created in the config", groupId); - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, innerConfTx -> addSnatMissFlowForGroup(innerConfTx, dpnId, routerId, groupId)), LOG, "Error adding flow for the group {}",groupId); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java index 10d07c471a..9a67311a20 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java @@ -43,7 +43,7 @@ import org.opendaylight.genius.mdsalutil.instructions.InstructionApplyActions; import org.opendaylight.genius.mdsalutil.instructions.InstructionGotoTable; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.matches.MatchTunnelId; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.bgpmanager.api.IBgpManager; @@ -171,7 +171,7 @@ public class EvpnDnatFlowProgrammer { LOG.debug("onAddFloatingIp : Add Floating Ip {} , found associated to fixed port {}", externalIp, interfaceName); if (floatingIpPortMacAddress != null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { vpnManager.addSubnetMacIntoVpnInstance(vpnName, null, floatingIpPortMacAddress, dpnId, tx); vpnManager.addArpResponderFlowsToExternalNetworkIps(routerName, Collections.singleton(externalIp), @@ -190,7 +190,7 @@ public class EvpnDnatFlowProgrammer { @Override public void onSuccess(@NonNull RpcResult result) { if (result.isSuccessful()) { - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, innerConfTx -> { LOG.info("onAddFloatingIp : Successfully installed custom FIB routes for Floating " + "IP Prefix {} on DPN {}", externalIp, dpnId); @@ -231,7 +231,7 @@ public class EvpnDnatFlowProgrammer { SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker, LogicalDatastoreType.CONFIGURATION, vpnIfIdentifier); if (optionalVpnInterface.isPresent()) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> { for (VpnInstanceNames vpnInstance : optionalVpnInterface.get().nonnullVpnInstanceNames().values()) { if (!vpnName.equals(vpnInstance.getVpnName())) { continue; @@ -323,7 +323,7 @@ public class EvpnDnatFlowProgrammer { @Override public void onSuccess(@NonNull RpcResult result) { if (result.isSuccessful()) { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, innerConfTx -> { LOG.info("onRemoveFloatingIp : Successfully removed custom FIB routes for Floating " + "IP Prefix {} on DPN {}", externalIp, dpnId); @@ -351,7 +351,7 @@ public class EvpnDnatFlowProgrammer { SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker, LogicalDatastoreType.CONFIGURATION, vpnIfIdentifier); if (optionalVpnInterface.isPresent()) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> { for (VpnInstanceNames vpnInstance : optionalVpnInterface.get().nonnullVpnInstanceNames().values()) { if (!vpnName.equals(vpnInstance.getVpnName())) { continue; diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java index 1adb620ae0..2b401b99c7 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java @@ -34,7 +34,7 @@ import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.genius.mdsalutil.instructions.InstructionGotoTable; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.matches.MatchTunnelId; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.netvirt.bgpmanager.api.IBgpManager; import org.opendaylight.netvirt.fibmanager.api.IFibManager; @@ -248,7 +248,7 @@ public class EvpnSnatFlowProgrammer { @Override public void onSuccess(@NonNull RpcResult result) { if (result.isSuccessful()) { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, innerConfTx -> { LOG.info("evpnDelFibTsAndReverseTraffic : Successfully removed custom FIB routes for " + "External Fixed IP {} on DPN {} with l3Vni {}, ExternalVpnName {} for " diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java index 443126f769..020a685b79 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java @@ -49,7 +49,7 @@ import org.opendaylight.genius.mdsalutil.matches.MatchIpv4Source; import org.opendaylight.genius.mdsalutil.matches.MatchMetadata; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.natservice.api.CentralizedSwitchScheduler; @@ -881,7 +881,7 @@ public class FloatingIPListener extends AbstractAsyncDataTreeChangeListener confTx, boolean create) throws ExecutionException, InterruptedException { if (confTx == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, newTx -> addOrDelDefaultFibRouteForDnat(dpnId, routerName, routerId, newTx, create)), LOG, "Error handling default FIB route for DNAT"); return; diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java index a009d12ad6..3473f32452 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java @@ -19,7 +19,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener; @@ -103,7 +103,7 @@ public class NatRouterInterfaceListener extends AbstractAsyncDataTreeChangeListe final ReentrantLock lock = NatUtil.lockForNat(dpId); lock.lock(); try { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, operTx -> { NatUtil.addToNeutronRouterDpnsMap(routerId, interfaceName, dpId, operTx); NatUtil.addToDpnRoutersMap(routerId, interfaceName, dpId, operTx); @@ -141,7 +141,7 @@ public class NatRouterInterfaceListener extends AbstractAsyncDataTreeChangeListe NatUtil.removeSnatEntriesForPort(dataBroker, naptManager, mdsalManager, neutronVpnService, interfaceName, routerId); } - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, operTx -> { //Delete the NeutronRouterDpnMap from the ODL:L3VPN operational model NatUtil @@ -151,8 +151,8 @@ public class NatRouterInterfaceListener extends AbstractAsyncDataTreeChangeListe interfaceManager, operTx); }), LOG, "Error handling NAT router interface removal"); //Delete the RouterInterfaces maintained in the ODL:L3VPN configuration model - ListenableFutures - .addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging( + txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, confTx -> confTx.delete(NatUtil.getRouterInterfaceId(interfaceName))), LOG, "Error handling NAT router interface removal"); } finally { diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java index d11a5eab7e..76f4315ae8 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java @@ -68,7 +68,7 @@ import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.matches.MatchEthernetType; import org.opendaylight.genius.mdsalutil.matches.MatchMetadata; import org.opendaylight.genius.utils.JvmGlobalLocks; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; @@ -2228,7 +2228,7 @@ public final class NatUtil { public static void installRouterGwFlows(ManagedNewTransactionRunner txRunner, IVpnManager vpnManager, Routers router, Uint64 primarySwitchId, int addOrRemove) { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { Map keyExternalIpsMap = router.getExternalIps(); List externalIpsSting = new ArrayList<>(); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java index 77bb9f3bb8..32746b8556 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java @@ -23,7 +23,7 @@ import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.natservice.api.SnatServiceManager; @@ -127,7 +127,7 @@ public class RouterDpnChangeListener extends AbstractAsyncDataTreeChangeListener LOG.debug("Skipping the notification recived for NAPT switch {}", routerUuid); return; } - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> { natServiceManager.notify(confTx, router, null, naptSwitch, dpnId, SnatServiceManager.Action.CNT_ROUTER_ENBL); @@ -241,7 +241,7 @@ public class RouterDpnChangeListener extends AbstractAsyncDataTreeChangeListener LOG.debug("Skipping the notification recived for NAPT switch {}", routerUuid); return; } - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> { natServiceManager.notify(confTx, router, null, naptSwitch, dpnId, SnatServiceManager.Action.CNT_ROUTER_DISBL); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatExternalRoutersListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatExternalRoutersListener.java index 73013b7ae2..b3e62ca6c9 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatExternalRoutersListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatExternalRoutersListener.java @@ -16,7 +16,7 @@ import javax.inject.Singleton; import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.natservice.api.CentralizedSwitchScheduler; @@ -128,7 +128,7 @@ public class SnatExternalRoutersListener extends AbstractAsyncDataTreeChangeList } if (!Objects.equals(original.getSubnetIds(), update.getSubnetIds()) || !Objects.equals(original.getExternalIps(), update.getExternalIps())) { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, confTx -> natServiceManager.notify(confTx, update, original, null, null, SnatServiceManager.Action.SNAT_ROUTER_UPDATE)), LOG, "error handling external router update"); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java index 5f1f55c082..38f631cc15 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java @@ -46,7 +46,6 @@ import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.matches.MatchEthernetType; import org.opendaylight.genius.mdsalutil.matches.MatchMplsLabel; import org.opendaylight.genius.mdsalutil.matches.MatchTunnelId; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -235,7 +234,7 @@ public class VpnFloatingIpHandler implements FloatingIPHandler { customInstructions.add(new InstructionApplyActions(actionInfoFib).buildInstruction(0)); customInstructions.add(new InstructionGotoTable(NwConstants.PDNAT_TABLE).buildInstruction(1)); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, innerConfTx -> { makeTunnelTableEntry(vpnName, dpnId, label, instructions, innerConfTx, provType); makeLFibTableEntry(dpnId, label, floatingIpPortMacAddress, NwConstants.PDNAT_TABLE, @@ -317,7 +316,7 @@ public class VpnFloatingIpHandler implements FloatingIPHandler { return; } - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { String networkVpnName = NatUtil.getAssociatedVPN(tx, networkId); vpnManager.removeSubnetMacFromVpnInstance(networkVpnName, subnetId.getValue(), floatingIpPortMacAddress, dpnId, tx); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java index 8e38c12b35..b81feff5c1 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java @@ -41,7 +41,7 @@ import org.opendaylight.genius.infra.TypedWriteTransaction; import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.ReadFailedException; @@ -288,7 +288,7 @@ public class NeutronPortChangeListener extends AbstractAsyncDataTreeChangeListen LOG.warn("update: Interface {} is not present", portName); } }); - ListenableFutures.addErrorLogging(future, LOG, + LoggingFutures.addErrorLogging(future, LOG, "update: Failed to update interface {} with networkId {}", portName, network); return Collections.singletonList(future); }); @@ -374,7 +374,7 @@ public class NeutronPortChangeListener extends AbstractAsyncDataTreeChangeListen nvpnNatManager.handleSubnetsForExternalRouter(routerId); return Collections.emptyList(); }); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, confTx -> { String portInterfaceName = createOfPortInterface(routerPort, confTx); createElanInterface(routerPort, portInterfaceName, confTx); @@ -419,7 +419,7 @@ public class NeutronPortChangeListener extends AbstractAsyncDataTreeChangeListen nvpnManager.deleteVpnInterface(routerPort.getUuid().getValue(), null /* vpn-id */, null /* wrtConfigTxn*/); // update RouterInterfaces map - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, confTx -> { IpVersionChoice ipVersion = IpVersionChoice.UNDEFINED; for (FixedIps portIP : keyFixedIpsMap.values()) { @@ -697,7 +697,7 @@ public class NeutronPortChangeListener extends AbstractAsyncDataTreeChangeListen } } }); - ListenableFutures.addErrorLogging(future, LOG, + LoggingFutures.addErrorLogging(future, LOG, "handleNeutronPortCreated: Failed for port {} with networkId {}", portName, networkId); return Collections.singletonList(future); }); @@ -767,7 +767,7 @@ public class NeutronPortChangeListener extends AbstractAsyncDataTreeChangeListen //dissociate fixedIP from floatingIP if associated nvpnManager.dissociatefixedIPFromFloatingIP(port.getUuid().getValue()); }); - ListenableFutures.addErrorLogging(future, LOG, + LoggingFutures.addErrorLogging(future, LOG, "handleNeutronPortDeleted: Failed to update interface {} with networkId", portName, port.getNetworkId().getValue()); return Collections.singletonList(future); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java index 35ace89673..ce0ff1cf6b 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netvirt.neutronvpn; import com.google.common.util.concurrent.JdkFutureAdapters; @@ -26,7 +25,7 @@ import javax.inject.Singleton; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.genius.arputil.api.ArpConstants; import org.opendaylight.genius.mdsalutil.NWUtil; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.netvirt.elanmanager.api.IElanService; import org.opendaylight.netvirt.vpnmanager.api.ICentralizedSwitchProvider; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; @@ -175,7 +174,7 @@ public class NeutronSubnetGwMacResolver { SendArpRequestInput sendArpRequestInput = new SendArpRequestInputBuilder().setIpaddress(dstIpAddress) .setInterfaceAddress(Collections.singletonList(interfaceAddress)).build(); - ListenableFutures.addErrorLogging(JdkFutureAdapters.listenInPoolThread( + LoggingFutures.addErrorLogging(JdkFutureAdapters.listenInPoolThread( arpUtilService.sendArpRequest(sendArpRequestInput)), LOG, "Send ARP request"); } catch (Exception e) { LOG.error("Failed to send ARP request to external GW {} from interface {}", diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java index 1f462df8f6..dc9fdfb46c 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java @@ -52,7 +52,7 @@ import org.opendaylight.genius.infra.TypedWriteTransaction; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.genius.utils.JvmGlobalLocks; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.infrautils.utils.concurrent.NamedLocks; import org.opendaylight.infrautils.utils.concurrent.NamedSimpleReentrantLock.AcquireResult; import org.opendaylight.mdsal.binding.api.DataBroker; @@ -978,7 +978,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even protected void deleteVpnInterface(String infName, @Nullable String vpnId, @Nullable TypedWriteTransaction wrtConfigTxn) { if (wrtConfigTxn == null) { - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> deleteVpnInterface(infName, vpnId, tx)), LOG, "Error deleting VPN interface {} {}", infName, vpnId); @@ -1697,7 +1697,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even } } }); - ListenableFutures.addErrorLogging(future, LOG, + LoggingFutures.addErrorLogging(future, LOG, "addSubnetToVpn: Failed while creating VPN interface for vpnId {}, portId {}" + "{}, subnetId {}", vpnId.getValue(), portId, subnet.getValue()); return Collections.singletonList(future); @@ -1772,7 +1772,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even subnetId.getValue()); } }); - ListenableFutures.addErrorLogging(future, LOG, + LoggingFutures.addErrorLogging(future, LOG, "removeSubnetFromVpn: Exception while processing deletion of VPN interfaces for port {}" + " belonging to subnet {} and vpnId {}", portId.getValue(), subnetId.getValue(), vpnId.getValue()); @@ -2026,7 +2026,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even .setVpnInstanceName(vpnName.getValue()) .build(); - ListenableFutures.addErrorLogging(JdkFutureAdapters.listenInPoolThread( + LoggingFutures.addErrorLogging(JdkFutureAdapters.listenInPoolThread( vpnRpcService.removeStaticRoute(rpcInput)), LOG, "Remove VPN routes"); } else { // Any other case is a fault. @@ -3153,7 +3153,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even return; } - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { for (String elanInterface : extElanInterfaces) { createExternalVpnInterface(extNetId, elanInterface, tx); } @@ -3168,7 +3168,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even LOG.error("No external ports attached for external network {}", extNetId.getValue()); return; } - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { for (String elanInterface : extElanInterfaces) { InstanceIdentifier vpnIfIdentifier = NeutronvpnUtils .buildVpnInterfaceIdentifier(elanInterface); @@ -3194,7 +3194,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even return; } if (wrtConfigTxn == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> writeVpnInterfaceToDs(vpnIdList, infName, adjacencies, networkUuid, isRouterInterface, tx)), LOG, "Error writing VPN interface"); return; @@ -3242,7 +3242,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even } if (wrtConfigTxn == null) { LOG.error("updateVpnInterfaceWithAdjancies called with wrtConfigTxn as null"); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> { updateVpnInterfaceWithAdjacencies(vpnId, infName, adjacencies, tx); }), LOG, "Error updating VPN interface with adjacencies"); return; diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java index dea6907054..d54bda3285 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java @@ -48,7 +48,6 @@ import org.opendaylight.genius.infra.TypedWriteTransaction; import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.genius.utils.JvmGlobalLocks; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; @@ -1695,7 +1694,7 @@ public class NeutronvpnUtils { } VpnInstanceOpDataEntryBuilder builder = new VpnInstanceOpDataEntryBuilder(vpnInstanceOpDataEntry); builder.setBgpvpnType(choice); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> { tx.merge(id, builder.build()); LOG.debug("updateVpnInstanceOpWithType: sent merge to operDS BgpvpnType {} for {}", choice, vpn.getValue()); }), LOG, "Error updating VPN instance op {} with type {}", vpn, choice); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java index 522133ebb3..1f5c2bf852 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java @@ -16,7 +16,7 @@ import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker; import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.elanmanager.api.ElanHelper; @@ -77,7 +77,7 @@ public class NeutronEvpnUtils { public void updateElanWithVpnInfo(String elanInstanceName, VpnInstance vpnInstance, Operation operation) { String vpnName = vpnInstance.getVpnInstanceName(); InstanceIdentifier elanIid = ElanHelper.getElanInstanceConfigurationDataPath(elanInstanceName); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { Optional elanInstanceOptional = tx.read(elanIid).get(); if (!elanInstanceOptional.isPresent()) { diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java index 95d8bb84c0..3cf8672852 100644 --- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java +++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java @@ -32,7 +32,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.genius.interfacemanager.globals.IfmConstants; import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo; import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetNodeConnectorStatisticsInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetNodeConnectorStatisticsOutput; @@ -322,7 +322,7 @@ public final class QosAlertManager implements Runnable { .setQosAlertPollInterval(alertPollInterval) .build(); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> tx.mergeParentStructurePut(path, qosAlertConfig)), LOG, "Error writing to the config data store"); } diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java index 6c26d9e6cb..23986c509f 100644 --- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java +++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java @@ -21,7 +21,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.qosservice.recovery.QosServiceRecoveryHandler; @@ -324,7 +324,7 @@ public class QosPolicyChangeListener extends AbstractClusteredAsyncDataTreeChang qrtBuilder.setRuleTypes(value); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> { InstanceIdentifier instanceIdentifier = InstanceIdentifier.create(Neutron.class).child(QosRuleTypes.class); tx.merge(instanceIdentifier, qrtBuilder.build()); }), LOG, "Error setting up supported QoS rule types"); diff --git a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java index 60c97ffa54..098442d513 100644 --- a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java +++ b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java @@ -34,7 +34,7 @@ import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager; import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.genius.mdsalutil.MatchInfoBase; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; @@ -235,7 +235,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan String requestKey = String.valueOf(intRequestKey); SettableFuture> result = SettableFuture.create(); - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewReadWriteTransactionAndSubmit(transaction -> { if (input.getIncomingTraffic() != null) { Optional eecrcOpt = @@ -310,7 +310,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan .child(CounterRequests.class, new CounterRequestsKey(input.getHandler())).build(); SettableFuture> result = SettableFuture.create(); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> { Optional iecrcOpt = tx.read(LogicalDatastoreType.CONFIGURATION, CountersServiceUtils.IECRC_IDENTIFIER).get(); Optional eecrcOpt = @@ -544,7 +544,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan } private void deleteCounterRequest(CounterRequests counterRequest, ElementCountersDirection direction) { - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { if (ElementCountersDirection.INGRESS.equals(direction)) { tx.delete(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier @@ -580,7 +580,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan } private void initializeCountrsConfigDataSrore() { - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewReadWriteTransactionAndSubmit(transaction -> { Optional iecrcOpt = transaction.read(LogicalDatastoreType.CONFIGURATION, diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java index b84d8b2303..c526bf8c7f 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java @@ -23,7 +23,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.genius.infra.TypedReadWriteTransaction; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.vpnmanager.api.IVpnManager; @@ -87,7 +87,7 @@ public class CentralizedSwitchChangeListener @Override public void remove(InstanceIdentifier key, RouterToNaptSwitch routerToNaptSwitch) { LOG.debug("Removing {}", routerToNaptSwitch); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> setupRouterGwFlows(routerToNaptSwitch, tx, NwConstants.DEL_FLOW)), LOG, "Error processing switch removal for {}", routerToNaptSwitch); } @@ -98,7 +98,7 @@ public class CentralizedSwitchChangeListener LOG.debug("Updating old {} new {}", origRouterToNaptSwitch, updatedRouterToNaptSwitch); if (!Objects.equals(updatedRouterToNaptSwitch.getPrimarySwitchId(), origRouterToNaptSwitch.getPrimarySwitchId())) { - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> { setupRouterGwFlows(origRouterToNaptSwitch, tx, NwConstants.DEL_FLOW); setupRouterGwFlows(updatedRouterToNaptSwitch, tx, NwConstants.ADD_FLOW); }), LOG, "Error updating switch {} to {}", origRouterToNaptSwitch, updatedRouterToNaptSwitch); @@ -108,7 +108,7 @@ public class CentralizedSwitchChangeListener @Override public void add(InstanceIdentifier key, RouterToNaptSwitch routerToNaptSwitch) { LOG.debug("Adding {}", routerToNaptSwitch); - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> setupRouterGwFlows(routerToNaptSwitch, tx, NwConstants.ADD_FLOW)), LOG, "Error processing switch addition for {}", routerToNaptSwitch); } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java index 42131ce1bc..ffd0b5292d 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java @@ -18,7 +18,7 @@ import javax.inject.Singleton; import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener; @@ -111,7 +111,7 @@ public class FibEntriesListener extends AbstractAsyncDataTreeChangeListener + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> tx.put(VpnUtil.getVpnInstanceOpDataIdentifier(rd), new VpnInstanceOpDataEntryBuilder(vpnInstanceOpData).setRouteEntryId(routeIds) .build())), @@ -132,7 +132,7 @@ public class FibEntriesListener extends AbstractAsyncDataTreeChangeListener + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> tx.put(VpnUtil.getVpnInstanceOpDataIdentifier(rd), new VpnInstanceOpDataEntryBuilder(vpnInstanceOpData).setRouteEntryId(routeIds) .build())), diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java index e2d1c7e663..69cee47696 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java @@ -20,7 +20,7 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.genius.utils.JvmGlobalLocks; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.vpnmanager.api.IVpnManager; @@ -239,7 +239,7 @@ public class SubnetmapChangeListener extends AbstractAsyncDataTreeChangeListener protected long getElanTag(String elanInstanceName) { final long[] elanTag = {0L}; - ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> { + LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> { InstanceIdentifier elanIdentifierId = InstanceIdentifier.builder(ElanInstances.class) .child(ElanInstance.class, new ElanInstanceKey(elanInstanceName)).build(); ElanInstance elanInstance = tx.read(LogicalDatastoreType.CONFIGURATION, elanIdentifierId) diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java index c4a04c34c8..82fadd7bc5 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java @@ -18,7 +18,7 @@ import javax.inject.Singleton; import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.elanmanager.api.IElanService; @@ -84,7 +84,7 @@ public class VpnElanInterfaceChangeListener extends AbstractAsyncDataTreeChangeL } InstanceIdentifier vpnInterfaceIdentifier = VpnUtil.getVpnInterfaceIdentifier(interfaceName); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> tx.delete(vpnInterfaceIdentifier)), LOG, "Error removing VPN interface {}", vpnInterfaceIdentifier); LOG.info("remove: Removed VPN interface {}", interfaceName); } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java index 9bf4ec081c..a77c0c9a86 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java @@ -49,7 +49,7 @@ import org.opendaylight.genius.utils.JvmGlobalLocks; import org.opendaylight.genius.utils.SystemPropertyReader; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.fibmanager.api.IFibManager; @@ -216,7 +216,7 @@ public class VpnInstanceListener extends AbstractAsyncDataTreeChangeListener { ListenableFuture future = txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, operTx -> addVpnInstance(vpnInstance, confTx, operTx)); - ListenableFutures.addErrorLogging(future, LOG, "{} call: error creating VPN {} rd {}", + LoggingFutures.addErrorLogging(future, LOG, "{} call: error creating VPN {} rd {}", LOGGING_PREFIX_ADD, vpnInstance.getVpnInstanceName(), vpnInstance.getRouteDistinguisher()); futures.add(future); @@ -233,12 +233,12 @@ public class VpnInstanceListener extends AbstractAsyncDataTreeChangeListener writeConfigTxn, TypedWriteTransaction writeOperTxn) { if (writeConfigTxn == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> addVpnInstance(value, tx, writeOperTxn)), LOG, "Error adding VPN instance {}", value); return; } if (writeOperTxn == null) { - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL, tx -> addVpnInstance(value, writeConfigTxn, tx)), LOG, "Error adding VPN instance {}", value); return; } 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 0cd01626f5..f703ddc010 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java @@ -53,7 +53,7 @@ import org.opendaylight.genius.utils.JvmGlobalLocks; import org.opendaylight.infrautils.caches.CacheProvider; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; @@ -350,7 +350,7 @@ public class VpnInterfaceManager extends AbstractAsyncDataTreeChangeListener vrfEntries = vpnUtil.getAllVrfEntries(vpn.getVrfId()); if (vrfEntries != null) { - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, confTx -> { for (VrfEntry vrfEntry : vrfEntries) { try { @@ -1259,7 +1259,7 @@ public class VpnInterfaceManager extends AbstractAsyncDataTreeChangeListener future : futures) { - ListenableFutures.addErrorLogging(future, LOG, "update: failed for interface {} on vpn {}", + LoggingFutures.addErrorLogging(future, LOG, "update: failed for interface {} on vpn {}", update.getName(), update.getVpnInstanceNames()); } } else { diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java index e5faa9f4db..bce704258b 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java @@ -71,7 +71,7 @@ import org.opendaylight.genius.utils.JvmGlobalLocks; import org.opendaylight.genius.utils.ServiceIndex; import org.opendaylight.genius.utils.SystemPropertyReader; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -641,7 +641,7 @@ public final class VpnUtil { Optional vrfTablesOpc = read(LogicalDatastoreType.CONFIGURATION, vpnVrfTableIid); if (vrfTablesOpc.isPresent()) { VrfTables vrfTables = vrfTablesOpc.get(); - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( new ManagedNewTransactionRunnerImpl(dataBroker).callWithNewWriteOnlyTransactionAndSubmit( Datastore.CONFIGURATION, tx -> { for (VrfEntry vrfEntry : vrfTables.nonnullVrfEntry().values()) { @@ -672,7 +672,7 @@ public final class VpnUtil { public void removeVrfEntries(String rd, List vrfEntries) { InstanceIdentifier vpnVrfTableIid = InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).build(); - ListenableFutures.addErrorLogging( + LoggingFutures.addErrorLogging( new ManagedNewTransactionRunnerImpl(dataBroker).callWithNewWriteOnlyTransactionAndSubmit( Datastore.CONFIGURATION, tx -> { for (VrfEntry vrfEntry : vrfEntries) { diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java index 6760f9f8d0..0adb6cca74 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java @@ -27,7 +27,7 @@ import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker; import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.genius.mdsalutil.NwConstants; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.netvirt.bgpmanager.api.IBgpManager; @@ -192,7 +192,7 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { .child(VrfTables.class, new VrfTablesKey(dstVpnRd)) .child(VrfEntry.class, new VrfEntryKey(newVrfEntry.getDestPrefix())) .build(); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> tx.put(newVrfEntryIid, newVrfEntry)), LOG, "Error adding VRF entry {}", newVrfEntry); // Finally, route is advertised it to the DC-GW. But while in the FibEntries the nexthop is the other diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java index 938a6230e5..5e0c191d79 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java @@ -29,7 +29,6 @@ import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.infrautils.utils.concurrent.Executors; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.NotificationPublishService; @@ -363,7 +362,7 @@ public class InterVpnLinkListener extends AbstractAsyncDataTreeChangeListener interVpnLinkStateIid = InterVpnLinkUtil.getInterVpnLinkStateIid(del.getName()); - ListenableFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> tx.delete(interVpnLinkStateIid)), LOG, "Error deleting inter-VPN link state {}", interVpnLinkStateIid); } @@ -464,7 +463,7 @@ public class InterVpnLinkListener extends AbstractAsyncDataTreeChangeListener + LoggingFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> tx.mergeParentStructurePut(vpnLinkStateIid, vpnLinkErrorState)), LOG, "Error storing the VPN link error state for {}, {}", vpnLinkStateIid, vpnLinkErrorState); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/IpMonitorStopTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/IpMonitorStopTask.java index 023bc0dd41..dac94b5469 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/IpMonitorStopTask.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/IpMonitorStopTask.java @@ -15,7 +15,7 @@ import java.util.concurrent.Callable; import org.opendaylight.genius.infra.Datastore; import org.opendaylight.genius.infra.ManagedNewTransactionRunner; import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; -import org.opendaylight.infrautils.utils.concurrent.ListenableFutures; +import org.opendaylight.infrautils.utils.concurrent.LoggingFutures; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.netvirt.vpnmanager.VpnUtil; import org.opendaylight.netvirt.vpnmanager.iplearn.model.MacEntry; @@ -68,7 +68,7 @@ public class IpMonitorStopTask implements Callable vpnUtil.removeMipAdjacency(macEntry.getVpnName(), macEntry.getInterfaceName(), macEntry.getIpAddress().getHostAddress(), tx)), LOG, "ArpMonitorStopTask: Error writing to datastore for Vpn {} IP {}", diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java index baab86afb6..458d15b94c 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java @@ -8,7 +8,7 @@ package org.opendaylight.netvirt.vpnmanager.populator.impl; import static org.opendaylight.genius.infra.Datastore.OPERATIONAL; -import static org.opendaylight.infrautils.utils.concurrent.ListenableFutures.addErrorLogging; +import static org.opendaylight.infrautils.utils.concurrent.LoggingFutures.addErrorLogging; import com.google.common.base.Preconditions; import java.util.Collections; -- 2.36.6