summaryrefslogtreecommitdiffstats
path: root/nsh/impl/src/main/java
diff options
context:
space:
mode:
authorMichal Cmarada <michal.cmarada@pantheon.tech>2018-09-25 11:21:09 +0200
committerMichal Cmarada <mcmarada@cisco.com>2018-09-28 12:54:22 +0200
commit5bbd9feb84660d06fe635a0cd4cbdf45b110665c (patch)
tree934a3fb9159f832cce5cfbbfd03f9d68c306bf33 /nsh/impl/src/main/java
parent9b0967210e3e50d0b52475cfc02e636dbfa28421 (diff)
Fix bugs after bumping to Fluorine ODL dependencies (HONEYCOMB-433)
Change-Id: I99b630f97144770849679a04efccaf7fc9868cb6 Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
Diffstat (limited to 'nsh/impl/src/main/java')
-rwxr-xr-xnsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/config/NshEntryWriterCustomizer.java4
-rwxr-xr-xnsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshEntryReaderCustomizer.java2
-rwxr-xr-xnsh/impl/src/main/java/io/fd/hc2vpp/vppnsh/impl/oper/NshMapReaderCustomizer.java2
3 files changed, 4 insertions, 4 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));