Bug 8220 - fixing ACE entry in VPP renderer

Only tenant/provider domain subnets should be
blocked in the end of entries for tenant networking.

Change-Id: Ia7b829c384ccd90d12428befb6a50548885a3ce1
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/AccessListUtil.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/AccessListUtil.java
index ea917662f60ecd00280a6d21981be6113b02b2b2..6e15411df4d84ce5a26d0f3438cd50abf50ee943 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/AccessListUtil.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/AccessListUtil.java
@@ -326,10 +326,10 @@ public class AccessListUtil {
                     SubnetAugmentRenderer subnetAug = rnd.getAugmentation(SubnetAugmentRenderer.class);
                     // subnetAug should not be null
                     subnetAug.getSubnet();
-                    if (policyDirection.equals(ACE_DIRECTION.INGRESS)) {
+                    if (policyDirection.equals(ACE_DIRECTION.INGRESS) && subnetAug.getSubnet().isIsTenant()) {
                         aclRuleBuilders.add(denyIngressTrafficForPrefix(subnetAug.getSubnet()));
                     }
-                    else {
+                    else if(subnetAug.getSubnet().isIsTenant()) {
                         aclRuleBuilders.add(denyEgressTrafficForPrefix(subnetAug.getSubnet()));
                     }
                 });

diff --git a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/DtoFactory.java b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/DtoFactory.java
index 7bf93baf3758fa946a85174f783d75168777063f..17d947f9fc87ee192fa35896508ee66502c56460 100644 (file)
--- a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/DtoFactory.java
+++ b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/DtoFactory.java
@@ -186,7 +186,7 @@ public class DtoFactory {
             .addAugmentation(
                     SubnetAugmentRenderer.class,
                     new SubnetAugmentRendererBuilder().setSubnet(
-                            new SubnetBuilder().setIpPrefix(subnetPrefix).setVirtualRouterIp(virtRouterIp).build())
+                            new SubnetBuilder().setIpPrefix(subnetPrefix).setVirtualRouterIp(virtRouterIp).setIsTenant(true).build())
                         .build())
             .build();
         return new RendererForwardingByTenantBuilder().setTenantId(TENANT_ID)

diff --git a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/TestResources.java b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/TestResources.java
index 45f79c326515a5d25765c11e1d5886b3d131d979..8595f27920185e4b4c1e122ad904b53cb6721daa 100644 (file)
--- a/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/TestResources.java
+++ b/renderers/vpp/src/test/java/org/opendaylight/groupbasedpolicy/renderer/vpp/policy/acl/TestResources.java
@@ -192,23 +192,23 @@ public class TestResources {
     }
 
     private RendererForwardingByTenant createForwarding() {
-        RendererForwardingContext l2Fd = createRendererForwardingCtx(L2_FD_ID, new Name("l2fd"), L2FloodDomain.class).setParent(
-                createParent(L2_BD_ID, L2BridgeDomain.class))
-            .build();
-        RendererForwardingContext l2Bd = createRendererForwardingCtx(L3_CTX_ID, new Name("l3ctx"), L3Context.class).setParent(
-                createParent(L3_CTX_ID, L3Context.class))
-            .build();
-        RendererForwardingContext l3Ctx = createRendererForwardingCtx(L2_BD_ID, new Name("l2bd"), L2BridgeDomain.class).build();
-        RendererNetworkDomain subnet = new RendererNetworkDomainBuilder().setNetworkDomainId(SUBNET_ID)
-            .setName(new Name("subnet"))
-            .setNetworkDomainType(Subnet.class)
-            .setParent(createParent(L2_FD_ID, L2FloodDomain.class))
-            .addAugmentation(
-                    SubnetAugmentRenderer.class,
-                    new SubnetAugmentRendererBuilder().setSubnet(
-                            new SubnetBuilder().setIpPrefix(SUBNET_PREFIX).setVirtualRouterIp(VIRTUAL_ROUTER_IP).build())
-                        .build())
-            .build();
+        RendererForwardingContext l2Fd = createRendererForwardingCtx(L2_FD_ID, new Name("l2fd"), L2FloodDomain.class)
+            .setParent(createParent(L2_BD_ID, L2BridgeDomain.class)).build();
+        RendererForwardingContext l2Bd = createRendererForwardingCtx(L3_CTX_ID, new Name("l3ctx"), L3Context.class)
+            .setParent(createParent(L3_CTX_ID, L3Context.class)).build();
+        RendererForwardingContext l3Ctx =
+                createRendererForwardingCtx(L2_BD_ID, new Name("l2bd"), L2BridgeDomain.class).build();
+        RendererNetworkDomain subnet =
+                new RendererNetworkDomainBuilder().setNetworkDomainId(SUBNET_ID)
+                    .setName(new Name("subnet"))
+                    .setNetworkDomainType(Subnet.class)
+                    .setParent(createParent(L2_FD_ID, L2FloodDomain.class))
+                    .addAugmentation(SubnetAugmentRenderer.class,
+                            new SubnetAugmentRendererBuilder().setSubnet(new SubnetBuilder().setIsTenant(true)
+                                .setIpPrefix(SUBNET_PREFIX)
+                                .setVirtualRouterIp(VIRTUAL_ROUTER_IP)
+                                .build()).build())
+                    .build();
         return new RendererForwardingByTenantBuilder().setTenantId(TENANT_ID)
             .setRendererForwardingContext(ImmutableList.<RendererForwardingContext>of(l2Fd, l2Bd, l3Ctx))
             .setRendererNetworkDomain(ImmutableList.<RendererNetworkDomain>of(subnet))