From a63a72192bdd8148b6147b58db1eea054efb09a1 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Wed, 12 Dec 2018 13:04:35 +0100 Subject: fix after VPP api changes for address type aliases Change-Id: I228340d362adcbec9e46c8e406337392caffaf37 Signed-off-by: Michal Cmarada --- .../java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java | 2 +- .../io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java index 4a684ccf8..2039aaac6 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizer.java @@ -104,7 +104,7 @@ public class ArpTerminationTableEntryCustomizer extends FutureJVppCustomizer request.mac = macAddress; final IpAddressNoZone ipAddress = entry.getIpAddress(); Ip4Address ip4Address = new Ip4Address(); - ip4Address.address = ipAddressToArray(ipAddress); + ip4Address.ip4Address = ipAddressToArray(ipAddress); Address address = new Address(); address.af = AddressFamily.ADDRESS_IP4; address.un = new AddressUnion(ip4Address); diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java index 807a99328..f83852c0a 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/l2/ArpTerminationTableEntryCustomizerTest.java @@ -112,7 +112,7 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest Address address = new Address(); address.af = AddressFamily.ADDRESS_IP4; Ip4Address ip4Address = new Ip4Address(); - ip4Address.address = ipAddress; + ip4Address.ip4Address = ipAddress; address.un = new AddressUnion(ip4Address); request.ip = address; MacAddress macAddr = new MacAddress(); @@ -137,7 +137,7 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest verify(api).bdIpMacAddDel(argumentCaptor.capture()); final BdIpMacAddDel actual = argumentCaptor.getValue(); assertArrayEquals(expected.mac.bytes, actual.mac.bytes); - assertArrayEquals(expected.ip.un.getIp4().address, actual.ip.un.getIp4().address); + assertArrayEquals(expected.ip.un.getIp4().ip4Address, actual.ip.un.getIp4().ip4Address); assertEquals(expected.bdId, actual.bdId); assertEquals(expected.isAdd, actual.isAdd); } -- cgit 1.2.3-korg