Increase snat unit test coverage > 80% 32/5032/4
authorMarek Gradzki <[email protected]>
Mon, 6 Feb 2017 06:11:41 +0000 (07:11 +0100)
committerJan Srnicek <[email protected]>
Tue, 7 Feb 2017 12:44:41 +0000 (12:44 +0000)
Change-Id: I3531d746ed12334f71f45f824d92bbe3bd517ba3
Signed-off-by: Marek Gradzki <[email protected]>
nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java [new file with mode: 0644]
nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java [new file with mode: 0644]
nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java [new file with mode: 0644]
nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java [new file with mode: 0644]
nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java [new file with mode: 0644]
nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java [new file with mode: 0644]
nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java [new file with mode: 0644]
nat/nat2vpp/src/test/resources/nat/external-ip-pool.json [new file with mode: 0644]

diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizerTest.java
new file mode 100644 (file)
index 0000000..8413bce
--- /dev/null
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.nat.read;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
+import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
+import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
+import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
+import io.fd.vpp.jvpp.snat.dto.SnatAddressDetails;
+import io.fd.vpp.jvpp.snat.dto.SnatAddressDetailsReplyDump;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.LongStream;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.parameters.ExternalIpAddressPool;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.parameters.ExternalIpAddressPoolBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.parameters.ExternalIpAddressPoolKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.NatInstances;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.NatInstance;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.NatInstanceKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.nat.instance.NatCurrentConfig;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.nat.instance.NatCurrentConfigBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class ExternalIpPoolCustomizerTest
+    extends ListReaderCustomizerTest<ExternalIpAddressPool, ExternalIpAddressPoolKey, ExternalIpAddressPoolBuilder> {
+
+    private InstanceIdentifier<ExternalIpAddressPool> externalPoolIdDefaultNatInstance;
+    private InstanceIdentifier<ExternalIpAddressPool> externalPoolIdDifferentNatInstance;
+    private DumpCacheManager<SnatAddressDetailsReplyDump, Void> dumpCacheManager;
+
+    @Mock
+    private EntityDumpExecutor<SnatAddressDetailsReplyDump, Void> executor;
+
+    public ExternalIpPoolCustomizerTest() {
+        super(ExternalIpAddressPool.class, NatCurrentConfigBuilder.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        externalPoolIdDefaultNatInstance = InstanceIdentifier
+            .create(NatInstances.class)
+            .child(NatInstance.class, new NatInstanceKey(NatInstanceCustomizer.DEFAULT_VRF_ID))
+            .child(NatCurrentConfig.class)
+            .child(ExternalIpAddressPool.class, new ExternalIpAddressPoolKey(2L));
+
+        externalPoolIdDifferentNatInstance = InstanceIdentifier
+            .create(NatInstances.class)
+            .child(NatInstance.class, new NatInstanceKey(7L))
+            .child(NatCurrentConfig.class)
+            .child(ExternalIpAddressPool.class, new ExternalIpAddressPoolKey(2L));
+
+        dumpCacheManager = new DumpCacheManager.DumpCacheManagerBuilder<SnatAddressDetailsReplyDump, Void>()
+            .withExecutor(executor)
+            .acceptOnly(SnatAddressDetailsReplyDump.class)
+            .build();
+    }
+
+    @Override
+    protected ReaderCustomizer<ExternalIpAddressPool, ExternalIpAddressPoolBuilder> initCustomizer() {
+        return new ExternalIpPoolCustomizer(dumpCacheManager);
+    }
+
+    @Test
+    public void testReadAttributes() throws Exception {
+        when(executor.executeDump(externalPoolIdDefaultNatInstance, null)).thenReturn(dumpReplyNonEmpty());
+
+        final ExternalIpAddressPoolBuilder builder = new ExternalIpAddressPoolBuilder();
+        getCustomizer().readCurrentAttributes(externalPoolIdDefaultNatInstance, builder, ctx);
+
+        assertEquals("192.168.2.3/32", builder.getExternalIpPool().getValue());
+        assertEquals(2L, builder.getPoolId().longValue());
+    }
+
+    @Test
+    public void testGetAll() throws Exception {
+        when(executor.executeDump(externalPoolIdDefaultNatInstance, null)).thenReturn(dumpReplyNonEmpty());
+
+        final List<ExternalIpAddressPoolKey> allIds = getCustomizer().getAllIds(externalPoolIdDefaultNatInstance, ctx);
+        assertThat(allIds, hasItems(
+            LongStream.range(0, 2).mapToObj(ExternalIpAddressPoolKey::new).toArray(ExternalIpAddressPoolKey[]::new)));
+    }
+
+    @Test
+    public void testGetAllDifferentInstance() throws Exception {
+        assertThat(getCustomizer().getAllIds(externalPoolIdDifferentNatInstance, ctx), empty());
+    }
+
+    @Test
+    public void testGetAllNoDump() throws Exception {
+        when(executor.executeDump(externalPoolIdDefaultNatInstance, null)).thenReturn(dumpReplyEmpty());
+        assertThat(getCustomizer().getAllIds(externalPoolIdDefaultNatInstance, ctx), empty());
+    }
+
+    private static SnatAddressDetailsReplyDump dumpReplyEmpty() {
+        return new SnatAddressDetailsReplyDump();
+    }
+
+    private static SnatAddressDetailsReplyDump dumpReplyNonEmpty() {
+        SnatAddressDetailsReplyDump replyDump = dumpReplyEmpty();
+
+        SnatAddressDetails detailsOne = new SnatAddressDetails();
+        detailsOne.ipAddress = new byte[] {-64, -88, 2, 1};
+        detailsOne.isIp4 = 1;
+
+        SnatAddressDetails detailsTwo = new SnatAddressDetails();
+        detailsTwo.ipAddress = new byte[] {-64, -88, 2, 2};
+        detailsTwo.isIp4 = 1;
+
+        SnatAddressDetails detailsThree = new SnatAddressDetails();
+        detailsThree.ipAddress = new byte[] {-64, -88, 2, 3};
+        detailsThree.isIp4 = 1;
+
+        replyDump.snatAddressDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree);
+
+        return replyDump;
+    }
+}
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/MappingEntryCustomizerTest.java
new file mode 100644 (file)
index 0000000..678d67b
--- /dev/null
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.nat.read;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest;
+import io.fd.hc2vpp.nat.util.MappingEntryContext;
+import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
+import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
+import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
+import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetails;
+import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetailsReplyDump;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.NatInstances;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.NatInstance;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.NatInstanceKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.nat.instance.MappingTable;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.nat.instance.MappingTableBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.nat.instance.mapping.table.MappingEntry;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.nat.instance.mapping.table.MappingEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.nat.instance.mapping.table.MappingEntryKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.port.number.port.type.SinglePortNumber;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class MappingEntryCustomizerTest
+    extends InitializingListReaderCustomizerTest<MappingEntry, MappingEntryKey, MappingEntryBuilder> {
+
+    private static final long NAT_MAPPING_ID = 2L;
+    private InstanceIdentifier<MappingEntry> mappingEntryId;
+    private InstanceIdentifier<MappingEntry> mappingEntryWildcarded;
+    private DumpCacheManager<SnatStaticMappingDetailsReplyDump, Void> dumpCacheManager;
+
+    @Mock
+    private MappingEntryContext mappingContext;
+
+    @Mock
+    private EntityDumpExecutor<SnatStaticMappingDetailsReplyDump, Void> dumpExecutor;
+
+    public MappingEntryCustomizerTest() {
+        super(MappingEntry.class, MappingTableBuilder.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        mappingEntryId = InstanceIdentifier.create(NatInstances.class)
+            .child(NatInstance.class, new NatInstanceKey(NatInstanceCustomizer.DEFAULT_VRF_ID))
+            .child(MappingTable.class)
+            .child(MappingEntry.class, new MappingEntryKey(NAT_MAPPING_ID));
+        mappingEntryWildcarded = InstanceIdentifier.create(NatInstances.class)
+            .child(NatInstance.class, new NatInstanceKey(NatInstanceCustomizer.DEFAULT_VRF_ID))
+            .child(MappingTable.class)
+            .child(MappingEntry.class);
+        dumpCacheManager = new DumpCacheManager.DumpCacheManagerBuilder<SnatStaticMappingDetailsReplyDump, Void>()
+            .withExecutor(dumpExecutor)
+            .acceptOnly(SnatStaticMappingDetailsReplyDump.class)
+            .build();
+    }
+
+    @Test
+    public void testReadAttributes() throws Exception {
+        final SnatStaticMappingDetailsReplyDump dump = dumpNonEmptyDefaultInstance();
+        when(dumpExecutor.executeDump(mappingEntryId, null)).thenReturn(dump);
+        final MappingEntryBuilder builder = new MappingEntryBuilder();
+        when(mappingContext.findDetails(dump.snatStaticMappingDetails, NatInstanceCustomizer.DEFAULT_VRF_ID.getId(),
+            NAT_MAPPING_ID, ctx.getMappingContext())).thenReturn(dump.snatStaticMappingDetails.get(2));
+        getCustomizer().readCurrentAttributes(mappingEntryId, builder, ctx);
+
+        assertEquals(NAT_MAPPING_ID, builder.getIndex().longValue());
+        assertEquals("192.168.3.8", builder.getExternalSrcAddress().getValue());
+        assertEquals(6874,
+            ((SinglePortNumber) builder.getExternalSrcPort().getPortType()).getSinglePortNumber().getValue()
+                .intValue());
+        assertArrayEquals("192.168.2.2".toCharArray(), builder.getInternalSrcAddress().getValue());
+        assertEquals(1274,
+            ((SinglePortNumber) builder.getInternalSrcPort().getPortType()).getSinglePortNumber().getValue()
+                .intValue());
+    }
+
+    @Test
+    public void testGetAll() throws Exception {
+        final SnatStaticMappingDetailsReplyDump dump = dumpNonEmptyDefaultInstance();
+        when(dumpExecutor.executeDump(mappingEntryWildcarded, null)).thenReturn(dump);
+        when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(),
+            dump.snatStaticMappingDetails.get(0), ctx.getMappingContext())).thenReturn(0L);
+        when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(),
+            dump.snatStaticMappingDetails.get(1), ctx.getMappingContext())).thenReturn(1L);
+        when(mappingContext.getStoredOrArtificialIndex(NatInstanceCustomizer.DEFAULT_VRF_ID.getId(),
+            dump.snatStaticMappingDetails.get(2), ctx.getMappingContext())).thenReturn(2L);
+
+        final List<MappingEntryKey> allIds = getCustomizer().getAllIds(mappingEntryWildcarded, ctx);
+        assertThat(allIds, hasItems(new MappingEntryKey(0L), new MappingEntryKey(2L)));
+    }
+
+    @Override
+    protected ReaderCustomizer<MappingEntry, MappingEntryBuilder> initCustomizer() {
+        return new MappingEntryCustomizer(dumpCacheManager, mappingContext);
+    }
+
+    private static SnatStaticMappingDetailsReplyDump dumpNonEmptyDefaultInstance() {
+        SnatStaticMappingDetailsReplyDump replyDump = new SnatStaticMappingDetailsReplyDump();
+
+        SnatStaticMappingDetails detailsOne = new SnatStaticMappingDetails();
+        detailsOne.isIp4 = 1;
+        detailsOne.addrOnly = 1;
+        detailsOne.localIpAddress = new byte[] {-64, -88, 2, 1};
+        detailsOne.localPort = 1234;
+        detailsOne.externalIpAddress = new byte[] {-64, -88, 2, 8};
+        detailsOne.externalPort = 5874;
+        detailsOne.vrfId = NatInstanceCustomizer.DEFAULT_VRF_ID.getId().byteValue();
+
+        SnatStaticMappingDetails detailsTwo = new SnatStaticMappingDetails();
+        detailsTwo.isIp4 = 1;
+        detailsTwo.addrOnly = 1;
+        detailsTwo.localIpAddress = new byte[] {-64, -88, 2, 3};
+        detailsTwo.localPort = 1235;
+        detailsTwo.externalIpAddress = new byte[] {-64, -88, 2, 5};
+        detailsTwo.externalPort = 5874;
+        detailsTwo.vrfId = 2;
+
+        SnatStaticMappingDetails detailsThree = new SnatStaticMappingDetails();
+        detailsThree.isIp4 = 1;
+        detailsThree.addrOnly = 0;
+        detailsThree.localIpAddress = new byte[] {-64, -88, 2, 2};
+        detailsThree.localPort = 1274;
+        detailsThree.externalIpAddress = new byte[] {-64, -88, 3, 8};
+        detailsThree.externalPort = 6874;
+        detailsThree.vrfId = NatInstanceCustomizer.DEFAULT_VRF_ID.getId().byteValue();
+
+        replyDump.snatStaticMappingDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree);
+        return replyDump;
+    }
+}
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/read/NatInstanceCustomizerTest.java
new file mode 100644 (file)
index 0000000..821a592
--- /dev/null
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.nat.read;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest;
+import io.fd.honeycomb.translate.read.ReadFailedException;
+import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
+import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
+import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetails;
+import io.fd.vpp.jvpp.snat.dto.SnatStaticMappingDetailsReplyDump;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.NatInstances;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.NatInstancesBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.NatInstance;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.NatInstanceBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.state.nat.instances.NatInstanceKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+
+public class NatInstanceCustomizerTest
+    extends InitializingListReaderCustomizerTest<NatInstance, NatInstanceKey, NatInstanceBuilder> {
+    @Mock
+    private EntityDumpExecutor<SnatStaticMappingDetailsReplyDump, Void> dumpExecutor;
+
+    private KeyedInstanceIdentifier<NatInstance, NatInstanceKey> natInstanceId;
+    private InstanceIdentifier<NatInstance> natInstanceWildcarded;
+    private DumpCacheManager<SnatStaticMappingDetailsReplyDump, Void> dumpCacheManager;
+
+    public NatInstanceCustomizerTest() {
+        super(NatInstance.class, NatInstancesBuilder.class);
+    }
+
+    @Override
+    protected NatInstanceCustomizer initCustomizer() {
+        return new NatInstanceCustomizer(dumpCacheManager);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        natInstanceId = InstanceIdentifier.create(NatInstances.class)
+            .child(NatInstance.class, new NatInstanceKey(NatInstanceCustomizer.DEFAULT_VRF_ID));
+        natInstanceWildcarded = InstanceIdentifier.create(NatInstances.class)
+            .child(NatInstance.class);
+        dumpCacheManager = new DumpCacheManager.DumpCacheManagerBuilder<SnatStaticMappingDetailsReplyDump, Void>()
+            .withExecutor(dumpExecutor)
+            .acceptOnly(SnatStaticMappingDetailsReplyDump.class)
+            .build();
+    }
+
+    @Test
+    public void testRead() throws ReadFailedException {
+        final NatInstanceBuilder builder = mock(NatInstanceBuilder.class);
+        getCustomizer().readCurrentAttributes(natInstanceId, builder, ctx);
+        verify(builder).setId(natInstanceId.getKey().getId());
+    }
+
+    @Test
+    public void testReadAll() throws ReadFailedException {
+        final SnatStaticMappingDetailsReplyDump dump = dumpNonEmptyDefaultInstance();
+        when(dumpExecutor.executeDump(natInstanceWildcarded, null)).thenReturn(dump);
+        final List<NatInstanceKey> allIds = getCustomizer().getAllIds(natInstanceWildcarded, ctx);
+        assertThat(allIds, hasItems(
+            new NatInstanceKey(0L), new NatInstanceKey(1L), new NatInstanceKey(2L), new NatInstanceKey(3L)));
+    }
+
+    private static SnatStaticMappingDetailsReplyDump dumpNonEmptyDefaultInstance() {
+        SnatStaticMappingDetailsReplyDump replyDump = new SnatStaticMappingDetailsReplyDump();
+        SnatStaticMappingDetails detailsOne = new SnatStaticMappingDetails();
+        detailsOne.vrfId = 1;
+
+        SnatStaticMappingDetails detailsTwo = new SnatStaticMappingDetails();
+        detailsTwo.vrfId = 2;
+
+        SnatStaticMappingDetails detailsThree = new SnatStaticMappingDetails();
+        detailsThree.vrfId = 3;
+
+        replyDump.snatStaticMappingDetails = Arrays.asList(detailsOne, detailsTwo, detailsThree);
+        return replyDump;
+    }
+}
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizerTest.java
new file mode 100644 (file)
index 0000000..917b9a9
--- /dev/null
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.nat.write;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.nat.NatTestSchemaContext;
+import io.fd.honeycomb.test.tools.HoneycombTestRunner;
+import io.fd.honeycomb.test.tools.annotations.InjectTestData;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.vpp.jvpp.snat.dto.SnatAddAddressRange;
+import io.fd.vpp.jvpp.snat.dto.SnatAddAddressRangeReply;
+import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.NatConfig;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.NatInstances;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.nat.instances.NatInstance;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.nat.instances.NatInstanceKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.parameters.ExternalIpAddressPool;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.parameters.ExternalIpAddressPoolKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+@RunWith(HoneycombTestRunner.class)
+public class ExternalIpPoolCustomizerTest extends WriterCustomizerTest implements NatTestSchemaContext {
+
+    private static final long NAT_INSTANCE_ID = 0;
+    private static final long POOL_ID = 22;
+    private static final InstanceIdentifier<ExternalIpAddressPool> IID = InstanceIdentifier.create(NatConfig.class)
+        .child(NatInstances.class).child(NatInstance.class, new NatInstanceKey(NAT_INSTANCE_ID))
+        .child(ExternalIpAddressPool.class, new ExternalIpAddressPoolKey(POOL_ID));
+
+    private static final String NAT_INSTANCES_PATH = "/ietf-nat:nat-config/ietf-nat:nat-instances";
+
+    @Mock
+    private FutureJVppSnatFacade jvppSnat;
+    private ExternalIpPoolCustomizer customizer;
+
+    @Override
+    public void setUpTest() {
+        customizer = new ExternalIpPoolCustomizer(jvppSnat);
+        when(jvppSnat.snatAddAddressRange(any())).thenReturn(future(new SnatAddAddressRangeReply()));
+    }
+
+    @Test
+    public void testWrite(
+        @InjectTestData(resourcePath = "/nat/external-ip-pool.json", id = NAT_INSTANCES_PATH) NatInstances data)
+        throws WriteFailedException {
+        customizer.writeCurrentAttributes(IID, extractIpPool(data), writeContext);
+        final SnatAddAddressRange expectedRequest = getExpectedRequest();
+        expectedRequest.isAdd = 1;
+        verify(jvppSnat).snatAddAddressRange(expectedRequest);
+    }
+
+    @Test(expected = WriteFailedException.UpdateFailedException.class)
+    public void testUpdate() throws WriteFailedException {
+        final ExternalIpAddressPool data = mock(ExternalIpAddressPool.class);
+        customizer.updateCurrentAttributes(IID, data, data, writeContext);
+    }
+
+    @Test
+    public void testDelete(
+        @InjectTestData(resourcePath = "/nat/external-ip-pool.json", id = NAT_INSTANCES_PATH) NatInstances data)
+        throws WriteFailedException {
+        customizer.deleteCurrentAttributes(IID, extractIpPool(data), writeContext);
+        final SnatAddAddressRange expectedRequest = getExpectedRequest();
+        verify(jvppSnat).snatAddAddressRange(expectedRequest);
+    }
+
+    private static ExternalIpAddressPool extractIpPool(NatInstances data) {
+        // assumes single nat instance and single ip pool
+        return data.getNatInstance().get(0).getExternalIpAddressPool().get(0);
+    }
+
+    private static SnatAddAddressRange getExpectedRequest() {
+        final SnatAddAddressRange expectedRequest = new SnatAddAddressRange();
+        expectedRequest.isIp4 = 1;
+        expectedRequest.firstIpAddress = new byte[] {(byte) 192, (byte) 168, 1, 0};
+        expectedRequest.lastIpAddress = new byte[] {(byte) 192, (byte) 168, 1, (byte) 255};
+        return expectedRequest;
+    }
+}
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/AbstractNatCustomizerTest.java
new file mode 100644 (file)
index 0000000..f78c813
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.nat.write.ifc;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeature;
+import io.fd.vpp.jvpp.snat.dto.SnatInterfaceAddDelFeatureReply;
+import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.nat.Inbound;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+abstract class AbstractNatCustomizerTest<D extends DataObject, T extends AbstractInterfaceNatCustomizer<D>>
+    extends WriterCustomizerTest implements ByteDataTranslator {
+
+    private static final String IFC_CTX_NAME = "ifc-test-instance";
+    private static final String IFACE_NAME = "eth0";
+    private static final int IFACE_ID = 123;
+    private T customizer;
+
+    @Mock
+    private FutureJVppSnatFacade snatApi;
+    private NamingContext ifcNamingCtx = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
+
+    @Override
+    public void setUpTest() {
+        customizer = getCustomizer(snatApi, ifcNamingCtx);
+    }
+
+    @Test
+    public void testWrite() throws Exception {
+        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+        when(snatApi.snatInterfaceAddDelFeature(any())).thenReturn(future(new SnatInterfaceAddDelFeatureReply()));
+        final D data = getData();
+        customizer.writeCurrentAttributes(getIId(IFACE_NAME), data, writeContext);
+        verify(snatApi).snatInterfaceAddDelFeature(expectedRequest(data, true));
+    }
+
+    @Test(expected = WriteFailedException.UpdateFailedException.class)
+    public void testUpdate() throws Exception {
+        customizer.updateCurrentAttributes(getIId(IFACE_NAME), getData(), getData(), writeContext);
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+        when(snatApi.snatInterfaceAddDelFeature(any())).thenReturn(future(new SnatInterfaceAddDelFeatureReply()));
+        final D data = getData();
+        customizer.deleteCurrentAttributes(getIId(IFACE_NAME), data, writeContext);
+        verify(snatApi).snatInterfaceAddDelFeature(expectedRequest(data, false));
+    }
+
+    private SnatInterfaceAddDelFeature expectedRequest(final D data, boolean isAdd) {
+        SnatInterfaceAddDelFeature request = new SnatInterfaceAddDelFeature();
+        request.isInside = (byte) ((data instanceof Inbound) ? 1 : 0);
+        request.swIfIndex = IFACE_ID;
+        request.isAdd = booleanToByte(isAdd);
+        return request;
+    }
+
+    protected abstract D getData();
+
+    protected abstract InstanceIdentifier<D> getIId(final String ifaceName);
+
+    protected abstract T getCustomizer(final FutureJVppSnatFacade snatApi, final NamingContext ifcNamingCtx);
+}
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceInboundNatCustomizerTest.java
new file mode 100644 (file)
index 0000000..e30d3fd
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.nat.write.ifc;
+
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214.NatInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.Nat;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.nat.Inbound;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.nat.InboundBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class InterfaceInboundNatCustomizerTest extends AbstractNatCustomizerTest<Inbound, InterfaceInboundNatCustomizer> {
+
+    @Override
+    protected Inbound getData() {
+        return new InboundBuilder().build();
+    }
+
+    @Override
+    protected InstanceIdentifier<Inbound> getIId(final String ifaceName) {
+        return InstanceIdentifier.create(Interfaces.class)
+            .child(Interface.class, new InterfaceKey(ifaceName)).augmentation(NatInterfaceAugmentation.class)
+            .child(Nat.class).child(Inbound.class);
+    }
+
+    @Override
+    protected InterfaceInboundNatCustomizer getCustomizer(final FutureJVppSnatFacade snatApi, final NamingContext ifcNamingCtx) {
+        return new InterfaceInboundNatCustomizer(snatApi, ifcNamingCtx);
+    }
+}
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/ifc/InterfaceOutboundNatCustomizerTest.java
new file mode 100644 (file)
index 0000000..e52036d
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.nat.write.ifc;
+
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214.NatInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.Nat;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.nat.Outbound;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev161214._interface.nat.attributes.nat.OutboundBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class InterfaceOutboundNatCustomizerTest extends AbstractNatCustomizerTest<Outbound, InterfaceOutboundNatCustomizer> {
+
+    @Override
+    protected Outbound getData() {
+        return new OutboundBuilder().build();
+    }
+
+    @Override
+    protected InstanceIdentifier<Outbound> getIId(final String ifaceName) {
+        return InstanceIdentifier.create(Interfaces.class)
+            .child(Interface.class, new InterfaceKey(ifaceName)).augmentation(NatInterfaceAugmentation.class)
+            .child(Nat.class).child(Outbound.class);
+    }
+
+    @Override
+    protected InterfaceOutboundNatCustomizer getCustomizer(final FutureJVppSnatFacade snatApi, final NamingContext ifcNamingCtx) {
+        return new InterfaceOutboundNatCustomizer(snatApi, ifcNamingCtx);
+    }
+}
\ No newline at end of file
diff --git a/nat/nat2vpp/src/test/resources/nat/external-ip-pool.json b/nat/nat2vpp/src/test/resources/nat/external-ip-pool.json
new file mode 100644 (file)
index 0000000..37e8e90
--- /dev/null
@@ -0,0 +1,12 @@
+{
+  "nat-instances" : {
+    "nat-instance" : {
+      "id" : 0,
+      "external-ip-address-pool": {
+        "pool-id": 22,
+        "external-ip-pool": "192.168.1.1/24"
+      }
+    }
+  }
+}
+