1 files changed, 39 insertions, 33 deletions

diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizerTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizerTest.java
index 5dc139acc..b6c26ceeb 100644
--- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizerTest.java
+++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/write/InterfaceAclCustomizerTest.java
@@ -17,10 +17,10 @@
 package io.fd.hc2vpp.acl.write;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import io.fd.hc2vpp.acl.AclIIds;
 import io.fd.hc2vpp.acl.AclTestSchemaContext;
 import io.fd.hc2vpp.acl.util.AclContextManager;
 import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
@@ -31,15 +31,12 @@ import io.fd.vpp.jvpp.acl.future.FutureJVppAclFacade;
 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.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._interface.acl.rev161214.VppAclInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.Acl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.acl.IngressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214.vpp.acls.base.attributes.VppAcls;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214.vpp.acls.base.attributes.VppAclsBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points.InterfaceBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points._interface.IngressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points._interface.acl.AclSetsBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev181001.acls.attachment.points._interface.acl.acl.sets.AclSetBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class InterfaceAclCustomizerTest extends WriterCustomizerTest implements AclTestSchemaContext {
@@ -47,61 +44,70 @@ public class InterfaceAclCustomizerTest extends WriterCustomizerTest implements
     private static final String IFC_CTX_NAME = "ifc-test-instance";
     private static final String IFACE_NAME = "eth0";
     private static final int IFACE_ID = 123;
+    private static final int ACL_ID = 111;
 
     @Mock
     private FutureJVppAclFacade aclApi;
     @Mock
     private AclContextManager standardAclContext;
+    @Mock
+    private AclContextManager macipAclContext;
 
     private InterfaceAclCustomizer customizer;
-    private NamingContext interfaceContext;
-    private InstanceIdentifier<Acl> ACL_ID = InstanceIdentifier.create(Interfaces.class)
-        .child(Interface.class, new InterfaceKey(IFACE_NAME)).augmentation(VppAclInterfaceAugmentation.class).child(Acl.class);
+    private InstanceIdentifier<Interface> IFC_IID =
+            AclIIds.ACLS_AP.child(Interface.class, new InterfaceKey(IFACE_NAME));
+    private Interface ifcAcl;
+    private static final String ACL_NAME = "standard_acl";
+
 
     @Override
-    protected void setUpTest() throws Exception {
+    protected void setUpTest() {
         defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        interfaceContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
-        customizer = new InterfaceAclCustomizer(aclApi, interfaceContext, standardAclContext);
+        final NamingContext interfaceContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
+        customizer = new InterfaceAclCustomizer(aclApi, interfaceContext, standardAclContext, macipAclContext);
+        ifcAcl = new InterfaceBuilder()
+                .setIngress(new IngressBuilder()
+                        .setAclSets(new AclSetsBuilder()
+                                .setAclSet(Collections.singletonList(new AclSetBuilder()
+                                        .setName(ACL_NAME)
+                                        .build()))
+                                .build())
+                        .build())
+                .build();
+        when(standardAclContext.getAclIndex(ACL_NAME, mappingContext)).thenReturn(ACL_ID);
+        when(standardAclContext.containsAcl(ACL_NAME, mappingContext)).thenReturn(true);
         when(aclApi.aclInterfaceSetAclList(any())).thenReturn(future(new AclInterfaceSetAclListReply()));
     }
 
     @Test
     public void testWrite() throws Exception {
-        final Acl acl = new AclBuilder().build();
-        customizer.writeCurrentAttributes(ACL_ID, acl, writeContext);
+        customizer.writeCurrentAttributes(IFC_IID, ifcAcl, writeContext);
         final AclInterfaceSetAclList list = new AclInterfaceSetAclList();
         list.swIfIndex = IFACE_ID;
-        list.acls = new int[]{};
+        list.acls = new int[]{ACL_ID};
+        list.count = 1;
+        list.nInput = 1;
         verify(aclApi).aclInterfaceSetAclList(list);
     }
 
     @Test
     public void testUpdate() throws Exception {
-        final Acl acl = new AclBuilder().build();
-        customizer.updateCurrentAttributes(ACL_ID, acl, acl, writeContext);
+        final Interface updIfcAcl = new InterfaceBuilder().build();
+        customizer.updateCurrentAttributes(IFC_IID, updIfcAcl, ifcAcl, writeContext);
         final AclInterfaceSetAclList list = new AclInterfaceSetAclList();
         list.swIfIndex = IFACE_ID;
-        list.acls = new int[]{};
+        list.acls = new int[]{ACL_ID};
+        list.count = 1;
+        list.nInput = 1;
         verify(aclApi).aclInterfaceSetAclList(list);
     }
 
     @Test
     public void testDelete() throws Exception {
-        final VppAcls
-            element = mock(VppAcls.class);
-        final Acl acl = new AclBuilder()
-            .setIngress(new IngressBuilder()
-                .setVppAcls(Collections.singletonList(new VppAclsBuilder()
-                    .setName("asd")
-                    .build()))
-                .build())
-            .build();
-        customizer.deleteCurrentAttributes(ACL_ID, acl, writeContext);
+        customizer.deleteCurrentAttributes(IFC_IID, ifcAcl, writeContext);
         final AclInterfaceSetAclList list = new AclInterfaceSetAclList();
         list.swIfIndex = IFACE_ID;
         list.acls = new int[]{};
         verify(aclApi).aclInterfaceSetAclList(list);
     }
-
 }
\ No newline at end of file