import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
-import io.fd.honeycomb.translate.v3po.test.ContextTestUtils;
-import io.fd.honeycomb.translate.v3po.util.NamingContext;
+import io.fd.honeycomb.translate.v3po.interfaces.acl.ingress.AclCustomizer;
import io.fd.honeycomb.translate.v3po.vppclassifier.VppClassifierContextManager;
+import io.fd.honeycomb.translate.vpp.util.NamingContext;
import io.fd.honeycomb.translate.write.WriteFailedException;
import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.vpp.jvpp.VppBaseCallException;
+import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
+import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
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.v3po.rev150105.VppInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.acl.base.attributes.L2Acl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.acl.base.attributes.L2AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.Acl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.AclBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.acl.base.attributes.L2Acl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.acl.base.attributes.L2AclBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.Acl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.acl.Ingress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.acl.IngressBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.jvpp.VppBaseCallException;
-import org.openvpp.jvpp.core.dto.InputAclSetInterface;
-import org.openvpp.jvpp.core.dto.InputAclSetInterfaceReply;
public class AclCustomizerTest extends WriterCustomizerTest {
@Override
public void setUp() {
- ContextTestUtils.mockMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
+ defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
customizer = new AclCustomizer(api, new NamingContext("generatedInterfaceName", IFC_TEST_INSTANCE),
classifyTableContext);
}
- private InstanceIdentifier<Acl> getAclId(final String name) {
+ private InstanceIdentifier<Ingress> getAclId(final String name) {
return InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(name)).augmentation(
- VppInterfaceAugmentation.class).child(Acl.class);
+ VppInterfaceAugmentation.class).child(Acl.class).child(Ingress.class);
}
- private Acl generateAcl(final String tableName) {
- final AclBuilder builder = new AclBuilder();
+ private Ingress generateAcl(final String tableName) {
+ final IngressBuilder builder = new IngressBuilder();
final L2Acl l2Acl = new L2AclBuilder().setClassifyTable(tableName).build();
builder.setL2Acl(l2Acl);
return builder.build();
@Test
public void testCreate() throws Exception {
- final Acl acl = generateAcl(ACL_TABLE_NAME);
- final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+ final Ingress acl = generateAcl(ACL_TABLE_NAME);
+ final InstanceIdentifier<Ingress> id = getAclId(IF_NAME);
whenInputAclSetInterfaceThenSuccess();
@Test
public void testCreateFailed() throws Exception {
- final Acl acl = generateAcl(ACL_TABLE_NAME);
- final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+ final Ingress acl = generateAcl(ACL_TABLE_NAME);
+ final InstanceIdentifier<Ingress> id = getAclId(IF_NAME);
whenInputAclSetInterfaceThenFailure();
try {
customizer.writeCurrentAttributes(id, acl, writeContext);
- } catch (WriteFailedException.CreateFailedException e) {
+ } catch (WriteFailedException e) {
assertTrue(e.getCause() instanceof VppBaseCallException);
verify(api).inputAclSetInterface(generateInputAclSetInterface((byte) 1, IF_INDEX, ACL_TABLE_INDEX));
return;
@Test
public void testDelete() throws Exception {
- final Acl acl = generateAcl(ACL_TABLE_NAME);
- final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+ final Ingress acl = generateAcl(ACL_TABLE_NAME);
+ final InstanceIdentifier<Ingress> id = getAclId(IF_NAME);
whenInputAclSetInterfaceThenSuccess();
@Test
public void testDeleteFailed() throws Exception {
- final Acl acl = generateAcl(ACL_TABLE_NAME);
- final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+ final Ingress acl = generateAcl(ACL_TABLE_NAME);
+ final InstanceIdentifier<Ingress> id = getAclId(IF_NAME);
whenInputAclSetInterfaceThenFailure();
try {
customizer.deleteCurrentAttributes(id, acl, writeContext);
- } catch (WriteFailedException.DeleteFailedException e) {
+ } catch (WriteFailedException e) {
assertTrue(e.getCause() instanceof VppBaseCallException);
verify(api).inputAclSetInterface(generateInputAclSetInterface((byte) 0, IF_INDEX, ACL_TABLE_INDEX));
return;