Fix ingress/egress acl assignment read

Ingress and egress acls are not anymore
mixed on the same list when reading interface state

Change-Id: I2f775db4482e61593aa9689afcb687f7db7b4e73
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

4 files changed, 149 insertions, 93 deletions

diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractVppAclCustomizer.java
index 948b6408a..ed853eeea 100644
--- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/VppAclCustomizer.java
+++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/AbstractVppAclCustomizer.java
@@ -16,8 +16,8 @@
 
 package io.fd.hc2vpp.acl.read;
 
-
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSet;
 import io.fd.hc2vpp.acl.util.FutureJVppAclCustomizer;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
@@ -28,64 +28,55 @@ import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
 import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
 import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder;
 import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor;
-import io.fd.honeycomb.translate.util.read.cache.EntityDumpPostProcessingFunction;
+import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory;
+import io.fd.vpp.jvpp.acl.dto.AclDetails;
 import io.fd.vpp.jvpp.acl.dto.AclDetailsReplyDump;
 import io.fd.vpp.jvpp.acl.dto.AclDump;
+import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails;
 import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetailsReplyDump;
 import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDump;
 import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.HexString;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.acl.EgressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.acl.IngressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214.vpp.acls.base.attributes.VppAcls;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214.vpp.acls.base.attributes.VppAclsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214.vpp.acls.base.attributes.VppAclsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.VppAcl;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public class VppAclCustomizer extends FutureJVppAclCustomizer
