1 files changed, 9 insertions, 6 deletions

diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java
index f15119be6..a97f57ec1 100644
--- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java
+++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/AclModule.java
@@ -22,10 +22,12 @@ import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.name.Names;
+import io.fd.hc2vpp.acl.read.factory.AclReaderFactory;
 import io.fd.hc2vpp.acl.read.factory.InterfaceAclReaderFactory;
+import io.fd.hc2vpp.acl.util.AclContextManager;
+import io.fd.hc2vpp.acl.util.AclContextManagerImpl;
 import io.fd.hc2vpp.acl.write.factory.InterfaceAclWriterFactory;
 import io.fd.hc2vpp.acl.write.factory.VppAclWriterFactory;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.read.ReaderFactory;
 import io.fd.honeycomb.translate.write.WriterFactory;
 import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
@@ -39,7 +41,7 @@ public class AclModule extends AbstractModule {
     public static final String STANDARD_ACL_CONTEXT_NAME = "standard-acl-context";
     public static final String STANDARD_LEARNED_ACL_NAME_PREFIX = "standard-learned-acl-";
     public static final String MAC_IP_ACL_CONTEXT_NAME = "mac-ip-acl-context";
-    public static final String MAC_IP_LEARNED_ACL_NAME_PREFIX = "mac-ip-acl-context";
+    public static final String MAC_IP_LEARNED_ACL_NAME_PREFIX = "mac-ip-learned-acl-";
 
     private static final Logger LOG = LoggerFactory.getLogger(AclModule.class);
 
@@ -62,11 +64,11 @@ public class AclModule extends AbstractModule {
         // binds JVpp Acl future facade
         bind(FutureJVppAclFacade.class).toProvider(jvppAclProviderClass).in(Singleton.class);
 
-        bind(NamingContext.class).annotatedWith(Names.named(STANDARD_ACL_CONTEXT_NAME))
-                .toInstance(new NamingContext(STANDARD_LEARNED_ACL_NAME_PREFIX, STANDARD_ACL_CONTEXT_NAME));
+        bind(AclContextManager.class).annotatedWith(Names.named(STANDARD_ACL_CONTEXT_NAME))
+                .toInstance(new AclContextManagerImpl(STANDARD_LEARNED_ACL_NAME_PREFIX, STANDARD_ACL_CONTEXT_NAME));
 
-        bind(NamingContext.class).annotatedWith(Names.named(MAC_IP_ACL_CONTEXT_NAME))
-                .toInstance(new NamingContext(MAC_IP_LEARNED_ACL_NAME_PREFIX, MAC_IP_ACL_CONTEXT_NAME));
+        bind(AclContextManager.class).annotatedWith(Names.named(MAC_IP_ACL_CONTEXT_NAME))
+                .toInstance(new AclContextManagerImpl(MAC_IP_LEARNED_ACL_NAME_PREFIX, MAC_IP_ACL_CONTEXT_NAME));
 
         final Multibinder<WriterFactory> writerFactoryMultibinder =
                 Multibinder.newSetBinder(binder(), WriterFactory.class);
@@ -76,6 +78,7 @@ public class AclModule extends AbstractModule {
         final Multibinder<ReaderFactory> readerFactoryMultibinder =
                 Multibinder.newSetBinder(binder(), ReaderFactory.class);
         readerFactoryMultibinder.addBinding().to(InterfaceAclReaderFactory.class);
+        readerFactoryMultibinder.addBinding().to(AclReaderFactory.class);
 
         LOG.info("Module Acl successfully configured");
     }