Code improvements for FDS scenarios

[groupbasedpolicy.git] / renderers / vpp / src / test / java / org / opendaylight / groupbasedpolicy / renderer / vpp / policy / acl / AccessListUtilTest.java

diff --git a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/AccessListUtilTest.java b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/AccessListUtilTest.java
index 8239172738dd0e32c93d5dd0f7b5445c60894121..2e5d37bd7e5e74d9865f9f10254f60494b29ebb6 100644 (file)
--- a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/AccessListUtilTest.java
+++ b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/AccessListUtilTest.java
@@ -31,7 +31,8 @@ public class AccessListUtilTest extends TestResources {
 
     @Before
     public void init() {
-        ctx = super.createPolicyContext();
+        ctx = super.createPolicyContext(createAddressEndpoints(), createRendEps(), createRuleGroups(),
+                createForwarding());
         mountedDataProviderMock = Mockito.mock(MountedDataBrokerProvider.class);
         mountPointDataBroker = Mockito.mock(DataBroker.class);
         Mockito.when(mountedDataProviderMock.resolveDataBrokerForMountPoint(Mockito.any(InstanceIdentifier.class)))
@@ -40,18 +41,17 @@ public class AccessListUtilTest extends TestResources {
 
     @Test
     public void resolveAclsOnInterfaceTest() throws Exception {
-        // TODO add more checking
         AclManager aclManager = new AclManager(mountedDataProviderMock, Mockito.mock(InterfaceManager.class));
         List<AccessListWrapper> acls =
-                aclManager.resolveAclsOnInterface(rendererEndpoint(l2AddrEp2).build().getKey(), ctx).get();
+                aclManager.resolveAclsOnInterface(rendererEndpointKey(l3AddrEp2.getKey()), ctx).get();
         Assert.assertEquals(2, acls.size());
         Assert.assertEquals(2, acls.stream().map(AccessListWrapper::getDirection).collect(Collectors.toSet()).size());
         acls.stream().forEach(ace -> {
             // allow peer + deny rest of tenant net + permit external
             if (ace instanceof IngressAccessListWrapper) {
-                Assert.assertEquals(3, ace.readRules().size());
+                Assert.assertEquals(4, ace.readRules().size());
             } else if (ace instanceof EgressAccessListWrapper) {
-                Assert.assertEquals(3, ace.readRules().size());
+                Assert.assertEquals(4, ace.readRules().size());
             }
         });
     }