X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Ftopology%2FTapiTopologyImplTest.java;h=233032238609b2163105d806ba7b2d090c5f3af1;hb=b1b3bafd549bb501937cea5c976d5344608b6ed3;hp=71a6aaf554a2534e503c300773d42926d00862d1;hpb=db87ba733190c2e59997e00e0fe9199c9c74234d;p=transportpce.git diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java index 71a6aaf55..233032238 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java @@ -30,6 +30,10 @@ import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.opendaylight.mdsal.binding.api.RpcService; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; @@ -37,6 +41,12 @@ import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOper import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl; import org.opendaylight.transportpce.tapi.TapiStringConstants; import org.opendaylight.transportpce.tapi.connectivity.ConnectivityUtils; +import org.opendaylight.transportpce.tapi.impl.rpc.GetLinkDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetNodeDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetNodeEdgePointDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetServiceInterfacePointDetailsImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetServiceInterfacePointListImpl; +import org.opendaylight.transportpce.tapi.impl.rpc.GetTopologyDetailsImpl; import org.opendaylight.transportpce.tapi.utils.TapiContext; import org.opendaylight.transportpce.tapi.utils.TapiInitialORMapping; import org.opendaylight.transportpce.tapi.utils.TapiLink; @@ -82,9 +92,12 @@ import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@ExtendWith(MockitoExtension.class) public class TapiTopologyImplTest extends AbstractTest { private static final Logger LOG = LoggerFactory.getLogger(TapiTopologyImplTest.class); + @Mock + private RpcService rpcService; private static ListeningExecutorService executorService; private static CountDownLatch endSignal; private static final int NUM_THREADS = 3; @@ -123,22 +136,17 @@ public class TapiTopologyImplTest extends AbstractTest { } @Test - void getTopologyDetailsForTransponder100GTopologyWhenSuccessful() - throws ExecutionException, InterruptedException { + void getTopologyDetailsForTransponder100GTopologyWhenSuccessful() throws ExecutionException, InterruptedException { Uuid topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.TPDR_100G.getBytes( Charset.forName("UTF-8"))).toString()); LOG.info("TPDR100GUuid = {}", topologyUuid); GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput(topologyUuid); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker(), tapiContext, topologyUtils, tapiLink); - ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); +// TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(networkTransactionService, tapiContext, topologyUtils, +// tapiLink); + ListenableFuture> result = new GetTopologyDetailsImpl(tapiContext, + topologyUtils, tapiLink, networkTransactionService) + .invoke(input); LOG.info("RESULT of getTopoDetailsTopo/name = {}", result.get().getResult().getTopology().getName().toString()); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); @@ -173,21 +181,14 @@ public class TapiTopologyImplTest extends AbstractTest { } @Test - void getTopologyDetailsForOtnTopologyWithOtnLinksWhenSuccessful() - throws ExecutionException, InterruptedException { + void getTopologyDetailsForOtnTopologyWithOtnLinksWhenSuccessful() throws ExecutionException, InterruptedException { Uuid topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_MULTILAYER.getBytes( Charset.forName("UTF-8"))).toString()); LOG.info("T0MultilayerUuid = {}", topologyUuid); GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput(topologyUuid); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker(), tapiContext, topologyUtils, tapiLink); - ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result = new GetTopologyDetailsImpl(tapiContext, + topologyUtils, tapiLink, networkTransactionService) + .invoke(input); RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); @@ -329,15 +330,9 @@ public class TapiTopologyImplTest extends AbstractTest { Charset.forName("UTF-8"))).toString()); LOG.info("T0FullMultilayerUuid = {}", topologyUuid); GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput(topologyUuid); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker(), tapiContext, topologyUtils, tapiLink); - ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result = new GetTopologyDetailsImpl(tapiContext, + topologyUtils, tapiLink, networkTransactionService) + .invoke(input); RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); @@ -460,12 +455,6 @@ public class TapiTopologyImplTest extends AbstractTest { .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint")))) .count(); assertEquals(4, inb5, "SPDR-SA1-XPDR2+XPONDER (switch) should have 4 external network neps"); - Node nodeRoadm = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA) - && !node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().get(new NameKey("roadm node name")).getValue() - .equals("ROADM-A1+PHOTONIC_MEDIA")) - .findAny().orElseThrow(); long inb6 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA) && !node.getLayerProtocolName().contains(LayerProtocolName.DSR)) @@ -518,53 +507,31 @@ public class TapiTopologyImplTest extends AbstractTest { } @Test - void getNodeAndNepsDetailsWhenSuccessful() - throws ExecutionException, InterruptedException { + void getNodeAndNepsDetailsWhenSuccessful() throws ExecutionException, InterruptedException { Uuid topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER.getBytes( Charset.forName("UTF-8"))).toString()); GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput(topologyUuid); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker(), tapiContext, topologyUtils, tapiLink); - ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result = new GetTopologyDetailsImpl(tapiContext, + topologyUtils, tapiLink, networkTransactionService) + .invoke(input); RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); for (Node node:topology.getNode().values()) { - //String nodeName = node.getName().values().stream().findFirst().orElseThrow().getValue(); Uuid nodeUuid = node.getUuid(); GetNodeDetailsInput input1 = TapiTopologyDataUtils.buildGetNodeDetailsInput(topologyUuid, nodeUuid); - ListenableFuture> result1 = tapiTopoImpl.getNodeDetails(input1); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result1 = new GetNodeDetailsImpl(tapiContext) + .invoke(input1); RpcResult rpcResult1 = result1.get(); @Nullable Node node1 = rpcResult1.getResult().getNode(); assertNotNull(node1, "Node should not be null"); for (OwnedNodeEdgePoint onep:node1.getOwnedNodeEdgePoint().values()) { - //String onepName = onep.getName().values().stream().findFirst().orElseThrow().getValue(); Uuid onepUuid = onep.getUuid(); GetNodeEdgePointDetailsInput input2 = TapiTopologyDataUtils.buildGetNodeEdgePointDetailsInput( topologyUuid, nodeUuid, onepUuid); - ListenableFuture> result2 - = tapiTopoImpl.getNodeEdgePointDetails(input2); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result2 = + new GetNodeEdgePointDetailsImpl(tapiContext).invoke(input2); RpcResult rpcResult2 = result2.get(); org.opendaylight.yang.gen.v1 .urn.onf.otcc.yang.tapi.topology.rev221121.get.node.edge.point.details.output.NodeEdgePoint @@ -575,36 +542,22 @@ public class TapiTopologyImplTest extends AbstractTest { } @Test - void getLinkDetailsWhenSuccessful() - throws ExecutionException, InterruptedException { + void getLinkDetailsWhenSuccessful() throws ExecutionException, InterruptedException { Uuid topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER.getBytes( Charset.forName("UTF-8"))).toString()); GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput(topologyUuid); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker(), tapiContext, topologyUtils, tapiLink); - ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result = new GetTopologyDetailsImpl(tapiContext, + topologyUtils, tapiLink, networkTransactionService) + .invoke(input); RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); for (Link link:topology.getLink().values()) { - //String linkName = link.getName().values().stream().findFirst().orElseThrow().getValue(); Uuid linkUuid = link.getUuid(); GetLinkDetailsInput input1 = TapiTopologyDataUtils.buildGetLinkDetailsInput( topologyUuid, linkUuid); - ListenableFuture> result1 = tapiTopoImpl.getLinkDetails(input1); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result1 = new GetLinkDetailsImpl(tapiContext) + .invoke(input1); RpcResult rpcResult1 = result1.get(); org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.link.details.output.Link link1 = rpcResult1.getResult().getLink(); @@ -613,34 +566,18 @@ public class TapiTopologyImplTest extends AbstractTest { } @Test - void getSipDetailsWhenSuccessful() - throws ExecutionException, InterruptedException { + void getSipDetailsWhenSuccessful() throws ExecutionException, InterruptedException { GetServiceInterfacePointListInput input = TapiTopologyDataUtils.buildServiceInterfacePointListInput(); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker(), tapiContext, topologyUtils, tapiLink); - ListenableFuture> result = tapiTopoImpl - .getServiceInterfacePointList(input); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result = + new GetServiceInterfacePointListImpl(tapiContext).invoke(input); RpcResult rpcResult = result.get(); Map sipMap = rpcResult.getResult().getSip(); for (Sip sip:sipMap.values()) { Uuid sipUuid = sip.getUuid(); GetServiceInterfacePointDetailsInput input1 = TapiTopologyDataUtils .buildGetServiceInterfacePointDetailsInput(sipUuid); - ListenableFuture> result1 - = tapiTopoImpl.getServiceInterfacePointDetails(input1); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + ListenableFuture> result1 = + new GetServiceInterfacePointDetailsImpl(tapiContext).invoke(input1); RpcResult rpcResult1 = result1.get(); org.opendaylight.yang.gen.v1 .urn.onf.otcc.yang.tapi.common.rev221121.get.service._interface.point.details.output.Sip sip1