1 files changed, 18 insertions, 26 deletions

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizerTest.java
index 35dacab56..07e050ec6 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/VxlanGpeCustomizerTest.java
@@ -16,7 +16,8 @@
 
 package io.fd.honeycomb.translate.v3po.interfaces;
 
-import static java.util.Collections.singletonList;
+import static io.fd.honeycomb.translate.v3po.test.ContextTestUtils.getMapping;
+import static io.fd.honeycomb.translate.v3po.test.ContextTestUtils.getMappingIid;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -31,8 +32,8 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import com.google.common.base.Optional;
 import com.google.common.net.InetAddresses;
+import io.fd.honeycomb.translate.MappingContext;
 import io.fd.honeycomb.translate.ModificationCache;
 import io.fd.honeycomb.translate.v3po.DisabledInterfacesManager;
 import io.fd.honeycomb.translate.v3po.test.ContextTestUtils;
@@ -40,7 +41,6 @@ import io.fd.honeycomb.translate.v3po.test.TestHelperUtils;
 import io.fd.honeycomb.translate.v3po.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.honeycomb.translate.MappingContext;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
@@ -50,9 +50,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.Mappings;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.MappingsBuilder;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.Mapping;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
@@ -101,7 +98,7 @@ public class VxlanGpeCustomizerTest {
 
         customizer = new VxlanGpeCustomizer(api, namingContext, interfaceDisableContext);
 
-        ifaceName = "eth0";
+        ifaceName = "elth0";
         id = InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(ifaceName))
                         .augmentation(VppInterfaceAugmentation.class).child(VxlanGpe.class);
     }
@@ -172,32 +169,29 @@ public class VxlanGpeCustomizerTest {
         final VxlanGpe vxlanGpe = generateVxlanGpe();
 
         whenVxlanGpeAddDelTunnelThenSuccess();
-
-        doReturn(Optional.absent())
-            .when(mappingContext).read(ContextTestUtils.getMappingIid(ifaceName, "test-instance").firstIdentifierOf(Mappings.class));
+        ContextTestUtils.mockEmptyMapping(mappingContext, ifaceName, "test-instance");
 
         customizer.writeCurrentAttributes(id, vxlanGpe, writeContext);
         verifyVxlanGpeAddWasInvoked(vxlanGpe);
-        verify(mappingContext).put(eq(ContextTestUtils.getMappingIid(ifaceName, "test-instance")), eq(
-                ContextTestUtils.getMapping(ifaceName, 0).get()));
+        verify(mappingContext).put(eq(getMappingIid(ifaceName, "test-instance")), eq(
+                getMapping(ifaceName, 0).get()));
     }
 
     @Test
     public void testWriteCurrentAttributesMappingAlreadyPresent() throws Exception {
         final VxlanGpe vxlanGpe = generateVxlanGpe();
+        final int ifaceId = 0;
 
         whenVxlanGpeAddDelTunnelThenSuccess();
-        final Optional<Mapping> ifcMapping = ContextTestUtils.getMapping(ifaceName, 0);
-
-        doReturn(Optional.of(new MappingsBuilder().setMapping(singletonList(ifcMapping.get())).build()))
-            .when(mappingContext).read(ContextTestUtils.getMappingIid(ifaceName, "test-instance").firstIdentifierOf(Mappings.class));
+        ContextTestUtils.mockMapping(mappingContext, ifaceName, ifaceId, "test-instance");
 
         customizer.writeCurrentAttributes(id, vxlanGpe, writeContext);
         verifyVxlanGpeAddWasInvoked(vxlanGpe);
 
         // Remove the first mapping before putting in the new one
-        verify(mappingContext).delete(eq(ContextTestUtils.getMappingIid(ifaceName, "test-instance")));
-        verify(mappingContext).put(eq(ContextTestUtils.getMappingIid(ifaceName, "test-instance")), eq(ifcMapping.get()));
+        verify(mappingContext).delete(eq(getMappingIid(ifaceName, "test-instance")));
+        verify(mappingContext).put(eq(getMappingIid(ifaceName, "test-instance")),
+            eq(getMapping(ifaceName, ifaceId).get()));
     }
 
     @Test
@@ -213,8 +207,8 @@ public class VxlanGpeCustomizerTest {
             verifyVxlanGpeAddWasInvoked(vxlanGpe);
             // Mapping not stored due to failure
             verify(mappingContext, times(0))
-                    .put(eq(ContextTestUtils.getMappingIid(ifaceName, "test-instance")), eq(
-                            ContextTestUtils.getMapping(ifaceName, 0).get()));
+                    .put(eq(getMappingIid(ifaceName, "test-instance")), eq(
+                            getMapping(ifaceName, 0).get()));
             return;
         }
         fail("WriteFailedException.CreateFailedException was expected");
@@ -236,12 +230,11 @@ public class VxlanGpeCustomizerTest {
         final VxlanGpe vxlanGpe = generateVxlanGpe();
 
         whenVxlanGpeAddDelTunnelThenSuccess();
-        doReturn(ContextTestUtils.getMapping(ifaceName, 1)).when(mappingContext).read(
-                ContextTestUtils.getMappingIid(ifaceName, "test-instance"));
+        ContextTestUtils.mockMapping(mappingContext, ifaceName, 1, "test-instance");
 
         customizer.deleteCurrentAttributes(id, vxlanGpe, writeContext);
         verifyVxlanGpeDeleteWasInvoked(vxlanGpe);
-        verify(mappingContext).delete(eq(ContextTestUtils.getMappingIid(ifaceName, "test-instance")));
+        verify(mappingContext).delete(eq(getMappingIid(ifaceName, "test-instance")));
     }
 
     @Test
@@ -249,15 +242,14 @@ public class VxlanGpeCustomizerTest {
         final VxlanGpe vxlanGpe = generateVxlanGpe();
 
         whenVxlanGpeAddDelTunnelThenFailure();
-        doReturn(ContextTestUtils.getMapping(ifaceName, 1)).when(mappingContext).read(
-                ContextTestUtils.getMappingIid(ifaceName, "test-instance"));
+        ContextTestUtils.mockMapping(mappingContext, ifaceName, 1, "test-instance");
 
         try {
             customizer.deleteCurrentAttributes(id, vxlanGpe, writeContext);
         } catch (WriteFailedException.DeleteFailedException e) {
             assertTrue(e.getCause() instanceof VppBaseCallException);
             verifyVxlanGpeDeleteWasInvoked(vxlanGpe);
-            verify(mappingContext, times(0)).delete(eq(ContextTestUtils.getMappingIid(ifaceName, "test-instance")));
+            verify(mappingContext, times(0)).delete(eq(getMappingIid(ifaceName, "test-instance")));
             return;
         }
         fail("WriteFailedException.DeleteFailedException was expected");