1 files changed, 24 insertions, 31 deletions

diff --git a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java
index 7d6c64baf..4f3e6a1ef 100755
--- a/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java
+++ b/nsh/impl/src/main/java/io/fd/honeycomb/vppnsh/impl/oper/NshMapReaderCustomizer.java
@@ -21,23 +21,17 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
 import io.fd.honeycomb.translate.read.ReadContext;
-import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
 import io.fd.honeycomb.translate.read.ReadFailedException;
+import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
+import io.fd.honeycomb.translate.v3po.util.JvppReplyConsumer;
 import io.fd.honeycomb.translate.v3po.util.NamingContext;
-import io.fd.honeycomb.translate.v3po.util.TranslateUtils;
-
+import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 import javax.annotation.Nonnull;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ethernet;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.EncapType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VxlanGpe;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.VppNshStateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.NshMapsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nsh.rev160624.vpp.nsh.state.nsh.maps.NshMapBuilder;
@@ -46,11 +40,10 @@ import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.openvpp.jvpp.VppBaseCallException;
-import org.openvpp.jvpp.nsh.dto.NshMapDump;
 import org.openvpp.jvpp.nsh.dto.NshMapDetails;
 import org.openvpp.jvpp.nsh.dto.NshMapDetailsReplyDump;
+import org.openvpp.jvpp.nsh.dto.NshMapDump;
 import org.openvpp.jvpp.nsh.future.FutureJVppNsh;
-import io.fd.honeycomb.vppnsh.impl.util.FutureJVppNshCustomizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,15 +51,15 @@ import org.slf4j.LoggerFactory;
  * Reader customizer responsible for nsh map read.<br> to VPP.
  */
 public class NshMapReaderCustomizer extends FutureJVppNshCustomizer
-    implements ListReaderCustomizer<NshMap, NshMapKey, NshMapBuilder> {
+        implements ListReaderCustomizer<NshMap, NshMapKey, NshMapBuilder>, JvppReplyConsumer {
 
     private static final Logger LOG = LoggerFactory.getLogger(NshMapReaderCustomizer.class);
     private final NamingContext nshMapContext;
     private final NamingContext interfaceContext;
 
     public NshMapReaderCustomizer(@Nonnull final FutureJVppNsh futureJVppNsh,
-                                    @Nonnull final NamingContext nshMapContext,
-                                    @Nonnull final NamingContext interfaceContext) {
+                                  @Nonnull final NamingContext nshMapContext,
+                                  @Nonnull final NamingContext interfaceContext) {
         super(futureJVppNsh);
         this.nshMapContext = checkNotNull(nshMapContext, "nshMapContext should not be null");
         this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
@@ -87,8 +80,8 @@ public class NshMapReaderCustomizer extends FutureJVppNshCustomizer
 
     @Override
     public void readCurrentAttributes(@Nonnull final InstanceIdentifier<NshMap> id,
-                    @Nonnull final NshMapBuilder builder, @Nonnull final ReadContext ctx)
-                    throws ReadFailedException {
+                                      @Nonnull final NshMapBuilder builder, @Nonnull final ReadContext ctx)
+            throws ReadFailedException {
         LOG.debug("Reading attributes for nsh map: {}", id);
         try {
             final NshMapKey key = id.firstKeyOf(NshMap.class);
@@ -103,9 +96,9 @@ public class NshMapReaderCustomizer extends FutureJVppNshCustomizer
             request.mapIndex = nshMapContext.getIndex(mapName, ctx.getMappingContext());
 
             final CompletionStage<NshMapDetailsReplyDump> nshMapDetailsReplyDumpCompletionStage =
-                     getFutureJVppNsh().nshMapDump(request);
+                    getFutureJVppNsh().nshMapDump(request);
             final NshMapDetailsReplyDump reply =
-                     TranslateUtils.getReplyForRead(nshMapDetailsReplyDumpCompletionStage.toCompletableFuture(), id);
+                    getReplyForRead(nshMapDetailsReplyDumpCompletionStage.toCompletableFuture(), id);
 
             if (reply == null || reply.nshMapDetails == null || reply.nshMapDetails.isEmpty()) {
                 LOG.debug("Has no Nsh Map {} in VPP. ", key.getName());
@@ -118,19 +111,19 @@ public class NshMapReaderCustomizer extends FutureJVppNshCustomizer
             builder.setName(mapName);
             builder.setKey(key);
 
-            builder.setNsp( (long)((nshMapDetails.nspNsi>>8) & 0xFFFFFF));
-            builder.setNsi( (short)(nshMapDetails.nspNsi & 0xFF ));
+            builder.setNsp((long) ((nshMapDetails.nspNsi >> 8) & 0xFFFFFF));
+            builder.setNsi((short) (nshMapDetails.nspNsi & 0xFF));
 
-            builder.setMappedNsp( (long)((nshMapDetails.mappedNspNsi>>8) & 0xFFFFFF));
-            builder.setMappedNsi( (short)(nshMapDetails.mappedNspNsi & 0xFF ));
+            builder.setMappedNsp((long) ((nshMapDetails.mappedNspNsi >> 8) & 0xFFFFFF));
+            builder.setMappedNsi((short) (nshMapDetails.mappedNspNsi & 0xFF));
 
-            switch(nshMapDetails.nextNode) {
-            case 2:
-                builder.setEncapType(VxlanGpe.class);
-                break;
-            default:
-                LOG.trace("Unsupported encap type for nsh map: {}", nshMapDetails.nextNode);
-                return;
+            switch (nshMapDetails.nextNode) {
+                case 2:
+                    builder.setEncapType(VxlanGpe.class);
+                    break;
+                default:
+                    LOG.trace("Unsupported encap type for nsh map: {}", nshMapDetails.nextNode);
+                    return;
             }
 
             checkState(interfaceContext.containsName(nshMapDetails.swIfIndex, ctx.getMappingContext()),
@@ -143,14 +136,14 @@ public class NshMapReaderCustomizer extends FutureJVppNshCustomizer
             }
         } catch (VppBaseCallException e) {
             LOG.warn("Failed to readCurrentAttributes for: {}", id);
-            throw new ReadFailedException( id, e );
+            throw new ReadFailedException(id, e);
         }
     }
 
     @Nonnull
     @Override
     public List<NshMapKey> getAllIds(@Nonnull final InstanceIdentifier<NshMap> id,
-                                       @Nonnull final ReadContext context) throws ReadFailedException {
+                                     @Nonnull final ReadContext context) throws ReadFailedException {
         LOG.debug("Reading list of keys for nsh map: {}", id);
 
         final NshMapDump request = new NshMapDump();