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 --- .../main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java | 2 +- .../l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java | 2 +- .../main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java | 2 +- .../l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'l3') diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java index 993fb75f8..48a2d5aed 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/Ipv4NeighbourCustomizer.java @@ -77,7 +77,7 @@ public class Ipv4NeighbourCustomizer extends IpNeighbourReader .filter(ipNeighborDetails -> ip.equals(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress))) .findFirst() .ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress)) - .setKey(keyMapper().apply(ipNeighborDetails)) + .withKey(keyMapper().apply(ipNeighborDetails)) .setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress)) .setOrigin(ipNeighborDetails.isStatic == 0 ? Dynamic diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java index 0d2cbae48..0c820c47e 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java @@ -70,7 +70,7 @@ public class SubInterfaceIpv4NeighbourCustomizer extends IpNeighbourReader .filter(ipNeighborDetails -> ip.equals(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress))) .findFirst() .ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress)) - .setKey(keyMapper().apply(ipNeighborDetails)) + .withKey(keyMapper().apply(ipNeighborDetails)) .setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress))); } } diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java index 1b277b4a8..7d7578777 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/Ipv6NeighbourCustomizer.java @@ -72,7 +72,7 @@ public class Ipv6NeighbourCustomizer extends IpNeighbourReader .filter(ipNeighborDetails -> ip.equals(arrayToIpv6AddressNoZone(ipNeighborDetails.ipAddress))) .findFirst() .ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv6AddressNoZone(ipNeighborDetails.ipAddress)) - .setKey(keyMapper().apply(ipNeighborDetails)) + .withKey(keyMapper().apply(ipNeighborDetails)) .setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress)) .setOrigin(ipNeighborDetails.isStatic == 0 ? Dynamic diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java index 3ca6a14e3..ba34dcf82 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/read/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java @@ -70,7 +70,7 @@ public class SubInterfaceIpv6NeighbourCustomizer extends IpNeighbourReader .filter(ipNeighborDetails -> ip.equals(arrayToIpv6AddressNoZone(ipNeighborDetails.ipAddress))) .findFirst() .ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv6AddressNoZone(ipNeighborDetails.ipAddress)) - .setKey(keyMapper().apply(ipNeighborDetails)) + .withKey(keyMapper().apply(ipNeighborDetails)) .setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress))); } } -- cgit 1.2.3-korg