fix after changes in VPP API

 - fixes for mac adress
 - fixes for ipaddress
 - fixes refactoring in ipsec


Change-Id: Idc3e3557b72a5f1ac5b32b9738d90ca23ed6ed9e
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

1 files changed, 7 insertions, 4 deletions

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 8e0267aca..c1c2f8559 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
@@ -67,11 +67,13 @@ public class SubInterfaceIpv4NeighbourCustomizer extends IpNeighbourReader
         if (dumpOpt.isPresent()) {
             dumpOpt.get().ipNeighborDetails
                     .stream()
-                    .filter(ipNeighborDetails -> ip.equals(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress)))
+                    .filter(ipNeighborDetails -> ip.equals(arrayToIpv4AddressNoZone(
+                            ipNeighborDetails.neighbor.ipAddress.un.getIp4().ip4Address)))
                     .findFirst()
-                    .ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress))
+                    .ifPresent(ipNeighborDetails -> builder.setIp(arrayToIpv4AddressNoZone(
+                            ipNeighborDetails.neighbor.ipAddress.un.getIp4().ip4Address))
                             .withKey(keyMapper().apply(ipNeighborDetails))
-                            .setLinkLayerAddress(toPhysAddress(ipNeighborDetails.macAddress)));
+                            .setLinkLayerAddress(toPhysAddress(ipNeighborDetails.neighbor.macAddress.macaddress)));
         }
     }
 
@@ -87,6 +89,7 @@ public class SubInterfaceIpv4NeighbourCustomizer extends IpNeighbourReader
     }
 
     private Function<IpNeighborDetails, NeighborKey> keyMapper() {
-        return ipNeighborDetails -> new NeighborKey(arrayToIpv4AddressNoZone(ipNeighborDetails.ipAddress));
+        return ipNeighborDetails -> new NeighborKey(
+                arrayToIpv4AddressNoZone(ipNeighborDetails.neighbor.ipAddress.un.getIp4().ip4Address));
     }
 }