From 6221f64a5da88bb2d574dad7f61d9b09648869b0 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Fri, 3 May 2019 19:16:43 +0200 Subject: Update SwInterfaceDump request with required swIfIndex Default value should be set to ~0 to dump all interfaces or single interface index to dump single interface. If it is desired to filter interface by name swIfIndex should be set to ~0 and nameFilter should be set to interface name together with nameFilterValid set to 1. Change-Id: I1412f1c3175d55b99a4e8e87742b940c3a0ac72e Signed-off-by: Michal Cmarada --- .../v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java | 5 +++++ .../io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java | 7 +++++++ .../interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java index 9e4c94d81..f0f08d9d7 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java @@ -31,6 +31,7 @@ import io.fd.jvpp.core.dto.SwInterfaceDetails; import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump; import io.fd.jvpp.core.dto.SwInterfaceDump; import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.InterfaceIndex; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; @@ -173,6 +174,8 @@ final class InterfaceCacheDumpManagerImpl implements InterfaceCacheDumpManager { final FutureJVppCore api) { return (identifier, params) -> { final SwInterfaceDump request = new SwInterfaceDump(); + request.swIfIndex = new InterfaceIndex(); + request.swIfIndex.interfaceindex = ~0; request.nameFilter = "".getBytes(); request.nameFilterValid = 0; @@ -186,6 +189,8 @@ final class InterfaceCacheDumpManagerImpl implements InterfaceCacheDumpManager { final FutureJVppCore api) { return (identifier, ifaceName) -> { final SwInterfaceDump request = new SwInterfaceDump(); + request.swIfIndex = new InterfaceIndex(); + request.swIfIndex.interfaceindex =~0; request.nameFilter = ifaceName.getBytes(); request.nameFilterValid = 1; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java index 5baf2d962..8fe7666fe 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java @@ -32,6 +32,7 @@ import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; import io.fd.jvpp.core.dto.SwInterfaceDetails; import io.fd.jvpp.core.dto.SwInterfaceDump; +import io.fd.jvpp.core.types.InterfaceIndex; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; @@ -101,6 +102,8 @@ public class InterfaceCustomizerTest extends ListReaderCustomizerTest actualIds = getCustomizer().getAllIds(id, ctx); final SwInterfaceDump request = new SwInterfaceDump(); + request.swIfIndex = new InterfaceIndex(); + request.swIfIndex.interfaceindex = ~0; request.nameFilter = "".getBytes(); request.nameFilterValid = 0; diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java index c319cc6d4..af5862211 100644 --- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImplTest.java @@ -37,6 +37,7 @@ import io.fd.jvpp.core.dto.SwInterfaceDetails; import io.fd.jvpp.core.dto.SwInterfaceDetailsReplyDump; import io.fd.jvpp.core.dto.SwInterfaceDump; import io.fd.jvpp.core.future.FutureJVppCore; +import io.fd.jvpp.core.types.InterfaceIndex; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -189,6 +190,8 @@ public class InterfaceCacheDumpManagerImplTest implements NamingContextHelper, F private static SwInterfaceDump specificRequest(final String ifaceName) { final SwInterfaceDump specificRequest = new SwInterfaceDump(); + specificRequest.swIfIndex = new InterfaceIndex(); + specificRequest.swIfIndex.interfaceindex =~0; specificRequest.nameFilterValid = 1; specificRequest.nameFilter = ifaceName.getBytes(); return specificRequest; @@ -196,6 +199,8 @@ public class InterfaceCacheDumpManagerImplTest implements NamingContextHelper, F private static SwInterfaceDump fullRequest() { final SwInterfaceDump fullRequest = new SwInterfaceDump(); + fullRequest.swIfIndex = new InterfaceIndex(); + fullRequest.swIfIndex.interfaceindex = ~0; fullRequest.nameFilterValid = 0; fullRequest.nameFilter = "".getBytes(); return fullRequest; -- cgit 1.2.3-korg