1 files changed, 58 insertions, 37 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceCustomizer.java
index 718cef1b5..f7d473f73 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceCustomizer.java
@@ -19,6 +19,14 @@ package io.fd.honeycomb.v3po.translate.v3po.interfacesstate;
 import io.fd.honeycomb.v3po.translate.Context;
 import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
 import io.fd.honeycomb.v3po.translate.spi.read.ListReaderCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.util.FutureJVppCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.util.NamingContext;
+import io.fd.honeycomb.v3po.translate.v3po.utils.V3poUtils;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.EthernetCsmacd;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesStateBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
@@ -29,21 +37,23 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.vppjapi.vppInterfaceDetails;
+import org.openvpp.jvpp.dto.SwInterfaceDetails;
+import org.openvpp.jvpp.dto.SwInterfaceDetailsReplyDump;
+import org.openvpp.jvpp.dto.SwInterfaceDump;
+import org.openvpp.jvpp.future.FutureJVpp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
-
 
-public class InterfaceCustomizer extends io.fd.honeycomb.v3po.translate.v3po.util.VppApiCustomizer
+public class InterfaceCustomizer extends FutureJVppCustomizer
         implements ListReaderCustomizer<Interface, InterfaceKey, InterfaceBuilder> {
 
     private static final Logger LOG = LoggerFactory.getLogger(InterfaceCustomizer.class);
+    private final NamingContext interfaceContext;
 
-    public InterfaceCustomizer(org.openvpp.vppjapi.vppApi vppApi) {
-        super(vppApi);
+    public InterfaceCustomizer(@Nonnull final FutureJVpp jvpp, final NamingContext interfaceContext) {
+        super(jvpp);
+        this.interfaceContext = interfaceContext;
     }
 
     @Override
@@ -54,56 +64,67 @@ public class InterfaceCustomizer extends io.fd.honeycomb.v3po.translate.v3po.uti
     @Override
     public void readCurrentAttributes(InstanceIdentifier<Interface> id, InterfaceBuilder builder, Context ctx)
             throws ReadFailedException {
-        vppInterfaceDetails[] ifaces;
-
         final InterfaceKey key = id.firstKeyOf(id.getTargetType());
-        // Extract one interface detail from VPP
-        ifaces = getVppApi().swInterfaceDump((byte) 1, key.getName().getBytes());
-        if (null == ifaces) {
-            LOG.warn("VPP returned null instead of interface by key {}", key.getName().getBytes());
-            return;
-        }
 
-        if (1 != ifaces.length) {
-            LOG.error("Failed to extract interface {} details from VPP", key.getName());
-            return;
+        final SwInterfaceDetails iface;
+        try {
+            iface = InterfaceUtils.getVppInterfaceDetails(getFutureJVpp(), key);
+        } catch (Exception e) {
+            throw new ReadFailedException(id, e);
         }
 
-        final vppInterfaceDetails iface = ifaces[0];
 
-        builder.setName(iface.interfaceName);
+        builder.setName(key.getName());
         // FIXME: report interface type based on name
         //Tunnel.class l2vlan(802.1q) bridge (transparent bridge?)
         builder.setType(EthernetCsmacd.class);
-        builder.setIfIndex(InterfaceUtils.vppIfIndexToYang(iface.ifIndex));
-        builder.setAdminStatus(iface.adminUp == 1 ? AdminStatus.Up : AdminStatus.Down);
-        builder.setOperStatus(1 == iface.linkUp ? OperStatus.Up : OperStatus.Down);
+        builder.setIfIndex(InterfaceUtils.vppIfIndexToYang(iface.swIfIndex));
+        builder.setAdminStatus(iface.adminUpDown == 1
+                ? AdminStatus.Up
+                : AdminStatus.Down);
+        builder.setOperStatus(1 == iface.linkUpDown
+                ? OperStatus.Up
+                : OperStatus.Down);
         if (0 != iface.linkSpeed) {
             builder.setSpeed(InterfaceUtils.vppInterfaceSpeedToYang(iface.linkSpeed));
         }
-        if (iface.physAddr.length == 6) {
-            builder.setPhysAddress(new PhysAddress(InterfaceUtils.vppPhysAddrToYang(iface.physAddr)));
+        if (iface.l2AddressLength == 6) {
+            builder.setPhysAddress(new PhysAddress(InterfaceUtils.vppPhysAddrToYang(iface.l2Address)));
         }
     }
 
+    @Nonnull
     @Override
-    public List<InterfaceKey> getAllIds(InstanceIdentifier<Interface> id, Context context) {
-        vppInterfaceDetails[] ifaces;
-        final ArrayList<InterfaceKey> interfaceKeys = new ArrayList<>();
-
-        ifaces = getVppApi().swInterfaceDump((byte) 0, "".getBytes());
-        if (null != ifaces) {
-            for (vppInterfaceDetails ifc : ifaces) {
-                interfaceKeys.add(new InterfaceKey(ifc.interfaceName));
-            }
+    public List<InterfaceKey> getAllIds(@Nonnull final InstanceIdentifier<Interface> id,
+                                        @Nonnull final Context context) throws ReadFailedException {
+        final SwInterfaceDump request = new SwInterfaceDump();
+        request.nameFilter = "".getBytes();
+        request.nameFilterValid = 0;
+
+        final CompletableFuture<SwInterfaceDetailsReplyDump> swInterfaceDetailsReplyDumpCompletableFuture =
+                getFutureJVpp().swInterfaceDump(request).toCompletableFuture();
+        final SwInterfaceDetailsReplyDump ifaces = V3poUtils.getReply(swInterfaceDetailsReplyDumpCompletableFuture);
+
+        // TODO can we get null here?
+        if (null == ifaces || null == ifaces.swInterfaceDetails) {
+            return Collections.emptyList();
         }
 
-        return interfaceKeys;
+        return ifaces.swInterfaceDetails.stream()
+                .filter(elt -> elt != null)
+                .map((elt) -> {
+                    // Store interface name from VPP in context if not yet present
+                    if(!interfaceContext.containsName(elt.swIfIndex)){
+                        interfaceContext.addName(elt.swIfIndex, V3poUtils.toString(elt.interfaceName));
+                    }
+                    return new InterfaceKey(interfaceContext.getName(elt.swIfIndex));
+                })
+                .collect(Collectors.toList());
     }
 
     @Override
-    public void merge(org.opendaylight.yangtools.concepts.Builder<? extends DataObject> builder,
-                      List<Interface> readData) {
+    public void merge(@Nonnull final org.opendaylight.yangtools.concepts.Builder<? extends DataObject> builder,
+                      @Nonnull final  List<Interface> readData) {
         ((InterfacesStateBuilder) builder).setInterface(readData);
     }