From d474f0648427615a70c81f40d4bfdd2ec8c76b74 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Wed, 22 Mar 2017 10:35:49 +0100 Subject: HC2VPP-115 - lisp state check before write/read - checks lisp state before read,disabled state will result in returning empty data - checks lisp state before write,disabled state will result in throwing IllegalStateException - fixes ordering issues for lisp gpe interfaces Change-Id: I6dcfc6c7f514aad57841f2aac1b2ee0c6b868c3c Signed-off-by: Jan Srnicek --- .../translate/write/MapResolverCustomizerTest.java | 33 ++++++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java') diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java index 474e20f65..76017a439 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java @@ -17,12 +17,13 @@ package io.fd.hc2vpp.lisp.translate.write; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.core.dto.LispAddDelMapResolver; @@ -34,15 +35,18 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.map.resolvers.grouping.map.resolvers.MapResolver; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.map.resolvers.grouping.map.resolvers.MapResolverBuilder; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class MapResolverCustomizerTest extends WriterCustomizerTest implements Ipv4Translator { +public class MapResolverCustomizerTest extends LispWriterCustomizerTest implements Ipv4Translator { private MapResolverCustomizer customizer; + private InstanceIdentifier EMPTY_ID = InstanceIdentifier.create(MapResolver.class); + private MapResolver EMPTY_DATA = new MapResolverBuilder().build(); @Override public void setUpTest() { - customizer = new MapResolverCustomizer(api); + customizer = new MapResolverCustomizer(api, lispStateCheckService); } private void whenLispAddDelMapResolverThenSuccess() { @@ -100,4 +104,27 @@ public class MapResolverCustomizerTest extends WriterCustomizerTest implements I assertEquals("192.168.2.1", arrayToIpv4AddressNoZone(request.ipAddress).getValue()); } + @Test + public void testWriteLispDisabled() throws WriteFailedException { + mockLispDisabled(); + try { + customizer.writeCurrentAttributes(EMPTY_ID, EMPTY_DATA, writeContext); + } catch (IllegalArgumentException e) { + verifyZeroInteractions(api); + return; + } + fail("Test should have thrown IllegalArgumentException"); + } + + @Test + public void testDeleteLispDisabled() throws WriteFailedException { + mockLispDisabled(); + try { + customizer.deleteCurrentAttributes(EMPTY_ID, EMPTY_DATA, writeContext); + } catch (IllegalArgumentException e) { + verifyZeroInteractions(api); + return; + } + fail("Test should have thrown IllegalArgumentException"); + } } -- cgit 1.2.3-korg