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 <[email protected]>

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 9e4c94d..f0f08d9 100644 (file)
--- 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 5baf2d9..8fe7666 100644 (file)
--- 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<Interface,
         getCustomizer().readCurrentAttributes(id, builder, ctx);
 
         final SwInterfaceDump request = new SwInterfaceDump();
+        request.swIfIndex = new InterfaceIndex();
+        request.swIfIndex.interfaceindex =~0;
         request.nameFilter = IFACE0_NAME.getBytes();
         request.nameFilterValid = 1;
 
@@ -124,6 +127,8 @@ public class InterfaceCustomizerTest extends ListReaderCustomizerTest<Interface,
         getCustomizer().readCurrentAttributes(id, builder, ctx);
 
         final SwInterfaceDump request = new SwInterfaceDump();
+        request.swIfIndex = new InterfaceIndex();
+        request.swIfIndex.interfaceindex =~0;
         request.nameFilter = SUB_IFACE_NAME.getBytes();
         request.nameFilterValid = 1;
 
@@ -156,6 +161,8 @@ public class InterfaceCustomizerTest extends ListReaderCustomizerTest<Interface,
         final List<InterfaceKey> 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 c319cc6..af58622 100644 (file)
--- 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;