summaryrefslogtreecommitdiffstats
path: root/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-01-03 18:12:41 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-01-04 12:44:41 +0100
commitaf188c5c99d4b4fcb669a6e666b2b421ad69e8d9 (patch)
tree625eaa7bee2d6dfa4aab10e3b861c40bcfb0593a /acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java
parent9debe7fe89600b0e1d136f488119dddeb0c5702d (diff)
HONEYCOMB-310: readers&initializers for vpp and macip acls
Change-Id: I8892479123091e43bf191c544b6628d6254be564 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java')
-rw-r--r--acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java
index 2224d11b0..3eb1a6267 100644
--- a/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java
+++ b/acl/acl-impl/src/test/java/io/fd/hc2vpp/acl/util/iface/acl/AclInterfaceAssignmentRequestTest.java
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
import com.google.common.collect.ImmutableList;
+import io.fd.hc2vpp.acl.util.AclContextManager;
import io.fd.hc2vpp.common.test.util.FutureProducer;
import io.fd.hc2vpp.common.test.util.NamingContextHelper;
import io.fd.hc2vpp.common.translate.util.NamingContext;
@@ -79,7 +80,9 @@ public class AclInterfaceAssignmentRequestTest implements NamingContextHelper, F
private InstanceIdentifier<Acl> validIdentifier;
private NamingContext interfaceContext;
- private NamingContext aclContext;
+
+ @Mock
+ private AclContextManager aclContext;
@Before
public void setUp() {
@@ -91,15 +94,14 @@ public class AclInterfaceAssignmentRequestTest implements NamingContextHelper, F
.child(Acl.class);
interfaceContext = new NamingContext("iface", "interface-context");
- aclContext = new NamingContext("acl", "acl-context");
defineMapping(mappingContext, INTERFACE_NAME, INTERFACE_INDEX, "interface-context");
- defineMapping(mappingContext, ACL_NAME_1, ACL_INDEX_1, "acl-context");
- defineMapping(mappingContext, ACL_NAME_2, ACL_INDEX_2, "acl-context");
- defineMapping(mappingContext, ACL_NAME_3, ACL_INDEX_3, "acl-context");
- defineMapping(mappingContext, ACL_NAME_4, ACL_INDEX_4, "acl-context");
- defineMapping(mappingContext, ACL_NAME_5, ACL_INDEX_5, "acl-context");
+ when(aclContext.getAclIndex(ACL_NAME_1, mappingContext)).thenReturn(ACL_INDEX_1);
+ when(aclContext.getAclIndex(ACL_NAME_2, mappingContext)).thenReturn(ACL_INDEX_2);
+ when(aclContext.getAclIndex(ACL_NAME_3, mappingContext)).thenReturn(ACL_INDEX_3);
+ when(aclContext.getAclIndex(ACL_NAME_4, mappingContext)).thenReturn(ACL_INDEX_4);
+ when(aclContext.getAclIndex(ACL_NAME_5, mappingContext)).thenReturn(ACL_INDEX_5);
when(api.aclInterfaceSetAclList(any())).thenReturn(future(new AclInterfaceSetAclListReply()));
}