summaryrefslogtreecommitdiffstats
path: root/v3po/v3po2vpp/src/test/java/io
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-06-21 10:21:39 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-06-21 15:12:00 +0200
commita760fd96233ae4e95e5b2667cdebc1aff92da800 (patch)
treeb8bf7b811a8414971166a454ae26f68f225946e3 /v3po/v3po2vpp/src/test/java/io
parent6a48826150125820818dbf5d2786af0686b6a0ae (diff)
HONEYCOMB-64: Add ipv4 netmask support
Supported contiguous netmask only (strictly, only leading 1s are allowed) Update postman collection Change-Id: I989bbd013227bc3e1eda0861241543db0cdbf656 Signed-off-by: Tibor Sirovatka <tsirovat@cisco.com> Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/test/java/io')
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/AddressCustomizerTest.java311
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java2
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java176
3 files changed, 345 insertions, 144 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/AddressCustomizerTest.java
index 9924e316d..3ad12e01c 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/AddressCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/AddressCustomizerTest.java
@@ -1,23 +1,44 @@
+/*
+ * Copyright (c) 2016 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.honeycomb.v3po.translate.v3po.interfaces.ip;
+import static io.fd.honeycomb.v3po.translate.v3po.test.ContextTestUtils.mockMapping;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
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 io.fd.honeycomb.v3po.translate.MappingContext;
+import io.fd.honeycomb.v3po.translate.v3po.test.TestHelperUtils;
import io.fd.honeycomb.v3po.translate.v3po.util.NamingContext;
import io.fd.honeycomb.v3po.translate.write.WriteContext;
import io.fd.honeycomb.v3po.translate.write.WriteFailedException;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
+import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.Mapping;
+import org.mockito.Mock;
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.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
@@ -28,126 +49,262 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev14061
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4Builder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.AddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.address.subnet.Netmask;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.address.subnet.NetmaskBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.address.subnet.PrefixLength;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.address.subnet.PrefixLengthBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DottedQuad;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.openvpp.jvpp.VppBaseCallException;
+import org.openvpp.jvpp.VppInvocationException;
import org.openvpp.jvpp.dto.SwInterfaceAddDelAddress;
import org.openvpp.jvpp.dto.SwInterfaceAddDelAddressReply;
import org.openvpp.jvpp.future.FutureJVpp;
public class AddressCustomizerTest {
- @Test
- public void testWriteCurrentAttributes() throws WriteFailedException {
+ private static final String IFC_CTX_NAME = "ifc-test-instance";
+ private static final String IFACE_NAME = "eth0";
+ private static final int IFACE_ID = 123;
- ArgumentCaptor<SwInterfaceAddDelAddress> requestCaptor = ArgumentCaptor.forClass(SwInterfaceAddDelAddress.class);
+ @Mock
+ private WriteContext writeContext;
+ @Mock
+ private MappingContext mappingContext;
+ @Mock
+ private FutureJVpp api;
- FutureJVpp jvpp = mock(FutureJVpp.class);
- WriteContext context = mock(WriteContext.class);
- MappingContext mappingContext = mock(MappingContext.class);
- NamingContext namingContext = new NamingContext("prefix", "instance");
+ private NamingContext interfaceContext;
+ private AddressCustomizer customizer;
- namingContext.addName(5, "parent", mappingContext);
+ @Before
+ public void setUp() throws Exception {
+ initMocks(this);
+ doReturn(mappingContext).when(writeContext).getMappingContext();
+ interfaceContext = new NamingContext("generatedlIfaceName", IFC_CTX_NAME);
- InterfaceKey key = new InterfaceKey("local0");
+ customizer = new AddressCustomizer(api, interfaceContext);
+ }
- InstanceIdentifier<Address> id = InstanceIdentifier.builder(Interfaces.class)
- .child(Interface.class,key)
- .augmentation(Interface1.class)
- .child(Ipv4.class)
- .child(Address.class)
- .build();
+ private static InstanceIdentifier<Address> getAddressId(final String ifaceName) {
+ return InstanceIdentifier.builder(Interfaces.class)
+ .child(Interface.class, new InterfaceKey(ifaceName))
+ .augmentation(Interface1.class)
+ .child(Ipv4.class)
+ .child(Address.class)
+ .build();
+ }
- Mapping mapping = mock(Mapping.class);
+ private void whenSwInterfaceAddDelAddressThenSuccess() {
+ final CompletableFuture<SwInterfaceAddDelAddressReply> replyFuture = new CompletableFuture<>();
+ final SwInterfaceAddDelAddressReply reply = new SwInterfaceAddDelAddressReply();
+ replyFuture.complete(reply);
+ doReturn(replyFuture).when(api).swInterfaceAddDelAddress(any(SwInterfaceAddDelAddress.class));
+ }
- Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
+ private void whenSwInterfaceAddDelAddressThenFailure() {
+ doReturn(TestHelperUtils.createFutureException()).when(api)
+ .swInterfaceAddDelAddress(any(SwInterfaceAddDelAddress.class));
+ }
- PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
- Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
+ private void verifySwInterfaceAddDelAddressWasInvoked(final SwInterfaceAddDelAddress expected) throws
+ VppInvocationException {
+ ArgumentCaptor<SwInterfaceAddDelAddress> argumentCaptor =
+ ArgumentCaptor.forClass(SwInterfaceAddDelAddress.class);
+ verify(api).swInterfaceAddDelAddress(argumentCaptor.capture());
+ verifySwInterfaceAddDelAddressWasInvoked(expected, argumentCaptor.getValue());
+ }
- CompletableFuture<SwInterfaceAddDelAddressReply> future = new CompletableFuture<>();
- future.complete(new SwInterfaceAddDelAddressReply());
+ private void verifySwInterfaceAddDelAddressWasInvoked(final SwInterfaceAddDelAddress expected,
+ final SwInterfaceAddDelAddress actual) throws
+ VppInvocationException {
+ assertArrayEquals(expected.address, actual.address);
+ assertEquals(expected.addressLength, actual.addressLength);
+ assertEquals(expected.delAll, actual.delAll);
+ assertEquals(expected.isAdd, actual.isAdd);
+ assertEquals(expected.isIpv6, actual.isIpv6);
+ assertEquals(expected.swIfIndex, actual.swIfIndex);
+ }
- when(context.getMappingContext()).thenReturn(mappingContext);
- when(mapping.getIndex()).thenReturn(5);
- when(mapping.getName()).thenReturn("local0");
- when(mappingContext.read(Mockito.any())).thenReturn(Optional.fromNullable(mapping));
- when(jvpp.swInterfaceAddDelAddress(Mockito.any(SwInterfaceAddDelAddress.class))).thenReturn(future);
+ @Test
+ public void testAddPrefixLengthIpv4Address() throws Exception {
+ final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
- new AddressCustomizer(jvpp, namingContext).writeCurrentAttributes(id, data, context);
+ Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
+ PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
+ Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
- verify(jvpp, times(1)).swInterfaceAddDelAddress(requestCaptor.capture());
+ mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+ whenSwInterfaceAddDelAddressThenSuccess();
- SwInterfaceAddDelAddress request = requestCaptor.getValue();
+ customizer.writeCurrentAttributes(id, data, writeContext);
- assertEquals(0, request.isIpv6);
- assertEquals(1, request.isAdd);
- assertEquals(0, request.delAll);
- assertEquals(5, request.swIfIndex);
- assertEquals(24, request.addressLength);
- assertEquals(true,Arrays.equals(new byte[]{-64, -88, 2, 1}, request.address));
+ verifySwInterfaceAddDelAddressWasInvoked(generateSwInterfaceAddDelAddressRequest(new byte[] {-64, -88, 2, 1},
+ (byte) 1, (byte) 24));
}
@Test
- public void testDeleteCurrentAttributes() throws WriteFailedException {
- ArgumentCaptor<SwInterfaceAddDelAddress> requestCaptor = ArgumentCaptor.forClass(SwInterfaceAddDelAddress.class);
-
- FutureJVpp jvpp = mock(FutureJVpp.class);
- WriteContext context = mock(WriteContext.class);
- MappingContext mappingContext = mock(MappingContext.class);
- NamingContext namingContext = new NamingContext("prefix", "instance");
+ public void testAddPrefixLengthIpv4AddressFailed() throws Exception {
+ final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
- namingContext.addName(5, "parent", mappingContext);
+ Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
+ PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
+ Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
- InterfaceKey key = new InterfaceKey("local0");
+ mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+ whenSwInterfaceAddDelAddressThenFailure();
+
+ try {
+ customizer.writeCurrentAttributes(id, data, writeContext);
+ } catch (WriteFailedException e) {
+ assertTrue(e.getCause() instanceof VppBaseCallException);
+ verifySwInterfaceAddDelAddressWasInvoked(
+ generateSwInterfaceAddDelAddressRequest(new byte[] {-64, -88, 2, 1},
+ (byte) 1, (byte) 24));
+ return;
+ }
+ fail("WriteFailedException was expected");
+ }
- InstanceIdentifier<Address> id = InstanceIdentifier.builder(Interfaces.class)
- .child(Interface.class,key)
- .augmentation(Interface1.class)
- .child(Ipv4.class)
- .child(Address.class)
- .build();
+ private SwInterfaceAddDelAddress generateSwInterfaceAddDelAddressRequest(final byte[] address, final byte isAdd,
+ final byte prefixLength) {
+ final SwInterfaceAddDelAddress request = new SwInterfaceAddDelAddress();
+ request.swIfIndex = IFACE_ID;
+ request.isAdd = isAdd;
+ request.isIpv6 = 0;
+ request.delAll = 0;
+ request.addressLength = prefixLength;
+ request.address = address;
+ return request;
+ }
- Mapping mapping = mock(Mapping.class);
+ @Test
+ public void testDeletePrefixLengthIpv4Address() throws Exception {
+ final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-
PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
- CompletableFuture<SwInterfaceAddDelAddressReply> future = new CompletableFuture<>();
- future.complete(new SwInterfaceAddDelAddressReply());
+ mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+ whenSwInterfaceAddDelAddressThenSuccess();
- when(context.getMappingContext()).thenReturn(mappingContext);
- when(mapping.getIndex()).thenReturn(5);
- when(mapping.getName()).thenReturn("local0");
- when(mappingContext.read(Mockito.any())).thenReturn(Optional.fromNullable(mapping));
- when(jvpp.swInterfaceAddDelAddress(Mockito.any(SwInterfaceAddDelAddress.class))).thenReturn(future);
+ customizer.deleteCurrentAttributes(id, data, writeContext);
- new AddressCustomizer(jvpp, namingContext).deleteCurrentAttributes(id, data, context);
+ verifySwInterfaceAddDelAddressWasInvoked(generateSwInterfaceAddDelAddressRequest(new byte[] {-64, -88, 2, 1},
+ (byte) 0, (byte) 24));
+ }
- verify(jvpp, times(1)).swInterfaceAddDelAddress(requestCaptor.capture());
+ @Test
+ public void testDeletePrefixLengthIpv4AddressFailed() throws Exception {
+ final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
- SwInterfaceAddDelAddress request = requestCaptor.getValue();
+ Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
+ PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
+ Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
- assertEquals(0, request.isIpv6);
- assertEquals(0, request.isAdd);
- assertEquals(0, request.delAll);
- assertEquals(5, request.swIfIndex);
- assertEquals(24, request.addressLength);
- assertEquals(true,Arrays.equals(new byte[]{-64, -88, 2, 1}, request.address));
+ mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+ whenSwInterfaceAddDelAddressThenFailure();
+
+ try {
+ customizer.deleteCurrentAttributes(id, data, writeContext);
+ } catch (WriteFailedException e) {
+ assertTrue(e.getCause() instanceof VppBaseCallException);
+ verifySwInterfaceAddDelAddressWasInvoked(
+ generateSwInterfaceAddDelAddressRequest(new byte[] {-64, -88, 2, 1},
+ (byte) 0, (byte) 24));
+ return;
+ }
+ fail("WriteFailedException was expec16ted");
}
@Test
public void testExtract() {
+ final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
+
Address address = new AddressBuilder().build();
Ipv4 parentData = new Ipv4Builder().setAddress(Arrays.asList(address)).build();
- Optional<List<Address>> addressesOptional = new AddressCustomizer(mock(FutureJVpp.class),null).extract(null, parentData);
+ Optional<List<Address>> addressesOptional = customizer.extract(id, parentData);
+
+ assertEquals(true, addressesOptional.isPresent());
+ assertEquals(1, addressesOptional.get().size());
+ assertEquals(true, addressesOptional.get().contains(address));
+ }
+
+ private void testSingleNetmask(final int expectedPrefixLength, final String stringMask) throws Exception {
+ final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
- assertEquals(true,addressesOptional.isPresent());
- assertEquals(1,addressesOptional.get().size());
- assertEquals(true,addressesOptional.get().contains(address));
+ Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
+ Netmask subnet = new NetmaskBuilder().setNetmask(new DottedQuad(stringMask)).build();
+ Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(subnet).build();
+
+ mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+
+ final CompletableFuture<SwInterfaceAddDelAddressReply> replyFuture = new CompletableFuture<>();
+ replyFuture.complete(new SwInterfaceAddDelAddressReply());
+ ArgumentCaptor<SwInterfaceAddDelAddress> argumentCaptor =
+ ArgumentCaptor.forClass(SwInterfaceAddDelAddress.class);
+ doReturn(replyFuture).when(api).swInterfaceAddDelAddress(argumentCaptor.capture());
+
+ customizer.writeCurrentAttributes(id, data, writeContext);
+
+ verifySwInterfaceAddDelAddressWasInvoked(generateSwInterfaceAddDelAddressRequest(new byte[] {-64, -88, 2, 1},
+ (byte) 1, (byte) expectedPrefixLength), argumentCaptor.getValue());
+ }
+
+ private void testSingleIllegalNetmask(final String stringMask) throws Exception {
+ try {
+ final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
+
+ Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
+ Netmask subnet = new NetmaskBuilder().setNetmask(new DottedQuad(stringMask)).build();
+ Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(subnet).build();
+
+ mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+
+ final CompletableFuture<SwInterfaceAddDelAddressReply> replyFuture = new CompletableFuture<>();
+ replyFuture.complete(new SwInterfaceAddDelAddressReply());
+ ArgumentCaptor<SwInterfaceAddDelAddress> argumentCaptor =
+ ArgumentCaptor.forClass(SwInterfaceAddDelAddress.class);
+ doReturn(replyFuture).when(api).swInterfaceAddDelAddress(argumentCaptor.capture());
+
+ customizer.writeCurrentAttributes(id, data, writeContext);
+ } catch (IllegalArgumentException e) {
+ return;
+ }
+ fail("IllegalArgumentException expected");
+
+ }
+
+ /**
+ * Test contiguous netmask length from QuadDotted notation
+ */
+ @Test
+ public void testNetmaskLength() throws Exception {
+ testSingleNetmask(1, "128.0.0.0");
+ testSingleNetmask(2, "192.0.0.0");
+ testSingleNetmask(8, "255.0.0.0");
+ testSingleNetmask(9, "255.128.0.0");
+ testSingleNetmask(16, "255.255.0.0");
+ testSingleNetmask(24, "255.255.255.0");
+ }
+
+ @Test
+ public void testNetmaskIllegal() throws Exception {
+ testSingleIllegalNetmask("");
+ testSingleIllegalNetmask(".");
+ testSingleIllegalNetmask(".255");
+ testSingleIllegalNetmask("255");
+ testSingleIllegalNetmask("255.");
+ testSingleIllegalNetmask("255.255");
+ testSingleIllegalNetmask("255.255.0");
+ testSingleIllegalNetmask("255.255.255.");
+ testSingleIllegalNetmask("255.255.255.256");
+ testSingleIllegalNetmask("0.0.0.0");
+ testSingleIllegalNetmask("10.10.10.10");
+ testSingleIllegalNetmask("255.1.255.0");
+ testSingleIllegalNetmask("255.255.255.255");
}
}
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java
index 0f45f1c83..c5781624a 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtilsTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.EthernetCsmacd;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.Tap;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VhostUser;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VxlanTunnel;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VxlanGpeTunnel;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VxlanTunnel;
public class InterfaceUtilsTest {
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java
index 8008ba5bd..85f528e1e 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java
@@ -16,17 +16,23 @@
package io.fd.honeycomb.v3po.translate.v3po.interfacesstate.ip;
+import static io.fd.honeycomb.v3po.translate.v3po.test.ContextTestUtils.getMapping;
+import static io.fd.honeycomb.v3po.translate.v3po.test.ContextTestUtils.getMappingIid;
+import static io.fd.honeycomb.v3po.translate.v3po.util.TranslateUtils.reverseBytes;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import io.fd.honeycomb.v3po.translate.ModificationCache;
-import io.fd.honeycomb.v3po.translate.read.ReadContext;
import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
+import io.fd.honeycomb.v3po.translate.spi.read.RootReaderCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.test.ListReaderCustomizerTest;
+import io.fd.honeycomb.v3po.translate.v3po.util.NamingContext;
import io.fd.honeycomb.v3po.translate.v3po.util.TranslateUtils;
import java.util.Arrays;
import java.util.List;
@@ -34,10 +40,15 @@ import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import org.junit.Test;
import org.mockito.Mockito;
+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.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.MappingKey;
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.inet.types.rev130715.Ipv4AddressNoZone;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4Builder;
@@ -45,64 +56,93 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev14061
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.AddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.AddressKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.openvpp.jvpp.dto.IpAddressDetails;
import org.openvpp.jvpp.dto.IpAddressDetailsReplyDump;
import org.openvpp.jvpp.dto.IpAddressDump;
-import org.openvpp.jvpp.future.FutureJVpp;
-public class Ipv4AddressCustomizerTest {
+public class Ipv4AddressCustomizerTest extends ListReaderCustomizerTest<Address, AddressKey, AddressBuilder> {
- @Test
- public void testGetBuilder() {
- assertNotNull(new Ipv4AddressCustomizer(mock(FutureJVpp.class)).getBuilder(null));
+ private static final String IFACE_NAME = "eth0";
+ private static final int IFACE_ID = 1;
+
+ private NamingContext interfacesContext;
+
+ public Ipv4AddressCustomizerTest() {
+ super(Address.class);
+ }
+
+ @Override
+ public void setUpBefore() {
+ interfacesContext = new NamingContext("generatedIfaceName", "test-instance");
+ }
+
+ @Override
+ protected RootReaderCustomizer<Address, AddressBuilder> initCustomizer() {
+ final KeyedInstanceIdentifier<Mapping, MappingKey> eth0Id = getMappingIid(IFACE_NAME, "test-instance");
+ final Optional<Mapping> eth0 = getMapping(IFACE_NAME, IFACE_ID);
+
+ final List<Mapping> allMappings = Lists.newArrayList(getMapping(IFACE_NAME, IFACE_ID).get());
+ final Mappings allMappingsBaObject = new MappingsBuilder().setMapping(allMappings).build();
+ doReturn(Optional.of(allMappingsBaObject)).when(mappingContext).read(eth0Id.firstIdentifierOf(Mappings.class));
+
+ doReturn(eth0).when(mappingContext).read(eth0Id);
+
+ return new Ipv4AddressCustomizer(api, interfacesContext);
+ }
+
+ private static InstanceIdentifier<Address> getId(final String address) {
+ return InstanceIdentifier.builder(InterfacesState.class)
+ .child(Interface.class, new InterfaceKey(IFACE_NAME))
+ .augmentation(Interface2.class)
+ .child(Ipv4.class)
+ .child(Address.class, new AddressKey(new Ipv4AddressNoZone(new Ipv4Address(address))))
+ .build();
}
@Test
public void testReadCurrentAttributesFromCache() throws ReadFailedException {
- ReadContext context = mock(ReadContext.class);
ModificationCache cache = new ModificationCache();
- FutureJVpp jvpp = mock(FutureJVpp.class);
IpAddressDetails detail1 = new IpAddressDetails();
IpAddressDetails detail2 = new IpAddressDetails();
IpAddressDetails detail3 = new IpAddressDetails();
- detail1.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
- detail2.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2")));
- detail3.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3")));
+ detail1.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"))));
+ detail2.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2"))));
+ detail3.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3"))));
IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
reply.ipAddressDetails = ImmutableList.of(detail1, detail2, detail3);
cache.put(Ipv4AddressCustomizer.class.getName(), reply);
- when(context.getModificationCache()).thenReturn(cache);
+ when(ctx.getModificationCache()).thenReturn(cache);
- AddressBuilder builder = new AddressBuilder();
- InstanceIdentifier<Address> id = InstanceIdentifier.builder(InterfacesState.class)
- .child(Interface.class)
- .augmentation(Interface2.class)
- .child(Ipv4.class)
- .child(Address.class, new AddressKey(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"))))
- .build();
+ final AddressBuilder builder = new AddressBuilder();
+ final InstanceIdentifier<Address> id = getId("192.168.2.1");
- new Ipv4AddressCustomizer(jvpp).readCurrentAttributes(id, builder, context);
+ getCustomizer().readCurrentAttributes(id, builder, ctx);
- assertEquals("1.2.168.192", builder.getIp().getValue());
+ assertEquals("192.168.2.1", builder.getIp().getValue());
}
@Test
public void testReadCurrentAttributesFromOperationalData() throws ReadFailedException {
- ReadContext context = mock(ReadContext.class);
ModificationCache cache = new ModificationCache();
- FutureJVpp jvpp = mock(FutureJVpp.class);
IpAddressDetails detail1 = new IpAddressDetails();
IpAddressDetails detail2 = new IpAddressDetails();
IpAddressDetails detail3 = new IpAddressDetails();
- detail1.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
- detail2.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2")));
- detail3.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3")));
+ detail1.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"))));
+ detail2.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2"))));
+ detail3.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3"))));
IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
reply.ipAddressDetails = ImmutableList.of(detail1, detail2, detail3);
@@ -110,65 +150,66 @@ public class Ipv4AddressCustomizerTest {
CompletableFuture<IpAddressDetailsReplyDump> future = new CompletableFuture<>();
future.complete(reply);
- when(jvpp.ipAddressDump(Mockito.any(IpAddressDump.class))).thenReturn(future);
- when(context.getModificationCache()).thenReturn(cache);
+ when(api.ipAddressDump(Mockito.any(IpAddressDump.class))).thenReturn(future);
+ when(ctx.getModificationCache()).thenReturn(cache);
+
- AddressBuilder builder = new AddressBuilder();
- InstanceIdentifier<Address> id = InstanceIdentifier.builder(InterfacesState.class)
- .child(Interface.class)
- .augmentation(Interface2.class)
- .child(Ipv4.class)
- .child(Address.class, new AddressKey(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"))))
- .build();
+ final AddressBuilder builder = new AddressBuilder();
+ final InstanceIdentifier<Address> id = getId("192.168.2.1");
- new Ipv4AddressCustomizer(jvpp).readCurrentAttributes(id, builder, context);
+ getCustomizer().readCurrentAttributes(id, builder, ctx);
- assertEquals("1.2.168.192", builder.getIp().getValue());
+ assertEquals("192.168.2.1", builder.getIp().getValue());
}
@Test
public void testGetAllIdsFromCache() throws ReadFailedException {
- ReadContext context = mock(ReadContext.class);
ModificationCache cache = new ModificationCache();
- FutureJVpp jvpp = mock(FutureJVpp.class);
IpAddressDetails detail1 = new IpAddressDetails();
IpAddressDetails detail2 = new IpAddressDetails();
IpAddressDetails detail3 = new IpAddressDetails();
- detail1.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
- detail2.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2")));
- detail3.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3")));
+ detail1.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"))));
+ detail2.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2"))));
+ detail3.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3"))));
IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
reply.ipAddressDetails = ImmutableList.of(detail1, detail2, detail3);
cache.put(Ipv4AddressCustomizer.class.getName(), reply);
- when(context.getModificationCache()).thenReturn(cache);
- List<Ipv4AddressNoZone> ids = new Ipv4AddressCustomizer(jvpp).getAllIds(null, context).stream()
- .map(id -> id.getIp())
- .collect(Collectors.toList());
+ when(ctx.getModificationCache()).thenReturn(cache);
- verify(jvpp, times(0)).ipAddressDump(Mockito.any(IpAddressDump.class));
+ final InstanceIdentifier<Address> id = getId("192.168.2.1");
+
+ List<Ipv4AddressNoZone> ids = getCustomizer().getAllIds(id, ctx).stream()
+ .map(key -> key.getIp())
+ .collect(Collectors.toList());
+
+ verify(api, times(0)).ipAddressDump(Mockito.any(IpAddressDump.class));
assertEquals(3, ids.size());
- assertEquals(true, "1.2.168.192".equals(ids.get(0).getValue()));
- assertEquals(true, "2.2.168.192".equals(ids.get(1).getValue()));
- assertEquals(true, "3.2.168.192".equals(ids.get(2).getValue()));
+ assertEquals(true, "192.168.2.1".equals(ids.get(0).getValue()));
+ assertEquals(true, "192.168.2.2".equals(ids.get(1).getValue()));
+ assertEquals(true, "192.168.2.3".equals(ids.get(2).getValue()));
}
@Test
public void testGetAllIdsFromOperationalData() throws ReadFailedException {
- ReadContext context = mock(ReadContext.class);
ModificationCache cache = new ModificationCache();
- FutureJVpp jvpp = mock(FutureJVpp.class);
IpAddressDetails detail1 = new IpAddressDetails();
IpAddressDetails detail2 = new IpAddressDetails();
IpAddressDetails detail3 = new IpAddressDetails();
- detail1.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
- detail2.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2")));
- detail3.ip = TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3")));
+ detail1.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"))));
+ detail2.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2"))));
+ detail3.ip = reverseBytes(
+ TranslateUtils.ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3"))));
IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
reply.ipAddressDetails = ImmutableList.of(detail1, detail2, detail3);
@@ -176,16 +217,19 @@ public class Ipv4AddressCustomizerTest {
CompletableFuture<IpAddressDetailsReplyDump> future = new CompletableFuture<>();
future.complete(reply);
- when(jvpp.ipAddressDump(Mockito.any(IpAddressDump.class))).thenReturn(future);
- when(context.getModificationCache()).thenReturn(cache);
- List<Ipv4AddressNoZone> ids = new Ipv4AddressCustomizer(jvpp).getAllIds(null, context).stream()
- .map(id -> id.getIp())
- .collect(Collectors.toList());
+ when(api.ipAddressDump(Mockito.any(IpAddressDump.class))).thenReturn(future);
+ when(ctx.getModificationCache()).thenReturn(cache);
+
+ final InstanceIdentifier<Address> id = getId("192.168.2.1");
+
+ List<Ipv4AddressNoZone> ids = getCustomizer().getAllIds(id, ctx).stream()
+ .map(key -> key.getIp())
+ .collect(Collectors.toList());
assertEquals(3, ids.size());
- assertEquals(true, "1.2.168.192".equals(ids.get(0).getValue()));
- assertEquals(true, "2.2.168.192".equals(ids.get(1).getValue()));
- assertEquals(true, "3.2.168.192".equals(ids.get(2).getValue()));
+ assertEquals(true, "192.168.2.1".equals(ids.get(0).getValue()));
+ assertEquals(true, "192.168.2.2".equals(ids.get(1).getValue()));
+ assertEquals(true, "192.168.2.3".equals(ids.get(2).getValue()));
}
@Test
@@ -193,7 +237,7 @@ public class Ipv4AddressCustomizerTest {
Address address = new AddressBuilder().build();
Ipv4Builder ipv4Builder = new Ipv4Builder();
- new Ipv4AddressCustomizer(mock(FutureJVpp.class)).merge(ipv4Builder, Arrays.asList(address));
+ getCustomizer().merge(ipv4Builder, Arrays.asList(address));
assertEquals(1, ipv4Builder.getAddress().size());
assertEquals(true, ipv4Builder.getAddress().contains(address));