From 14e7d138cb112832fe0512d9b553ee8f10d58c2e Mon Sep 17 00:00:00 2001 From: Tomas Cechvala Date: Tue, 11 Apr 2017 14:22:31 +0200 Subject: [PATCH] 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 --- .../vpp/policy/acl/AccessListUtil.java | 4 +-- .../renderer/vpp/DtoFactory.java | 2 +- .../vpp/policy/acl/TestResources.java | 34 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) 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 ea917662f..6e15411df 100644 --- 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 7bf93baf3..17d947f9f 100644 --- 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 45f79c326..8595f2792 100644 --- 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.of(l2Fd, l2Bd, l3Ctx)) .setRendererNetworkDomain(ImmutableList.of(subnet)) -- 2.36.6