* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParserTest.DISTINGUISHER;
import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParserTest.IPV6PREFIX;
import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParserTest.IPV6_VPN;
import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParserTest.LABEL_STACK;
import static org.opendaylight.protocol.bgp.parser.spi.PathIdUtil.NON_PATH_ID;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
import java.util.Collection;
-import java.util.Collections;
-import org.junit.Assert;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.junit.Test;
import org.opendaylight.protocol.bgp.rib.spi.AbstractRIBSupportTest;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.PathId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.PathId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.Update;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.Attributes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.AttributesReach;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.AttributesUnreach;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv6.rev180329.bgp.rib.rib.loc.rib.tables.routes.VpnIpv6RoutesCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv6.rev180329.bgp.rib.rib.loc.rib.tables.routes.VpnIpv6RoutesCaseBuilder;
import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidates;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
+import org.opendaylight.yangtools.yang.data.tree.spi.DataTreeCandidates;
-public class VpnIpv6RIBSupportTest extends AbstractRIBSupportTest<VpnIpv6RoutesCase, VpnIpv6Routes, VpnRoute,
- VpnRouteKey> {
+public class VpnIpv6RIBSupportTest extends AbstractRIBSupportTest<VpnIpv6RoutesCase, VpnIpv6Routes, VpnRoute> {
private VpnIpv6RIBSupport ribSupport;
private static final DestinationVpnIpv6Case REACH_NLRI = new DestinationVpnIpv6CaseBuilder()
.setVpnIpv6Destination(new VpnIpv6DestinationBuilder()
- .setVpnDestination(Lists.newArrayList(IPV6_VPN)).build()).build();
+ .setVpnDestination(List.of(IPV6_VPN)).build()).build();
private static final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv6.rev180329.update
.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationVpnIpv6Case UNREACH_NLRI =
new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv6.rev180329.update
.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationVpnIpv6CaseBuilder()
.setVpnIpv6Destination(new VpnIpv6DestinationBuilder()
- .setVpnDestination(Collections.singletonList(IPV6_VPN)).build()).build();
+ .setVpnDestination(List.of(IPV6_VPN)).build()).build();
private static final VpnRouteKey ROUTE_KEY = new VpnRouteKey(new PathId(Uint32.ZERO), "cAABAQIDBAECIAEjRVaJ");
private static final VpnRoute ROUTE = new VpnRouteBuilder().setPathId(NON_PATH_ID)
.setAttributes(ATTRIBUTES).setPrefix(IPV6PREFIX)
.setLabelStack(LABEL_STACK).setRouteDistinguisher(DISTINGUISHER).withKey(ROUTE_KEY).build();
private static final VpnIpv6Routes ROUTES = new VpnIpv6RoutesBuilder()
- .setVpnRoute(Collections.singletonList(ROUTE)).build();
+ .setVpnRoute(Map.of(ROUTE.key(), ROUTE)).build();
@Override
public void setUp() throws Exception {
super.setUp();
- this.ribSupport = VpnIpv6RIBSupport.getInstance(this.mappingService);
- setUpTestCustomizer(this.ribSupport);
+ ribSupport = new VpnIpv6RIBSupport(adapter.currentSerializer());
+ setUpTestCustomizer(ribSupport);
}
@Test
public void testDeleteRoutes() {
- this.ribSupport.deleteRoutes(this.tx, getTablePath(), createNlriWithDrawnRoute(UNREACH_NLRI));
- final InstanceIdentifier<VpnRoute> instanceIdentifier = this.deletedRoutes.get(0);
+ ribSupport.deleteRoutes(tx, getTablePath(), createNlriWithDrawnRoute(UNREACH_NLRI));
+ final InstanceIdentifier<VpnRoute> instanceIdentifier = deletedRoutes.get(0);
assertEquals(ROUTE_KEY, instanceIdentifier.firstKeyOf(VpnRoute.class));
}
@Test
public void testPutRoutes() {
- this.ribSupport.putRoutes(this.tx, getTablePath(), createNlriAdvertiseRoute(REACH_NLRI), createAttributes());
- final VpnRoute route = (VpnRoute) this.insertedRoutes.get(0).getValue();
+ ribSupport.putRoutes(tx, getTablePath(), createNlriAdvertiseRoute(REACH_NLRI), createAttributes());
+ final VpnRoute route = (VpnRoute) insertedRoutes.get(0).getValue();
assertEquals(ROUTE, route);
}
@Test
public void testEmptyRoute() {
- assertEquals(createEmptyTable(), this.ribSupport.emptyTable());
+ assertEquals(createEmptyTable(), ribSupport.emptyTable());
}
@Test
public void testBuildMpUnreachNlriUpdate() {
- final Update update = this.ribSupport.buildUpdate(Collections.emptyList(), createRoutes(ROUTES), ATTRIBUTES);
- assertEquals(UNREACH_NLRI, update.getAttributes().augmentation(Attributes2.class)
+ final Update update = ribSupport.buildUpdate(List.of(), createRoutes(ROUTES), ATTRIBUTES);
+ assertEquals(UNREACH_NLRI, update.getAttributes().augmentation(AttributesUnreach.class)
.getMpUnreachNlri().getWithdrawnRoutes().getDestinationType());
- assertNull(update.getAttributes().augmentation(Attributes1.class));
+ assertNull(update.getAttributes().augmentation(AttributesReach.class));
}
@Test
public void testBuildMpReachNlriUpdate() {
- final Update update = this.ribSupport.buildUpdate(createRoutes(ROUTES), Collections.emptyList(), ATTRIBUTES);
- assertEquals(REACH_NLRI, update.getAttributes().augmentation(Attributes1.class).getMpReachNlri()
+ final Update update = ribSupport.buildUpdate(createRoutes(ROUTES), List.of(), ATTRIBUTES);
+ assertEquals(REACH_NLRI, update.getAttributes().augmentation(AttributesReach.class).getMpReachNlri()
.getAdvertizedRoutes().getDestinationType());
- assertNull(update.getAttributes().augmentation(Attributes2.class));
+ assertNull(update.getAttributes().augmentation(AttributesUnreach.class));
}
@Test
public void testCacheableNlriObjects() {
- assertEquals(ImmutableSet.of(), this.ribSupport.cacheableNlriObjects());
+ assertEquals(Set.of(), ribSupport.cacheableNlriObjects());
}
@Test
public void testCacheableAttributeObjects() {
- assertEquals(ImmutableSet.of(), this.ribSupport.cacheableAttributeObjects());
- }
-
- @Test
- public void testRouteIdAddPath() {
- Assert.assertEquals(ROUTE_KEY, this.ribSupport.createRouteListKey(ROUTE_KEY.getPathId(),
- ROUTE_KEY.getRouteKey()));
+ assertEquals(Set.of(), ribSupport.cacheableAttributeObjects());
}
@Test
public void testRoutePath() {
final NodeIdentifierWithPredicates prefixNii = createRouteNIWP(ROUTES);
assertEquals(getRoutePath().node(prefixNii),
- this.ribSupport.routePath(getTablePath(), prefixNii));
+ ribSupport.routePath(getTablePath(), prefixNii));
}
@Test
public void testRouteAttributesIdentifier() {
assertEquals(new NodeIdentifier(QName.create(VpnIpv6Routes.QNAME,
- Attributes.QNAME.getLocalName().intern())), this.ribSupport.routeAttributesIdentifier());
+ Attributes.QNAME.getLocalName().intern())), ribSupport.routeAttributesIdentifier());
}
@Test
public void testRoutesCaseClass() {
- assertEquals(VpnIpv6RoutesCase.class, this.ribSupport.routesCaseClass());
+ assertEquals(VpnIpv6RoutesCase.class, ribSupport.routesCaseClass());
}
@Test
public void testRoutesContainerClass() {
- assertEquals(VpnIpv6Routes.class, this.ribSupport.routesContainerClass());
+ assertEquals(VpnIpv6Routes.class, ribSupport.routesContainerClass());
}
@Test
public void testRoutesListClass() {
- assertEquals(VpnRoute.class, this.ribSupport.routesListClass());
+ assertEquals(VpnRoute.class, ribSupport.routesListClass());
}
@Test
final Routes emptyCase = new VpnIpv6RoutesCaseBuilder().build();
DataTreeCandidateNode tree = DataTreeCandidates.fromNormalizedNode(getRoutePath(),
createRoutes(emptyCase)).getRootNode();
- Assert.assertTrue(this.ribSupport.changedRoutes(tree).isEmpty());
+ assertTrue(ribSupport.changedRoutes(tree).isEmpty());
final Routes emptyRoutes = new VpnIpv6RoutesCaseBuilder()
.setVpnIpv6Routes(new VpnIpv6RoutesBuilder().build()).build();
tree = DataTreeCandidates.fromNormalizedNode(getRoutePath(), createRoutes(emptyRoutes)).getRootNode();
- Assert.assertTrue(this.ribSupport.changedRoutes(tree).isEmpty());
+ assertTrue(ribSupport.changedRoutes(tree).isEmpty());
final Routes routes = new VpnIpv6RoutesCaseBuilder().setVpnIpv6Routes(ROUTES).build();
tree = DataTreeCandidates.fromNormalizedNode(getRoutePath(), createRoutes(routes)).getRootNode();
- final Collection<DataTreeCandidateNode> result = this.ribSupport.changedRoutes(tree);
- Assert.assertFalse(result.isEmpty());
+ final Collection<DataTreeCandidateNode> result = ribSupport.changedRoutes(tree);
+ assertFalse(result.isEmpty());
}
}
Code Review / bgpcep.git / blobdiff