coe dead code removal

This patch removes unused methods and fields.

Change-Id: I7d48f4bda57ed510a2b0fff9f5d656df3a09a65a
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java
index 37e6508c173c95bccba27078c1b1084658dbba33..dee09b34fa0b9835effed6c26dddb95a53e241a3 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java
@@ -37,7 +37,6 @@ import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev14081
 import org.opendaylight.yang.gen.v1.urn.opendaylight.coe.northbound.pod.rev170611.Coe;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.coe.northbound.pod.rev170611.coe.Pods;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.coe.northbound.pod.rev170611.pod_attributes.Interface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.coe.config.rev180703.CoeConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -51,15 +50,12 @@ public class PodListener implements DataTreeChangeListener<Pods> {
     private ListenerRegistration<PodListener> listenerRegistration;
     private final JobCoordinator jobCoordinator;
     private final ManagedNewTransactionRunner txRunner;
-    private final CoeConfig coeConfig;
 
     @Inject
-    public PodListener(final DataBroker dataBroker, JobCoordinator jobCoordinator,
-                       CoeConfig coeConfig) {
+    public PodListener(final DataBroker dataBroker, JobCoordinator jobCoordinator) {
         registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
         this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
         this.jobCoordinator = jobCoordinator;
-        this.coeConfig = coeConfig;
     }
 
     protected InstanceIdentifier<Pods> getWildCardPath() {

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java
index d4f9ca1ea37aba84b7e85200bb482744c6772454..3d17cb891ae79496c92ec273480c4b5f73dfbde3 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java
@@ -31,12 +31,10 @@ public class ServiceListener implements DataTreeChangeListener<Services> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ServiceListener.class);
     private ListenerRegistration<ServiceListener> listenerRegistration;
-    private final DataBroker dataBroker;
 
     @Inject
     public ServiceListener(final DataBroker dataBroker) {
         registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
-        this.dataBroker = dataBroker;
     }
 
     protected InstanceIdentifier<Services> getWildCardPath() {

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/TerminationPointStateListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/TerminationPointStateListener.java
index c311b628edc9614e8a4a3f9f43a19808a77a57e4..7cc80811e2d98d8eaf6be7c448a2abd18f0117fe 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/TerminationPointStateListener.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/TerminationPointStateListener.java
@@ -27,7 +27,6 @@ import org.opendaylight.genius.infra.TypedReadWriteTransaction;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.genius.utils.ServiceIndex;
-import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
 import org.opendaylight.netvirt.coe.api.SouthboundInterfaceInfo;
 import org.opendaylight.netvirt.coe.caches.PodsCache;
@@ -55,18 +54,16 @@ import org.slf4j.LoggerFactory;
 public class TerminationPointStateListener extends
         AbstractSyncDataTreeChangeListener<OvsdbTerminationPointAugmentation> {
     private static final Logger LOG = LoggerFactory.getLogger(TerminationPointStateListener.class);
-    private final JobCoordinator coordinator;
     private final PodsCache  podsCache;
     private final DataTreeEventCallbackRegistrar eventCallbacks;
     private final ManagedNewTransactionRunner txRunner;
 
     @Inject
-    public TerminationPointStateListener(DataBroker dataBroker, final JobCoordinator coordinator,
-                                         PodsCache podsCache, DataTreeEventCallbackRegistrar eventCallbacks) {
+    public TerminationPointStateListener(DataBroker dataBroker,
+        PodsCache podsCache, DataTreeEventCallbackRegistrar eventCallbacks) {
         super(dataBroker, LogicalDatastoreType.OPERATIONAL,
                 InstanceIdentifier.builder(NetworkTopology.class).child(Topology.class).child(Node.class)
                         .child(TerminationPoint.class).augmentation(OvsdbTerminationPointAugmentation.class).build());
-        this.coordinator = coordinator;
         this.podsCache = podsCache;
         this.eventCallbacks = eventCallbacks;
         this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);

diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java
index a6b22211dc9d5773f1200de167ebad62e60cdd83..2d8f15106eff0737e0b684b404dd8ff1999c2ace 100644 (file)
--- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java
+++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java
@@ -18,7 +18,6 @@ import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 
 import org.opendaylight.genius.infra.Datastore;
@@ -377,13 +376,6 @@ public final class CoeUtils {
         tx.put(vpnIdentifier, newVpn);
     }
 
-    static void deleteVpnInstance(String vpnName, WriteTransaction wrtConfigTxn) {
-        LOG.debug("Deleting vpn-instance for {} ", vpnName);
-        InstanceIdentifier<VpnInstance> vpnIdentifier = InstanceIdentifier.builder(VpnInstances.class)
-                .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build();
-        wrtConfigTxn.delete(LogicalDatastoreType.CONFIGURATION, vpnIdentifier);
-    }
-
     static InstanceIdentifier<VpnInterface> buildVpnInterfaceIdentifier(String ifName) {
         InstanceIdentifier<VpnInterface> id = InstanceIdentifier.builder(VpnInterfaces.class).child(VpnInterface
                 .class, new VpnInterfaceKey(ifName)).build();
@@ -402,7 +394,7 @@ public final class CoeUtils {
                 .setName(interfaceName)
                 .setVpnInstanceNames(listVpn)
                 .setRouterInterface(isRouterInterface);
-        Adjacencies adjs = createPortIpAdjacencies(pod, interfaceName, macAddress, isRouterInterface);
+        Adjacencies adjs = createPortIpAdjacencies(pod, interfaceName, macAddress);
         if (adjs != null) {
             vpnb.addAugmentation(Adjacencies.class, adjs);
         }
@@ -420,8 +412,7 @@ public final class CoeUtils {
         wrtConfigTxn.delete(vpnIfIdentifier);
     }
 
-    static Adjacencies createPortIpAdjacencies(Pods pod, String interfaceName, String macAddress,
-                                                  Boolean isRouterInterface) {
+    static Adjacencies createPortIpAdjacencies(Pods pod, String interfaceName, String macAddress) {
         List<Adjacency> adjList = new ArrayList<>();
         LOG.trace("create config adjacencies for Port: {}", interfaceName);
         IpAddress ip = pod.getInterface().get(0).getIpAddress();