Upgrade to the Neon base platform

[netvirt.git] / neutronvpn / impl / src / test / java / org / opendaylight / netvirt / neutronvpn / NeutronPortChangeListenerTest.java

diff --git a/neutronvpn/impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java b/neutronvpn/impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
index 9c990343fa49c973d2a256aa00437db521fc39a1..70b8e383f666d9625f363ad3cc838b9c9b81fb2b 100644 (file)
--- a/neutronvpn/impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
+++ b/neutronvpn/impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java
@@ -9,7 +9,6 @@
 package org.opendaylight.netvirt.neutronvpn;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
@@ -86,8 +85,6 @@ public class NeutronPortChangeListenerTest {
 
     @Before
     public void setUp() {
-        doReturn(mockWriteTx).when(dataBroker).newWriteOnlyTransaction();
-        doReturn(Futures.immediateCheckedFuture(null)).when(mockWriteTx).submit();
         doReturn(mockReadTx).when(dataBroker).newReadOnlyTransaction();
         when(mockReadTx.read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)))
             .thenReturn(Futures.immediateCheckedFuture(Optional.of(mockNetwork)));
@@ -99,8 +96,6 @@ public class NeutronPortChangeListenerTest {
         InstanceIdentifier<ElanInstance> elanIdentifierId = InstanceIdentifier.builder(ElanInstances.class)
                 .child(ElanInstance.class,
                         new ElanInstanceKey(new Uuid("12345678-1234-1234-1234-123456789012").getValue())).build();
-        when(mockReadTx.read(any(LogicalDatastoreType.class), eq(elanIdentifierId)))
-            .thenReturn(Futures.immediateCheckedFuture(Optional.of(elanInstance)));
     }
 
     @After