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, 8 insertions, 8 deletions

diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java
index 61685af9c..89d6dbf51 100644
--- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java
+++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv4/subinterface/SubInterfaceIpv4NeighbourCustomizer.java
@@ -55,11 +55,11 @@ public class SubInterfaceIpv4NeighbourCustomizer extends FutureJVppCustomizer
         LOG.debug("Processing request for Neighbour {} write", id);
 
         addDelNeighbour(id, () -> {
-            IpNeighborAddDel request = preBindIpv4Request(true);
+            IpNeighborAddDel request = preBindRequest(true);
 
-            request.dstAddress = ipv4AddressNoZoneToArray(data.getIp());
-            request.macAddress = parseMac(data.getLinkLayerAddress().getValue());
-            request.swIfIndex = subInterfaceIndex(id, interfaceContext, writeContext.getMappingContext());
+            request.neighbor.macAddress = parseMacAddress(data.getLinkLayerAddress().getValue());
+            request.neighbor.ipAddress = ipv4AddressNoZoneToAddress(data.getIp());
+            request.neighbor.swIfIndex = subInterfaceIndex(id, interfaceContext, writeContext.getMappingContext());
             // we don't have support for sub-interface routing, so not setting vrf
 
             return request;
@@ -75,11 +75,11 @@ public class SubInterfaceIpv4NeighbourCustomizer extends FutureJVppCustomizer
         LOG.debug("Processing request for Neighbour {} delete", id);
 
         addDelNeighbour(id, () -> {
-            IpNeighborAddDel request = preBindIpv4Request(false);
+            IpNeighborAddDel request = preBindRequest(false);
 
-            request.dstAddress = ipv4AddressNoZoneToArray(data.getIp());
-            request.macAddress = parseMac(data.getLinkLayerAddress().getValue());
-            request.swIfIndex = subInterfaceIndex(id, interfaceContext, writeContext.getMappingContext());
+            request.neighbor.macAddress = parseMacAddress(data.getLinkLayerAddress().getValue());
+            request.neighbor.ipAddress = ipv4AddressNoZoneToAddress(data.getIp());
+            request.neighbor.swIfIndex = subInterfaceIndex(id, interfaceContext, writeContext.getMappingContext());
 
             //TODO HONEYCOMB-182 if it is necessary for future use ,make adjustments to be able to set vrfid
             //request.vrfId