1 files changed, 2 insertions, 12 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizerTest.java
index 7ca2bc155..c74423aba 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/vpp/L2FibEntryCustomizerTest.java
@@ -79,7 +79,9 @@ public class L2FibEntryCustomizerTest {
         initMocks(this);
         doReturn(mappingContext).when(writeContext).getMappingContext();
         bdContext = new NamingContext("generatedBdName", BD_CTX_NAME);
+        ContextTestUtils.mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
         interfaceContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
+        ContextTestUtils.mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
 
         customizer = new L2FibEntryCustomizer(api, bdContext, interfaceContext);
     }
@@ -145,9 +147,6 @@ public class L2FibEntryCustomizerTest {
         final L2FibEntry entry = generateL2FibEntry(address);
         final InstanceIdentifier<L2FibEntry> id = getL2FibEntryId(address);
 
-        ContextTestUtils.mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
-        ContextTestUtils.mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-
         whenL2FibAddDelThenSuccess();
 
         customizer.writeCurrentAttributes(id, entry, writeContext);
@@ -162,9 +161,6 @@ public class L2FibEntryCustomizerTest {
         final L2FibEntry entry = generateL2FibEntry(address);
         final InstanceIdentifier<L2FibEntry> id = getL2FibEntryId(address);
 
-        ContextTestUtils.mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
-        ContextTestUtils.mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-
         whenL2FibAddDelThenFailure();
 
         try {
@@ -190,9 +186,6 @@ public class L2FibEntryCustomizerTest {
         final L2FibEntry entry = generateL2FibEntry(address);
         final InstanceIdentifier<L2FibEntry> id = getL2FibEntryId(address);
 
-        ContextTestUtils.mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
-        ContextTestUtils.mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-
         whenL2FibAddDelThenSuccess();
 
         customizer.deleteCurrentAttributes(id, entry, writeContext);
@@ -207,9 +200,6 @@ public class L2FibEntryCustomizerTest {
         final L2FibEntry entry = generateL2FibEntry(address);
         final InstanceIdentifier<L2FibEntry> id = getL2FibEntryId(address);
 
-        ContextTestUtils.mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
-        ContextTestUtils.mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-
         whenL2FibAddDelThenFailure();
 
         try {