diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2017-03-22 10:35:49 +0100 |
---|---|---|
committer | Jan Srnicek <jsrnicek@cisco.com> | 2017-03-22 11:03:13 +0000 |
commit | d474f0648427615a70c81f40d4bfdd2ec8c76b74 (patch) | |
tree | 22a59520ae9f9a27ad8013229900085a86ff3138 /lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java | |
parent | 00046200da55e56e62d03d39248a75b0e4c49bd6 (diff) |
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 <jsrnicek@cisco.com>
Diffstat (limited to 'lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java')
-rwxr-xr-x | lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java index 65544903b..50cba9dd5 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java @@ -24,11 +24,11 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; 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 com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet; @@ -55,7 +55,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.locator.sets.grouping.locator.sets.locator.set.InterfaceBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class LocatorSetCustomizerTest extends WriterCustomizerTest { +public class LocatorSetCustomizerTest extends LispWriterCustomizerTest { private static final InstanceIdentifier<EidTable> EID_TABLE_ID = InstanceIdentifier.create(Lisp.class) @@ -68,9 +68,13 @@ public class LocatorSetCustomizerTest extends WriterCustomizerTest { private LocatorSetCustomizer customizer; + private final InstanceIdentifier<LocatorSet> EMPTY_ID = InstanceIdentifier.create(LocatorSet.class); + private final LocatorSet EMPTY_DATA = new LocatorSetBuilder().build(); + @Override public void setUpTest() { - customizer = new LocatorSetCustomizer(api, new NamingContext("locator-set", "locator-set-context")); + customizer = new LocatorSetCustomizer(api, new NamingContext("locator-set", "locator-set-context"), + lispStateCheckService); } @Test(expected = NullPointerException.class) @@ -197,6 +201,30 @@ public class LocatorSetCustomizerTest extends WriterCustomizerTest { fail("testDeleteReferenced should have failed"); } + @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"); + } + private static Optional<EidTable> eidTableData() { return Optional.of(new EidTableBuilder() .setVniTable( |