HC2VPP-14: remove deprecated, classfier based ietf-acl model implementation

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

45 files changed, 0 insertions, 4406 deletions

diff --git a/v3po/api/src/main/yang/ietf-acl-context.yang b/v3po/api/src/main/yang/ietf-acl-context.yang
deleted file mode 100644
index 875e7f2c8..000000000
--- a/v3po/api/src/main/yang/ietf-acl-context.yang
+++ /dev/null
@@ -1,67 +0,0 @@
-module ietf-acl-context {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:vpp:acl:context";
-    prefix "nc";
-
-    description "Context for ietf-acl assignment mapping";
-
-    revision "2016-12-14" {
-        description "Initial revision.";
-    }
-
-    import ietf-inet-types {
-       prefix "inet";
-    }
-
-    import naming-context {
-       prefix "nc";
-    }
-
-    import yang-ext {
-       prefix "ext";
-    }
-
-    grouping mapping-entry-context-attributes {
-        container acl-mapping-entry-context {
-            list mapping-table {
-                key "direction";
-
-                leaf direction {
-                    type enumeration {
-                        enum "ingress";
-                        enum "egress";
-                    }
-                }
-
-                list mapping-entry {
-                    key "index";
-
-                    leaf index {
-                        type int32;
-                        description "interface id";
-                    }
-
-                    leaf ip4_table_id {
-                        type int32;
-                        description "ip4 table id";
-                    }
-
-                    leaf ip6_table_id {
-                        type int32;
-                        description "ip6 table id";
-                    }
-
-                    leaf l2_table_id {
-                        type int32;
-                        description "l2 table id";
-                    }
-                }
-            }
-        }
-    }
-
-    augment /nc:contexts {
-        ext:augment-identifier "acl-mapping-entry-ctx-augmentation";
-        uses mapping-entry-context-attributes;
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/InterfaceClassifierIetfAclModule.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/InterfaceClassifierIetfAclModule.java
deleted file mode 100644
index 643abd5c2..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/InterfaceClassifierIetfAclModule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
-import io.fd.hc2vpp.vpp.classifier.factory.write.InterfacesClassifierIetfAclWriterFactory;
-import io.fd.honeycomb.translate.write.WriterFactory;
-
-public class InterfaceClassifierIetfAclModule extends AbstractModule{
-
-    @Override
-    protected void configure() {
-        // Writers
-        final Multibinder<WriterFactory> writerFactoryBinder = Multibinder.newSetBinder(binder(), WriterFactory.class);
-        writerFactoryBinder.addBinding().to(InterfacesClassifierIetfAclWriterFactory.class);
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/SubInterfaceClassifierIetfAclModule.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/SubInterfaceClassifierIetfAclModule.java
deleted file mode 100644
index 338624bc6..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/SubInterfaceClassifierIetfAclModule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
-import io.fd.hc2vpp.vpp.classifier.factory.write.SubInterfacesClassifierIetfAclWriterFactory;
-import io.fd.honeycomb.translate.write.WriterFactory;
-
-public class SubInterfaceClassifierIetfAclModule extends AbstractModule{
-
-    @Override
-    protected void configure() {
-        // Writers
-        final Multibinder<WriterFactory> writerFactoryBinder = Multibinder.newSetBinder(binder(), WriterFactory.class);
-        writerFactoryBinder.addBinding().to(SubInterfacesClassifierIetfAclWriterFactory.class);
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/VppClassifierAclModule.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/VppClassifierAclModule.java
deleted file mode 100644
index 3b2cdb975..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/VppClassifierAclModule.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
-import io.fd.hc2vpp.vpp.classifier.factory.write.AclWriterFactory;
-import io.fd.hc2vpp.vpp.classifier.provider.EgressIetfAClWriterProvider;
-import io.fd.hc2vpp.vpp.classifier.provider.IngressIetfAClWriterProvider;
-import io.fd.hc2vpp.vpp.classifier.write.acl.egress.EgressIetfAclWriter;
-import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.IngressIetfAclWriter;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class VppClassifierAclModule extends AbstractModule {
-
-    private static final Logger LOG = LoggerFactory.getLogger(VppClassifierAclModule.class);
-
-    @Override
-    protected void configure() {
-        // Utils
-        bind(IngressIetfAclWriter.class).toProvider(IngressIetfAClWriterProvider.class);
-        bind(EgressIetfAclWriter.class).toProvider(EgressIetfAClWriterProvider.class);
-
-        // Writers
-        final Multibinder<WriterFactory> writerFactoryBinder = Multibinder.newSetBinder(binder(), WriterFactory.class);
-        writerFactoryBinder.addBinding().to(AclWriterFactory.class);
-
-        LOG.info("Module VppClassifierAcl module successfully configured");
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/AclWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/AclWriterFactory.java
deleted file mode 100644
index 4e2db8d9e..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/AclWriterFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.factory.write;
-
-import com.google.common.collect.Sets;
-import io.fd.hc2vpp.vpp.classifier.write.acl.IetfAclWriter;
-import io.fd.honeycomb.translate.impl.write.GenericListWriter;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntries;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.Ace;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.Actions;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.Matches;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRange;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.AceIpAndEthNodes;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public final class AclWriterFactory implements WriterFactory {
-
-    public static final InstanceIdentifier<Acl> ACL_ID =
-        InstanceIdentifier.create(AccessLists.class).child(Acl.class);
-
-    @Override
-    public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) {
-
-        final InstanceIdentifier<Acl> aclIdRelative = InstanceIdentifier.create(Acl.class);
-
-        final InstanceIdentifier<Ace> aceId = aclIdRelative.child(AccessListEntries.class).child(Ace.class);
-        final InstanceIdentifier<Actions> actionsId = aceId.child(Actions.class);
-        final InstanceIdentifier<Matches> matchesId = aceId.child(Matches.class);
-        final InstanceIdentifier<AceIpAndEthNodes> aceIpAndEthId = matchesId.child(AceIpAndEthNodes.class);
-        final InstanceIdentifier<SourcePortRange> srcPortId = matchesId.child((Class)SourcePortRange.class);
-        final InstanceIdentifier<DestinationPortRange> dstPortId = matchesId.child((Class)DestinationPortRange.class);
-
-        registry.subtreeAddBefore(Sets.newHashSet(aceId, actionsId, matchesId, aceIpAndEthId, srcPortId, dstPortId),
-            new GenericListWriter<>(ACL_ID, new IetfAclWriter()),
-            Sets.newHashSet(InterfacesClassifierIetfAclWriterFactory.IETF_ACL_ID, SubInterfacesClassifierIetfAclWriterFactory.SUBIF_IETF_ACL_ID));
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/InterfacesClassifierIetfAclWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/InterfacesClassifierIetfAclWriterFactory.java
deleted file mode 100644
index 83c44699b..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/InterfacesClassifierIetfAclWriterFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.factory.write;
-
-import com.google.common.collect.Sets;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.egress.EgressIetfAclWriter;
-import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.IngressIetfAclWriter;
-import io.fd.honeycomb.translate.impl.write.GenericWriter;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.Acl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Ingress;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public final class InterfacesClassifierIetfAclWriterFactory implements WriterFactory {
-
-    public static final InstanceIdentifier<Interface> IFC_ID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class);
-    public static final InstanceIdentifier<VppInterfaceAclAugmentation> VPP_IFC_AUG_ID =
-        IFC_ID.augmentation(VppInterfaceAclAugmentation.class);
-    public static final InstanceIdentifier<IetfAcl> IETF_ACL_ID = VPP_IFC_AUG_ID.child(IetfAcl.class);
-    public static final InstanceIdentifier<Ingress> INGRESS_IETF_ACL_ID = IETF_ACL_ID.child(Ingress.class);
-    public static final InstanceIdentifier<Egress> EGRESS_IETF_ACL_ID = IETF_ACL_ID.child(Egress.class);
-
-    private final IngressIetfAclWriter ingressAclWriter;
-    private final EgressIetfAclWriter egressAclWriter;
-    private final NamingContext ifcNamingContext;
-
-    @Inject
-    public InterfacesClassifierIetfAclWriterFactory(final IngressIetfAclWriter ingressAclWriter,
-                                                    final EgressIetfAclWriter egressAclWriter,
-                                                    @Named("interface-context") final NamingContext interfaceContextDependency) {
-        this.ingressAclWriter = ingressAclWriter;
-        this.egressAclWriter = egressAclWriter;
-        this.ifcNamingContext = interfaceContextDependency;
-    }
-
-    @Override
-    public void init(final ModifiableWriterRegistryBuilder registry) {
-        // Ingress IETF-ACL, also handles AccessLists and Acl:
-        final InstanceIdentifier<AccessLists> accessListsIdIngress =
-            InstanceIdentifier.create(Ingress.class).child(AccessLists.class);
-        final InstanceIdentifier<?> aclIdIngress = accessListsIdIngress.child(Acl.class);
-        registry.subtreeAdd(
-            Sets.newHashSet(accessListsIdIngress, aclIdIngress),
-            new GenericWriter<>(INGRESS_IETF_ACL_ID,
-                new io.fd.hc2vpp.vpp.classifier.write.acl.ingress.IetfAclCustomizer(ingressAclWriter, ifcNamingContext)));
-
-        // Ingress IETF-ACL, also handles AccessLists and Acl:
-        final InstanceIdentifier<AccessLists> accessListsIdEgress =
-            InstanceIdentifier.create(Egress.class).child(AccessLists.class);
-        final InstanceIdentifier<?> aclIdEgress = accessListsIdEgress.child(Acl.class);
-        registry.subtreeAdd(
-            Sets.newHashSet(accessListsIdEgress, aclIdEgress),
-            new GenericWriter<>(EGRESS_IETF_ACL_ID,
-                new io.fd.hc2vpp.vpp.classifier.write.acl.egress.IetfAclCustomizer(egressAclWriter, ifcNamingContext)));
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/SubInterfacesClassifierIetfAclWriterFactory.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/SubInterfacesClassifierIetfAclWriterFactory.java
deleted file mode 100644
index 9230b7523..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/factory/write/SubInterfacesClassifierIetfAclWriterFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.factory.write;
-
-import com.google.common.collect.Sets;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.v3po.factory.InterfacesWriterFactory;
-import io.fd.hc2vpp.vpp.classifier.write.acl.egress.EgressIetfAclWriter;
-import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.IngressIetfAclWriter;
-import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.SubInterfaceIetfAclCustomizer;
-import io.fd.honeycomb.translate.impl.write.GenericWriter;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.Acl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Ingress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.subinterface.acl.rev170315.VppSubinterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.SubinterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public final class SubInterfacesClassifierIetfAclWriterFactory implements WriterFactory {
-
-    public static final InstanceIdentifier<SubinterfaceAugmentation> SUB_IFC_AUG_ID =
-        InterfacesWriterFactory.IFC_ID.augmentation(SubinterfaceAugmentation.class);
-    public static final InstanceIdentifier<SubInterface> SUB_IFC_ID =
-        SUB_IFC_AUG_ID.child(SubInterfaces.class).child(SubInterface.class);
-
-    public static final InstanceIdentifier<VppSubinterfaceAclAugmentation> SUB_IFC_ACL_AUG_ID =
-            SUB_IFC_ID.augmentation(VppSubinterfaceAclAugmentation.class);
-
-    public static final InstanceIdentifier<IetfAcl> SUBIF_IETF_ACL_ID = SUB_IFC_ACL_AUG_ID.child(IetfAcl.class);
-    public static final InstanceIdentifier<Ingress> SUBIF_INGRESS_IETF_ACL_ID = SUBIF_IETF_ACL_ID.child(Ingress.class);
-    public static final InstanceIdentifier<Egress> SUBIF_EGRESS_IETF_ACL_ID = SUBIF_IETF_ACL_ID.child(Egress.class);
-
-    private final IngressIetfAclWriter ingressAclWriter;
-    private final EgressIetfAclWriter egressAclWriter;
-    private final NamingContext ifcContext;
-
-    @Inject
-    public SubInterfacesClassifierIetfAclWriterFactory(final IngressIetfAclWriter ingressAclWriter,
-                                                       final EgressIetfAclWriter egressAclWriter,
-                                                       @Named("interface-context") final NamingContext ifcContext) {
-        this.ingressAclWriter = ingressAclWriter;
-        this.egressAclWriter = egressAclWriter;
-        this.ifcContext = ifcContext;
-    }
-
-    @Override
-    public void init(final ModifiableWriterRegistryBuilder registry) {
-        // Ingress IETF-ACL, also handles AccessLists and Acl:
-        final InstanceIdentifier<AccessLists> accessListsIdIngress =
-            InstanceIdentifier.create(Ingress.class).child(AccessLists.class);
-        final InstanceIdentifier<?> aclIdIngress = accessListsIdIngress.child(Acl.class);
-        registry.subtreeAdd(
-            Sets.newHashSet(accessListsIdIngress, aclIdIngress),
-            new GenericWriter<>(SUBIF_INGRESS_IETF_ACL_ID,
-                new SubInterfaceIetfAclCustomizer(ingressAclWriter, ifcContext)));
-
-        // Egress IETF-ACL, also handles AccessLists and Acl:
-        final InstanceIdentifier<AccessLists> accessListsIdEgress =
-            InstanceIdentifier.create(Egress.class).child(AccessLists.class);
-        final InstanceIdentifier<?> aclIdEgress = accessListsIdEgress.child(Acl.class);
-        registry.subtreeAdd(
-            Sets.newHashSet(accessListsIdEgress, aclIdEgress),
-            new GenericWriter<>(SUBIF_EGRESS_IETF_ACL_ID,
-                new io.fd.hc2vpp.vpp.classifier.write.acl.egress.SubInterfaceIetfAclCustomizer(
-                    egressAclWriter, ifcContext)));
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/provider/EgressIetfAClWriterProvider.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/provider/EgressIetfAClWriterProvider.java
deleted file mode 100644
index afba2118e..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/provider/EgressIetfAClWriterProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.provider;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManagerImpl;
-import io.fd.hc2vpp.vpp.classifier.write.acl.egress.EgressIetfAclWriter;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTable;
-
-public class EgressIetfAClWriterProvider implements Provider<EgressIetfAclWriter> {
-
-    private final FutureJVppCore jvpp;
-
-    @Inject
-    public EgressIetfAClWriterProvider(final FutureJVppCore jvpp) {
-        this.jvpp = jvpp;
-    }
-
-    @Override
-    public EgressIetfAclWriter get() {
-        return new EgressIetfAclWriter(jvpp, new AclTableContextManagerImpl(MappingTable.Direction.Egress));
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/provider/IngressIetfAClWriterProvider.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/provider/IngressIetfAClWriterProvider.java
deleted file mode 100644
index ef6c01347..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/provider/IngressIetfAClWriterProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.provider;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManagerImpl;
-import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.IngressIetfAclWriter;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTable;
-
-public class IngressIetfAClWriterProvider implements Provider<IngressIetfAclWriter> {
-
-    private final FutureJVppCore jvpp;
-
-    @Inject
-    public IngressIetfAClWriterProvider(final FutureJVppCore jvpp) {
-        this.jvpp = jvpp;
-    }
-
-    @Override
-    public IngressIetfAclWriter get() {
-        return new IngressIetfAclWriter(jvpp, new AclTableContextManagerImpl(MappingTable.Direction.Ingress));
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/IetfAclWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/IetfAclWriter.java
deleted file mode 100644
index 14c56c311..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/IetfAclWriter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl;
-
-import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import java.util.Optional;
-import java.util.stream.Stream;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Writer customizer responsible for Access Control Lists management. Does not send any messages to VPP. All the config
- * data are stored in HC and used when acl is assigned/unassigned to/from an interface.
- *
- * ACLs that are currently assigned to an interface cannot be updated/deleted.
- */
-public class IetfAclWriter implements ListWriterCustomizer<Acl, AclKey> {
-
-    public static final InstanceIdentifier<AccessLists> ACL_ID =
-        InstanceIdentifier.create(AccessLists.class);
-
-    private static final Logger LOG = LoggerFactory.getLogger(IetfAclWriter.class);
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Acl> id, @Nonnull final Acl dataAfter,
-                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        LOG.debug("Creating ACL: iid={} dataAfter={}", id, dataAfter);
-
-        // no vpp call, just updates DataTree
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Acl> id, @Nonnull final Acl dataBefore,
-                                        @Nonnull final Acl dataAfter, @Nonnull final WriteContext writeContext)
-        throws WriteFailedException {
-        LOG.debug("Updating ACL: iid={} dataBefore={} dataAfter={}", id, dataBefore, dataAfter);
-
-        if (isAssigned(dataAfter, writeContext)) {
-            throw new WriteFailedException(id,
-                String.format("Failed to update data at %s: acl %s is already assigned", id, dataAfter));
-        }
-
-        LOG.debug("Updating unassigned ACL: iid={} dataBefore={} dataAfter={}", id, dataBefore, dataAfter);
-
-        // no vpp call, just updates DataTree
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Acl> id, @Nonnull final Acl dataBefore,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        LOG.debug("Deleting ACL: iid={} dataBefore={}", id, dataBefore);
-
-        if (isAssigned(dataBefore, writeContext)) {
-            throw new WriteFailedException(id,
-                String.format("Failed to delete data at %s: acl %s is already assigned", id, dataBefore));
-        }
-
-        LOG.debug("Deleting unassigned ACL: iid={} dataBefore={}", id, dataBefore);
-
-        // no vpp call, just updates DataTree
-    }
-
-    private static boolean isAssigned(@Nonnull final Acl acl,
-                                      @Nonnull final WriteContext writeContext) {
-        final String aclName = acl.getAclName();
-        final Class<? extends AclBase> aclType = acl.getAclType();
-        final Interfaces interfaces = writeContext.readAfter(InstanceIdentifier.create(Interfaces.class)).get();
-
-        return interfaces.getInterface().stream()
-                .map(i -> Optional.ofNullable(i.getAugmentation(VppInterfaceAclAugmentation.class))
-                        .map(aug -> aug.getIetfAcl())
-                        .map(ietfAcl -> ietfAcl.getIngress())
-                        .map(ingress -> ingress.getAccessLists())
-                        .map(accessLists -> accessLists.getAcl()))
-            .flatMap(iacl -> iacl.isPresent()
-                ? iacl.get().stream()
-                : Stream.empty())
-            .filter(assignedAcl -> aclName.equals(assignedAcl.getName()) && aclType.equals(assignedAcl.getType()))
-            .findFirst().isPresent();
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AbstractIetfAclWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AbstractIetfAclWriter.java
deleted file mode 100644
index 9abf770db..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AbstractIetfAclWriter.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntries;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.Ace;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.AceType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceEth;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.AceIpVersion;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpAndEth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.Acl;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractIetfAclWriter implements IetfAclWriter, JvppReplyConsumer, AclTranslator {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractIetfAclWriter.class);
-    protected static final int NOT_DEFINED = -1;
-    protected final FutureJVppCore jvpp;
-
-    private Map<AclType, AceWriter<? extends AceType>> aceWriters = new HashMap<>();
-
-    public AbstractIetfAclWriter(@Nonnull final FutureJVppCore futureJVppCore) {
-        this.jvpp = Preconditions.checkNotNull(futureJVppCore, "futureJVppCore should not be null");
-        aceWriters.put(AclType.ETH, new AceEthWriter());
-        aceWriters.put(AclType.IP4, new AceIp4Writer());
-        aceWriters.put(AclType.IP6, new AceIp6Writer());
-        aceWriters.put(AclType.ETH_AND_IP, new AceIpAndEthWriter());
-    }
-
-    private static Stream<Ace> aclToAceStream(@Nonnull final Acl assignedAcl,
-                                              @Nonnull final WriteContext writeContext) {
-        final String aclName = assignedAcl.getName();
-        final Class<? extends AclBase> aclType = assignedAcl.getType();
-
-        // ietf-acl updates are handled first, so we use writeContext.readAfter
-        final Optional<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl>
-            aclOptional =
-            writeContext.readAfter(io.fd.hc2vpp.vpp.classifier.write.acl.IetfAclWriter.ACL_ID.child(
-                org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl.class,
-                new AclKey(aclName, aclType)));
-        checkArgument(aclOptional.isPresent(), "Acl lists not configured");
-        final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl
-            acl = aclOptional.get();
-
-        final AccessListEntries accessListEntries = acl.getAccessListEntries();
-        checkArgument(accessListEntries != null, "access list entries not configured");
-
-        return accessListEntries.getAce().stream();
-    }
-
-    protected void removeClassifyTables(@Nonnull final InstanceIdentifier<?> id, @Nonnull final MappingEntry entry)
-        throws WriteFailedException {
-        removeClassifyTable(id, entry.getL2TableId());
-        removeClassifyTable(id, entry.getIp4TableId());
-        removeClassifyTable(id, entry.getIp6TableId());
-    }
-
-    private void removeClassifyTable(@Nonnull final InstanceIdentifier<?> id, final int tableIndex)
-        throws WriteFailedException {
-
-        if (tableIndex == -1) {
-            return; // classify table id is absent
-        }
-        final ClassifyAddDelTable request = new ClassifyAddDelTable();
-        request.delChain = 1;
-        request.tableIndex = tableIndex;
-        final CompletionStage<ClassifyAddDelTableReply> cs = jvpp.classifyAddDelTable(request);
-        getReplyForDelete(cs.toCompletableFuture(), id);
-    }
-
-    protected static boolean appliesToIp4Path(final Ace ace) {
-        final AceType aceType = ace.getMatches().getAceType();
-        final AclType aclType = AclType.fromAce(ace);
-        if (aclType == AclType.IP4) {
-            return true;
-        }
-        if (aclType == AclType.ETH) {
-            return true;  // L2 only rules are possible for IP4 traffic
-        }
-        if (aclType == AclType.ETH_AND_IP && ((AceIpAndEth) aceType).getAceIpAndEthNodes()
-            .getAceIpVersion() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.ace.ip.and.eth.nodes.ace.ip.version.AceIpv4) {
-            return true;
-        }
-        return false;
-    }
-
-    protected static boolean appliesToIp6Path(final Ace ace) {
-        final AceType aceType = ace.getMatches().getAceType();
-        final AclType aclType = AclType.fromAce(ace);
-        if (aclType == AclType.IP6) {
-            return true;
-        }
-        if (aclType == AclType.ETH) {
-            return true;  // L2 only rules are possible for IP6 traffic
-        }
-        if (aclType == AclType.ETH_AND_IP && ((AceIpAndEth) aceType).getAceIpAndEthNodes()
-            .getAceIpVersion() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.ace.ip.and.eth.nodes.ace.ip.version.AceIpv6) {
-            return true;
-        }
-        return false;
-    }
-
-    protected static List<Ace> getACEs(@Nonnull final List<Acl> acls, @Nonnull final WriteContext writeContext,
-                                       final Predicate<? super Ace> filter) {
-        return acls.stream().flatMap(acl -> aclToAceStream(acl, writeContext)).filter(filter)
-            .collect(Collectors.toList());
-    }
-
-    protected int writeAces(final InstanceIdentifier<?> id, final List<Ace> aces,
-                            final AccessLists.DefaultAction defaultAction, final InterfaceMode mode,
-                            final int vlanTags) throws WriteFailedException {
-        if (aces.isEmpty()) {
-            return NOT_DEFINED;
-        }
-
-        int nextTableIndex = configureDefaultAction(id, defaultAction);
-        final ListIterator<Ace> iterator = aces.listIterator(aces.size());
-        while (iterator.hasPrevious()) {
-            final Ace ace = iterator.previous();
-            LOG.trace("Processing ACE: {}", ace);
-
-            final AceWriter aceWriter =
-                aceWriters.get(AclType.fromAce(ace));
-            if (aceWriter == null) {
-                LOG.warn("AceProcessor for {} not registered. Skipping ACE.", ace.getClass());
-            } else {
-                final AceType aceType = ace.getMatches().getAceType();
-                final PacketHandling action = ace.getActions().getPacketHandling();
-                final ClassifyAddDelTable ctRequest = aceWriter.createTable(aceType, mode, nextTableIndex, vlanTags);
-                nextTableIndex = createClassifyTable(id, ctRequest);
-                final List<ClassifyAddDelSession> sessionRequests =
-                    aceWriter.createSession(action, aceType, mode, nextTableIndex, vlanTags);
-                for (ClassifyAddDelSession csRequest : sessionRequests) {
-                    createClassifySession(id, csRequest);
-                }
-            }
-        }
-        return nextTableIndex;
-    }
-
-    private int configureDefaultAction(@Nonnull final InstanceIdentifier<?> id,
-                                       final AccessLists.DefaultAction defaultAction)
-        throws WriteFailedException {
-        ClassifyAddDelTable ctRequest = createTable(-1);
-        if (AccessLists.DefaultAction.Permit.equals(defaultAction)) {
-            ctRequest.missNextIndex = -1;
-        } else {
-            ctRequest.missNextIndex = 0;
-        }
-        ctRequest.mask = new byte[16];
-        ctRequest.skipNVectors = 0;
-        ctRequest.matchNVectors = 1;
-        return createClassifyTable(id, ctRequest);
-    }
-
-    private int createClassifyTable(@Nonnull final InstanceIdentifier<?> id,
-                                    @Nonnull final ClassifyAddDelTable request)
-        throws WriteFailedException {
-        final CompletionStage<ClassifyAddDelTableReply> cs = jvpp.classifyAddDelTable(request);
-
-        final ClassifyAddDelTableReply reply = getReplyForWrite(cs.toCompletableFuture(), id);
-        return reply.newTableIndex;
-    }
-
-    private void createClassifySession(@Nonnull final InstanceIdentifier<?> id,
-                                       @Nonnull final ClassifyAddDelSession request)
-        throws WriteFailedException {
-        final CompletionStage<ClassifyAddDelSessionReply> cs = jvpp.classifyAddDelSession(request);
-
-        getReplyForWrite(cs.toCompletableFuture(), id);
-    }
-
-    private enum AclType {
-        ETH, IP4, IP6, ETH_AND_IP;
-
-        @Nonnull
-        private static AclType fromAce(final Ace ace) {
-            AclType result = null;
-            final AceType aceType;
-            try {
-                aceType = ace.getMatches().getAceType();
-                if (aceType instanceof AceEth) {
-                    result = ETH;
-                } else if (aceType instanceof AceIp) {
-                    final AceIpVersion aceIpVersion = ((AceIp) aceType).getAceIpVersion();
-                    if (aceIpVersion == null) {
-                        throw new IllegalArgumentException("Incomplete ACE (ip-version was not provided): " + ace);
-                    }
-                    if (aceIpVersion instanceof AceIpv4) {
-                        result = IP4;
-                    } else if (aceIpVersion instanceof AceIpv6) {
-                        result = IP6;
-                    }
-                } else if (aceType instanceof AceIpAndEth) {
-                    result = ETH_AND_IP;
-                }
-            } catch (NullPointerException e) {
-                throw new IllegalArgumentException("Incomplete ACE: " + ace, e);
-            }
-            if (result == null) {
-                throw new IllegalArgumentException(String.format("Not supported ace type %s", aceType));
-            }
-            return result;
-        }
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriter.java
deleted file mode 100644
index a0a681263..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.util.Collections;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceEth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-final class AceEthWriter implements AceWriter<AceEth>, AclTranslator, L2AclTranslator {
-
-    @VisibleForTesting
-    static final int MATCH_N_VECTORS = 1;
-    private static final Logger LOG = LoggerFactory.getLogger(AceEthWriter.class);
-
-    @Override
-    public ClassifyAddDelTable createTable(@Nonnull final AceEth aceEth,
-                                           @Nullable final InterfaceMode mode,
-                                           final int nextTableIndex,
-                                           final int vlanTags) {
-        final ClassifyAddDelTable request = createTable(nextTableIndex);
-
-        request.mask = new byte[16];
-        boolean aceIsEmpty =
-            destinationMacAddressMask(aceEth.getDestinationMacAddressMask(), aceEth.getDestinationMacAddress(),
-                request);
-        aceIsEmpty &=
-            sourceMacAddressMask(aceEth.getSourceMacAddressMask(), aceEth.getSourceMacAddress(), request);
-
-        if (aceIsEmpty) {
-            throw new IllegalArgumentException(
-                String.format("Ace %s does not define packet field match values", aceEth.toString()));
-        }
-
-        request.skipNVectors = 0;
-        request.matchNVectors = MATCH_N_VECTORS;
-
-        LOG.debug("ACE rule={} translated to table={}.", aceEth, request);
-        return request;
-    }
-
-    @Override
-    public List<ClassifyAddDelSession> createSession(@Nonnull final PacketHandling action,
-                                                     @Nonnull final AceEth aceEth,
-                                                     @Nullable final InterfaceMode mode,
-                                                     final int tableIndex,
-                                                     final int vlanTags) {
-        final ClassifyAddDelSession request = createSession(action, tableIndex);
-
-        request.match = new byte[16];
-        boolean noMatch = destinationMacAddressMatch(aceEth.getDestinationMacAddress(), request);
-        noMatch &= sourceMacAddressMatch(aceEth.getSourceMacAddress(), request);
-
-        if (noMatch) {
-            throw new IllegalArgumentException(
-                String.format("Ace %s does not define neither source nor destination MAC address",
-                    aceEth.toString()));
-        }
-
-        LOG.debug("ACE action={}, rule={} translated to session={}.", action, aceEth, request);
-        return Collections.singletonList(request);
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4Writer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4Writer.java
deleted file mode 100644
index e66d79215..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4Writer.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-final class AceIp4Writer implements AceWriter<AceIp>, AclTranslator, Ip4AclTranslator {
-
-    @VisibleForTesting
-    static final int MATCH_N_VECTORS = 3; // number of 16B vectors
-    private static final int TABLE_MASK_LENGTH = 48;
-    private static final Logger LOG = LoggerFactory.getLogger(AceIp4Writer.class);
-
-    @Override
-    public ClassifyAddDelTable createTable(@Nonnull final AceIp aceIp,
-                                           @Nullable final InterfaceMode mode,
-                                           final int nextTableIndex,
-                                           final int vlanTags) {
-        checkArgument(aceIp.getAceIpVersion() instanceof AceIpv4, "Expected AceIpv4 version, but was %", aceIp);
-        final AceIpv4 ipVersion = (AceIpv4) aceIp.getAceIpVersion();
-
-        final int numberOfSessions = PortPair.fromRange(aceIp.getSourcePortRange(), aceIp.getDestinationPortRange()).size();
-        final ClassifyAddDelTable request = createTable(nextTableIndex, numberOfSessions);
-        request.skipNVectors = 0; // match entire L2 and L3 header
-        request.matchNVectors = MATCH_N_VECTORS;
-        request.mask = new byte[TABLE_MASK_LENGTH];
-
-        final int baseOffset = getVlanTagsLen(vlanTags);
-        boolean aceIsEmpty = ip4Mask(baseOffset, mode, aceIp, ipVersion, request);
-        if (aceIsEmpty) {
-            throw new IllegalArgumentException(
-                String.format("Ace %s does not define packet field match values", aceIp.toString()));
-        }
-
-        LOG.debug("ACE rule={} translated to table={}.", aceIp, request);
-        return request;
-    }
-
-    @Override
-    public List<ClassifyAddDelSession> createSession(@Nonnull final PacketHandling action,
-                                                     @Nonnull final AceIp aceIp,
-                                                     @Nullable final InterfaceMode mode,
-                                                     final int tableIndex,
-                                                     final int vlanTags) {
-        checkArgument(aceIp.getAceIpVersion() instanceof AceIpv4, "Expected AceIpv4 version, but was %", aceIp);
-        final AceIpv4 ipVersion = (AceIpv4) aceIp.getAceIpVersion();
-
-        final List<PortPair> portPairs = PortPair.fromRange(aceIp.getSourcePortRange(), aceIp.getDestinationPortRange());
-        final List<ClassifyAddDelSession> requests = new ArrayList<>(portPairs.size());
-        for (final PortPair pair : portPairs) {
-            final ClassifyAddDelSession request = createSession(action, tableIndex);
-            request.match = new byte[TABLE_MASK_LENGTH];
-
-            final int baseOffset = getVlanTagsLen(vlanTags);
-            boolean noMatch = ip4Match(baseOffset, mode, aceIp, ipVersion, pair.getSrc(), pair.getDst(), request);
-            if (noMatch) {
-                throw new IllegalArgumentException(
-                    String.format("Ace %s does not define packet field match values", aceIp.toString()));
-            }
-
-            LOG.debug("ACE action={}, rule={} translated to session={}.", action, aceIp, request);
-            requests.add(request);
-        }
-        return requests;
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6Writer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6Writer.java
deleted file mode 100644
index 8c813eef4..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6Writer.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-final class AceIp6Writer implements AceWriter<AceIp>, AclTranslator, Ip6AclTranslator {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AceIp6Writer.class);
-
-    @Override
-    public ClassifyAddDelTable createTable(@Nonnull final AceIp aceIp,
-                                           @Nullable final InterfaceMode mode,
-                                           final int nextTableIndex,
-                                           final int vlanTags) {
-        checkArgument(aceIp.getAceIpVersion() instanceof AceIpv6, "Expected AceIpv6 version, but was %", aceIp);
-        final AceIpv6 ipVersion = (AceIpv6) aceIp.getAceIpVersion();
-
-        final int numberOfSessions = PortPair.fromRange(aceIp.getSourcePortRange(), aceIp.getDestinationPortRange()).size();
-        final ClassifyAddDelTable request = createTable(nextTableIndex, numberOfSessions);
-        request.skipNVectors = 0; // match entire L2 and L3 header
-        request.mask = new byte[getTableMaskLength(vlanTags)];
-        request.matchNVectors = request.mask.length/16;
-
-        final int baseOffset = getVlanTagsLen(vlanTags);
-        boolean aceIsEmpty = ip6Mask(baseOffset, mode, aceIp, ipVersion, request);
-        if (aceIsEmpty) {
-            throw new IllegalArgumentException(
-                String.format("Ace %s does not define packet field match values", aceIp.toString()));
-        }
-
-        LOG.debug("ACE rule={} translated to table={}.", aceIp, request);
-        return request;
-    }
-
-    private static int getTableMaskLength(final int vlanTags) {
-        if (vlanTags == 2) {
-            return 80;
-        } else {
-            return 64;
-        }
-    }
-
-    @Override
-    public List<ClassifyAddDelSession> createSession(@Nonnull final PacketHandling action,
-                                                     @Nonnull final AceIp aceIp,
-                                                     @Nullable final InterfaceMode mode,
-                                                     final int tableIndex,
-                                                     final int vlanTags) {
-        checkArgument(aceIp.getAceIpVersion() instanceof AceIpv6, "Expected AceIpv6 version, but was %", aceIp);
-        final AceIpv6 ipVersion = (AceIpv6) aceIp.getAceIpVersion();
-        final List<PortPair> portPairs =
-            PortPair.fromRange(aceIp.getSourcePortRange(), aceIp.getDestinationPortRange());
-
-        final List<ClassifyAddDelSession> requests = new ArrayList<>(portPairs.size());
-        for (final PortPair pair : portPairs) {
-            final ClassifyAddDelSession request = createSession(action, tableIndex);
-            request.match = new byte[getTableMaskLength(vlanTags)];
-
-            final int baseOffset = getVlanTagsLen(vlanTags);
-            boolean noMatch = ip6Match(baseOffset, mode, aceIp, ipVersion, pair.getSrc(), pair.getDst(), request);
-            if (noMatch) {
-                throw new IllegalArgumentException(
-                    String.format("Ace %s does not define packet field match values", aceIp.toString()));
-            }
-
-            LOG.debug("ACE action={}, rule={} translated to session={}.", action, aceIp, request);
-            requests.add(request);
-        }
-        return requests;
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriter.java
deleted file mode 100644
index f14a24a3f..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriter.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpAndEth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.AceIpAndEthNodes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.ace.ip.and.eth.nodes.AceIpVersion;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.ace.ip.and.eth.nodes.ace.ip.version.AceIpv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.ace.ip.and.eth.nodes.ace.ip.version.AceIpv6;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class AceIpAndEthWriter
-    implements AceWriter<AceIpAndEth>, AclTranslator, L2AclTranslator, Ip4AclTranslator, Ip6AclTranslator {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AceIpAndEthWriter.class);
-
-    private static int maskLength(@Nonnull final AceIpAndEth ace, final int vlanTags) {
-        if (ace.getAceIpAndEthNodes().getAceIpVersion() != null) {
-            if (ace.getAceIpAndEthNodes().getAceIpVersion() instanceof AceIpv4) {
-                return 48;
-            } else {
-                return vlanTags == 2
-                    ? 80
-                    : 64;
-            }
-        }
-        return 16;
-    }
-
-    @Override
-    public ClassifyAddDelTable createTable(@Nonnull final AceIpAndEth ace, @Nullable final InterfaceMode mode,
-                                           final int nextTableIndex, final int vlanTags) {
-        final AceIpAndEthNodes nodes = ace.getAceIpAndEthNodes();
-        final int numberOfSessions = PortPair.fromRange(nodes.getSourcePortRange(), nodes.getDestinationPortRange()).size();
-        final ClassifyAddDelTable request = createTable(nextTableIndex, numberOfSessions);
-        final int maskLength = maskLength(ace, vlanTags);
-        request.mask = new byte[maskLength];
-        request.skipNVectors = 0;
-        request.matchNVectors = maskLength / 16;
-
-        boolean aceIsEmpty =
-            destinationMacAddressMask(nodes.getDestinationMacAddressMask(), nodes.getDestinationMacAddress(), request);
-        aceIsEmpty &= sourceMacAddressMask(nodes.getSourceMacAddressMask(), nodes.getSourceMacAddress(), request);
-
-        // if we use classifier API, we need to know ip version (fields common for ip4 and ip6 have different offsets):
-        final AceIpVersion aceIpVersion = nodes.getAceIpVersion();
-        checkArgument(aceIpVersion != null, "AceIpAndEth have to define IpVersion");
-
-        final int baseOffset = getVlanTagsLen(vlanTags);
-        if (aceIpVersion instanceof AceIpv4) {
-            final AceIpv4 ipVersion = (AceIpv4) aceIpVersion;
-            aceIsEmpty &= ip4Mask(baseOffset, mode, nodes, ipVersion, request);
-        } else if (aceIpVersion instanceof AceIpv6) {
-            final AceIpv6 ipVersion = (AceIpv6) aceIpVersion;
-            aceIsEmpty &= ip6Mask(baseOffset, mode, nodes, ipVersion, request);
-        } else {
-            throw new IllegalArgumentException(String.format("Unsupported IP version %s", aceIpVersion));
-        }
-
-        if (aceIsEmpty) {
-            throw new IllegalArgumentException(
-                String.format("Ace %s does not define packet field match values", ace.toString()));
-        }
-
-        LOG.debug("ACE rule={} translated to table={}.", ace, request);
-        return request;
-    }
-
-    @Override
-    public List<ClassifyAddDelSession> createSession(@Nonnull final PacketHandling action,
-                                                     @Nonnull final AceIpAndEth ace,
-                                                     @Nullable final InterfaceMode mode, final int tableIndex,
-                                                     final int vlanTags) {
-        final AceIpAndEthNodes nodes = ace.getAceIpAndEthNodes();
-        final List<PortPair> portPairs = PortPair.fromRange(nodes.getSourcePortRange(), nodes.getDestinationPortRange());
-        final List<ClassifyAddDelSession> requests = new ArrayList<>(portPairs.size());
-        for (final PortPair pair : portPairs) {
-            final ClassifyAddDelSession request = createSession(action, tableIndex);
-            request.match = new byte[maskLength(ace, vlanTags)];
-
-            boolean noMatch = destinationMacAddressMatch(nodes.getDestinationMacAddress(), request);
-            noMatch &= sourceMacAddressMatch(nodes.getSourceMacAddress(), request);
-
-            final AceIpVersion aceIpVersion = nodes.getAceIpVersion();
-            checkArgument(aceIpVersion != null, "AceIpAndEth have to define IpVersion");
-
-            final int baseOffset = getVlanTagsLen(vlanTags);
-            if (aceIpVersion instanceof AceIpv4) {
-                final AceIpv4 ipVersion = (AceIpv4) aceIpVersion;
-                noMatch &= ip4Match(baseOffset, mode, nodes, ipVersion, pair.getSrc(), pair.getDst(), request);
-            } else if (aceIpVersion instanceof AceIpv6) {
-                final AceIpv6 ipVersion = (AceIpv6) aceIpVersion;
-                noMatch &= ip6Match(baseOffset, mode, nodes, ipVersion, pair.getSrc(), pair.getDst(), request);
-            } else {
-                throw new IllegalArgumentException(String.format("Unsupported IP version %s", aceIpVersion));
-            }
-
-            if (noMatch) {
-                throw new IllegalArgumentException(
-                    String.format("Ace %s does not define packet field match values", ace.toString()));
-            }
-            LOG.debug("ACE action={}, rule={} translated to session={}.", action, ace, request);
-            requests.add(request);
-        }
-        return requests;
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceWriter.java
deleted file mode 100644
index 2c7948675..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceWriter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.AceType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-/**
- * Writer responsible for translation of ietf-acl model ACEs to VPP's classify tables and sessions.
- *
- * @param <T> type of access control list entry
- */
-interface AceWriter<T extends AceType> {
-    /**
-     * @param ace            access list entry
-     * @param mode           interface mode (L2/L3)
-     * @param nextTableIndex index of the next classify table in chain
-     * @param vlanTags       number of vlan tags
-     */
-    @Nonnull
-    ClassifyAddDelTable createTable(@Nonnull final T ace, @Nullable final InterfaceMode mode, final int nextTableIndex,
-                                    final int vlanTags);
-
-    /**
-     * @param action     to be taken when packet does match the specified ace
-     * @param ace        access list entry
-     * @param mode       interface mode (L2/L3)
-     * @param tableIndex index of corresponding classify table
-     * @param vlanTags   number of vlan tags
-     */
-    @Nonnull
-    List<ClassifyAddDelSession> createSession(@Nonnull final PacketHandling action, @Nonnull T ace,
-                                              @Nullable final InterfaceMode mode, final int tableIndex, final int vlanTags);
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManager.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManager.java
deleted file mode 100644
index ed7960dd9..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.MappingContext;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntry;
-
-/**
- * Manages interface metadata for ietf-acl model.
- */
-public interface AclTableContextManager {
-
-    /**
-     * Obtains mapping entry for given interface.
-     *
-     * @param index          interface index
-     * @param mappingContext mapping context providing context data for current transaction
-     * @return ietf-acl metadata for given interface
-     */
-    Optional<MappingEntry> getEntry(final int index, @Nonnull final MappingContext mappingContext);
-
-    /**
-     * Adds mapping entry.
-     *
-     * @param entry          to be added
-     * @param mappingContext mapping context providing context data for current transaction
-     */
-    void addEntry(@Nonnull final MappingEntry entry, @Nonnull final MappingContext mappingContext);
-
-    /**
-     * Removes entry for given interface (if present).
-     *
-     * @param index          interface index
-     * @param mappingContext mapping context providing context data for current transaction
-     */
-    void removeEntry(final int index, @Nonnull final MappingContext mappingContext);
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImpl.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImpl.java
deleted file mode 100644
index 16848acfd..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
-import io.fd.honeycomb.translate.MappingContext;
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.Contexts;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.AclMappingEntryCtxAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.AclMappingEntryContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTableKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-@ThreadSafe
-public class AclTableContextManagerImpl implements AclTableContextManager {
-
-    private MappingTable.Direction direction;
-
-    public AclTableContextManagerImpl(@Nonnull final  MappingTable.Direction direction) {
-        this.direction = checkNotNull(direction, "direction should not be null");
-    }
-
-    @Nonnull
-    @Override
-    public synchronized Optional<MappingEntry> getEntry(final int swIfIndex, @Nonnull final MappingContext mappingContext) {
-        return mappingContext.read(getId(swIfIndex));
-    }
-
-    @Override
-    public synchronized void addEntry(@Nonnull final MappingEntry entry, @Nonnull final MappingContext mappingContext) {
-        mappingContext.put(getId(entry.getIndex()), entry);
-    }
-
-    @Override
-    public synchronized void removeEntry(final int swIfIndex, @Nonnull final MappingContext mappingContext) {
-        mappingContext.delete(getId(swIfIndex));
-    }
-
-    @VisibleForTesting
-    protected InstanceIdentifier<MappingEntry> getId(final int index) {
-        return InstanceIdentifier.create(Contexts.class)
-            .augmentation(AclMappingEntryCtxAugmentation.class)
-            .child(AclMappingEntryContext.class)
-            .child(MappingTable.class, new MappingTableKey(direction))
-            .child(MappingEntry.class, new MappingEntryKey(index));
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTranslator.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTranslator.java
deleted file mode 100644
index e75d0af24..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTranslator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.Permit;
-
-/**
- * Utility that helps translating of ietf-acl model ACEs to VPP's classify tables and sessions.
- */
-interface AclTranslator {
-    int TABLE_MEM_SIZE = 8 * 1024;
-    int VLAN_TAG_LEN = 4;
-
-    default ClassifyAddDelTable createTable(final int nextTableIndex) {
-        return createTable(nextTableIndex, 1);
-    }
-
-    default ClassifyAddDelTable createTable(final int nextTableIndex, @Nonnegative final int numberOfSessions) {
-        final ClassifyAddDelTable request = new ClassifyAddDelTable();
-        request.isAdd = 1;
-        request.tableIndex = -1; // value not present
-        request.nbuckets = numberOfSessions;
-        request.nextTableIndex = nextTableIndex;
-
-
-        // TODO: HONEYCOMB-181 minimise memory used by classify tables (we create a lot of them to make ietf-acl model
-        // mapping more convenient):
-        // according to https://wiki.fd.io/view/VPP/Introduction_To_N-tuple_Classifiers#Creating_a_classifier_table,
-        // classify table needs 16*(1 + match_n_vectors) bytes, but this does not quite work,
-        // so setting 8K +1k*numberOfSessions for now
-        checkArgument(numberOfSessions>0, "negative numberOfSessions %s", numberOfSessions);
-        request.memorySize = TABLE_MEM_SIZE+1024*(numberOfSessions-1);
-        request.missNextIndex = -1; // value not set, but anyway it is ignored for tables in chain
-        return request;
-    }
-
-    default ClassifyAddDelSession createSession(@Nonnull final PacketHandling action, final int tableIndex) {
-        final ClassifyAddDelSession request = new ClassifyAddDelSession();
-        request.isAdd = 1;
-        request.tableIndex = tableIndex;
-        request.opaqueIndex = ~0; // value not used
-
-        if (action instanceof Permit) {
-            request.hitNextIndex = -1;
-        } // deny (0) is default value
-
-        return request;
-    }
-
-    default int getVlanTagsLen(final int vlanTags) {
-        return vlanTags * VLAN_TAG_LEN;
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/IetfAclWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/IetfAclWriter.java
deleted file mode 100644
index abab5f1ee..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/IetfAclWriter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import java.util.List;
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.Acl;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public interface IetfAclWriter {
-    default void write(@Nonnull final InstanceIdentifier<?> id, final int ifIndex, @Nonnull final List<Acl> acls,
-                       final AccessLists.DefaultAction defaultAction, @Nullable final InterfaceMode mode,
-                       @Nonnull final WriteContext writeContext, @Nonnull final MappingContext mappingContext)
-        throws WriteFailedException {
-        write(id, ifIndex, acls, defaultAction, mode, writeContext, 0, mappingContext);
-    }
-
-    void write(@Nonnull final InstanceIdentifier<?> id, int ifIndex, @Nonnull final List<Acl> acls,
-               final AccessLists.DefaultAction defaultAction, @Nullable InterfaceMode mode,
-               @Nonnull final WriteContext writeContext, @Nonnegative final int numberOfTags,
-               @Nonnull final MappingContext mappingContext)
-        throws WriteFailedException;
-
-    void deleteAcl(@Nonnull final InstanceIdentifier<?> id, int ifIndex, @Nonnull final MappingContext mappingContext)
-        throws WriteFailedException;
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/Ip4AclTranslator.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/Ip4AclTranslator.java
deleted file mode 100644
index 0108b879a..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/Ip4AclTranslator.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import com.google.common.primitives.Ints;
-import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.AclIpHeaderFields;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.AclIpv4HeaderFields;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-interface Ip4AclTranslator extends Ipv4Translator {
-    int ETHER_TYPE_OFFSET = 12; // first 14 bytes represent L2 header (2x6)
-    int DSCP_OFFSET = 15;
-    int DSCP_MASK = 0xfc;
-
-    int IP_PROTOCOL_OFFSET = ETHER_TYPE_OFFSET + 11;
-    int IP_PROTOCOL_MASK = 0xff;
-
-    int IP4_LEN = 4;
-    int IP4_MASK_BIT_LENGTH = 32;
-    int SRC_IP_OFFSET = ETHER_TYPE_OFFSET + 14;
-    int DST_IP_OFFSET = SRC_IP_OFFSET + IP4_LEN;
-    int SRC_PORT_OFFSET = DST_IP_OFFSET + IP4_LEN;
-    int DST_PORT_OFFSET = SRC_PORT_OFFSET + 2;
-
-    default boolean ip4Mask(final int baseOffset, final InterfaceMode mode, final AclIpHeaderFields header,
-                            final AclIpv4HeaderFields ip4, final ClassifyAddDelTable request) {
-        boolean aceIsEmpty = true;
-        if (InterfaceMode.L2.equals(mode)) {
-            // in L2 mode we need to match ether type
-            request.mask[baseOffset + ETHER_TYPE_OFFSET] = (byte) 0xff;
-            request.mask[baseOffset + ETHER_TYPE_OFFSET + 1] = (byte) 0xff;
-        }
-        if (header.getDscp() != null) {
-            aceIsEmpty = false;
-            request.mask[baseOffset + DSCP_OFFSET] = (byte) DSCP_MASK; // first 6 bits
-        }
-        if (header.getProtocol() != null) { // Internet Protocol number
-            aceIsEmpty = false;
-            request.mask[baseOffset + IP_PROTOCOL_OFFSET] = (byte) IP_PROTOCOL_MASK;
-        }
-        if (header.getSourcePortRange() != null) {
-            // TODO (HONEYCOMB-253): port matching will not work correctly if Options are present
-            aceIsEmpty = false;
-            request.mask[baseOffset + SRC_PORT_OFFSET] = (byte) 0xff;
-            request.mask[baseOffset + SRC_PORT_OFFSET + 1] = (byte) 0xff;
-        }
-        if (header.getDestinationPortRange() != null) {
-            // TODO (HONEYCOMB-253): port matching will not work correctly if Options are present
-            aceIsEmpty = false;
-            request.mask[baseOffset + DST_PORT_OFFSET] = (byte) 0xff;
-            request.mask[baseOffset + DST_PORT_OFFSET + 1] = (byte) 0xff;
-        }
-        if (ip4.getSourceIpv4Network() != null) {
-            aceIsEmpty = false;
-            System.arraycopy(Impl.toByteMask(ip4.getSourceIpv4Network()), 0, request.mask,
-                baseOffset + SRC_IP_OFFSET, IP4_LEN);
-        }
-        if (ip4.getDestinationIpv4Network() != null) {
-            aceIsEmpty = false;
-            System.arraycopy(Impl.toByteMask(ip4.getDestinationIpv4Network()), 0, request.mask,
-                baseOffset + DST_IP_OFFSET, IP4_LEN);
-        }
-        return aceIsEmpty;
-    }
-
-    default boolean ip4Match(final int baseOffset, final InterfaceMode mode, final AclIpHeaderFields header,
-                             final AclIpv4HeaderFields ip4, final Integer srcPort,
-                             final Integer dstPort, final ClassifyAddDelSession request) {
-        boolean noMatch = true;
-        if (InterfaceMode.L2.equals(mode)) {
-            // match IP4 etherType (0x0800)
-            request.match[baseOffset + ETHER_TYPE_OFFSET] = 0x08;
-            request.match[baseOffset + ETHER_TYPE_OFFSET + 1] = 0x00;
-        }
-        if (header.getDscp() != null) {
-            noMatch = false;
-            request.match[baseOffset + DSCP_OFFSET] = (byte) (DSCP_MASK & (header.getDscp().getValue() << 2));
-        }
-        if (header.getProtocol() != null) { // Internet Protocol number
-            noMatch = false;
-            request.match[baseOffset + IP_PROTOCOL_OFFSET] = (byte) (IP_PROTOCOL_MASK & header.getProtocol());
-        }
-        if (srcPort != null) {
-            // TODO (HONEYCOMB-253): port matching will not work correctly if Options are present
-            noMatch = false;
-            request.match[baseOffset + SRC_PORT_OFFSET] = (byte) (0xff & srcPort >> 8);
-            request.match[baseOffset + SRC_PORT_OFFSET + 1] = (byte) (0xff & srcPort);
-        }
-        if (header.getDestinationPortRange() != null) {
-            // TODO (HONEYCOMB-253): port matching will not work correctly if Options are present
-            noMatch = false;
-            request.match[baseOffset + DST_PORT_OFFSET] = (byte) (0xff & dstPort >> 8);
-            request.match[baseOffset + DST_PORT_OFFSET + 1] = (byte) (0xff & dstPort);
-        }
-        if (ip4.getSourceIpv4Network() != null) {
-            noMatch = false;
-            System.arraycopy(Impl.toMatchValue(ip4.getSourceIpv4Network()), 0, request.match,
-                baseOffset + SRC_IP_OFFSET, IP4_LEN);
-
-        }
-        if (ip4.getDestinationIpv4Network() != null) {
-            noMatch = false;
-            System.arraycopy(Impl.toMatchValue(ip4.getDestinationIpv4Network()), 0, request.match,
-                baseOffset + DST_IP_OFFSET, IP4_LEN);
-
-        }
-        return noMatch;
-    }
-
-    class Impl {
-        private static byte[] toByteMask(final int prefixLength) {
-            final long mask = ((1L << prefixLength) - 1) << (IP4_MASK_BIT_LENGTH - prefixLength);
-            return Ints.toByteArray((int) mask);
-        }
-
-        private static byte[] toByteMask(final Ipv4Prefix ipv4Prefix) {
-            final int prefixLength = Byte.valueOf(ipv4Prefix.getValue().split("/")[1]);
-            return toByteMask(prefixLength);
-        }
-
-        private static byte[] toMatchValue(final Ipv4Prefix ipv4Prefix) {
-            final String[] split = ipv4Prefix.getValue().split("/");
-            final byte[] addressBytes = Ipv4Translator.INSTANCE.ipv4AddressNoZoneToArray(split[0]);
-            final byte[] mask = Impl.toByteMask(Byte.valueOf(split[1]));
-            for (int i = 0; i < addressBytes.length; ++i) {
-                addressBytes[i] &= mask[i];
-            }
-            return addressBytes;
-        }
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/Ip6AclTranslator.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/Ip6AclTranslator.java
deleted file mode 100644
index 100b8746f..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/Ip6AclTranslator.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.BitSet;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.AclIpHeaderFields;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.AclIpv6HeaderFields;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-interface Ip6AclTranslator {
-
-    int ETHER_TYPE_OFFSET = 12; // first 14 bytes represent L2 header (2x6)
-    int IP_VERSION_OFFSET = ETHER_TYPE_OFFSET + 2;
-    int DSCP_MASK1 = 0x0f;
-    int DSCP_MASK2 = 0xc0;
-    int IP_PROTOCOL_OFFSET = IP_VERSION_OFFSET + 6;
-    int IP_PROTOCOL_MASK = 0xff;
-    int IP6_LEN = 16;
-    int SRC_IP_OFFSET = IP_VERSION_OFFSET + 8;
-    int DST_IP_OFFSET = SRC_IP_OFFSET + IP6_LEN;
-    int SRC_PORT_OFFSET = DST_IP_OFFSET + IP6_LEN;
-    int DST_PORT_OFFSET = SRC_PORT_OFFSET + 2;
-
-    default boolean ip6Mask(final int baseOffset, final InterfaceMode mode, final AclIpHeaderFields header,
-                            final AclIpv6HeaderFields ip6, final ClassifyAddDelTable request) {
-        boolean aceIsEmpty = true;
-        if (InterfaceMode.L2.equals(mode)) {
-            // in L2 mode we need to match ether type
-            request.mask[baseOffset + ETHER_TYPE_OFFSET] = (byte) 0xff;
-            request.mask[baseOffset + ETHER_TYPE_OFFSET + 1] = (byte) 0xff;
-        }
-        if (header.getDscp() != null) {
-            aceIsEmpty = false;
-            // DCSP (bits 4-9 of IP6 header)
-            request.mask[baseOffset + IP_VERSION_OFFSET] |= DSCP_MASK1;
-            request.mask[baseOffset + IP_VERSION_OFFSET + 1] |= DSCP_MASK2;
-        }
-        if (header.getProtocol() != null) { // Internet Protocol number
-            aceIsEmpty = false;
-            request.mask[baseOffset + IP_PROTOCOL_OFFSET] = (byte) IP_PROTOCOL_MASK;
-        }
-        if (ip6.getFlowLabel() != null) {
-            aceIsEmpty = false;
-            // bits 12-31
-            request.mask[baseOffset + IP_VERSION_OFFSET + 1] |= (byte) 0x0f;
-            request.mask[baseOffset + IP_VERSION_OFFSET + 2] = (byte) 0xff;
-            request.mask[baseOffset + IP_VERSION_OFFSET + 3] = (byte) 0xff;
-        }
-        if (header.getSourcePortRange() != null) {
-            // TODO (HONEYCOMB-253): port matching will not work correctly if Options are present
-            aceIsEmpty = false;
-            request.mask[baseOffset + SRC_PORT_OFFSET] = (byte) 0xff;
-            request.mask[baseOffset + SRC_PORT_OFFSET + 1] = (byte) 0xff;
-        }
-        if (header.getDestinationPortRange() != null) {
-            // TODO (HONEYCOMB-253): port matching will not work correctly if Options are present
-            aceIsEmpty = false;
-            request.mask[baseOffset + DST_PORT_OFFSET] = (byte) 0xff;
-            request.mask[baseOffset + DST_PORT_OFFSET + 1] = (byte) 0xff;
-        }
-        if (ip6.getSourceIpv6Network() != null) {
-            aceIsEmpty = false;
-            final byte[] mask = Impl.toByteMask(ip6.getSourceIpv6Network());
-            System.arraycopy(mask, 0, request.mask, baseOffset + SRC_IP_OFFSET, mask.length);
-        }
-        if (ip6.getDestinationIpv6Network() != null) {
-            aceIsEmpty = false;
-            final byte[] mask = Impl.toByteMask(ip6.getDestinationIpv6Network());
-            System.arraycopy(mask, 0, request.mask, baseOffset + DST_IP_OFFSET, mask.length);
-        }
-        return aceIsEmpty;
-    }
-
-    default boolean ip6Match(final int baseOffset, final InterfaceMode mode, final AclIpHeaderFields header,
-                             final AclIpv6HeaderFields ip6, final Integer srcPort, final Integer dstPort, final ClassifyAddDelSession request) {
-        boolean noMatch = true;
-        if (InterfaceMode.L2.equals(mode)) {
-            // match IP6 etherType (0x86dd)
-            request.match[baseOffset + ETHER_TYPE_OFFSET] = (byte) 0x86;
-            request.match[baseOffset + ETHER_TYPE_OFFSET + 1] = (byte) 0xdd;
-        }
-        if (header.getDscp() != null) {
-            noMatch = false;
-            final int dcsp = header.getDscp().getValue();
-            // set bits 4-9 of IP6 header:
-            request.match[baseOffset + IP_VERSION_OFFSET] |= (byte) (DSCP_MASK1 & (dcsp >> 2));
-            request.match[baseOffset + IP_VERSION_OFFSET + 1] |= (byte) (DSCP_MASK2 & (dcsp << 6));
-        }
-        if (header.getProtocol() != null) { // Internet Protocol number
-            noMatch = false;
-            request.match[baseOffset + IP_PROTOCOL_OFFSET] = (byte) (IP_PROTOCOL_MASK & header.getProtocol());
-        }
-        if (ip6.getFlowLabel() != null) {
-            noMatch = false;
-            final int flowLabel = ip6.getFlowLabel().getValue().intValue();
-            // bits 12-31
-            request.match[baseOffset + IP_VERSION_OFFSET + 1] |= (byte) (0x0f & (flowLabel >> 16));
-            request.match[baseOffset + IP_VERSION_OFFSET + 2] = (byte) (0xff & (flowLabel >> 8));
-            request.match[baseOffset + IP_VERSION_OFFSET + 3] = (byte) (0xff & flowLabel);
-        }
-        if (header.getSourcePortRange() != null) {
-            // TODO (HONEYCOMB-253): port matching will not work correctly if Options are present
-            noMatch = false;
-            request.match[baseOffset + SRC_PORT_OFFSET] = (byte) (0xff & srcPort >> 8);
-            request.match[baseOffset + SRC_PORT_OFFSET + 1] = (byte) (0xff & srcPort);
-        }
-        if (header.getDestinationPortRange() != null) {
-            // TODO (HONEYCOMB-253): port matching will not work correctly if Options are present
-            noMatch = false;
-            request.match[baseOffset + DST_PORT_OFFSET] = (byte) (0xff & dstPort >> 8);
-            request.match[baseOffset + DST_PORT_OFFSET + 1] = (byte) (0xff & dstPort);
-        }
-        if (ip6.getSourceIpv6Network() != null) {
-            noMatch = false;
-            final byte[] match = Impl.toMatchValue(ip6.getSourceIpv6Network());
-            System.arraycopy(match, 0, request.match, baseOffset + SRC_IP_OFFSET, IP6_LEN);
-        }
-        if (ip6.getDestinationIpv6Network() != null) {
-            noMatch = false;
-            final byte[] match = Impl.toMatchValue(ip6.getDestinationIpv6Network());
-            System.arraycopy(match, 0, request.match, baseOffset + DST_IP_OFFSET, IP6_LEN);
-        }
-        return noMatch;
-    }
-
-    class Impl {
-        private static final int IP6_MASK_BIT_LENGTH = 128;
-
-        private static byte[] toByteMask(final int prefixLength) {
-            final BitSet mask = new BitSet(IP6_MASK_BIT_LENGTH);
-            mask.set(0, prefixLength, true);
-            if (prefixLength < IP6_MASK_BIT_LENGTH) {
-                mask.set(prefixLength, IP6_MASK_BIT_LENGTH, false);
-            }
-            return mask.toByteArray();
-        }
-
-        private static byte[] toByteMask(final Ipv6Prefix ipv6Prefix) {
-            final int prefixLength = Short.valueOf(ipv6Prefix.getValue().split("/")[1]);
-            return toByteMask(prefixLength);
-        }
-
-        private static byte[] toMatchValue(final Ipv6Prefix ipv6Prefix) {
-            final String[] split = ipv6Prefix.getValue().split("/");
-            final byte[] addressBytes;
-            try {
-                addressBytes = InetAddress.getByName(split[0]).getAddress();
-            } catch (UnknownHostException e) {
-                throw new IllegalArgumentException("Invalid IP6 address", e);
-            }
-            final byte[] mask = toByteMask(Short.valueOf(split[1]));
-            int pos = 0;
-            for (; pos < mask.length; ++pos) {
-                addressBytes[pos] &= mask[pos];
-            }
-            // mask can be shorter that address, so we need to clear rest of the address:
-            for (; pos < addressBytes.length; ++pos) {
-                addressBytes[pos] = 0;
-            }
-            return addressBytes;
-        }
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/L2AclTranslator.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/L2AclTranslator.java
deleted file mode 100644
index 7addf28da..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/L2AclTranslator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import io.fd.hc2vpp.common.translate.util.MacTranslator;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import java.util.List;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-
-interface L2AclTranslator extends MacTranslator {
-
-    default boolean destinationMacAddressMask(final MacAddress dstMask, final MacAddress dstAddress,
-                                              final ClassifyAddDelTable request) {
-        // destination-mac-address or destination-mac-address-mask is present =>
-        // ff:ff:ff:ff:ff:ff:00:00:00:00:00:00:00:00:00:00
-        if (dstMask != null) {
-            final List<String> parts = COLON_SPLITTER.splitToList(dstMask.getValue());
-            int i = 0;
-            for (String part : parts) {
-                request.mask[i++] = parseHexByte(part);
-            }
-            return false;
-        } else if (dstAddress != null) {
-            for (int i = 0; i < 6; ++i) {
-                request.mask[i] = (byte) 0xff;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    default boolean sourceMacAddressMask(final MacAddress srcMask, final MacAddress srcAddress,
-                                         final ClassifyAddDelTable request) {
-        // source-mac-address or source-mac-address-mask =>
-        // 00:00:00:00:00:00:ff:ff:ff:ff:ff:ff:00:00:00:00
-        if (srcMask != null) {
-            final List<String> parts = COLON_SPLITTER.splitToList(srcMask.getValue());
-            int i = 6;
-            for (String part : parts) {
-                request.mask[i++] = parseHexByte(part);
-            }
-            return false;
-        } else if (srcAddress != null) {
-            for (int i = 6; i < 12; ++i) {
-                request.mask[i] = (byte) 0xff;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    default boolean destinationMacAddressMatch(final MacAddress dstAddress, final ClassifyAddDelSession request) {
-        if (dstAddress != null) {
-            final List<String> parts = COLON_SPLITTER.splitToList(dstAddress.getValue());
-            int i = 0;
-            for (String part : parts) {
-                request.match[i++] = parseHexByte(part);
-            }
-            return false;
-        }
-        return true;
-    }
-
-    default boolean sourceMacAddressMatch(final MacAddress srcAddress, final ClassifyAddDelSession request) {
-        if (srcAddress != null) {
-            final List<String> parts = COLON_SPLITTER.splitToList(srcAddress.getValue());
-            int i = 6;
-            for (String part : parts) {
-                request.match[i++] = parseHexByte(part);
-            }
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPair.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPair.java
deleted file mode 100644
index 339102117..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPair.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.BiFunction;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRange;
-
-/**
- * Utility that produces cartesian product out of src and dst port ranges (used to translate ranges into
- * list of classify sessions).
- */
-final class PortPair {
-    private final Integer src;
-    private final Integer dst;
-
-    PortPair(@Nullable final Integer src, @Nullable final Integer dst) {
-        this.src = src;
-        this.dst = dst;
-    }
-
-    Integer getSrc() {
-        return src;
-    }
-
-    Integer getDst() {
-        return dst;
-    }
-
-    @Override
-    public String toString() {
-        return "(" + src + "," + dst + ")";
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        final PortPair that = (PortPair) o;
-        if (!Objects.equals(src, that.src)) {
-            return false;
-        }
-        if (!Objects.equals(dst, that.dst)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(src, dst);
-    }
-
-    static List<PortPair> fromRange(final SourcePortRange srcRange,
-                                    final DestinationPortRange dstRange) {
-        final List<PortPair> result = new ArrayList<>();
-        if (srcRange == null && dstRange == null) {
-            result.add(new PortPair(null, null));
-        } else if (srcRange != null && dstRange == null) {
-            processSingleRange(result, srcRange.getLowerPort(), srcRange.getUpperPort(), PortPair::new);
-        } else if (srcRange == null && dstRange != null) {
-            processSingleRange(result, dstRange.getLowerPort(), dstRange.getUpperPort(),
-                (dst, src) -> new PortPair(src, dst));
-        } else {
-            processDoubleRange(result, srcRange, dstRange);
-        }
-        return result;
-    }
-
-    private static void processSingleRange(final List<PortPair> result,
-                                           final PortNumber lowerPort,
-                                           final PortNumber upperPort,
-                                           final BiFunction<Integer, Integer, PortPair> f) {
-        int low = lowerPort.getValue(); // mandatory
-        int hi = low;
-        if (upperPort != null) {
-            hi = upperPort.getValue();
-        }
-        for (; low <= hi; ++low) {
-            result.add(f.apply(low, null));
-        }
-    }
-
-    private static void processDoubleRange(final List<PortPair> result, final SourcePortRange srcRange,
-                                           final DestinationPortRange dstRange) {
-        int srcL = srcRange.getLowerPort().getValue();
-        int srcH = srcL;
-        if (srcRange.getUpperPort() != null) {
-            srcH = srcRange.getUpperPort().getValue();
-        }
-        int dstL = dstRange.getLowerPort().getValue();
-        int dstH = dstL;
-        if (dstRange.getUpperPort() != null) {
-            dstH = dstRange.getUpperPort().getValue();
-        }
-        for (int i=srcL; i <= srcH; ++i) {
-            for (int j=dstL; j <= dstH; ++j) {
-                result.add(new PortPair(i, j));
-            }
-        }
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriter.java
deleted file mode 100644
index cd87193bc..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.egress;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AbstractIetfAclWriter;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManager;
-import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2Tables;
-import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2TablesReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.Ace;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.Matches;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceEth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.Acl;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public final class EgressIetfAclWriter extends AbstractIetfAclWriter {
-    private final AclTableContextManager aclCtx;
-
-    public EgressIetfAclWriter(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull AclTableContextManager aclCtx) {
-        super(futureJVppCore);
-        this.aclCtx = checkNotNull(aclCtx, "aclCtx should not be null");
-    }
-
-    @Override
-    public void deleteAcl(@Nonnull final InstanceIdentifier<?> id, final int swIfIndex,
-                          @Nonnull final MappingContext mappingContext)
-        throws WriteFailedException {
-        Optional<MappingEntry> optional = aclCtx.getEntry(swIfIndex, mappingContext);
-        checkState(optional.isPresent(), "Removing ACL id=%s, but acl mapping entry is not present", id);
-        final MappingEntry entry = optional.get();
-        unassignClassifyTables(id, swIfIndex);
-        removeClassifyTables(id, entry);
-        aclCtx.removeEntry(swIfIndex, mappingContext);
-    }
-
-    private void unassignClassifyTables(@Nonnull final InstanceIdentifier<?> id, final int swIfIndex)
-        throws WriteFailedException {
-        final ClassifySetInterfaceL2Tables request = new ClassifySetInterfaceL2Tables();
-        request.swIfIndex = swIfIndex;
-        request.ip4TableIndex = NOT_DEFINED;
-        request.ip6TableIndex = NOT_DEFINED;
-        request.otherTableIndex = NOT_DEFINED;
-        request.isInput = 0; // egress
-        final CompletionStage<ClassifySetInterfaceL2TablesReply> cs = jvpp.classifySetInterfaceL2Tables(request);
-        getReplyForDelete(cs.toCompletableFuture(), id);
-    }
-
-    @Override
-    public void write(@Nonnull final InstanceIdentifier<?> id, int swIfIndex, @Nonnull final List<Acl> acls,
-                      @Nonnull final AccessLists.DefaultAction defaultAction, @Nullable InterfaceMode mode,
-                      @Nonnull final WriteContext writeContext, @Nonnegative final int numberOfTags,
-                      @Nonnull final MappingContext mappingContext)
-        throws WriteFailedException {
-        checkArgument(numberOfTags >= 0 && numberOfTags <= 2, "Number of vlan tags %s is not in [0,2] range");
-        checkArgument(InterfaceMode.L2.equals(mode), "Writing egress Acls is supported only in L2 mode");
-
-        final ClassifySetInterfaceL2Tables request = new ClassifySetInterfaceL2Tables();
-        request.isInput = 0; // egress
-        request.swIfIndex = swIfIndex;
-
-        // applied to packets according to their ether type
-        final List<Ace> ip4Aces = getACEs(acls, writeContext, (AbstractIetfAclWriter::appliesToIp4Path));
-        request.ip4TableIndex = writeAces(id, ip4Aces, defaultAction, mode, numberOfTags);
-        final List<Ace> ip6Aces = getACEs(acls, writeContext, (AbstractIetfAclWriter::appliesToIp6Path));
-        request.ip6TableIndex = writeAces(id, ip6Aces, defaultAction, mode, numberOfTags);
-        final List<Ace> aces = getACEs(acls, writeContext, EgressIetfAclWriter::isNotIpRule);
-        request.otherTableIndex = writeAces(id, aces, defaultAction, mode, numberOfTags);
-
-        final MappingEntry entry = new MappingEntryBuilder().setIndex(swIfIndex)
-            .setIp4TableId(request.ip4TableIndex)
-            .setIp6TableId(request.ip6TableIndex)
-            .setL2TableId(request.otherTableIndex)
-            .build();
-        aclCtx.addEntry(entry, mappingContext);
-
-        try {
-            getReplyForWrite(jvpp.classifySetInterfaceL2Tables(request).toCompletableFuture(), id);
-        } catch (WriteFailedException e) {
-            removeClassifyTables(id, entry);
-            throw e;
-        }
-    }
-
-    private static boolean isNotIpRule(final Ace ace) {
-        final Matches matches = ace.getMatches();
-        checkArgument(matches != null, "Incomplete ACE: %s", ace);
-        return matches.getAceType() instanceof AceEth;
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizer.java
deleted file mode 100644
index 32b82fb72..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizer.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.egress;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IetfAclCustomizer implements WriterCustomizer<Egress> {
-    private static final Logger LOG = LoggerFactory.getLogger(IetfAclCustomizer.class);
-    private final IetfAclWriter aclWriter;
-    private final NamingContext interfaceContext;
-
-    public IetfAclCustomizer(final IetfAclWriter aclWriter, final NamingContext interfaceContext) {
-        this.aclWriter = checkNotNull(aclWriter, "aclWriter should not be null");
-        this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Egress> id, @Nonnull final Egress dataAfter,
-                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        final String ifName = id.firstKeyOf(Interface.class).getName();
-        final int ifIndex = interfaceContext.getIndex(ifName, writeContext.getMappingContext());
-        LOG.debug("Adding egress ACLs for interface={}(id={}): {}", ifName, ifIndex, dataAfter);
-
-        final AccessLists accessLists = dataAfter.getAccessLists();
-        checkArgument(accessLists != null && accessLists.getAcl() != null,
-            "ietf-acl container does not define acl list");
-
-        if (!InterfaceMode.L2.equals(accessLists.getMode())) {
-            LOG.debug("Writing egress Acls is supported only in L2 mode. Ignoring config: {}", dataAfter);
-            return;
-        }
-
-        aclWriter.write(id, ifIndex, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-            writeContext, writeContext.getMappingContext());
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Egress> id, @Nonnull final Egress dataBefore,
-                                        @Nonnull final Egress dataAfter, @Nonnull final WriteContext writeContext)
-        throws WriteFailedException {
-        LOG.debug("ACLs update: removing previously configured ACLs");
-        deleteCurrentAttributes(id, dataBefore, writeContext);
-        LOG.debug("ACLs update: adding updated ACLs");
-        writeCurrentAttributes(id, dataAfter, writeContext);
-        LOG.debug("ACLs update was successful");
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Egress> id, @Nonnull final Egress dataBefore,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        final String ifName = id.firstKeyOf(Interface.class).getName();
-        final int ifIndex = interfaceContext.getIndex(ifName, writeContext.getMappingContext());
-        LOG.debug("Removing ACLs for interface={}(id={}): {}", ifName, ifIndex, dataBefore);
-        aclWriter.deleteAcl(id, ifIndex, writeContext.getMappingContext());
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizer.java
deleted file mode 100644
index 90cef519f..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizer.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.egress;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.getNumberOfTags;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SubInterfaceIetfAclCustomizer implements WriterCustomizer<Egress> {
-    private static final Logger LOG = LoggerFactory.getLogger(SubInterfaceIetfAclCustomizer.class);
-    private final IetfAclWriter aclWriter;
-    private final NamingContext interfaceContext;
-
-    public SubInterfaceIetfAclCustomizer(final IetfAclWriter aclWriter, final NamingContext interfaceContext) {
-        this.aclWriter = checkNotNull(aclWriter, "aclWriter should not be null");
-        this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
-    }
-
-    private String getSubInterfaceName(@Nonnull final InstanceIdentifier<Egress> id) {
-        final InterfaceKey parentInterfacekey = id.firstKeyOf(Interface.class);
-        final SubInterfaceKey subInterfacekey = id.firstKeyOf(SubInterface.class);
-        return SubInterfaceUtils
-            .getSubInterfaceName(parentInterfacekey.getName(), subInterfacekey.getIdentifier().intValue());
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Egress> id, @Nonnull final Egress dataAfter,
-                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        final String subInterfaceName = getSubInterfaceName(id);
-        final int subInterfaceIndex = interfaceContext.getIndex(subInterfaceName, writeContext.getMappingContext());
-        LOG.debug("Adding IETF-ACL for sub-interface: {}(id={}): {}", subInterfaceName, subInterfaceIndex, dataAfter);
-
-        final AccessLists accessLists = dataAfter.getAccessLists();
-        checkArgument(accessLists != null && accessLists.getAcl() != null,
-            "ietf-acl container does not define acl list");
-
-        final Optional<SubInterface> subInterfaceOptional =
-            writeContext.readAfter(id.firstIdentifierOf(SubInterface.class));
-        checkState(subInterfaceOptional.isPresent(), "Could not read SubInterface data object for %s", id);
-        final SubInterface subInterface = subInterfaceOptional.get();
-
-        if (!InterfaceMode.L2.equals(accessLists.getMode())) {
-            LOG.debug("Writing egress Acls is supported only in L2 mode. Ignoring config: {}", dataAfter);
-            return;
-        }
-
-        aclWriter
-            .write(id, subInterfaceIndex, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-                writeContext, getNumberOfTags(subInterface.getTags()), writeContext.getMappingContext());
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Egress> id, @Nonnull final Egress dataBefore,
-                                        @Nonnull final Egress dataAfter, @Nonnull final WriteContext writeContext)
-        throws WriteFailedException {
-        LOG.debug("Sub-interface ACLs update: removing previously configured ACLs");
-        deleteCurrentAttributes(id, dataBefore, writeContext);
-        LOG.debug("Sub-interface ACLs update: adding updated ACLs");
-        writeCurrentAttributes(id, dataAfter, writeContext);
-        LOG.debug("Sub-interface ACLs update was successful");
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Egress> id, @Nonnull final Egress dataBefore,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        final String subInterfaceName = getSubInterfaceName(id);
-        final int subInterfaceIndex = interfaceContext.getIndex(subInterfaceName, writeContext.getMappingContext());
-        LOG.debug("Removing ACLs for sub-interface={}(id={}): {}", subInterfaceName, subInterfaceIndex, dataBefore);
-        aclWriter.deleteAcl(id, subInterfaceIndex, writeContext.getMappingContext());
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizer.java
deleted file mode 100644
index 96f034f72..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.ingress;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Ingress;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Customizer for enabling/disabling ingress ACLs for given interface (as defined in ietf-acl model).
- *
- * The customizer assumes it owns classify table management for interfaces where ietf-acl container is present. Using
- * low level classifier model or direct changes to classify tables in combination with ietf-acls are not supported and
- * can result in unpredictable behaviour.
- */
-public class IetfAclCustomizer implements WriterCustomizer<Ingress> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(IetfAclCustomizer.class);
-    private final IngressIetfAclWriter aclWriter;
-    private final NamingContext interfaceContext;
-
-    public IetfAclCustomizer(@Nonnull final IngressIetfAclWriter aclWriter,
-                             @Nonnull final NamingContext interfaceContext) {
-        this.aclWriter = checkNotNull(aclWriter, "aclWriter should not be null");
-        this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Ingress> id, @Nonnull final Ingress dataAfter,
-                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        final String ifName = id.firstKeyOf(Interface.class).getName();
-        final int ifIndex = interfaceContext.getIndex(ifName, writeContext.getMappingContext());
-        LOG.debug("Adding ACLs for interface={}(id={}): {}", ifName, ifIndex, dataAfter);
-
-        final AccessLists accessLists = dataAfter.getAccessLists();
-        checkArgument(accessLists != null && accessLists.getAcl() != null,
-                "ietf-acl container does not define acl list");
-
-        aclWriter.write(id, ifIndex, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-            writeContext, writeContext.getMappingContext());
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Ingress> id,
-                                        @Nonnull final Ingress dataBefore, @Nonnull final Ingress dataAfter,
-                                        @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-        LOG.debug("ACLs update: removing previously configured ACLs");
-        deleteCurrentAttributes(id, dataBefore, writeContext);
-        LOG.debug("ACLs update: adding updated ACLs");
-        writeCurrentAttributes(id, dataAfter, writeContext);
-        LOG.debug("ACLs update was successful");
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Ingress> id,
-                                        @Nonnull final Ingress dataBefore,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        final String ifName = id.firstKeyOf(Interface.class).getName();
-        final int ifIndex = interfaceContext.getIndex(ifName, writeContext.getMappingContext());
-        LOG.debug("Removing ACLs for interface={}(id={}): {}", ifName, ifIndex, dataBefore);
-        aclWriter.deleteAcl(id, ifIndex, writeContext.getMappingContext());
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IngressIetfAclWriter.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IngressIetfAclWriter.java
deleted file mode 100644
index 3a47f42f4..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IngressIetfAclWriter.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.ingress;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AbstractIetfAclWriter;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManager;
-import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.Ace;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.Acl;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public final class IngressIetfAclWriter extends AbstractIetfAclWriter {
-    private final AclTableContextManager aclCtx;
-
-    public IngressIetfAclWriter(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull AclTableContextManager aclCtx) {
-        super(futureJVppCore);
-        this.aclCtx = checkNotNull(aclCtx, "aclCtx should not be null");
-    }
-
-    @Override
-    public void deleteAcl(@Nonnull final InstanceIdentifier<?> id, final int swIfIndex,
-                          @Nonnull final MappingContext mappingContext)
-        throws WriteFailedException {
-        Optional<MappingEntry> optional = aclCtx.getEntry(swIfIndex, mappingContext);
-        checkState(optional.isPresent(), "Removing ACL id=%s, but acl mapping entry is not present", id);
-        final MappingEntry entry = optional.get();
-        unassignClassifyTables(id, entry);
-        removeClassifyTables(id, entry);
-        aclCtx.removeEntry(swIfIndex, mappingContext);
-    }
-
-    private void unassignClassifyTables(@Nonnull final InstanceIdentifier<?> id,
-                                        @Nonnull final MappingEntry entry)
-        throws WriteFailedException {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.isAdd = 0;
-        request.swIfIndex = entry.getIndex();
-        request.l2TableIndex = entry.getL2TableId();
-        request.ip4TableIndex = entry.getIp4TableId();
-        request.ip6TableIndex = entry.getIp6TableId();
-        final CompletionStage<InputAclSetInterfaceReply> inputAclSetInterfaceReplyCompletionStage =
-            jvpp.inputAclSetInterface(request);
-        getReplyForDelete(inputAclSetInterfaceReplyCompletionStage.toCompletableFuture(), id);
-    }
-
-    @Override
-    public void write(@Nonnull final InstanceIdentifier<?> id, int swIfIndex, @Nonnull final List<Acl> acls,
-                      @Nonnull final AccessLists.DefaultAction defaultAction, @Nullable final InterfaceMode mode,
-                      @Nonnull final WriteContext writeContext, @Nonnegative final int numberOfTags,
-                      @Nonnull final MappingContext mappingContext)
-        throws WriteFailedException {
-        checkArgument(numberOfTags >= 0 && numberOfTags <= 2, "Number of vlan tags %s is not in [0,2] range");
-
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.isAdd = 1;
-        request.swIfIndex = swIfIndex;
-        request.l2TableIndex = NOT_DEFINED;
-        request.ip4TableIndex = NOT_DEFINED;
-        request.ip6TableIndex = NOT_DEFINED;
-
-        if (InterfaceMode.L2.equals(mode)) {
-            final List<Ace> aces = getACEs(acls, writeContext, ace -> true);
-            request.l2TableIndex = writeAces(id, aces, defaultAction, mode, numberOfTags);
-        } else {
-            final List<Ace> ip4Aces = getACEs(acls, writeContext, (AbstractIetfAclWriter::appliesToIp4Path));
-            request.ip4TableIndex = writeAces(id, ip4Aces, defaultAction, mode, numberOfTags);
-            final List<Ace> ip6Aces = getACEs(acls, writeContext, (AbstractIetfAclWriter::appliesToIp6Path));
-            request.ip6TableIndex = writeAces(id, ip6Aces, defaultAction, mode, numberOfTags);
-        }
-
-        final MappingEntry entry = new MappingEntryBuilder().setIndex(swIfIndex)
-            .setIp4TableId(request.ip4TableIndex)
-            .setIp6TableId(request.ip6TableIndex)
-            .setL2TableId(request.l2TableIndex)
-            .build();
-        aclCtx.addEntry(entry, mappingContext);
-
-        try {
-            getReplyForWrite(jvpp.inputAclSetInterface(request).toCompletableFuture(), id);
-        } catch (WriteFailedException e) {
-            removeClassifyTables(id, entry);
-            throw e;
-        }
-    }
-}
diff --git a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizer.java b/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizer.java
deleted file mode 100644
index 6c2356efc..000000000
--- a/vpp-classifier/impl/src/main/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizer.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2017 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.vpp.classifier.write.acl.ingress;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static io.fd.hc2vpp.v3po.util.SubInterfaceUtils.getNumberOfTags;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.v3po.util.SubInterfaceUtils;
-import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Ingress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Customizer for enabling/disabling ingress ACLs for given sub-interface (as defined in ietf-acl model).
- *
- * The customizer assumes it owns classify table management for sub-interfaces where ietf-acl container is present.
- * Using low level classifier model or direct changes to classify tables in combination with ietf-acls are not supported
- * and can result in unpredictable behaviour.
- */
-public class SubInterfaceIetfAclCustomizer implements WriterCustomizer<Ingress> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(SubInterfaceIetfAclCustomizer.class);
-    private final IngressIetfAclWriter aclWriter;
-    private final NamingContext interfaceContext;
-
-    public SubInterfaceIetfAclCustomizer(@Nonnull final IngressIetfAclWriter aclWriter,
-                                         @Nonnull final NamingContext interfaceContext) {
-        this.aclWriter = checkNotNull(aclWriter, "aclWriter should not be null");
-        this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
-    }
-
-    private String getSubInterfaceName(@Nonnull final InstanceIdentifier<Ingress> id) {
-        final InterfaceKey parentInterfacekey = id.firstKeyOf(Interface.class);
-        final SubInterfaceKey subInterfacekey = id.firstKeyOf(SubInterface.class);
-        return SubInterfaceUtils
-            .getSubInterfaceName(parentInterfacekey.getName(), subInterfacekey.getIdentifier().intValue());
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Ingress> id, @Nonnull final Ingress dataAfter,
-                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        final String subInterfaceName = getSubInterfaceName(id);
-        final int subInterfaceIndex = interfaceContext.getIndex(subInterfaceName, writeContext.getMappingContext());
-        LOG.debug("Adding IETF-ACL for sub-interface: {}(id={}): {}", subInterfaceName, subInterfaceIndex, dataAfter);
-
-        final AccessLists accessLists = dataAfter.getAccessLists();
-        checkArgument(accessLists != null && accessLists.getAcl() != null,
-            "ietf-acl container does not define acl list");
-
-        final Optional<SubInterface> subInterfaceOptional =
-            writeContext.readAfter(id.firstIdentifierOf(SubInterface.class));
-        checkState(subInterfaceOptional.isPresent(), "Could not read SubInterface data object for %s", id);
-        final SubInterface subInterface = subInterfaceOptional.get();
-
-        aclWriter
-            .write(id, subInterfaceIndex, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-                writeContext, getNumberOfTags(subInterface.getTags()), writeContext.getMappingContext());
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Ingress> id,
-                                        @Nonnull final Ingress dataBefore, @Nonnull final Ingress dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        LOG.debug("Sub-interface ACLs update: removing previously configured ACLs");
-        deleteCurrentAttributes(id, dataBefore, writeContext);
-        LOG.debug("Sub-interface ACLs update: adding updated ACLs");
-        writeCurrentAttributes(id, dataAfter, writeContext);
-        LOG.debug("Sub-interface ACLs update was successful");
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Ingress> id,
-                                        @Nonnull final Ingress dataBefore, @Nonnull final WriteContext writeContext)
-        throws WriteFailedException {
-        final String subInterfaceName = getSubInterfaceName(id);
-        final int subInterfaceIndex = interfaceContext.getIndex(subInterfaceName, writeContext.getMappingContext());
-        LOG.debug("Removing ACLs for sub-interface={}(id={}): {}", subInterfaceName, subInterfaceIndex, dataBefore);
-        aclWriter.deleteAcl(id, subInterfaceIndex, writeContext.getMappingContext());
-    }
-}
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java
index 3b51a6dca..dc822a924 100644
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java
+++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java
@@ -63,11 +63,8 @@ public class VppClassifierModuleTest {
         ifcContext = new NamingContext("interface-", "interface-context");
         Guice.createInjector(
                 new VppClassifierModule(),
-                new VppClassifierAclModule(),
                 new InterfaceClassifierAclModule(),
-                new InterfaceClassifierIetfAclModule(),
                 new SubInterfaceClassifierAclModule(),
-                new SubInterfaceClassifierIetfAclModule(),
                 BoundFieldModule.of(this)).injectMembers(this);
     }
 
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclWriterTest.java
deleted file mode 100644
index 5b620a82e..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclWriterTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.IngressBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class AclWriterTest extends WriterCustomizerTest {
-
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
-    private static final InstanceIdentifier<Acl> IID =
-        InstanceIdentifier.create(AccessLists.class).child(Acl.class, new AclKey(ACL_NAME, ACL_TYPE));
-
-    @Mock
-    private Acl acl;
-    private IetfAclWriter customizer;
-
-    @Override
-    public void setUpTest() {
-        customizer = new IetfAclWriter();
-        when(acl.getAclName()).thenReturn(ACL_NAME);
-        doReturn(ACL_TYPE).when(acl).getAclType();
-    }
-
-    private void defineInterfacesContext(final List<Interface> interfaces) {
-        when(writeContext.readAfter(InstanceIdentifier.create(Interfaces.class))).thenReturn(Optional.of(
-            new InterfacesBuilder().setInterface(interfaces).build()
-        ));
-    }
-
-    @Test
-    public void testWrite() throws Exception {
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-    }
-
-    @Test
-    public void testUpdate() throws WriteFailedException {
-        defineInterfacesContext(Collections.emptyList());
-        customizer.updateCurrentAttributes(IID, acl, acl, writeContext);
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        defineInterfacesContext(Collections.emptyList());
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-    }
-
-    @Test(expected = WriteFailedException.class)
-    public void testDeleteFailed() throws WriteFailedException {
-        final Interface iface = new InterfaceBuilder().addAugmentation(VppInterfaceAclAugmentation.class,
-            new VppInterfaceAclAugmentationBuilder().setIetfAcl(
-                new IetfAclBuilder().setIngress(
-                    new IngressBuilder().setAccessLists(
-                        new AccessListsBuilder().setAcl(
-                            Collections.singletonList(new AclBuilder().setName(ACL_NAME).setType(ACL_TYPE).build())
-                        ).build()
-                    ).build()
-                ).build()
-            ).build()
-        ).build();
-        defineInterfacesContext(Collections.singletonList(iface));
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriterTest.java
deleted file mode 100644
index e588e35f5..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriterTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.common;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceEth;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceEthBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-public class AceEthWriterTest {
-
-    private AceEthWriter writer;
-    private PacketHandling action;
-    private AceEth aceEth;
-
-    @Before
-    public void setUp() {
-        initMocks(this);
-        writer = new AceEthWriter();
-        action = new DenyBuilder().setDeny(true).build();
-        aceEth = new AceEthBuilder()
-            .setDestinationMacAddress(new MacAddress("11:22:33:44:55:66"))
-            .setDestinationMacAddressMask(new MacAddress("ff:ff:ff:ff:ff:ff"))
-            .setSourceMacAddress(new MacAddress("aa:bb:cc:dd:ee:ff"))
-            .setSourceMacAddressMask(new MacAddress("ff:ff:ff:00:00:00"))
-            .build();
-    }
-
-    @Test
-    public void testCreateTable() {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request = writer.createTable(aceEth, InterfaceMode.L2, nextTableIndex, 0);
-
-        assertEquals(1, request.isAdd);
-        assertEquals(-1, request.tableIndex);
-        assertEquals(1, request.nbuckets);
-        assertEquals(nextTableIndex, request.nextTableIndex);
-        assertEquals(0, request.skipNVectors);
-        assertEquals(AceEthWriter.MATCH_N_VECTORS, request.matchNVectors);
-        assertEquals(AceEthWriter.TABLE_MEM_SIZE, request.memorySize);
-
-        byte[] expectedMask = new byte[] {
-            // destination MAC:
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            // source MAC:
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, 0, 0, 0,
-            0, 0, 0, 0
-        };
-        assertArrayEquals(expectedMask, request.mask);
-    }
-
-    @Test
-    public void testCreateClassifySession() {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request = writer.createSession(action, aceEth, InterfaceMode.L2, tableIndex, 0).get(0);
-
-        assertEquals(1, request.isAdd);
-        assertEquals(tableIndex, request.tableIndex);
-        assertEquals(0, request.hitNextIndex);
-
-        byte[] expectedMatch = new byte[] {
-            // destination MAC:
-            (byte) 0x11, (byte) 0x22, (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66,
-            // source MAC:
-            (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 0xee, (byte) 0xff,
-            0, 0, 0, 0
-        };
-        assertArrayEquals(expectedMatch, request.match);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4WriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4WriterTest.java
deleted file mode 100644
index 2d3d6eeb6..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4WriterTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.common;
-
-import static io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTranslator.VLAN_TAG_LEN;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Dscp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-public class AceIp4WriterTest {
-
-    private AceIp4Writer writer;
-    private PacketHandling action;
-    private AceIp aceIp;
-
-    @Before
-    public void setUp() throws Exception {
-        initMocks(this);
-        writer = new AceIp4Writer();
-        action = new DenyBuilder().setDeny(true).build();
-        aceIp = new AceIpBuilder()
-            .setProtocol((short) 132)
-            .setDscp(new Dscp((short) 11))
-            .setAceIpVersion(new AceIpv4Builder()
-                .setSourceIpv4Network(new Ipv4Prefix("1.2.3.4/32"))
-                .setDestinationIpv4Network(new Ipv4Prefix("1.2.4.5/24"))
-                .build())
-            .setSourcePortRange(new SourcePortRangeBuilder().setLowerPort(new PortNumber(0x1111)).build())
-            .setDestinationPortRange(new DestinationPortRangeBuilder().setLowerPort(new PortNumber(0x2222)).build())
-            .build();
-    }
-
-    private static void verifyTableRequest(final ClassifyAddDelTable request, final int nextTableIndex,
-                                           final int vlanTags, final boolean isL2) {
-        assertEquals(1, request.isAdd);
-        assertEquals(-1, request.tableIndex);
-        assertEquals(1, request.nbuckets);
-        assertEquals(nextTableIndex, request.nextTableIndex);
-        assertEquals(0, request.skipNVectors);
-        assertEquals(AceIp4Writer.MATCH_N_VECTORS, request.matchNVectors);
-        assertEquals(AceIp4Writer.TABLE_MEM_SIZE, request.memorySize);
-
-        byte[] expectedMask = new byte[] {
-            // L2:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // dscp:
-            (byte) 0x00, (byte) 0xfc,
-            // protocol:
-            0, 0, 0, 0, 0, 0, 0, (byte) 0xff, 0, 0,
-            // source address:
-            -1, -1, -1, -1,
-            // destination address:
-            -1, -1, -1, 0,
-            // source and destination port:
-            -1, -1, -1, -1,
-            // padding:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
-
-        if (isL2) {
-            expectedMask[12] = (byte) 0xff;
-            expectedMask[13] = (byte) 0xff;
-        }
-        AceIpWriterTestUtils
-            .assertArrayEqualsWithOffset(expectedMask, expectedMask.length, request.mask, vlanTags * VLAN_TAG_LEN);
-
-    }
-
-    private static void verifySessionRequest(final ClassifyAddDelSession request, final int tableIndex,
-                                             final int vlanTags, final boolean isL2) {
-        assertEquals(1, request.isAdd);
-        assertEquals(tableIndex, request.tableIndex);
-        assertEquals(0, request.hitNextIndex);
-
-        byte[] expectedMatch = new byte[] {
-            // L2:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // dscp:
-            0, (byte) 0x2c,
-            // protocol (132):
-            0, 0, 0, 0, 0, 0, 0, (byte) 132, 0, 0,
-            // source address:
-            1, 2, 3, 4,
-            // destination address:
-            1, 2, 4, 0,
-            // source and destination port:
-            0x11, 0x11, 0x22, 0x22,
-            // padding:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
-
-        if (isL2) {
-            expectedMatch[12] = (byte) 0x08;
-            expectedMatch[13] = (byte) 0x00;
-        }
-        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMatch, expectedMatch.length, request.match, vlanTags * VLAN_TAG_LEN);
-
-    }
-
-    @Test
-    public void testCreateTable() throws Exception {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request = writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, 0);
-        verifyTableRequest(request, nextTableIndex, 0, false);
-    }
-
-    @Test
-    public void testCreateTableForL2Interface() throws Exception {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request = writer.createTable(aceIp, InterfaceMode.L2, nextTableIndex, 0);
-        verifyTableRequest(request, nextTableIndex, 0, true);
-    }
-
-    @Test
-    public void testCreateTable1VlanTag() throws Exception {
-        final int nextTableIndex = 42;
-        final int vlanTags = 1;
-        final ClassifyAddDelTable request = writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, vlanTags);
-        verifyTableRequest(request, nextTableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateTable2VlanTags() throws Exception {
-        final int nextTableIndex = 42;
-        final int vlanTags = 2;
-        final ClassifyAddDelTable request = writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, vlanTags);
-        verifyTableRequest(request, nextTableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateClassifySession() throws Exception {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request = writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, 0).get(0);
-        verifySessionRequest(request, tableIndex, 0, false);
-    }
-
-    @Test
-    public void testCreateClassifySessionForL2Interface() throws Exception {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request = writer.createSession(action, aceIp, InterfaceMode.L2, tableIndex, 0).get(0);
-        verifySessionRequest(request, tableIndex, 0, true);
-    }
-
-    @Test
-    public void testCreateClassifySession1VlanTag() throws Exception {
-        final int tableIndex = 123;
-        final int vlanTags = 1;
-        final ClassifyAddDelSession request = writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, vlanTags).get(0);
-        verifySessionRequest(request, tableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateClassifySession2VlanTags() throws Exception {
-        final int tableIndex = 123;
-        final int vlanTags = 2;
-        final ClassifyAddDelSession request = writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, vlanTags).get(0);
-
-        verifySessionRequest(request, tableIndex, vlanTags, false);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6WriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6WriterTest.java
deleted file mode 100644
index b193a2c78..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6WriterTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv6Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Dscp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6FlowLabel;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-public class AceIp6WriterTest {
-
-    private AceIp6Writer writer;
-    private PacketHandling action;
-    private AceIp aceIp;
-
-    @Before
-    public void setUp() {
-        initMocks(this);
-        writer = new AceIp6Writer();
-        action = new DenyBuilder().setDeny(true).build();
-        aceIp = new AceIpBuilder()
-            .setProtocol((short) 132)
-            .setDscp(new Dscp((short) 11))
-            .setAceIpVersion(new AceIpv6Builder()
-                .setFlowLabel(new Ipv6FlowLabel(123L))
-                .setSourceIpv6Network(new Ipv6Prefix("2001:db8:85a3:8d3:1319:8a2e:370:7348/128"))
-                .setDestinationIpv6Network(new Ipv6Prefix("fe80:1234:5678:abcd:ef01::/64"))
-                .build())
-            .setSourcePortRange(new SourcePortRangeBuilder().setLowerPort(new PortNumber(0x1111)).build())
-            .setDestinationPortRange(new DestinationPortRangeBuilder().setLowerPort(new PortNumber(0x2222)).build())
-            .build();
-    }
-
-
-    private static void verifyTableRequest(final ClassifyAddDelTable request, final int nextTableIndex,
-                                           final int vlanTags, final boolean isL2) {
-        assertEquals(1, request.isAdd);
-        assertEquals(-1, request.tableIndex);
-        assertEquals(1, request.nbuckets);
-        assertEquals(nextTableIndex, request.nextTableIndex);
-        assertEquals(0, request.skipNVectors);
-        assertEquals(vlanTags == 2 ? 5 : 4, request.matchNVectors);
-        assertEquals(AceIp6Writer.TABLE_MEM_SIZE, request.memorySize);
-
-        byte[] expectedMask = new byte[] {
-            // L2:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // dscp, flow:
-            (byte) 0x0f, (byte) 0xcf, (byte) 0xff, (byte) 0xff,
-            // protocol:
-            0, 0, (byte) 0xff, 0,
-            // source address:
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            // destination address:
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            0, 0, 0, 0, 0, 0, 0, 0,
-            // source and destination port:
-            -1, -1, -1, -1,
-            // padding to multiple of 16B:
-            0, 0, 0, 0, 0, 0
-        };
-
-        if (isL2) {
-            expectedMask[12] = (byte) 0xff;
-            expectedMask[13] = (byte) 0xff;
-        }
-        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMask, vlanTags == 2 ? 80 : 64, request.mask, vlanTags * AclTranslator.VLAN_TAG_LEN);
-    }
-
-    private static void verifySessionRequest(final ClassifyAddDelSession request, final int tableIndex,
-                                             final int vlanTags, final boolean isL2) {
-        assertEquals(1, request.isAdd);
-        assertEquals(tableIndex, request.tableIndex);
-        assertEquals(0, request.hitNextIndex);
-
-        byte[] expectedMatch = new byte[] {
-            // L2:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // dscp(11), flow(123):
-            (byte) 0x02, (byte) 0xc0, (byte) 0x00, (byte) 0x7b,
-            // protocol (132):
-            0, 0, (byte) 132, 0,
-            // source address:
-            (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x85, (byte) 0xa3, (byte) 0x08, (byte) 0xd3,
-            (byte) 0x13, (byte) 0x19, (byte) 0x8a, (byte) 0x2e, (byte) 0x03, (byte) 0x70, (byte) 0x73, (byte) 0x48,
-            // destination address:
-            (byte) 0xfe, (byte) 0x80, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0xab, (byte) 0xcd,
-            0, 0, 0, 0, 0, 0, 0, 0,
-            // source and destination port:
-            0x11, 0x11, 0x22, 0x22,
-            // padding to multiple of 16B:
-            0, 0, 0, 0, 0, 0
-        };
-
-        if (isL2) {
-            expectedMatch[12] = (byte) 0x86;
-            expectedMatch[13] = (byte) 0xdd;
-        }
-        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMatch, vlanTags == 2 ? 80 : 64, request.match, vlanTags * AclTranslator.VLAN_TAG_LEN);
-
-    }
-
-    @Test
-    public void testCreateTable() {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request =
-            writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, 0);
-        verifyTableRequest(request, nextTableIndex, 0, false);
-    }
-
-    @Test
-    public void testCreateTableForL2Interface() {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request =
-            writer.createTable(aceIp, InterfaceMode.L2, nextTableIndex, 0);
-        verifyTableRequest(request, nextTableIndex, 0, true);
-    }
-
-    @Test
-    public void testCreateTable1VlanTag() {
-        final int nextTableIndex = 42;
-        final int vlanTags = 1;
-        final ClassifyAddDelTable request =
-            writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, vlanTags);
-        verifyTableRequest(request, nextTableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateTable2VlanTags() {
-        final int nextTableIndex = 42;
-        final int vlanTags = 2;
-        final ClassifyAddDelTable request =
-            writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, vlanTags);
-        verifyTableRequest(request, nextTableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateClassifySession() {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request =
-            writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, 0).get(0);
-        verifySessionRequest(request, tableIndex, 0, false);
-    }
-
-    @Test
-    public void testCreateClassifySessionForL2Interface() {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request =
-            writer.createSession(action, aceIp, InterfaceMode.L2, tableIndex, 0).get(0);
-        verifySessionRequest(request, tableIndex, 0, true);
-    }
-
-    @Test
-    public void testCreateClassifySession1VlanTag() {
-        final int tableIndex = 123;
-        final int vlanTags = 1;
-        final ClassifyAddDelSession request =
-            writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, vlanTags).get(0);
-        verifySessionRequest(request, tableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateClassifySession2VlanTags() {
-        final int tableIndex = 123;
-        final int vlanTags = 2;
-        final ClassifyAddDelSession request =
-            writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, vlanTags).get(0);
-        verifySessionRequest(request, tableIndex, vlanTags, false);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriterTest.java
deleted file mode 100644
index 5626352b3..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriterTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.common;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpAndEth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpAndEthBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.AceIpAndEthNodesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.ace.ip.and.eth.nodes.ace.ip.version.AceIpv4Builder;
-
-public class AceIpAndEthWriterTest {
-
-    private AceIpAndEthWriter writer;
-    private PacketHandling action;
-    private AceIpAndEth ace;
-
-    @Before
-    public void setUp() {
-        initMocks(this);
-        writer = new AceIpAndEthWriter();
-        action = new DenyBuilder().setDeny(true).build();
-        ace = new AceIpAndEthBuilder().setAceIpAndEthNodes(new AceIpAndEthNodesBuilder()
-            .setDestinationMacAddress(new MacAddress("11:22:33:44:55:66"))
-            .setSourceMacAddress(new MacAddress("aa:bb:cc:dd:ee:ff"))
-            .setAceIpVersion(new AceIpv4Builder()
-                .setSourceIpv4Network(new Ipv4Prefix("1.2.3.4/32")).build())
-            .setSourcePortRange(new SourcePortRangeBuilder().setLowerPort(new PortNumber(0x1111)).build())
-            .setDestinationPortRange(new DestinationPortRangeBuilder().setLowerPort(new PortNumber(0x2222)).build())
-            .build()).build();
-    }
-
-    @Test
-    public void testCreateTable() {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request = writer.createTable(ace, InterfaceMode.L2, nextTableIndex, 0);
-
-        assertEquals(1, request.isAdd);
-        assertEquals(-1, request.tableIndex);
-        assertEquals(1, request.nbuckets);
-        assertEquals(nextTableIndex, request.nextTableIndex);
-        assertEquals(0, request.skipNVectors);
-        assertEquals(3, request.matchNVectors);
-        assertEquals(AceEthWriter.TABLE_MEM_SIZE, request.memorySize);
-
-        byte[] expectedMask = new byte[] {
-            // destination MAC:
-            -1, -1, -1, -1, -1, -1,
-            // source MAC:
-            -1, -1, -1, -1, -1, -1,
-            // ether type:
-            -1, -1,
-            // IP header
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // source address:
-            -1, -1, -1, -1,
-            // destination address:
-            0, 0, 0, 0,
-            // source and destination port:
-            -1, -1, -1, -1,
-            // padding:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
-        assertArrayEquals(expectedMask, request.mask);
-    }
-
-    @Test
-    public void testCreateClassifySession() {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request = writer.createSession(action, ace, InterfaceMode.L2, tableIndex, 0).get(0);
-
-        assertEquals(1, request.isAdd);
-        assertEquals(tableIndex, request.tableIndex);
-        assertEquals(0, request.hitNextIndex);
-
-        byte[] expectedMatch = new byte[] {
-            // destination MAC:
-            (byte) 0x11, (byte) 0x22, (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66,
-            // source MAC:
-            (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 0xee, (byte) 0xff,
-            // ether type (IP4):
-            0x08, 0,
-            // IP header
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // source address:
-            1, 2, 3, 4,
-            // destination address:
-            0, 0, 0, 0,
-            // source and destination port:
-            0x11, 0x11, 0x22, 0x22,
-            // padding:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
-        assertArrayEquals(expectedMatch, request.match);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpWriterTestUtils.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpWriterTestUtils.java
deleted file mode 100644
index 257840169..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpWriterTestUtils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.common;
-
-import static org.junit.Assert.assertArrayEquals;
-
-final class AceIpWriterTestUtils {
-
-    private AceIpWriterTestUtils() {
-        throw new UnsupportedOperationException("This utility class cannot be instantiated");
-    }
-
-    protected static void assertArrayEqualsWithOffset(final byte[] baseExpected, final int expectedLength, final byte[] actual,
-                                                      final int offset) {
-        byte[] expected = new byte[expectedLength];
-        System.arraycopy(baseExpected, 0, expected, offset, Math.min(baseExpected.length, expectedLength-offset));
-
-        assertArrayEquals(expected, actual);
-    }
-}
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImplTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImplTest.java
deleted file mode 100644
index f2b73b44b..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImplTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.common;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.honeycomb.translate.MappingContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-
-public class AclTableContextManagerImplTest {
-
-    private AclTableContextManagerImpl ctx;
-    @Mock
-    private MappingContext mappingContext;
-    private static final int INDEX = 42;
-
-    @Before
-    public void setUp() throws Exception {
-        initMocks(this);
-        ctx = new AclTableContextManagerImpl(MappingTable.Direction.Ingress);
-    }
-
-    @Test
-    public void testAddEntry() throws Exception {
-        final MappingEntry entry =
-            new MappingEntryBuilder().setL2TableId(1).setIp4TableId(2).setIp6TableId(3).setIndex(INDEX).build();
-        ctx.addEntry(entry, mappingContext);
-        verify(mappingContext).put(ctx.getId(INDEX), entry);
-    }
-
-    @Test
-    public void testRemoveEntry() throws Exception {
-        ctx.removeEntry(INDEX, mappingContext);
-        verify(mappingContext).delete(ctx.getId(INDEX));
-    }
-
-    @Test
-    public void testReadEntry() throws Exception {
-        ctx.getEntry(INDEX, mappingContext);
-        verify(mappingContext).read(ctx.getId(INDEX));
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPairTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPairTest.java
deleted file mode 100644
index 9126d8c01..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPairTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.common;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.hasSize;
-
-import java.util.List;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRangeBuilder;
-
-public class PortPairTest {
-
-    @Test
-    public void testSingleSrc() {
-        final SourcePortRange src = new SourcePortRangeBuilder().setLowerPort(new PortNumber(123)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, null);
-        assertThat(portPairs, hasSize(1));
-        assertThat(portPairs, contains(new PortPair(123, null)));
-    }
-
-    @Test
-    public void testSrcRange() {
-        final SourcePortRange src = new SourcePortRangeBuilder()
-            .setLowerPort(new PortNumber(123))
-            .setUpperPort(new PortNumber(125)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, null);
-        assertThat(portPairs, hasSize(3));
-        assertThat(portPairs, contains(new PortPair(123, null), new PortPair(124, null), new PortPair(125, null)));
-    }
-
-    @Test
-    public void testSrcRangeWithDst() {
-        final SourcePortRange src = new SourcePortRangeBuilder()
-            .setLowerPort(new PortNumber(123))
-            .setUpperPort(new PortNumber(125)).build();
-        final DestinationPortRange dst = new DestinationPortRangeBuilder().setLowerPort(new PortNumber(111)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, dst);
-        assertThat(portPairs, hasSize(3));
-        assertThat(portPairs, contains(new PortPair(123, 111), new PortPair(124, 111), new PortPair(125, 111)));
-    }
-
-    @Test
-    public void testSingleDst() {
-        final DestinationPortRange dst = new DestinationPortRangeBuilder().setLowerPort(new PortNumber(123)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(null, dst);
-        assertThat(portPairs, hasSize(1));
-        assertThat(portPairs, contains(new PortPair(null, 123)));
-    }
-
-    @Test
-    public void testDstRange() {
-        final DestinationPortRange dst = new DestinationPortRangeBuilder()
-            .setLowerPort(new PortNumber(10))
-            .setUpperPort(new PortNumber(11)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(null, dst);
-        assertThat(portPairs, hasSize(2));
-        assertThat(portPairs, contains(new PortPair(null, 10), new PortPair(null, 11)));
-    }
-
-    @Test
-    public void testDstRangeWithSrc() {
-        final SourcePortRange src = new SourcePortRangeBuilder().setLowerPort(new PortNumber(111)).build();
-        final DestinationPortRange dst = new DestinationPortRangeBuilder()
-            .setLowerPort(new PortNumber(10))
-            .setUpperPort(new PortNumber(11)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, dst);
-        assertThat(portPairs, hasSize(2));
-        assertThat(portPairs, contains(new PortPair(111, 10), new PortPair(111, 11)));
-    }
-
-    @Test
-    public void testSinglePair() {
-        final SourcePortRange src = new SourcePortRangeBuilder().setLowerPort(new PortNumber(123)).build();
-        final DestinationPortRange dst = new DestinationPortRangeBuilder().setLowerPort(new PortNumber(321)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, dst);
-        assertThat(portPairs, hasSize(1));
-        assertThat(portPairs, contains(new PortPair(123, 321)));
-    }
-
-    @Test
-    public void testCartesianProduct() {
-        final SourcePortRange src = new SourcePortRangeBuilder()
-            .setLowerPort(new PortNumber(1))
-            .setUpperPort(new PortNumber(2)).build();
-        final DestinationPortRange dst = new DestinationPortRangeBuilder()
-            .setLowerPort(new PortNumber(1))
-            .setUpperPort(new PortNumber(3)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, dst);
-        assertThat(portPairs, hasSize(6));
-        assertThat(portPairs,
-            contains(new PortPair(1, 1), new PortPair(1, 2), new PortPair(1, 3), new PortPair(2, 1), new PortPair(2, 2),
-                new PortPair(2, 3)));
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriterTest.java
deleted file mode 100644
index 0c7e42733..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriterTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.egress;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManager;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2Tables;
-import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2TablesReply;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.AceBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.ActionsBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.MatchesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.PermitBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv4Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.EgressBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class EgressIetfAclWriterTest extends WriterCustomizerTest {
-
-    private static final int IF_INDEX = 1;
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
-
-    private EgressIetfAclWriter writer;
-    @Mock
-    private AclTableContextManager aclCtx;
-    @Mock
-    private InstanceIdentifier<?> id;
-
-    private static ClassifyAddDelTable classifyAddDelTable(final int tableIndex) {
-        final ClassifyAddDelTable reply = new ClassifyAddDelTable();
-        reply.tableIndex = tableIndex;
-        reply.delChain = 1;
-        return reply;
-    }
-
-    @Override
-    protected void setUpTest() throws Exception {
-        writer = new EgressIetfAclWriter(api, aclCtx);
-    }
-
-    private ClassifySetInterfaceL2Tables classifySetInterfaceL2TablesRequest() {
-        final ClassifySetInterfaceL2Tables request = new ClassifySetInterfaceL2Tables();
-        request.isInput = 0;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = -1;
-        request.otherTableIndex = -1;
-        request.swIfIndex = IF_INDEX;
-        return request;
-    }
-
-    @Test
-    public void testDeleteAcl() throws Exception {
-        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
-        when(api.classifySetInterfaceL2Tables(any())).thenReturn(future(new ClassifySetInterfaceL2TablesReply()));
-        when(aclCtx.getEntry(IF_INDEX, mappingContext)).thenReturn(Optional.of(
-            new MappingEntryBuilder()
-                .setIndex(IF_INDEX)
-                .setL2TableId(1)
-                .setIp4TableId(2)
-                .setIp6TableId(3)
-                .build()));
-
-        writer.deleteAcl(id, IF_INDEX, mappingContext);
-
-        verify(api).classifySetInterfaceL2Tables(classifySetInterfaceL2TablesRequest());
-        verify(api).classifyAddDelTable(classifyAddDelTable(1));
-        verify(api).classifyAddDelTable(classifyAddDelTable(2));
-        verify(api).classifyAddDelTable(classifyAddDelTable(3));
-        verify(aclCtx).removeEntry(IF_INDEX, mappingContext);
-    }
-
-    @Test
-    public void testWrite() throws Exception {
-        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
-        when(api.classifyAddDelSession(any())).thenReturn(future(new ClassifyAddDelSessionReply()));
-        when(api.classifySetInterfaceL2Tables(any())).thenReturn(future(new ClassifySetInterfaceL2TablesReply()));
-
-        final Egress
-            acl = new EgressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).setMode(InterfaceMode.L2).build()
-        ).build();
-
-        final AccessLists accessLists = acl.getAccessLists();
-
-        when(writeContext.readAfter(any())).thenReturn(Optional.of(
-            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
-                .setAccessListEntries(
-                    new AccessListEntriesBuilder().setAce(Collections.singletonList(new AceBuilder()
-                        .setMatches(new MatchesBuilder().setAceType(
-                            new AceIpBuilder()
-                                .setAceIpVersion(new AceIpv4Builder().build())
-                                .setProtocol((short) 1)
-                                .build()
-                        ).build())
-                        .setActions(new ActionsBuilder().setPacketHandling(new PermitBuilder().build()).build())
-                        .build())).build()
-                ).build()
-
-        ));
-
-        writer.write(id, IF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-            writeContext, mappingContext);
-
-        final ClassifySetInterfaceL2Tables request = new ClassifySetInterfaceL2Tables();
-        request.isInput = 0;
-        request.swIfIndex = IF_INDEX;
-        request.otherTableIndex = -1;
-        request.ip4TableIndex = 0;
-        request.ip6TableIndex = -1;
-        verify(api).classifySetInterfaceL2Tables(request);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizerTest.java
deleted file mode 100644
index fc6453faf..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizerTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.egress;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.MixedAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.EgressBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class IetfAclCustomizerTest extends WriterCustomizerTest {
-    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final InstanceIdentifier<Egress> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
-            VppInterfaceAclAugmentation.class).child(IetfAcl.class).child(Egress.class);
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = MixedAcl.class;
-
-    @Mock
-    private IetfAclWriter aclWriter;
-    private IetfAclCustomizer customizer;
-
-    private static Egress acl(final InterfaceMode mode) {
-        return new EgressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).setMode(mode)
-                .build()
-        ).build();
-    }
-
-    @Override
-    protected void setUpTest() {
-        customizer = new IetfAclCustomizer(aclWriter, new NamingContext("prefix", IFC_TEST_INSTANCE));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-    }
-
-    private void verifyWrite(final AccessLists accessLists) throws WriteFailedException {
-        verify(aclWriter)
-            .write(IID, IF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-                writeContext, mappingContext);
-    }
-
-    private void verifyDelete() throws WriteFailedException {
-        verify(aclWriter).deleteAcl(IID, IF_INDEX, mappingContext);
-    }
-
-    @Test
-    public void testWriteL3() throws Exception {
-        customizer.writeCurrentAttributes(IID, acl(InterfaceMode.L3), writeContext);
-        verifyZeroInteractions(aclWriter);
-    }
-
-    @Test
-    public void testWriteL2() throws Exception {
-        final Egress acl = acl(InterfaceMode.L2);
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-        verifyWrite(acl.getAccessLists());
-    }
-
-    @Test
-    public void testUpdate() throws Exception {
-        final Egress aclBefore = acl(InterfaceMode.L3);
-        final Egress aclAfter = acl(InterfaceMode.L2);
-        customizer.updateCurrentAttributes(IID, aclBefore, aclAfter, writeContext);
-        verifyDelete();
-        verifyWrite(aclAfter.getAccessLists());
-    }
-
-    @Test
-    public void testDelete() throws Exception {
-        final Egress acl = acl(InterfaceMode.L2);
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-        verifyDelete();
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizerTest.java
deleted file mode 100644
index e015a530f..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizerTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.egress;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.MixedAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.EgressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.subinterface.acl.rev170315.VppSubinterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.SubinterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
-    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final String SUBIF_NAME = "local0.0";
-    private static final int SUBIF_INDEX = 11;
-    private static final long SUBIF_ID = 0;
-    private static final InstanceIdentifier<Egress> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
-            SubinterfaceAugmentation.class).child(SubInterfaces.class)
-            .child(SubInterface.class, new SubInterfaceKey(SUBIF_ID))
-                .augmentation(VppSubinterfaceAclAugmentation.class)
-                .child(IetfAcl.class).child(Egress.class);
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = MixedAcl.class;
-
-    @Mock
-    private IetfAclWriter aclWriter;
-    private SubInterfaceIetfAclCustomizer customizer;
-
-    private static Egress acl(final InterfaceMode mode) {
-        return new EgressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).setMode(mode)
-                .build()
-        ).build();
-    }
-
-    @Override
-    protected void setUpTest() {
-        customizer = new SubInterfaceIetfAclCustomizer(aclWriter, new NamingContext("prefix", IFC_TEST_INSTANCE));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
-
-
-        when(writeContext.readAfter(IID.firstIdentifierOf(SubInterface.class))).thenReturn(Optional.of(
-                new SubInterfaceBuilder().build()
-        ));
-    }
-
-    private void verifyWrite(final AccessLists accessLists) throws WriteFailedException {
-        verify(aclWriter)
-            .write(IID, SUBIF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-                writeContext, 0, mappingContext);
-    }
-
-    private void verifyDelete() throws WriteFailedException {
-        verify(aclWriter).deleteAcl(IID, SUBIF_INDEX, mappingContext);
-    }
-
-    @Test
-    public void testWriteL3() throws Exception {
-        customizer.writeCurrentAttributes(IID, acl(InterfaceMode.L3), writeContext);
-        verifyZeroInteractions(aclWriter);
-    }
-
-    @Test
-    public void testWriteL2() throws Exception {
-        final Egress acl = acl(InterfaceMode.L2);
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-        verifyWrite(acl.getAccessLists());
-    }
-
-    @Test
-    public void testUpdate() throws Exception {
-        final Egress aclBefore = acl(InterfaceMode.L3);
-        final Egress aclAfter = acl(InterfaceMode.L2);
-        customizer.updateCurrentAttributes(IID, aclBefore, aclAfter, writeContext);
-        verifyDelete();
-        verifyWrite(aclAfter.getAccessLists());
-    }
-
-    @Test
-    public void testDelete() throws Exception {
-        final Egress acl = acl(InterfaceMode.L2);
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-        verifyDelete();
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizerTest.java
deleted file mode 100644
index 44cc3a744..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizerTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.ingress;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManager;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
-import java.util.Arrays;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.Ace;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.AceBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.ActionsBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.MatchesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.Deny;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.Permit;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.PermitBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv6Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Ingress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.IngressBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class IetfAclCustomizerTest extends WriterCustomizerTest {
-
-    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final InstanceIdentifier<Ingress> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
-            VppInterfaceAclAugmentation.class).child(IetfAcl.class).child(Ingress.class);
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
-
-    @Mock
-    private AclTableContextManager aclCtx;
-
-    private IetfAclCustomizer customizer;
-    private Ingress acl;
-    private int DENY = 0;
-    private int PERMIT = -1;
-
-    private static Ace ace(final PacketHandling action) {
-        return new AceBuilder()
-                .setMatches(new MatchesBuilder().setAceType(
-                        new AceIpBuilder()
-                                .setAceIpVersion(new AceIpv6Builder().build())
-                                .setProtocol((short) 1)
-                                .build()
-                ).build())
-                .setActions(new ActionsBuilder().setPacketHandling(action).build())
-                .build();
-    }
-
-    private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = IF_INDEX;
-        request.l2TableIndex = 1;
-        request.ip4TableIndex = 2;
-        request.ip6TableIndex = 3;
-        return request;
-    }
-
-    private static ClassifyAddDelTable classifyAddDelTable(final int tableIndex) {
-        final ClassifyAddDelTable reply = new ClassifyAddDelTable();
-        reply.tableIndex = tableIndex;
-        reply.delChain = 1;
-        return reply;
-    }
-
-    private static InputAclSetInterface inputAclSetInterfaceWriteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = IF_INDEX;
-        request.isAdd = 1;
-        request.l2TableIndex = -1;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = 0;
-        return request;
-    }
-
-    @Override
-    protected void setUpTest() {
-        customizer = new IetfAclCustomizer(new IngressIetfAclWriter(api, aclCtx), new NamingContext("prefix", IFC_TEST_INSTANCE));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-        acl = new IngressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).build()
-        ).build();
-    }
-
-    @Test
-    public void testWrite() throws WriteFailedException {
-        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
-        when(api.classifyAddDelSession(any())).thenReturn(future(new ClassifyAddDelSessionReply()));
-
-        when(writeContext.readAfter(any())).thenReturn(Optional.of(
-            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
-                .setAccessListEntries(
-                    new AccessListEntriesBuilder().setAce(Arrays.asList(ace(permit()), ace(permit()), ace(deny())
-                    )).build()
-                ).build()
-
-        ));
-        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
-
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-
-        final InOrder inOrder = Mockito.inOrder(api);
-        inOrder.verify(api).classifyAddDelTable(argThat(actionOnMissEquals(DENY))); // default action
-        inOrder.verify(api).classifyAddDelTable(any());
-        inOrder.verify(api).classifyAddDelSession(argThat(actionOnHitEquals(DENY))); // last deny ACE
-        inOrder.verify(api).classifyAddDelTable(any());
-        inOrder.verify(api).classifyAddDelSession(argThat(actionOnHitEquals(PERMIT)));
-        inOrder.verify(api).classifyAddDelTable(any());
-        inOrder.verify(api).classifyAddDelSession(argThat(actionOnHitEquals(PERMIT)));
-        inOrder.verify(api).inputAclSetInterface(inputAclSetInterfaceWriteRequest()); // assignment
-    }
-
-    private ArgumentMatcher<ClassifyAddDelTable> actionOnMissEquals(final int action) {
-        return table -> table.missNextIndex == action;
-    }
-
-    private ArgumentMatcher<ClassifyAddDelSession> actionOnHitEquals(final int action) {
-        return session -> session.hitNextIndex == action;
-    }
-
-    private Deny deny() {
-        return new DenyBuilder().build();
-    }
-
-    private Permit permit() {
-        return new PermitBuilder().build();
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
-        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
-        when(aclCtx.getEntry(IF_INDEX, mappingContext)).thenReturn(Optional.of(
-            new MappingEntryBuilder()
-                .setIndex(IF_INDEX)
-                .setL2TableId(1)
-                .setIp4TableId(2)
-                .setIp6TableId(3)
-                .build()));
-
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-
-        final ClassifyTableByInterface expectedRequest = new ClassifyTableByInterface();
-        expectedRequest.swIfIndex = IF_INDEX;
-        verify(api).inputAclSetInterface(inputAclSetInterfaceDeleteRequest());
-        verify(api).classifyAddDelTable(classifyAddDelTable(1));
-        verify(api).classifyAddDelTable(classifyAddDelTable(2));
-        verify(api).classifyAddDelTable(classifyAddDelTable(3));
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
deleted file mode 100644
index 15c960aff..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.vpp.classifier.write.acl.ingress;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.IetfAclWriter;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManager;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Ingress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.IngressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.subinterface.acl.rev170315.VppSubinterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.SubinterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
-
-    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final String SUBIF_NAME = "local0.123";
-    private static final int SUBIF_INDEX = 2;
-    private static final long SUB_IF_ID = 123;
-    private static final InstanceIdentifier<Ingress> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
-            SubinterfaceAugmentation.class).child(SubInterfaces.class)
-            .child(SubInterface.class, new SubInterfaceKey(SUB_IF_ID))
-                .augmentation(VppSubinterfaceAclAugmentation.class)
-                .child(IetfAcl.class).child(Ingress.class);
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
-
-    private SubInterfaceIetfAclCustomizer customizer;
-    private Ingress acl;
-
-    @Mock
-    private AclTableContextManager aclCtx;
-
-    private static InputAclSetInterface inputAclSetInterfaceWriteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = SUBIF_INDEX;
-        request.isAdd = 1;
-        request.l2TableIndex = -1;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = -1;
-        return request;
-    }
-
-    private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = SUBIF_INDEX;
-        request.l2TableIndex = -1;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = -1;
-        return request;
-    }
-
-    @Override
-    protected void setUpTest() {
-        customizer =
-            new SubInterfaceIetfAclCustomizer(new IngressIetfAclWriter(api, aclCtx), new NamingContext("prefix", IFC_TEST_INSTANCE));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-
-        acl = new IngressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).build()
-        ).build();
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
-        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
-        when(aclCtx.getEntry(SUBIF_INDEX, mappingContext)).thenReturn(Optional.of(
-            new MappingEntryBuilder()
-                .setIndex(SUBIF_INDEX)
-                .setL2TableId(-1)
-                .setIp4TableId(-1)
-                .setIp6TableId(-1)
-                .build()));
-
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-
-        final ClassifyTableByInterface expectedRequest = new ClassifyTableByInterface();
-        expectedRequest.swIfIndex = SUBIF_INDEX;
-        verify(api).inputAclSetInterface(inputAclSetInterfaceDeleteRequest());
-    }
-
-    @Test
-    public void testWrite() throws WriteFailedException {
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
-
-        when(writeContext.readAfter(IID.firstIdentifierOf(SubInterface.class))).thenReturn(Optional.of(
-            new SubInterfaceBuilder().build()
-        ));
-
-        when(writeContext.readAfter(IetfAclWriter.ACL_ID.child(
-            org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl.class,
-            new AclKey(ACL_NAME, ACL_TYPE)))).thenReturn(Optional.of(
-            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
-                .setAccessListEntries(
-                    new AccessListEntriesBuilder().setAce(Collections.emptyList()).build()
-                ).build()
-        ));
-
-        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
-
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-
-        verify(api).inputAclSetInterface(inputAclSetInterfaceWriteRequest());
-    }
-}
\ No newline at end of file
diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 50f5d58b6..889d8fd58 100644
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -55,10 +55,6 @@
       io.fd.hc2vpp.vpp.classifier.VppClassifierModule,
       io.fd.hc2vpp.vpp.classifier.InterfaceClassifierAclModule,
       io.fd.hc2vpp.vpp.classifier.SubInterfaceClassifierAclModule,
-      <!-- Classifier Acl's module disabled by default, can't run in the same time with AclModule -->
-      // io.fd.hc2vpp.vpp.classifier.VppClassifierAclModule,
-      // io.fd.hc2vpp.vpp.classifier.InterfaceClassifierIetfAclModule,
-      // io.fd.hc2vpp.vpp.classifier.SubInterfaceClassifierIetfAclModule,
       io.fd.hc2vpp.nat.NatModule,
       io.fd.hc2vpp.routing.RoutingModule,
       io.fd.hc2vpp.acl.AclModule,