From 9b4c3f9bb0bddbbe2dcd6fc2a7b2497488159696 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Thu, 16 Nov 2017 20:26:12 +0100 Subject: [PATCH] Remove un-used fields, services and DEFAULT_CALLBACK in 3 ITM Workers Change-Id: Icb1cedc35c98cd91e0ca22500c3a1c1cc41677f6 Signed-off-by: Michael Vorburger --- .../ItmExternalTunnelAddWorker.java | 21 ------------------- .../ItmInternalTunnelAddWorker.java | 13 ------------ .../itm/confighelpers/ItmTepAddWorker.java | 5 +---- .../itm/confighelpers/ItmTepRemoveWorker.java | 5 +---- .../itm/listeners/TransportZoneListener.java | 17 +++++++-------- 5 files changed, 9 insertions(+), 52 deletions(-) diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmExternalTunnelAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmExternalTunnelAddWorker.java index 3cab74d34..051cded09 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmExternalTunnelAddWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmExternalTunnelAddWorker.java @@ -8,7 +8,6 @@ package org.opendaylight.genius.itm.confighelpers; import com.google.common.base.Optional; -import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; import java.math.BigInteger; import java.util.ArrayList; @@ -49,24 +48,9 @@ import org.slf4j.LoggerFactory; public class ItmExternalTunnelAddWorker { private static final Logger LOG = LoggerFactory.getLogger(ItmExternalTunnelAddWorker.class); - private static Boolean monitorEnabled; private static Integer monitorInterval; private static Class monitorProtocol; - private static final FutureCallback DEFAULT_CALLBACK = - new FutureCallback() { - @Override - public void onSuccess(Void result) { - LOG.debug("Success in Datastore operation"); - } - - @Override - public void onFailure(Throwable error) { - LOG.error("Error in Datastore operation", error); - } - - }; - public static List> buildTunnelsToExternalEndPoint(DataBroker dataBroker, List cfgDpnList, IpAddress extIp, @@ -135,7 +119,6 @@ public class ItmExternalTunnelAddWorker { WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); monitorInterval = ITMConstants.BFD_DEFAULT_MONITOR_INTERVAL; monitorProtocol = ITMConstants.DEFAULT_MONITOR_PROTOCOL; - monitorEnabled = ItmUtils.readMonitoringStateFromCache(dataBroker); if (null != cfgdDpnList && !cfgdDpnList.isEmpty()) { LOG.trace("calling tunnels from css {}",cfgdDpnList); tunnelsFromCSS(cfgdDpnList, writeTransaction , dataBroker); @@ -154,8 +137,6 @@ public class ItmExternalTunnelAddWorker { private static void tunnelsFromCSS(List cfgdDpnList, WriteTransaction transaction, DataBroker dataBroker) { - Boolean monitorEnabled = ItmUtils.readMonitoringStateFromCache(dataBroker); - Class monitorProtocol = ITMConstants.DEFAULT_MONITOR_PROTOCOL; for (DPNTEPsInfo dpn : cfgdDpnList) { LOG.trace("processing dpn {}" , dpn); if (dpn.getTunnelEndPoints() != null && !dpn.getTunnelEndPoints().isEmpty()) { @@ -224,8 +205,6 @@ public class ItmExternalTunnelAddWorker { Optional transportZoneOptional = ItmUtils.read(LogicalDatastoreType.CONFIGURATION, tzonePath, dataBroker); Class tunType = TunnelTypeVxlan.class; - Boolean monitorEnabled = ItmUtils.readMonitoringStateFromCache(dataBroker); - Class monitorProtocol = ITMConstants.DEFAULT_MONITOR_PROTOCOL; if (transportZoneOptional.isPresent()) { TransportZone tzone = transportZoneOptional.get(); //do we need to check tunnel type? diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java index b69339eac..2cc7831cd 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java @@ -9,7 +9,6 @@ package org.opendaylight.genius.itm.confighelpers; import static java.util.Collections.singletonList; -import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; import java.math.BigInteger; import java.util.ArrayList; @@ -53,18 +52,6 @@ public final class ItmInternalTunnelAddWorker { private static ItmConfig itmCfg; private static Class monitorProtocol; - private static final FutureCallback DEFAULT_CALLBACK = new FutureCallback() { - @Override - public void onSuccess(Void result) { - LOG.debug("Success in Datastore operation"); - } - - @Override - public void onFailure(Throwable error) { - LOG.error("Error in Datastore operation", error); - } - }; - private final DataBroker dataBroker; private final ManagedNewTransactionRunner txRunner; private final JobCoordinator jobCoordinator; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java index 891e70453..e27bd8f27 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java @@ -14,7 +14,6 @@ import java.util.concurrent.Callable; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.genius.itm.impl.ItmUtils; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.ItmConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.endpoints.DPNTEPsInfo; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.dc.gateway.ip.list.DcGatewayIp; @@ -26,7 +25,6 @@ public class ItmTepAddWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmTepAddWorker.class); private final DataBroker dataBroker; - private final IdManagerService idManagerService; private List meshedDpnList; private final List cfgdDpnList ; private final IMdsalApiManager mdsalManager; @@ -35,11 +33,10 @@ public class ItmTepAddWorker implements Callable>> { private final ItmInternalTunnelAddWorker itmInternalTunnelAddWorker; public ItmTepAddWorker(List cfgdDpnList, List hwVtepList, DataBroker broker, - IdManagerService idManagerService, IMdsalApiManager mdsalManager, + IMdsalApiManager mdsalManager, ItmConfig itmConfig, ItmInternalTunnelAddWorker itmInternalTunnelAddWorker) { this.cfgdDpnList = cfgdDpnList ; this.dataBroker = broker ; - this.idManagerService = idManagerService; this.mdsalManager = mdsalManager; this.cfgdHwVteps = hwVtepList; this.itmConfig = itmConfig; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java index 8235b8177..5fe82db01 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java @@ -14,7 +14,6 @@ import java.util.concurrent.Callable; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.genius.itm.impl.ItmUtils; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.endpoints.DPNTEPsInfo; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.dpn.endpoints.dpn.teps.info.TunnelEndPoints; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.dc.gateway.ip.list.DcGatewayIp; @@ -29,18 +28,16 @@ public class ItmTepRemoveWorker implements Callable> private final DataBroker dataBroker; private final List delDpnList ; private List meshedDpnList ; - private final IdManagerService idManagerService; private final IMdsalApiManager mdsalManager; private final List cfgdHwVteps; private final TransportZone originalTZone; private final ItmInternalTunnelDeleteWorker itmInternalTunnelDeleteWorker; public ItmTepRemoveWorker(List delDpnList, List delHwList, TransportZone originalTZone, - DataBroker broker, IdManagerService idManagerService, IMdsalApiManager mdsalManager, + DataBroker broker, IMdsalApiManager mdsalManager, ItmInternalTunnelDeleteWorker itmInternalTunnelDeleteWorker) { this.delDpnList = delDpnList; this.dataBroker = broker; - this.idManagerService = idManagerService; this.mdsalManager = mdsalManager; this.cfgdHwVteps = delHwList; this.originalTZone = originalTZone; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/TransportZoneListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/TransportZoneListener.java index 79bc1d598..5bd5b38af 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/TransportZoneListener.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/listeners/TransportZoneListener.java @@ -34,7 +34,6 @@ import org.opendaylight.genius.itm.confighelpers.ItmTepRemoveWorker; import org.opendaylight.genius.itm.confighelpers.ItmTepsNotHostedMoveWorker; import org.opendaylight.genius.itm.confighelpers.ItmTepsNotHostedRemoveWorker; import org.opendaylight.genius.itm.globals.ITMConstants; -import org.opendaylight.genius.itm.impl.ITMManager; import org.opendaylight.genius.itm.impl.ItmUtils; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; @@ -75,21 +74,19 @@ public class TransportZoneListener extends AsyncDataTreeChangeListenerBase oldHwList = createhWVteps(tzOld); @@ -233,14 +230,14 @@ public class TransportZoneListener extends AsyncDataTreeChangeListenerBase