From 5bbd9feb84660d06fe635a0cd4cbdf45b110665c Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 25 Sep 2018 11:21:09 +0200 Subject: Fix bugs after bumping to Fluorine ODL dependencies (HONEYCOMB-433) Change-Id: I99b630f97144770849679a04efccaf7fc9868cb6 Signed-off-by: Michal Cmarada --- .../hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java | 2 +- .../fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java | 2 +- .../fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'nsh/impl/src/test/java') diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java index 8b2320b76..95160f18b 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizerTest.java @@ -57,7 +57,7 @@ public class NshEntryWriterCustomizerTest extends WriterCustomizerTest { private static NshEntry generateNshEntry(final String name) { final NshEntryBuilder builder = new NshEntryBuilder(); builder.setName(name); - builder.setKey(new NshEntryKey(name)); + builder.withKey(new NshEntryKey(name)); builder.setVersion((short) 0); builder.setLength((short) 6); builder.setMdType(MdType1.class); diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java index e46c21926..11953e6c3 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/config/NshMapWriterCustomizerTest.java @@ -61,7 +61,7 @@ public class NshMapWriterCustomizerTest extends WriterCustomizerTest { private static NshMap generateNshMap(final String name) { final NshMapBuilder builder = new NshMapBuilder(); builder.setName(name); - builder.setKey(new NshMapKey(name)); + builder.withKey(new NshMapKey(name)); builder.setNsp(184L); builder.setNsi((short) 255); builder.setMappedNsp(183L); diff --git a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java index 78f90e821..ca947fc41 100644 --- a/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java +++ b/nsh/impl/src/test/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizerTest.java @@ -106,10 +106,10 @@ public class NshEntryReaderCustomizerTest extends assertEquals(Ethernet.class, builder.getNextProtocol()); assertEquals(123, builder.getNsp().intValue()); assertEquals(4, builder.getNsi().intValue()); - assertEquals(1, builder.getAugmentation(NshMdType1StateAugment.class).getC1().intValue()); - assertEquals(2, builder.getAugmentation(NshMdType1StateAugment.class).getC2().intValue()); - assertEquals(3, builder.getAugmentation(NshMdType1StateAugment.class).getC3().intValue()); - assertEquals(4, builder.getAugmentation(NshMdType1StateAugment.class).getC4().intValue()); + assertEquals(1, builder.augmentation(NshMdType1StateAugment.class).getC1().intValue()); + assertEquals(2, builder.augmentation(NshMdType1StateAugment.class).getC2().intValue()); + assertEquals(3, builder.augmentation(NshMdType1StateAugment.class).getC3().intValue()); + assertEquals(4, builder.augmentation(NshMdType1StateAugment.class).getC4().intValue()); verify(jvppNsh).nshEntryDump(any(NshEntryDump.class)); } -- cgit 1.2.3-korg