-        implements ListReaderCustomizer<VppAcls, VppAclsKey, VppAclsBuilder>, JvppReplyConsumer, ByteDataTranslator {
+abstract class AbstractVppAclCustomizer extends FutureJVppAclCustomizer
+    implements ListReaderCustomizer<VppAcls, VppAclsKey, VppAclsBuilder>, JvppReplyConsumer, ByteDataTranslator {
 
     private final NamingContext interfaceContext;
     private final NamingContext standardAclContext;
-    /**
-     * true == ingress
-     * false == egress
-     */
-    private final boolean input;
+
     private final DumpCacheManager<AclInterfaceListDetailsReplyDump, Integer> aclReferenceDumpManager;
     private final DumpCacheManager<AclDetailsReplyDump, Integer> aclDumpManager;
 
-    public VppAclCustomizer(@Nonnull final FutureJVppAclFacade jVppAclFacade,
-                            @Nonnull final NamingContext interfaceContext,
-                            @Nonnull final NamingContext standardAclContext,
-                            final boolean input) {
+    protected AbstractVppAclCustomizer(@Nonnull final FutureJVppAclFacade jVppAclFacade,
+                                       @Nonnull final NamingContext interfaceContext,
+                                       @Nonnull final NamingContext standardAclContext) {
         super(jVppAclFacade);
         this.interfaceContext = interfaceContext;
         this.standardAclContext = standardAclContext;
-        this.input = input;
 
         aclReferenceDumpManager =
-                new DumpCacheManagerBuilder<AclInterfaceListDetailsReplyDump, Integer>()
-                        .withExecutor(createAclReferenceDumpExecutor())
-                        .withPostProcessingFunction(input
-                                ? createInputAclFilter()
-                                : createOutputAclFilter())
-                        .acceptOnly(AclInterfaceListDetailsReplyDump.class)
-                        .build();
+            new DumpCacheManagerBuilder<AclInterfaceListDetailsReplyDump, Integer>()
+                .withExecutor(createAclReferenceDumpExecutor())
+                // Key needs to contain interface ID to distinguish dumps between interfaces
+                .withCacheKeyFactory(new TypeAwareIdentifierCacheKeyFactory(AclInterfaceListDetailsReplyDump.class,
+                    ImmutableSet.of(Interface.class)))
+                .build();
 
         aclDumpManager = new DumpCacheManagerBuilder<AclDetailsReplyDump, Integer>()
-                .withExecutor(createAclExecutor())
-                .acceptOnly(AclDetailsReplyDump.class)
-                .build();
+            .withExecutor(createAclExecutor())
+            .acceptOnly(AclDetailsReplyDump.class)
+            .build();
     }
 
     private EntityDumpExecutor<AclDetailsReplyDump, Integer> createAclExecutor() {
@@ -96,109 +87,77 @@ public class VppAclCustomizer extends FutureJVppAclCustomizer
         };
     }
 
-    private EntityDumpPostProcessingFunction<AclInterfaceListDetailsReplyDump> createInputAclFilter() {
-        return dump -> {
-            // filters acl's to first N(those are input ones)
-            dump.aclInterfaceListDetails = dump.aclInterfaceListDetails
-                    .stream()
-                    .map(iface -> {
-                        if (iface.acls != null && iface.acls.length > 0) {
-                            if (iface.nInput <= 0) {
-                                iface.acls = new int[0];
-                            } else {
-                                iface.acls = Arrays.copyOfRange(iface.acls, 0, iface.nInput);
-                            }
-                        }
-                        return iface;
-                    })
-                    .collect(Collectors.toList());
-            return dump;
-        };
-    }
-
-    private EntityDumpPostProcessingFunction<AclInterfaceListDetailsReplyDump> createOutputAclFilter() {
-        return dump -> {
-            // filters acl's to last N(those are output ones)
-            dump.aclInterfaceListDetails = dump.aclInterfaceListDetails
-                    .stream()
-                    .map(iface -> {
-                        if (iface.nInput >= iface.acls.length) {
-                            iface.acls = new int[0];
-                        } else {
-                            iface.acls = Arrays.copyOfRange(iface.acls, iface.nInput, iface.acls.length);
-                        }
-                        return iface;
-                    })
-                    .collect(Collectors.toList());
-            return dump;
-        };
-    }
-
     private EntityDumpExecutor<AclInterfaceListDetailsReplyDump, Integer> createAclReferenceDumpExecutor() {
         return (identifier, params) -> {
             AclInterfaceListDump dumpRequest = new AclInterfaceListDump();
             dumpRequest.swIfIndex = params;
             return getReplyForRead(getjVppAclFacade().aclInterfaceListDump(dumpRequest).toCompletableFuture(),
-                    identifier);
+                identifier);
         };
     }
 
     @Nonnull
     @Override
-    public List<VppAclsKey> getAllIds(@Nonnull final InstanceIdentifier<VppAcls> id, @Nonnull final ReadContext context)
-            throws ReadFailedException {
+    public final List<VppAclsKey> getAllIds(@Nonnull final InstanceIdentifier<VppAcls> id,
+                                            @Nonnull final ReadContext context)
+        throws ReadFailedException {
 
         final String parentInterfaceName = id.firstKeyOf(Interface.class).getName();
         final int parentInterfaceIndex = interfaceContext.getIndex(parentInterfaceName, context.getMappingContext());
 
         final Optional<AclInterfaceListDetailsReplyDump> dumpReply =
-                aclReferenceDumpManager.getDump(id, context.getModificationCache(), parentInterfaceIndex);
+            aclReferenceDumpManager.getDump(id, context.getModificationCache(), parentInterfaceIndex);
 
         if (dumpReply.isPresent() && !dumpReply.get().aclInterfaceListDetails.isEmpty()) {
-            return Arrays.stream(dumpReply.get().aclInterfaceListDetails.get(0).acls)
-                    .mapToObj(aclIndex -> standardAclContext.getName(aclIndex, context.getMappingContext()))
-                    .map(aclName -> new VppAclsKey(aclName, VppAcl.class))
-                    .collect(Collectors.toList());
+            // if dumpReply is present, then aclInterfaceListDetails contains single element (actually it should not be
+            // dump message in vpp)
+            final AclInterfaceListDetails aclDetails = dumpReply.get().aclInterfaceListDetails.get(0);
+            return filterAcls(aclDetails)
+                .mapToObj(aclIndex -> standardAclContext.getName(aclIndex, context.getMappingContext()))
+                .map(aclName -> new VppAclsKey(aclName, VppAcl.class))
+                .collect(Collectors.toList());
         } else {
             return Collections.emptyList();
         }
     }
 
-    @Override
-    public void merge(@Nonnull final Builder<? extends DataObject> builder, @Nonnull final List<VppAcls> readData) {
-        if (input) {
-            IngressBuilder.class.cast(builder).setVppAcls(readData);
-        } else {
-            EgressBuilder.class.cast(builder).setVppAcls(readData);
-        }
-    }
+    /**
+     * Streams ids of ACLs.
+     *
+     * @param aclDetails describes ACLs assigned to interface
+     * @return sequence of acl ids
+     */
+    protected abstract IntStream filterAcls(@Nonnull final AclInterfaceListDetails aclDetails);
 
     @Nonnull
     @Override
-    public VppAclsBuilder getBuilder(@Nonnull final InstanceIdentifier<VppAcls> id) {
+    public final VppAclsBuilder getBuilder(@Nonnull final InstanceIdentifier<VppAcls> id) {
         return new VppAclsBuilder();
     }
 
     @Override
-    public void readCurrentAttributes(@Nonnull final InstanceIdentifier<VppAcls> id,
-                                      @Nonnull final VppAclsBuilder builder,
-                                      @Nonnull final ReadContext ctx) throws ReadFailedException {
+    public final void readCurrentAttributes(@Nonnull final InstanceIdentifier<VppAcls> id,
+                                            @Nonnull final VppAclsBuilder builder,
+                                            @Nonnull final ReadContext ctx) throws ReadFailedException {
         final VppAclsKey vppAclsKey = id.firstKeyOf(VppAcls.class);
         final String aclName = vppAclsKey.getName();
         final int aclIndex = standardAclContext.getIndex(aclName, ctx.getMappingContext());
 
         final Optional<AclDetailsReplyDump> dumpReply =
-                aclDumpManager.getDump(id, ctx.getModificationCache(), aclIndex);
+            aclDumpManager.getDump(id, ctx.getModificationCache(), aclIndex);
 
         if (dumpReply.isPresent() && !dumpReply.get().aclDetails.isEmpty()) {
             // FIXME (model expects hex string, but tag is written and read as ascii string)
             // decide how tag should be handled (model change might be needed).
             builder.setName(aclName);
             builder.setType(vppAclsKey.getType());
-            builder.setTag(new HexString(printHexBinary(dumpReply.get().aclDetails.get(0).tag)));
+            final AclDetails aclDetails = dumpReply.get().aclDetails.get(0);
+            if (aclDetails.tag != null && aclDetails.tag.length > 0) {
+                builder.setTag(new HexString(printHexBinary(aclDetails.tag)));
+            }
         } else {
             throw new ReadFailedException(id,
-                    new IllegalArgumentException(String.format("Acl with name %s not found", aclName)));
+                new IllegalArgumentException(String.format("Acl with name %s not found", aclName)));
         }
     }
 }
diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressVppAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressVppAclCustomizer.java
new file mode 100644
index 000000000..536b27fcc
--- /dev/null
+++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/EgressVppAclCustomizer.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.acl.read;
+
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails;
+import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.acl.EgressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214.vpp.acls.base.attributes.VppAcls;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+public final class EgressVppAclCustomizer extends AbstractVppAclCustomizer {
+
+    public EgressVppAclCustomizer(@Nonnull final FutureJVppAclFacade jVppAclFacade,
+                                  @Nonnull final NamingContext interfaceContext,
+                                  @Nonnull final NamingContext standardAclContext) {
+        super(jVppAclFacade, interfaceContext, standardAclContext);
+    }
+
+    @Override
+    protected IntStream filterAcls(@Nonnull final AclInterfaceListDetails aclDetails) {
+        return Arrays.stream(aclDetails.acls).skip(aclDetails.nInput);
+    }
+
+    @Override
+    public void merge(@Nonnull final Builder<? extends DataObject> builder, @Nonnull final List<VppAcls> readData) {
+        EgressBuilder.class.cast(builder).setVppAcls(readData);
+    }
+}
diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressVppAclCustomizer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressVppAclCustomizer.java
new file mode 100644
index 000000000..8a31032d7
--- /dev/null
+++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/IngressVppAclCustomizer.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.acl.read;
+
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.vpp.jvpp.acl.dto.AclInterfaceListDetails;
+import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.acl.IngressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214.vpp.acls.base.attributes.VppAcls;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+
+public final class IngressVppAclCustomizer extends AbstractVppAclCustomizer {
+
+    public IngressVppAclCustomizer(@Nonnull final FutureJVppAclFacade jVppAclFacade,
+                                   @Nonnull final NamingContext interfaceContext,
+                                   @Nonnull final NamingContext standardAclContext) {
+        super(jVppAclFacade, interfaceContext, standardAclContext);
+    }
+
+    @Override
+    protected IntStream filterAcls(@Nonnull final AclInterfaceListDetails aclDetails) {
+        return Arrays.stream(aclDetails.acls).limit(aclDetails.nInput);
+    }
+
+    @Override
+    public void merge(@Nonnull final Builder<? extends DataObject> builder, @Nonnull final List<VppAcls> readData) {
+        IngressBuilder.class.cast(builder).setVppAcls(readData);
+    }
+}
diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java
index 89520620d..691479e64 100644
--- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java
+++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/read/factory/InterfaceAclReaderFactory.java
@@ -19,7 +19,8 @@ package io.fd.hc2vpp.acl.read.factory;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.fd.hc2vpp.acl.AclModule;
-import io.fd.hc2vpp.acl.read.VppAclCustomizer;
+import io.fd.hc2vpp.acl.read.EgressVppAclCustomizer;
+import io.fd.hc2vpp.acl.read.IngressVppAclCustomizer;
 import io.fd.hc2vpp.acl.read.VppMacIpAclCustomizer;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.impl.read.GenericListReader;
@@ -73,13 +74,13 @@ public class InterfaceAclReaderFactory implements ReaderFactory {
         final InstanceIdentifier<Ingress> ingressInstanceIdentifier = ACL_IID.child(Ingress.class);
         registry.addStructuralReader(ingressInstanceIdentifier, IngressBuilder.class);
         registry.addAfter(new GenericListReader<>(ingressInstanceIdentifier.child(VppAcls.class),
-            new VppAclCustomizer(futureAclFacade, interfaceContext, standardAclContext, true)), IFC_ID);
+            new IngressVppAclCustomizer(futureAclFacade, interfaceContext, standardAclContext)), IFC_ID);
         registry.addAfter(new GenericReader<>(ingressInstanceIdentifier.child(VppMacipAcl.class),
             new VppMacIpAclCustomizer(futureAclFacade, interfaceContext, macIpAClContext)), IFC_ID);
 
         final InstanceIdentifier<Egress> egressInstanceIdentifier = ACL_IID.child(Egress.class);
         registry.addStructuralReader(egressInstanceIdentifier, EgressBuilder.class);
         registry.addAfter(new GenericListReader<>(egressInstanceIdentifier.child(VppAcls.class),
-            new VppAclCustomizer(futureAclFacade, interfaceContext, standardAclContext, false)), IFC_ID);
+            new EgressVppAclCustomizer(futureAclFacade, interfaceContext, standardAclContext)), IFC_ID);
     }
 }