From 27c59c4083cb300f528d63b3e3924c348dd090e0 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Fri, 31 May 2019 11:18:36 +0200 Subject: HC2VPP-391: Fix read of oper interface state Several interface types that have different name in vpp than in the model didn't load their operational state. Since vpp supports listing interface by its index too, this fix changes the dump interface by name to dump by index. Change-Id: I6c2500d2caddad58b52aaee00ed2bff0fbd9f401 Signed-off-by: Michal Cmarada --- .../v3po/read/cache/InterfaceCacheDumpManagerImplTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/read/cache/InterfaceCacheDumpManagerImplTest.java') diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/read/cache/InterfaceCacheDumpManagerImplTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/read/cache/InterfaceCacheDumpManagerImplTest.java index 04b1d999e..4ee9d8ce3 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/read/cache/InterfaceCacheDumpManagerImplTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/read/cache/InterfaceCacheDumpManagerImplTest.java @@ -88,6 +88,7 @@ public class InterfaceCacheDumpManagerImplTest implements NamingContextHelper, F // this one is not in full dump when(jvpp.swInterfaceDump(specificRequest(IFACE_3))).thenReturn(future(specificReplyThree())); + when(jvpp.swInterfaceDump(specificRequest(3))).thenReturn(future(specificReplyThree())); defineMapping(mappingContext, IFACE_0, 0, "interface-context"); defineMapping(mappingContext, IFACE_1, 1, "interface-context"); defineMapping(mappingContext, IFACE_2, 2, "interface-context"); @@ -139,7 +140,7 @@ public class InterfaceCacheDumpManagerImplTest implements NamingContextHelper, F final SwInterfaceDetails specificDetail = manager.getInterfaceDetail(identifierThree, ctx, IFACE_3); assertEquals(detailThree(), specificDetail); - verify(jvpp, times(1)).swInterfaceDump(specificRequest(IFACE_3)); + verify(jvpp, times(1)).swInterfaceDump(specificRequest(3)); } private SwInterfaceDetailsReplyDump fullReply() { @@ -196,6 +197,14 @@ public class InterfaceCacheDumpManagerImplTest implements NamingContextHelper, F specificRequest.nameFilter = ifaceName.getBytes(); return specificRequest; } + private static SwInterfaceDump specificRequest(final int swIfIndex) { + final SwInterfaceDump specificRequest = new SwInterfaceDump(); + specificRequest.swIfIndex = new InterfaceIndex(); + specificRequest.swIfIndex.interfaceindex = swIfIndex; + specificRequest.nameFilterValid = 0; + specificRequest.nameFilter = "".getBytes(); + return specificRequest; + } private static SwInterfaceDump fullRequest() { final SwInterfaceDump fullRequest = new SwInterfaceDump(); -- cgit 1.2.3-korg