NETVIRT-1630 migrate to md-sal APIs

[netvirt.git] / vpnmanager / impl / src / test / java / org / opendaylight / netvirt / vpnmanager / test / SubnetOpDpnManagerTest.java

diff --git a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java
index f428408daaaf2c9037f656a2567b33489e15d0e5..a41a058439a4963a82dc449b6b017cc2aa1204c7 100644 (file)
--- a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java
+++ b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java
@@ -11,19 +11,18 @@ package org.opendaylight.netvirt.vpnmanager.test;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.Futures;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-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.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.netvirt.vpnmanager.SubnetOpDpnManager;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.PortOpData;
@@ -37,10 +36,12 @@ 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.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.subnet.op.data.subnet.op.data.entry.subnet.to.dpn.VpnInterfacesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.subnet.op.data.subnet.op.data.entry.subnet.to.dpn.VpnInterfacesKey;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint64;
 
-
 @RunWith(MockitoJUnitRunner.class)
 public class SubnetOpDpnManagerTest {
 
@@ -62,7 +63,7 @@ public class SubnetOpDpnManagerTest {
     @Mock
     DataBroker dataBroker;
     @Mock
-    ReadOnlyTransaction mockReadTx;
+    ReadTransaction mockReadTx;
     @Mock
     WriteTransaction mockWriteTx;
 
@@ -80,9 +81,9 @@ public class SubnetOpDpnManagerTest {
         optionalSubDpn = Optional.of(subnetToDpn);
         optionalPortOp = Optional.of(portOp);
 
-        doReturn(Futures.immediateCheckedFuture(optionalPortOp)).when(mockReadTx).read(LogicalDatastoreType
+        doReturn(FluentFutures.immediateFluentFuture(optionalPortOp)).when(mockReadTx).read(LogicalDatastoreType
             .OPERATIONAL, portOpIdentifier);
-        doReturn(Futures.immediateCheckedFuture(optionalSubDpn)).when(mockReadTx).read(LogicalDatastoreType
+        doReturn(FluentFutures.immediateFluentFuture(optionalSubDpn)).when(mockReadTx).read(LogicalDatastoreType
             .OPERATIONAL, dpnOpId);
 
     }
@@ -104,8 +105,13 @@ public class SubnetOpDpnManagerTest {
     public void testAddInterfaceToDpn() {
 
         subOpDpnManager.addInterfaceToDpn(subnetId, dpId, infName);
-
-        verify(mockWriteTx).put(LogicalDatastoreType.OPERATIONAL, dpnOpId, subnetToDpn,
+        List<VpnInterfaces> vpnIntfList = new ArrayList<>();
+        VpnInterfaces vpnIntfs =
+                new VpnInterfacesBuilder().withKey(new VpnInterfacesKey(infName)).setInterfaceName(infName).build();
+        vpnIntfList.add(vpnIntfs);
+        SubnetToDpn subnetToDpnLocal = new SubnetToDpnBuilder().setDpnId(dpId).withKey(new SubnetToDpnKey(dpId))
+                .setVpnInterfaces(vpnIntfList).build();
+        verify(mockWriteTx).put(LogicalDatastoreType.OPERATIONAL, dpnOpId, subnetToDpnLocal,
                 WriteTransaction.CREATE_MISSING_PARENTS);
 
     }
@@ -122,7 +128,7 @@ public class SubnetOpDpnManagerTest {
     @Test
     public void testAddPortOpDataEntryPortOpAbsent() {
 
-        doReturn(Futures.immediateCheckedFuture(Optional.absent())).when(mockReadTx).read(LogicalDatastoreType
+        doReturn(FluentFutures.immediateFluentFuture(Optional.empty())).when(mockReadTx).read(LogicalDatastoreType
             .OPERATIONAL, portOpIdentifier);
 
         subOpDpnManager.addPortOpDataEntry(infName, subnetId, dpId);
@@ -150,7 +156,7 @@ public class SubnetOpDpnManagerTest {
     @Test
     public void testRemovePortOpDataEntryPortOpAbsent() {
 
-        doReturn(Futures.immediateCheckedFuture(Optional.absent())).when(mockReadTx).read(LogicalDatastoreType
+        doReturn(FluentFutures.immediateFluentFuture(Optional.empty())).when(mockReadTx).read(LogicalDatastoreType
             .OPERATIONAL, portOpIdentifier);
 
         subOpDpnManager.removePortOpDataEntry(infName, null);
@@ -171,7 +177,7 @@ public class SubnetOpDpnManagerTest {
     @Test
     public void testGetPortOpDataEntryPortOpAbsent() {
 
-        doReturn(Futures.immediateCheckedFuture(Optional.absent())).when(mockReadTx).read(LogicalDatastoreType
+        doReturn(FluentFutures.immediateFluentFuture(Optional.empty())).when(mockReadTx).read(LogicalDatastoreType
             .OPERATIONAL, portOpIdentifier);
 
         subOpDpnManager.getPortOpDataEntry(infName);