diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2019-02-06 09:41:39 +0100 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2019-02-06 09:41:39 +0100 |
commit | 3751ef96ae1427cc8d5ecb9cbba705e837bb63ca (patch) | |
tree | 08c01465ea307e9eebcdf1e12990ebdb66961228 /l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java | |
parent | acf5a8a052e2f7f7c2b03c023df3dd489688cb00 (diff) |
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>
Diffstat (limited to 'l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java')
-rw-r--r-- | l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java index 3fc43f76b..00e499f92 100644 --- a/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java +++ b/l3/impl/src/main/java/io/fd/hc2vpp/l3/write/ipv6/subinterface/SubInterfaceIpv6NeighbourCustomizer.java @@ -55,11 +55,10 @@ public class SubInterfaceIpv6NeighbourCustomizer extends FutureJVppCustomizer LOG.debug("Processing request for Neighbour {} write", id); addDelNeighbour(id, () -> { - IpNeighborAddDel request = preBindIpv6Request(true); - - request.dstAddress = ipv6AddressNoZoneToArray(data.getIp()); - request.macAddress = parseMac(data.getLinkLayerAddress().getValue()); - request.swIfIndex = subInterfaceIndex(id, interfaceContext, writeContext.getMappingContext()); + IpNeighborAddDel request = preBindRequest(true); + request.neighbor.macAddress = parseMacAddress(data.getLinkLayerAddress().getValue()); + request.neighbor.ipAddress = ipv6AddressToAddress(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 +74,10 @@ public class SubInterfaceIpv6NeighbourCustomizer extends FutureJVppCustomizer LOG.debug("Processing request for Neighbour {} delete", id); addDelNeighbour(id, () -> { - IpNeighborAddDel request = preBindIpv6Request(false); - - request.dstAddress = ipv6AddressNoZoneToArray(data.getIp()); - request.macAddress = parseMac(data.getLinkLayerAddress().getValue()); - request.swIfIndex = subInterfaceIndex(id, interfaceContext, writeContext.getMappingContext()); + IpNeighborAddDel request = preBindRequest(false); + request.neighbor.macAddress = parseMacAddress(data.getLinkLayerAddress().getValue()); + request.neighbor.ipAddress = ipv6AddressToAddress(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 |