*/
package org.opendaylight.bgpcep.pcep.tunnel.provider;
-import com.google.common.collect.Lists;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+
import com.google.common.util.concurrent.ListenableFuture;
-import java.util.Collections;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.opendaylight.bgpcep.programming.spi.Instruction;
import org.opendaylight.bgpcep.programming.spi.InstructionScheduler;
import org.opendaylight.bgpcep.programming.spi.SchedulerException;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.binding.api.RpcService;
import org.opendaylight.mdsal.binding.api.WriteTransaction;
import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.Bandwidth;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.topology.rev140113.NetworkTopologyRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.AdministrativeStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcepCreateP2pTunnelInput1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcepCreateP2pTunnelInput1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcepUpdateTunnelInput1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcepUpdateTunnelInput1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720.AdministrativeStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720.PcepCreateP2pTunnelInput1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev200720.PcepUpdateTunnelInput1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.ClassType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.endpoints.address.family.Ipv4Case;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.endpoints.address.family.ipv4._case.Ipv4;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.IpPrefixCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.IpPrefixCaseBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.ip.prefix._case.IpPrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.AddLspInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.AddLspOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.NetworkTopologyPcepService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.RemoveLspInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.RemoveLspOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.UpdateLspInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.UpdateLspOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.add.lsp.args.Arguments;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.AddLsp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.AddLspInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.AddLspOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.RemoveLsp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.RemoveLspInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.RemoveLspOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.UpdateLsp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.UpdateLspInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.UpdateLspOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.add.lsp.args.Arguments;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.p2p.rev130819.tunnel.p2p.path.cfg.attributes.ExplicitHops;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.p2p.rev130819.tunnel.p2p.path.cfg.attributes.ExplicitHopsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepCreateP2pTunnelInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepDestroyTunnelInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev181109.PcepUpdateTunnelInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.rev181109.ExplicitHops1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.rev181109.ExplicitHops1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.rev181109.Link1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.rev181109.Link1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.rev181109.SupportingNode1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.rev181109.SupportingNode1Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.rev181109.tunnel.pcep.supporting.node.attributes.PathComputationClientBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.programming.rev130930.create.p2p.tunnel.input.DestinationBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.LinkKey;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.node.attributes.SupportingNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.node.attributes.SupportingNodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.node.attributes.SupportingNodeKey;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.TerminationPoint1;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.TerminationPoint1Builder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.termination.point.attributes.IgpTerminationPointAttributesBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.termination.point.attributes.igp.termination.point.attributes.termination.point.type.IpBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
import org.osgi.framework.BundleContext;
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest {
private static final TopologyId TOPOLOGY_ID = new TopologyId("tunnel-topo");
private static final String IPV4_PREFIX1 = "195.20.160.40/32";
private static final String IPV4_PREFIX2 = "201.20.160.43/32";
- @Mock
- private NetworkTopologyPcepService topologyService;
@Mock
private InstructionScheduler scheduler;
@Mock
@Mock
private RpcProviderService rpr;
@Mock
- private RpcConsumerRegistry rpcs;
+ private RpcService rpcs;
@Mock
private BundleContext bundleContext;
private ListenableFuture<RpcResult<UpdateLspOutput>> futureUpdateLspOutput;
@Mock
private ListenableFuture<RpcResult<RemoveLspOutput>> futureRemoveLspOutput;
+ @Mock
+ private AddLsp addLsp;
+ @Mock
+ private UpdateLsp updateLsp;
+ @Mock
+ private RemoveLsp removeLsp;
private static Node createNode(final NodeId nodeId, final TpId tpId, final String ipv4Address) {
- final TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
- tpBuilder.setTpId(tpId);
- tpBuilder.withKey(new TerminationPointKey(tpId));
- tpBuilder.addAugmentation(TerminationPoint1.class, new TerminationPoint1Builder()
- .setIgpTerminationPointAttributes(new IgpTerminationPointAttributesBuilder()
+ return new NodeBuilder()
+ .setNodeId(nodeId)
+ .setTerminationPoint(BindingMap.of(new TerminationPointBuilder()
+ .setTpId(tpId)
+ .addAugmentation(new TerminationPoint1Builder()
+ .setIgpTerminationPointAttributes(new IgpTerminationPointAttributesBuilder()
.setTerminationPointType(new IpBuilder()
- .setIpAddress(Collections.singletonList(new IpAddress(new Ipv4Address(ipv4Address))))
- .build()).build()).build());
- final NodeBuilder nodeBuilder = new NodeBuilder();
- nodeBuilder.setNodeId(nodeId);
- nodeBuilder.withKey(new NodeKey(nodeId));
- nodeBuilder.setTerminationPoint(Lists.newArrayList(tpBuilder.build()));
- final SupportingNode supportingNode = new SupportingNodeBuilder()
- .withKey(new SupportingNodeKey(nodeId, new TopologyId("dummy")))
- .addAugmentation(SupportingNode1.class, new SupportingNode1Builder()
- .setPathComputationClient(new PathComputationClientBuilder()
- .setControlling(true).build()).build()).build();
- nodeBuilder.setSupportingNode(Lists.newArrayList(supportingNode));
- return nodeBuilder.build();
+ .setIpAddress(Set.of(new IpAddress(new Ipv4Address(ipv4Address))))
+ .build())
+ .build())
+ .build())
+ .build()))
+ .setSupportingNode(BindingMap.of(new SupportingNodeBuilder()
+ .setTopologyRef(new TopologyId("dummy"))
+ .setNodeRef(nodeId)
+ .addAugmentation(new SupportingNode1Builder()
+ .setPathComputationClient(new PathComputationClientBuilder().setControlling(true).build())
+ .build())
+ .build()))
+ .build();
}
- private static ExplicitHops createExplicitHop(final String ipv4Prefix) {
- final ExplicitHopsBuilder explcitHopsBuilder = new ExplicitHopsBuilder();
- explcitHopsBuilder.addAugmentation(ExplicitHops1.class, new ExplicitHops1Builder()
- .setSubobjectType(new IpPrefixCaseBuilder().setIpPrefix(new IpPrefixBuilder()
- .setIpPrefix(new IpPrefix(new Ipv4Prefix(ipv4Prefix))).build()).build()).build());
- return explcitHopsBuilder.build();
+ private static ExplicitHops createExplicitHop(final String ipv4Prefix, final Uint32 order) {
+ return new ExplicitHopsBuilder()
+ .setOrder(order)
+ .addAugmentation(new ExplicitHops1Builder()
+ .setSubobjectType(new IpPrefixCaseBuilder().setIpPrefix(new IpPrefixBuilder()
+ .setIpPrefix(new IpPrefix(new Ipv4Prefix(ipv4Prefix))).build()).build())
+ .build())
+ .build();
}
@Before
public void setUp() throws SchedulerException, InterruptedException, ExecutionException {
- MockitoAnnotations.initMocks(this);
- Mockito.doReturn(true).when(this.instruction).checkedExecutionStart();
- Mockito.doNothing().when(this.instruction).executionCompleted(InstructionStatus.Failed, null);
- Mockito.doAnswer(invocation -> {
- final Runnable callback = invocation.getArgument(0);
- callback.run();
+ doReturn(true).when(instruction).checkedExecutionStart();
+ doNothing().when(instruction).executionCompleted(InstructionStatus.Failed, null);
+ doAnswer(invocation -> {
+ invocation.getArgument(0, Runnable.class).run();
return null;
- }).when(this.instructionFuture).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
- Mockito.doReturn(false).when(this.futureAddLspOutput).isCancelled();
- Mockito.doAnswer(invocation -> {
- final Runnable callback = invocation.getArgument(0);
- callback.run();
+ }).when(instructionFuture).addListener(ArgumentMatchers.any(Runnable.class), Mockito.any(Executor.class));
+ doReturn(false).when(futureAddLspOutput).isCancelled();
+ doAnswer(invocation -> {
+ invocation.getArgument(0, Runnable.class).run();
return null;
- }).when(this.futureAddLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
- Mockito.doReturn(false).when(this.futureUpdateLspOutput).isCancelled();
- Mockito.doAnswer(invocation -> {
- final Runnable callback = invocation.getArgument(0);
- callback.run();
+ }).when(futureAddLspOutput).addListener(any(Runnable.class), any(Executor.class));
+ doReturn(false).when(futureUpdateLspOutput).isCancelled();
+ doAnswer(invocation -> {
+ invocation.getArgument(0, Runnable.class).run();
return null;
- }).when(this.futureUpdateLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
- Mockito.doReturn(false).when(this.futureRemoveLspOutput).isCancelled();
- Mockito.doAnswer(invocation -> {
- final Runnable callback = invocation.getArgument(0);
- callback.run();
+ }).when(futureUpdateLspOutput).addListener(any(Runnable.class), any(Executor.class));
+ doReturn(false).when(futureRemoveLspOutput).isCancelled();
+ doAnswer(invocation -> {
+ invocation.getArgument(0, Runnable.class).run();
return null;
- }).when(this.futureRemoveLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
- Mockito.doAnswer(invocation -> {
- TunnelProgrammingTest.this.addLspInput = invocation.getArgument(0);
- return TunnelProgrammingTest.this.futureAddLspOutput;
- }).when(this.topologyService).addLsp(Mockito.any(AddLspInput.class));
- Mockito.doAnswer(invocation -> {
- TunnelProgrammingTest.this.updateLspInput = invocation.getArgument(0);
- return TunnelProgrammingTest.this.futureUpdateLspOutput;
- }).when(this.topologyService).updateLsp(Mockito.any(UpdateLspInput.class));
- Mockito.doAnswer(invocation -> {
- TunnelProgrammingTest.this.removeLspInput = invocation.getArgument(0);
- return TunnelProgrammingTest.this.futureRemoveLspOutput;
- }).when(this.topologyService).removeLsp(Mockito.any(RemoveLspInput.class));
- Mockito.doReturn(this.instruction).when(this.instructionFuture).get();
- Mockito.doReturn(true).when(this.instructionFuture).isDone();
- Mockito.doReturn(this.instructionFuture).when(this.scheduler)
- .scheduleInstruction(Mockito.any(SubmitInstructionInput.class));
+ }).when(futureRemoveLspOutput).addListener(any(Runnable.class), any(Executor.class));
+ doAnswer(invocation -> {
+ addLspInput = invocation.getArgument(0);
+ return futureAddLspOutput;
+ }).when(addLsp).invoke(any(AddLspInput.class));
+ doAnswer(invocation -> {
+ updateLspInput = invocation.getArgument(0);
+ return futureUpdateLspOutput;
+ }).when(updateLsp).invoke(any(UpdateLspInput.class));
+ doAnswer(invocation -> {
+ removeLspInput = invocation.getArgument(0);
+ return futureRemoveLspOutput;
+ }).when(removeLsp).invoke(any(RemoveLspInput.class));
+ doReturn(instruction).when(instructionFuture).get();
+ doReturn(true).when(instructionFuture).isDone();
+ doReturn(instructionFuture).when(scheduler)
+ .scheduleInstruction(any(SubmitInstructionInput.class));
- Mockito.doReturn(this.topologyService).when(this.rpcs)
- .getRpcService(NetworkTopologyPcepService.class);
+ doReturn(addLsp).when(rpcs).getRpc(AddLsp.class);
+ doReturn(updateLsp).when(rpcs).getRpc(UpdateLsp.class);
+ doReturn(removeLsp).when(rpcs).getRpc(RemoveLsp.class);
createInitialTopology();
- final TunnelProviderDependencies dependencies = new TunnelProviderDependencies(getDataBroker(), this.cssp,
- this.rpr, this.rpcs, this.bundleContext);
- this.tunnelProgramming = new TunnelProgramming(this.scheduler, dependencies);
+ tunnelProgramming = new TunnelProgramming(scheduler,
+ new TunnelProviderDependencies(getDataBroker(), cssp, rpr, rpcs, bundleContext));
}
@Test
public void testTunnelProgramming() throws InterruptedException, ExecutionException {
final Bandwidth bwd = new Bandwidth(new byte[] { 0x00, 0x00, 0x00, (byte) 0xff });
- final ClassType classType = new ClassType((short) 1);
+ final ClassType classType = new ClassType(Uint8.ONE);
final String tunnelName = "create-tunnel";
final NetworkTopologyRef topologyRef = new NetworkTopologyRef(TOPO_IID);
// create tunnel
- final PcepCreateP2pTunnelInputBuilder createInputBuilder = new PcepCreateP2pTunnelInputBuilder();
- createInputBuilder.setDestination(new DestinationBuilder().setNode(NODE2_ID).setTp(TP2_ID).build());
- createInputBuilder.setSource(new SourceBuilder().setNode(NODE1_ID).setTp(TP1_ID).build());
- createInputBuilder.setNetworkTopologyRef(topologyRef);
- createInputBuilder.setBandwidth(bwd);
- createInputBuilder.setClassType(classType);
- createInputBuilder.setSymbolicPathName(tunnelName);
- createInputBuilder.setExplicitHops(Collections.emptyList());
- createInputBuilder.addAugmentation(PcepCreateP2pTunnelInput1.class, new PcepCreateP2pTunnelInput1Builder()
- .setAdministrativeStatus(AdministrativeStatus.Active).build());
- this.tunnelProgramming.pcepCreateP2pTunnel(createInputBuilder.build());
+ tunnelProgramming.pcepCreateP2pTunnel(new PcepCreateP2pTunnelInputBuilder()
+ .setDestination(new DestinationBuilder().setNode(NODE2_ID).setTp(TP2_ID).build())
+ .setSource(new SourceBuilder().setNode(NODE1_ID).setTp(TP1_ID).build())
+ .setNetworkTopologyRef(topologyRef)
+ .setBandwidth(bwd)
+ .setClassType(classType)
+ .setSymbolicPathName(tunnelName)
+ .addAugmentation(new PcepCreateP2pTunnelInput1Builder()
+ .setAdministrativeStatus(AdministrativeStatus.Active)
+ .build())
+ .build());
//check add-lsp input
- Assert.assertNotNull(this.addLspInput);
- Assert.assertEquals(tunnelName, this.addLspInput.getName());
- final Arguments agrs = this.addLspInput.getArguments();
- Assert.assertNotNull(agrs);
- Assert.assertEquals(bwd, agrs.getBandwidth().getBandwidth());
- Assert.assertEquals(classType, agrs.getClassType().getClassType());
+ assertNotNull(addLspInput);
+ assertEquals(tunnelName, addLspInput.getName());
+ final Arguments agrs = addLspInput.getArguments();
+ assertNotNull(agrs);
+ assertEquals(bwd, agrs.getBandwidth().getBandwidth());
+ assertEquals(classType, agrs.getClassType().getClassType());
final Ipv4 ipv4Endpoints = ((Ipv4Case) agrs.getEndpointsObj().getAddressFamily()).getIpv4();
- Assert.assertEquals(NODE1_IPV4, ipv4Endpoints.getSourceIpv4Address().getValue());
- Assert.assertEquals(NODE2_IPV4, ipv4Endpoints.getDestinationIpv4Address().getValue());
- Assert.assertEquals(NODE1_ID.getValue(), this.addLspInput.getNode().getValue());
+ assertEquals(NODE1_IPV4, ipv4Endpoints.getSourceIpv4Address().getValue());
+ assertEquals(NODE2_IPV4, ipv4Endpoints.getDestinationIpv4Address().getValue());
+ assertEquals(NODE1_ID.getValue(), addLspInput.getNode().getValue());
createLink();
// update tunnel
- final PcepUpdateTunnelInputBuilder updateInputBuilder = new PcepUpdateTunnelInputBuilder();
- updateInputBuilder.setNetworkTopologyRef(topologyRef);
- updateInputBuilder.setBandwidth(bwd);
- updateInputBuilder.setClassType(classType);
- updateInputBuilder.setExplicitHops(Lists.newArrayList(createExplicitHop(IPV4_PREFIX1),
- createExplicitHop(IPV4_PREFIX2)));
- updateInputBuilder.setLinkId(LINK1_ID);
- updateInputBuilder.addAugmentation(PcepUpdateTunnelInput1.class, new PcepUpdateTunnelInput1Builder()
- .setAdministrativeStatus(AdministrativeStatus.Active).build());
- this.tunnelProgramming.pcepUpdateTunnel(updateInputBuilder.build());
+ tunnelProgramming.pcepUpdateTunnel(new PcepUpdateTunnelInputBuilder()
+ .setNetworkTopologyRef(topologyRef)
+ .setBandwidth(bwd)
+ .setClassType(classType)
+ // We assert on explicit order
+ .setExplicitHops(BindingMap.ordered(
+ createExplicitHop(IPV4_PREFIX1, Uint32.ONE),
+ createExplicitHop(IPV4_PREFIX2, Uint32.TWO)))
+ .setLinkId(LINK1_ID)
+ .addAugmentation(new PcepUpdateTunnelInput1Builder()
+ .setAdministrativeStatus(AdministrativeStatus.Active)
+ .build())
+ .build());
//check update-lsp input
- Assert.assertNotNull(this.updateLspInput);
- Assert.assertEquals(LINK1_ID.getValue(), this.updateLspInput.getName());
- final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.update.lsp
- .args.Arguments updArgs = this.updateLspInput.getArguments();
- Assert.assertEquals(2, updArgs.getEro().getSubobject().size());
- final List<Subobject> subObjects = updArgs.getEro().getSubobject();
+ assertNotNull(updateLspInput);
+ assertEquals(LINK1_ID.getValue(), updateLspInput.getName());
+ final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev220730.update.lsp
+ .args.Arguments updArgs = updateLspInput.getArguments();
+ assertEquals(2, updArgs.getEro().nonnullSubobject().size());
+ final List<Subobject> subObjects = updArgs.getEro().nonnullSubobject();
final IpPrefixCase prefix1 = (IpPrefixCase) subObjects.get(0).getSubobjectType();
final IpPrefixCase prefix2 = (IpPrefixCase) subObjects.get(1).getSubobjectType();
- Assert.assertEquals(IPV4_PREFIX1, prefix1.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue());
- Assert.assertEquals(IPV4_PREFIX2, prefix2.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue());
+ assertEquals(IPV4_PREFIX1, prefix1.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue());
+ assertEquals(IPV4_PREFIX2, prefix2.getIpPrefix().getIpPrefix().getIpv4Prefix().getValue());
// delete tunnel
final PcepDestroyTunnelInputBuilder destroyInputBuilder = new PcepDestroyTunnelInputBuilder();
destroyInputBuilder.setLinkId(LINK1_ID);
destroyInputBuilder.setNetworkTopologyRef(topologyRef);
- this.tunnelProgramming.pcepDestroyTunnel(destroyInputBuilder.build());
- Assert.assertNotNull(this.removeLspInput);
- Assert.assertEquals(LINK1_ID.getValue(), this.removeLspInput.getName());
- Assert.assertEquals(NODE1_ID.getValue(), this.removeLspInput.getNode().getValue());
+ tunnelProgramming.pcepDestroyTunnel(destroyInputBuilder.build());
+ assertNotNull(removeLspInput);
+ assertEquals(LINK1_ID.getValue(), removeLspInput.getName());
+ assertEquals(NODE1_ID, removeLspInput.getNode());
}
private void createInitialTopology() throws InterruptedException, ExecutionException {
- final TopologyBuilder topologyBuilder = new TopologyBuilder();
- topologyBuilder.withKey(new TopologyKey(TOPOLOGY_ID));
- topologyBuilder.setServerProvided(true);
- topologyBuilder.setTopologyId(TOPOLOGY_ID);
- topologyBuilder.setNode(Lists.newArrayList(createNode(NODE1_ID, TP1_ID, NODE1_IPV4),
- createNode(NODE2_ID, TP2_ID, NODE2_IPV4)));
final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction();
- wTx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, TOPO_IID, topologyBuilder.build());
+ wTx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, TOPO_IID, new TopologyBuilder()
+ .setTopologyId(TOPOLOGY_ID)
+ .setServerProvided(true)
+ .setTopologyId(TOPOLOGY_ID)
+ .setNode(BindingMap.of(createNode(NODE1_ID, TP1_ID, NODE1_IPV4), createNode(NODE2_ID, TP2_ID, NODE2_IPV4)))
+ .build());
wTx.commit().get();
}
private void createLink() throws InterruptedException, ExecutionException {
- final LinkBuilder linkBuilder = new LinkBuilder();
- linkBuilder.setSource(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology
- .rev131021.link.attributes.SourceBuilder().setSourceNode(NODE1_ID).setSourceTp(TP1_ID).build());
- linkBuilder.setDestination(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology
- .rev131021.link.attributes.DestinationBuilder().setDestNode(NODE2_ID).setDestTp(TP2_ID).build());
- linkBuilder.setLinkId(LINK1_ID);
- linkBuilder.withKey(new LinkKey(LINK1_ID));
- linkBuilder.addAugmentation(Link1.class, new Link1Builder().setSymbolicPathName(LINK1_ID.getValue()).build());
final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction();
wTx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL,
- TOPO_IID.builder().child(Link.class, new LinkKey(LINK1_ID)).build(), linkBuilder.build());
+ TOPO_IID.child(Link.class, new LinkKey(LINK1_ID)),
+ new LinkBuilder()
+ .setSource(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021
+ .link.attributes.SourceBuilder().setSourceNode(NODE1_ID).setSourceTp(TP1_ID).build())
+ .setDestination(new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021
+ .link.attributes.DestinationBuilder().setDestNode(NODE2_ID).setDestTp(TP2_ID).build())
+ .setLinkId(LINK1_ID)
+ .addAugmentation(new Link1Builder().setSymbolicPathName(LINK1_ID.getValue()).build())
+ .build());
wTx.commit().get();
}
-
}
Code Review / bgpcep.git / blobdiff