From 3fafe6a6a8be55aff4c71b21b6ee34969a4e801b Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Fri, 4 Jan 2019 09:10:39 +0100 Subject: Fix MacAddress API change Change-Id: I516b90dac084f169d1bf1cc74909777d0824b7cb 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 2039aaac6..198813ab2 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 @@ -100,7 +100,7 @@ public class ArpTerminationTableEntryCustomizer extends FutureJVppCustomizer request.bdId = bdId; request.isAdd = booleanToByte(isAdd); MacAddress macAddress = new MacAddress(); - macAddress.bytes = parseMac(entry.getPhysAddress().getValue()); + macAddress.macaddress = parseMac(entry.getPhysAddress().getValue()); request.mac = macAddress; final IpAddressNoZone ipAddress = entry.getIpAddress(); Ip4Address ip4Address = new 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 f83852c0a..80ca3a924 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 @@ -116,7 +116,7 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest address.un = new AddressUnion(ip4Address); request.ip = address; MacAddress macAddr = new MacAddress(); - macAddr.bytes = macAddress; + macAddr.macaddress = macAddress; request.mac = macAddr; request.bdId = BD_ID; request.isAdd = isAdd; @@ -136,7 +136,7 @@ public class ArpTerminationTableEntryCustomizerTest extends WriterCustomizerTest ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(BdIpMacAddDel.class); verify(api).bdIpMacAddDel(argumentCaptor.capture()); final BdIpMacAddDel actual = argumentCaptor.getValue(); - assertArrayEquals(expected.mac.bytes, actual.mac.bytes); + assertArrayEquals(expected.mac.macaddress, actual.mac.macaddress); 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