Remove unused references to DataChangeListener

Change-Id: I78e8c32bd76536fd420d31b6e7b0bd2b026d7a49
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
(cherry picked from commit 7f9a7a608934fd687748a913706181d165e146ce)

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
index b086a753acaa028df26e3a405c80d302467f5560..72dccf302d6414965fcb4b04767ebaee7e9a611a 100755 (executable)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
@@ -47,7 +47,6 @@ import org.apache.thrift.TException;
 import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.common.api.clustering.CandidateAlreadyRegisteredException;
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -121,7 +120,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev15033
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.macvrfentries.MacVrfEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.vrfentries.VrfEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data.VpnInstanceOpDataEntry;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.osgi.framework.BundleContext;
@@ -250,8 +248,6 @@ public class BgpConfigurationManager {
         MultipathReactor.class, VrfMaxpathReactor.class
     };
 
-    private ListenerRegistration<DataChangeListener>[] registrations;
-
     final BgpConfigurationManager bgpConfigurationManager;
 
     public BgpConfigurationManager(final DataBroker dataBroker,
@@ -320,7 +316,6 @@ public class BgpConfigurationManager {
 
     private void registerCallbacks() {
         String emsg = "Failed to register listener";
-        registrations = new ListenerRegistration[REACTORS.length];
         InstanceIdentifier<?> iid = InstanceIdentifier.create(Bgp.class);
         for (Class reactor : REACTORS) {
             Object obj = createListener(reactor);

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java
index 14f7f43708dc5d5c718f35c9135d4656b4e2925e..30b36d28102a1d8df9a3fb4e7f85367613c4d669 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java
@@ -17,7 +17,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -46,7 +45,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,8 +59,7 @@ public class HwvtepTerminationPointListener
 
     private static final Logger LOG = LoggerFactory.getLogger(HwvtepTerminationPointListener.class);
 
-    private DataBroker broker;
-    private ListenerRegistration<DataChangeListener> lstnerRegistration;
+    private final DataBroker broker;
     private final ElanL2GatewayUtils elanL2GatewayUtils;
     private final EntityOwnershipService entityOwnershipService;
 
@@ -96,15 +93,6 @@ public class HwvtepTerminationPointListener
     @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
     public void close() {
-        if (lstnerRegistration != null) {
-            try {
-                // TODO use https://git.opendaylight.org/gerrit/#/c/44145/ when merged, and remove @SuppressWarnings
-                lstnerRegistration.close();
-            } catch (final Exception e) {
-                LOG.error("Error when cleaning up DataChangeListener.", e);
-            }
-            lstnerRegistration = null;
-        }
     }
 
     @Override

diff --git a/vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java b/vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java
index 4077182b5d9219fccfdfb9f08aa36d9815db1a1e..c1689f69e0307ece67fdc6db086e248364aa71d4 100644 (file)
--- a/vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java
+++ b/vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java
@@ -7,22 +7,17 @@
  */
 package org.opendaylight.netvirt.fibmanager.test;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
 
 import java.math.BigInteger;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.netvirt.fibmanager.VrfEntryListener;
 import org.opendaylight.netvirt.fibmanager.api.FibHelper;
@@ -33,7 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev15033
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTablesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.vrfentries.VrfEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.vrfentries.VrfEntryKey;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
 
@@ -43,8 +37,6 @@ public class FibManagerTest {
     @Mock
     DataBroker dataBroker;
     @Mock
-    ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
-    @Mock
     ReadOnlyTransaction mockReadTx;
     @Mock
     WriteTransaction mockWriteTx;
@@ -55,7 +47,6 @@ public class FibManagerTest {
     @Mock
     VrfTablesKey vrfTableKey;
 
-    MockDataChangedEvent dataChangeEvent;
     VrfEntryListener fibmgr;
     private static final Long EGRESS_POINTER = 11L;
     VrfEntry vrfEntry;
@@ -80,17 +71,11 @@ public class FibManagerTest {
 
     @Before
     public void setUp() throws Exception {
-        when(
-            dataBroker.registerDataChangeListener(any(LogicalDatastoreType.class),
-                any(InstanceIdentifier.class), any(DataChangeListener.class),
-                any(DataChangeScope.class))).thenReturn(dataChangeListenerRegistration);
-        dataChangeEvent = new MockDataChangedEvent();
         setupMocks();
     }
 
     @Test
     public void testAdd() {
-        dataChangeEvent.created.put(identifier, vrfEntry);
         //fibmgr.onDataChanged(dataChangeEvent);
         //Mockito.verify(mdsalManager, Mockito.times(2)).installFlow(any(FlowEntity.class));
     }

diff --git a/vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/MockDataChangedEvent.java b/vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/MockDataChangedEvent.java
deleted file mode 100644 (file)
index 5f8dcfb..0000000
--- a/vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/MockDataChangedEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * 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.fibmanager.test;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-class MockDataChangedEvent implements AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> {
-    Map<InstanceIdentifier<?>, DataObject> created = new HashMap<>();
-    Map<InstanceIdentifier<?>, DataObject> updated = new HashMap<>();
-    Map<InstanceIdentifier<?>, DataObject> original = new HashMap<>();
-    Set<InstanceIdentifier<?>> removed = new HashSet<>();
-
-    @Override
-    public Map<InstanceIdentifier<?>, DataObject> getCreatedData() {
-        return created;
-    }
-
-    @Override
-    public Map<InstanceIdentifier<?>, DataObject> getUpdatedData() {
-        return updated;
-    }
-
-    @Override
-    public Set<InstanceIdentifier<?>> getRemovedPaths() {
-        return removed;
-    }
-
-    @Override
-    public Map<InstanceIdentifier<?>, DataObject> getOriginalData() {
-        return original;
-    }
-
-    @Override
-    public DataObject getOriginalSubtree() {
-        throw new UnsupportedOperationException("Not implemented by mock");
-    }
-
-    @Override
-    public DataObject getUpdatedSubtree() {
-        throw new UnsupportedOperationException("Not implemented by mock");
-    }
-}

diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java
index fa40279ebfb81905c1a92a44dbd375fefc56cc53..8268ac15179d1e8277df77d514a2a73929850037 100644 (file)
--- a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java
+++ b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java
@@ -14,7 +14,6 @@ import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
@@ -30,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +37,6 @@ import org.slf4j.LoggerFactory;
 public class Ipv6NodeListener extends AsyncDataTreeChangeListenerBase<FlowCapableNode, Ipv6NodeListener>
         implements AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(Ipv6NodeListener.class);
-    private ListenerRegistration<DataChangeListener> listenerRegistration;
     private final DataBroker dataBroker;
     private final IMdsalApiManager mdsalUtil;
 

diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java
index dd92582b73b16eefd6faeae333851e457867c6a0..c3475fb0891fc7c0db64ec03483872d9726d11f5 100644 (file)
--- a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java
+++ b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java
@@ -11,13 +11,11 @@ import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.Routers;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.Router;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,7 +24,6 @@ import org.slf4j.LoggerFactory;
 public class NeutronRouterChangeListener extends AsyncDataTreeChangeListenerBase<Router, NeutronRouterChangeListener>
         implements AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(NeutronRouterChangeListener.class);
-    private ListenerRegistration<DataChangeListener> listenerRegistration;
     private final DataBroker dataBroker;
     private final IfMgr ifMgr;
 

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java
index 5ed68fbd3d83d5e0db5826b1db9cef4f89b34aac..fa4d0366468118700d9ff9de1e35583899606bc2 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java
@@ -9,7 +9,6 @@ package org.opendaylight.netvirt.natservice.internal;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.ListenableFuture;
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +19,6 @@ import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
@@ -46,7 +44,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev16011
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.GetFixedIPsForNeutronPortInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.GetFixedIPsForNeutronPortOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.NeutronvpnService;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
@@ -58,7 +55,6 @@ public class InterfaceStateEventListener
     implements AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(InterfaceStateEventListener.class);
-    private ListenerRegistration<DataChangeListener> listenerRegistration;
     private final DataBroker dataBroker;
     private final IMdsalApiManager mdsalManager;
     private final FloatingIPListener floatingIPListener;

diff --git a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java b/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java
index 4a8d8ea27ae4bd669b75df21100459935d053275..b85744abcc36d7f210d55d39b901924572249c08 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java
+++ b/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java
@@ -8,9 +8,7 @@
 package org.opendaylight.netvirt.natservice.internal.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -22,9 +20,6 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
 import org.opendaylight.genius.mdsalutil.BucketInfo;
 import org.opendaylight.genius.mdsalutil.FlowEntity;
@@ -48,7 +43,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fib.rpc.rev160121.FibRpcService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.config.rev170206.NatserviceConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.vpn.rpc.rev160201.VpnRpcService;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -61,8 +55,6 @@ public class ExternalNetworksChangeListenerTest {
     @Mock
     DataBroker dataBroker;
     @Mock
-    ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
-    @Mock
     IMdsalApiManager mdsalManager;
     @Mock
     FlowEntity flowMock;
@@ -77,12 +69,6 @@ public class ExternalNetworksChangeListenerTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        when(dataBroker.registerDataChangeListener(
-            any(LogicalDatastoreType.class),
-            any(InstanceIdentifier.class),
-            any(DataChangeListener.class),
-            any(DataChangeScope.class)))
-            .thenReturn(dataChangeListenerRegistration);
         extNetworks = new ExternalNetworksChangeListener(dataBroker,
             Mockito.mock(IMdsalApiManager.class),
             Mockito.mock(FloatingIPListener.class),

diff --git a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java b/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java
index 10aea46ec0cbf84df79c185165afc56abc4e6e9b..4dd800290046e7e90c9e6552b2424e431695e91d 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java
+++ b/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java
@@ -19,8 +19,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.netvirt.natservice.internal.IPAddress;
@@ -33,7 +31,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev16011
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext.ip.map.ip.mapping.IpMap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext.ip.map.ip.mapping.IpMapBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext.ip.map.ip.mapping.IpMapKey;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.powermock.api.mockito.PowerMockito;
@@ -48,8 +45,6 @@ public class NaptManagerTest {
     IdManagerService idMgr;
     @Mock
     DataBroker dataBroker;
-    @Mock
-    ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
     InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111
         .intext.ip.map.ip.mapping.IpMap> ipmapId = null;
     org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.intext
@@ -60,12 +55,6 @@ public class NaptManagerTest {
     @Before
     public void init() {
         MockitoAnnotations.initMocks(this);
-        when(dataBroker.registerDataChangeListener(
-            any(LogicalDatastoreType.class),
-            any(InstanceIdentifier.class),
-            any(DataChangeListener.class),
-            any(DataChangeScope.class)))
-            .thenReturn(dataChangeListenerRegistration);
         naptManager = new NaptManager(dataBroker, idMgr);
         when(idMgr.createIdPool(any(CreateIdPoolInput.class)))
             .thenReturn(Futures.immediateFuture(RpcResultBuilder.<Void>success().build()));

diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java
index ac24b774a8aeabafbfdadff053a62e0f1ed0cb78..3757c62a53d75148b0dac625a9af02f51100e24e 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java
+++ b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java
@@ -7,12 +7,9 @@
  */
 package org.opendaylight.netvirt.neutronvpn.api.utils;
 
-import com.google.common.base.Predicates;
-import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -22,7 +19,6 @@ import java.util.Set;
 import java.util.function.Predicate;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.Identifiable;
@@ -65,11 +61,6 @@ public class ChangeUtils {
                 .ModificationType.DELETE && input.getDataBefore() != null;
     }
 
-    public static <T extends DataObject> Map<InstanceIdentifier<T>,T> extractCreated(
-            AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,Class<T> klazz) {
-        return extract(changes.getCreatedData(),klazz);
-    }
-
     /**
      * Extract all the instances of {@code clazz} which were created in the given set of modifications.
      *
@@ -84,11 +75,6 @@ public class ChangeUtils {
         return extractCreatedOrUpdated(changes, clazz, hasNoDataBefore());
     }
 
-    public static <T extends DataObject> Map<InstanceIdentifier<T>,T> extractUpdated(
-            AsyncDataChangeEvent<InstanceIdentifier<?>,DataObject> changes,Class<T> klazz) {
-        return extract(changes.getUpdatedData(),klazz);
-    }
-
     /**
      * Extract all the instances of {@code clazz} which were updated in the given set of modifications.
      *
@@ -125,13 +111,6 @@ public class ChangeUtils {
         return result;
     }
 
-    public static <T extends DataObject> Map<InstanceIdentifier<T>,T> extractCreatedOrUpdated(
-            AsyncDataChangeEvent<InstanceIdentifier<?>,DataObject> changes,Class<T> klazz) {
-        Map<InstanceIdentifier<T>,T> result = extractUpdated(changes,klazz);
-        result.putAll(extractCreated(changes,klazz));
-        return result;
-    }
-
     /**
      * Extract all the instances of {@code clazz} which were created or updated in the given set of modifications.
      *
@@ -146,14 +125,6 @@ public class ChangeUtils {
         return extractCreatedOrUpdated(changes, clazz, matchesEverything());
     }
 
-    public static <T extends DataObject> Map<InstanceIdentifier<T>, T> extractCreatedOrUpdatedOrRemoved(
-            AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
-            Class<T> klazz) {
-        Map<InstanceIdentifier<T>,T> result = extractCreatedOrUpdated(changes,klazz);
-        result.putAll(extractRemovedObjects(changes, klazz));
-        return result;
-    }
-
     /**
      * Extract all the instances of {@code clazz} which were created, updated, or removed in the given set of
      * modifications. For instances which were created or updated, the new instances are returned; for instances
@@ -172,11 +143,6 @@ public class ChangeUtils {
         return result;
     }
 
-    public static <T extends DataObject> Map<InstanceIdentifier<T>,T> extractOriginal(
-            AsyncDataChangeEvent<InstanceIdentifier<?>,DataObject> changes,Class<T> klazz) {
-        return extract(changes.getOriginalData(),klazz);
-    }
-
     /**
      * Extract the original instances of class {@code clazz} in the given set of modifications.
      *
@@ -196,22 +162,6 @@ public class ChangeUtils {
         return result;
     }
 
-    public static <T extends DataObject> Set<InstanceIdentifier<T>> extractRemoved(
-            AsyncDataChangeEvent<InstanceIdentifier<?>,DataObject> changes,Class<T> klazz) {
-        Set<InstanceIdentifier<T>> result = new HashSet<>();
-        if (changes != null && changes.getRemovedPaths() != null) {
-            for (InstanceIdentifier<?> iid : changes.getRemovedPaths()) {
-                if (iid.getTargetType().equals(klazz)) {
-                    // Actually checked above
-                    @SuppressWarnings("unchecked")
-                    InstanceIdentifier<T> iidn = (InstanceIdentifier<T>)iid;
-                    result.add(iidn);
-                }
-            }
-        }
-        return result;
-    }
-
     /**
      * Extract the instance identifier of removed instances of {@code clazz} from the given set of modifications.
      *
@@ -298,7 +248,7 @@ public class ChangeUtils {
             InstanceIdentifier<? extends DataObject> extendPath(
             InstanceIdentifier path,
             DataObjectModification child) {
-        Class<N> item = (Class<N>) child.getDataType();
+        Class<N> item = child.getDataType();
         if (child.getIdentifier() instanceof InstanceIdentifier.IdentifiableItem) {
             K key = (K) ((InstanceIdentifier.IdentifiableItem) child.getIdentifier()).getKey();
             KeyedInstanceIdentifier<N, K> extendedPath = path.child(item, key);
@@ -309,13 +259,6 @@ public class ChangeUtils {
         }
     }
 
-    public static <T extends DataObject> Map<InstanceIdentifier<T>, T> extractRemovedObjects(
-            AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
-            Class<T> klazz) {
-        Set<InstanceIdentifier<T>> iids = extractRemoved(changes, klazz);
-        return Maps.filterKeys(extractOriginal(changes, klazz),Predicates.in(iids));
-    }
-
     /**
      * Extract the removed instances of {@code clazz} from the given set of modifications.
      *

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java b/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
index 226391a17b7f66e2072d9ea518c424f23d6e6287..2619087730c891de3a68f2adfd3dd17d1c2b1e83 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
@@ -23,12 +23,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
@@ -45,7 +43,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.por
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.port.attributes.FixedIpsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.PortBuilder;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -66,8 +63,6 @@ public class NeutronPortChangeListenerTest {
     @Mock
     NeutronFloatingToFixedIpMappingChangeListener floatingIpMapListener;
     @Mock
-    ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
-    @Mock
     WriteTransaction mockWriteTx;
     @Mock
     ReadOnlyTransaction mockReadTx;
@@ -84,11 +79,6 @@ public class NeutronPortChangeListenerTest {
 
     @Before
     public void setUp() {
-        when(dataBroker.registerDataChangeListener(any(LogicalDatastoreType.class), //
-                any(InstanceIdentifier.class), //
-                any(DataChangeListener.class), //
-                any(AsyncDataBroker.DataChangeScope.class))). //
-                thenReturn(dataChangeListenerRegistration);
         doReturn(mockWriteTx).when(dataBroker).newWriteOnlyTransaction();
         doReturn(Futures.immediateCheckedFuture(null)).when(mockWriteTx).submit();
         doReturn(mockReadTx).when(dataBroker).newReadOnlyTransaction();

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AbstractDataChangeListener.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AbstractDataChangeListener.java
deleted file mode 100644 (file)
index 292af2a..0000000
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AbstractDataChangeListener.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2015 - 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * 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.vpnmanager;
-
-import com.google.common.base.Preconditions;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * AbstractDataChangeListener implemented basic {@link DataChangeListener} processing for
- * VPN related Data Objects.
- */
-public abstract class AbstractDataChangeListener<T extends DataObject> implements DataChangeListener {
-
-    protected final Class<T> clazz;
-
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractDataChangeListener.class);
-
-    /**
-     * Creates an instance.
-     *
-     * @param clazz The class for which the data change event is received.
-     */
-    public AbstractDataChangeListener(Class<T> clazz) {
-        this.clazz = Preconditions.checkNotNull(clazz, "Class can not be null!");
-    }
-
-    @Override
-    // TODO Clean up the exception handling
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    public void onDataChanged(final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changeEvent) {
-        try {
-            Preconditions.checkNotNull(changeEvent, "Async ChangeEvent can not be null!");
-
-            /* All DataObjects for create */
-            final Map<InstanceIdentifier<?>, DataObject> createdData = changeEvent.getCreatedData() != null
-                    ? changeEvent.getCreatedData() : Collections.emptyMap();
-            /* All DataObjects for remove */
-            final Set<InstanceIdentifier<?>> removeData = changeEvent.getRemovedPaths() != null
-                    ? changeEvent.getRemovedPaths() : Collections.emptySet();
-            /* All DataObjects for updates */
-            final Map<InstanceIdentifier<?>, DataObject> updateData = changeEvent.getUpdatedData() != null
-                    ? changeEvent.getUpdatedData() : Collections.emptyMap();
-            /* All Original DataObjects */
-            final Map<InstanceIdentifier<?>, DataObject> originalData = changeEvent.getOriginalData() != null
-                    ? changeEvent.getOriginalData() : Collections.emptyMap();
-
-            this.createData(createdData);
-            this.updateData(updateData, originalData);
-            this.removeData(removeData, originalData);
-        } catch (Exception e) {
-            LOG.error("failed to handle dcn ", e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void createData(final Map<InstanceIdentifier<?>, DataObject> createdData) {
-        for (Map.Entry<InstanceIdentifier<?>, DataObject> entry : createdData.entrySet()) {
-            InstanceIdentifier<?> key = entry.getKey();
-            if (clazz.equals(key.getTargetType())) {
-                DataObject value = entry.getValue();
-                if (value != null) {
-                    this.add(key.firstIdentifierOf(clazz), (T) value);
-                }
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void updateData(final Map<InstanceIdentifier<?>, DataObject> updateData,
-            final Map<InstanceIdentifier<?>, DataObject> originalData) {
-        for (Map.Entry<InstanceIdentifier<?>, DataObject> entry : updateData.entrySet()) {
-            InstanceIdentifier<?> key = entry.getKey();
-            if (clazz.equals(key.getTargetType())) {
-                InstanceIdentifier<T> updateKeyIdent = key.firstIdentifierOf(clazz);
-                final DataObject value = entry.getValue();
-                final DataObject original = originalData.get(key);
-                if (value != null && original != null) {
-                    this.update(updateKeyIdent, (T) original, (T) value);
-                }
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void removeData(final Set<InstanceIdentifier<?>> removeData,
-        final Map<InstanceIdentifier<?>, DataObject> originalData) {
-
-        for (InstanceIdentifier<?> key : removeData) {
-            if (clazz.equals(key.getTargetType())) {
-                final InstanceIdentifier<T> ident = key.firstIdentifierOf(clazz);
-                final DataObject removeValue = originalData.get(key);
-                this.remove(ident, (T) removeValue);
-            }
-        }
-    }
-
-    protected abstract void remove(InstanceIdentifier<T> identifier, T del);
-
-    protected abstract void update(InstanceIdentifier<T> identifier, T original, T update);
-
-    protected abstract void add(InstanceIdentifier<T> identifier, T add);
-
-}
-
-

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/MockDataChangedEvent.java b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/MockDataChangedEvent.java
deleted file mode 100644 (file)
index f053646..0000000
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/MockDataChangedEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * 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.vpnmanager.test;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-class MockDataChangedEvent implements AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> {
-    Map<InstanceIdentifier<?>, DataObject> created = new HashMap<>();
-    Map<InstanceIdentifier<?>, DataObject> updated = new HashMap<>();
-    Map<InstanceIdentifier<?>, DataObject> original = new HashMap<>();
-    Set<InstanceIdentifier<?>> removed = new HashSet<>();
-
-    @Override
-    public Map<InstanceIdentifier<?>, DataObject> getCreatedData() {
-        return created;
-    }
-
-    @Override
-    public Map<InstanceIdentifier<?>, DataObject> getUpdatedData() {
-        return updated;
-    }
-
-    @Override
-    public Set<InstanceIdentifier<?>> getRemovedPaths() {
-        return removed;
-    }
-
-    @Override
-    public Map<InstanceIdentifier<?>, DataObject> getOriginalData() {
-        return original;
-    }
-
-    @Override
-    public DataObject getOriginalSubtree() {
-        throw new UnsupportedOperationException("Not implemented by mock");
-    }
-
-    @Override
-    public DataObject getUpdatedSubtree() {
-        throw new UnsupportedOperationException("Not implemented by mock");
-    }
-}

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java
index 4f3a656e6481df8423580662068190b6a67a719d..af28181ad04f70945d5583e920cbf876ea03e941 100644 (file)
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java
@@ -8,10 +8,8 @@
 
 package org.opendaylight.netvirt.vpnmanager.test;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.Futures;
@@ -24,10 +22,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.netvirt.vpnmanager.SubnetOpDpnManager;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
@@ -42,7 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.sub
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.subnet.op.data.subnet.op.data.entry.SubnetToDpnBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.subnet.op.data.subnet.op.data.entry.SubnetToDpnKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.subnet.op.data.subnet.op.data.entry.subnet.to.dpn.VpnInterfaces;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 
@@ -67,8 +62,6 @@ public class SubnetOpDpnManagerTest {
     @Mock
     DataBroker dataBroker;
     @Mock
-    ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
-    @Mock
     ReadOnlyTransaction mockReadTx;
     @Mock
     WriteTransaction mockWriteTx;
@@ -80,12 +73,6 @@ public class SubnetOpDpnManagerTest {
 
     @Before
     public void setUp() throws Exception {
-        when(dataBroker.registerDataChangeListener(
-            any(LogicalDatastoreType.class),
-            any(InstanceIdentifier.class),
-            any(DataChangeListener.class),
-            any(AsyncDataBroker.DataChangeScope.class)))
-            .thenReturn(dataChangeListenerRegistration);
         setupMocks();
 
         subOpDpnManager = new SubnetOpDpnManager(dataBroker);

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java
index 530efb5738e8c8487702811587125bd2d3a88d01..76adec26a58ae5354d00b8b5c344ef015c181014 100644 (file)
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java
@@ -7,22 +7,15 @@
  */
 package org.opendaylight.netvirt.vpnmanager.test;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.netvirt.bgpmanager.api.IBgpManager;
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.VpnInstances;
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.af.config.ApplyLabelBuilder;
@@ -37,7 +30,6 @@ import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev14081
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.instances.VpnInstanceKey;
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.instances.vpn.instance.Ipv4Family;
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.instances.vpn.instance.Ipv4FamilyBuilder;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
 
@@ -47,19 +39,9 @@ public class VpnServiceTest {
     DataBroker dataBroker;
     @Mock
     IBgpManager bgpManager;
-    @Mock
-    ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
-    MockDataChangedEvent event;
 
     @Before
     public void setUp() throws Exception {
-        when(dataBroker.registerDataChangeListener(
-            any(LogicalDatastoreType.class),
-            any(InstanceIdentifier.class),
-            any(DataChangeListener.class),
-            any(DataChangeScope.class)))
-            .thenReturn(dataChangeListenerRegistration);
-        event = new MockDataChangedEvent();
     }
 
     @Test
@@ -84,7 +66,6 @@ public class VpnServiceTest {
         VpnInstanceBuilder builder =
             new VpnInstanceBuilder().setKey(new VpnInstanceKey("Vpn1")).setIpv4Family(ipv4Family);
         VpnInstance instance = builder.build();
-        event.created.put(createVpnId("Vpn1"), instance);
         //TODO: Need to enhance the test case to handle ds read/write ops
         //vpnManager.onDataChanged(event);
     }

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java
index dac8a2d66ead7efd7b14d114b195c6e96d2cd623..96797db9ee5432d592b020789cb16f43908bfc8a 100644 (file)
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java
@@ -8,7 +8,6 @@
 
 package org.opendaylight.netvirt.vpnmanager.test;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
@@ -16,13 +15,11 @@ import static org.mockito.Mockito.when;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.Futures;
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Future;
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -30,10 +27,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.interfacemanager.globals.IfmConstants;
 import org.opendaylight.netvirt.bgpmanager.api.IBgpManager;
@@ -93,7 +88,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev15060
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.Subnetmap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.SubnetmapBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.SubnetmapKey;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -166,8 +160,6 @@ public class VpnSubnetRouteHandlerTest {
     @Mock
     DataBroker dataBroker;
     @Mock
-    ListenerRegistration<DataChangeListener> dataChangeListenerRegistration;
-    @Mock
     ReadOnlyTransaction mockReadTx;
     @Mock
     WriteTransaction mockWriteTx;
@@ -205,12 +197,6 @@ public class VpnSubnetRouteHandlerTest {
 
     @Before
     public void setUp() throws Exception {
-        when(dataBroker.registerDataChangeListener(
-            any(LogicalDatastoreType.class),
-            any(InstanceIdentifier.class),
-            any(DataChangeListener.class),
-            any(AsyncDataBroker.DataChangeScope.class)))
-            .thenReturn(dataChangeListenerRegistration);
         setupMocks();
 
         vpnSubnetRouteHandler = new VpnSubnetRouteHandler(dataBroker, subnetOpDpnManager, bgpManager,