diff options
Diffstat (limited to 'nsh/impl')
6 files changed, 10 insertions, 10 deletions
diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java index 3e70ec686..3c3fa3b88 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java @@ -105,7 +105,7 @@ public class NshEntryWriterCustomizer extends FutureJVppNshCustomizer private void getNshEntryMdType1Request(@Nonnull final NshEntry entry, @Nonnull NshAddDelEntry request) { - final NshMdType1Augment nshMdType1Augment = entry.getAugmentation(NshMdType1Augment.class); + final NshMdType1Augment nshMdType1Augment = entry.augmentation(NshMdType1Augment.class); if (nshMdType1Augment != null) { request.c1 = (int) nshMdType1Augment.getC1().longValue(); request.c2 = (int) nshMdType1Augment.getC2().longValue(); @@ -115,7 +115,7 @@ public class NshEntryWriterCustomizer extends FutureJVppNshCustomizer } private void getNshEntryMdType2Request(@Nonnull final NshEntry entry, @Nonnull NshAddDelEntry request) { - final List<Md2Data> md2Datas = entry.getAugmentation(NshMdType2Augment.class).getMd2Data(); + final List<Md2Data> md2Datas = entry.augmentation(NshMdType2Augment.class).getMd2Data(); final byte md2_len = (byte) (entry.getLength() * 4 - 8); byte cur_len = 0; byte option_len; diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java index e5fcef6c2..f5ecf9bc1 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java @@ -156,7 +156,7 @@ public class NshEntryReaderCustomizer extends FutureJVppNshCustomizer final NshEntryDetails nshEntryDetails = reply.nshEntryDetails.get(0); builder.setName(entryName); - builder.setKey(key); + builder.withKey(key); builder.setVersion((short) nshEntryDetails.verOC); builder.setLength((short) nshEntryDetails.length); diff --git a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java index e3fcad0b6..ec8591004 100755 --- a/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java +++ b/nsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java @@ -115,7 +115,7 @@ implements InitializingListReaderCustomizer<NshMap, NshMapKey, NshMapBuilder>, J final NshMapDetails nshMapDetails = reply.nshMapDetails.get(0); builder.setName(mapName); - builder.setKey(key); + builder.withKey(key); builder.setNsp((long) ((nshMapDetails.nspNsi >> 8) & 0xFFFFFF)); builder.setNsi((short) (nshMapDetails.nspNsi & 0xFF)); 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)); } |