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=346c7590fd149c8c92c618ccbcf63974e6c9421a;hpb=e25f274098143d1171db8072a8b6091fb97b8e4a;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 346c7590f..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 @@ -16,6 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; @@ -29,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; @@ -36,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; @@ -43,45 +54,50 @@ import org.opendaylight.transportpce.tapi.utils.TapiLinkImpl; import org.opendaylight.transportpce.tapi.utils.TapiTopologyDataUtils; import org.opendaylight.transportpce.test.AbstractTest; import org.opendaylight.transportpce.test.utils.TopologyDataUtils; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.AdministrativeState; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.CapacityUnit; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.ForwardingDirection; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointDetailsInput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointDetailsOutput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointListInput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.GetServiceInterfacePointListOutput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.LayerProtocolName; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.OperationalState; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.get.service._interface.point.list.output.Sip; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.get.service._interface.point.list.output.SipKey; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.Name; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameKey; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.ForwardingRule; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsInput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsOutput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeDetailsInput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeDetailsOutput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeEdgePointDetailsInput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeEdgePointDetailsOutput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsOutput; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.Node; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.RuleType; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.get.topology.details.output.Topology; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.NodeRuleGroup; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePoint; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.Rule; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.AdministrativeState; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.CAPACITYUNITGBPS; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.ForwardingDirection; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.GetServiceInterfacePointDetailsInput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.GetServiceInterfacePointDetailsOutput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.GetServiceInterfacePointListInput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.GetServiceInterfacePointListOutput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.LayerProtocolName; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.OperationalState; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.Uuid; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.get.service._interface.point.list.output.Sip; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.get.service._interface.point.list.output.SipKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.global._class.Name; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.global._class.NameKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.FORWARDINGRULEMAYFORWARDACROSSGROUP; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetLinkDetailsInput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetLinkDetailsOutput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeDetailsInput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeDetailsOutput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeEdgePointDetailsInput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetNodeEdgePointDetailsOutput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetTopologyDetailsInput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetTopologyDetailsOutput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.Node; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.RuleType; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.topology.details.output.Topology; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.NodeRuleGroup; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.OwnedNodeEdgePoint; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.rule.group.NodeEdgePoint; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.rule.group.Rule; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.LinkKey; +import org.opendaylight.yangtools.yang.common.Decimal64; import org.opendaylight.yangtools.yang.common.RpcResult; 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; @@ -120,19 +136,17 @@ public class TapiTopologyImplTest extends AbstractTest { } @Test - void getTopologyDetailsForTransponder100GTopologyWhenSuccessful() - throws ExecutionException, InterruptedException { - GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput( - TapiStringConstants.TPDR_100G); - 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(); + 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(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()); RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); @@ -141,16 +155,18 @@ public class TapiTopologyImplTest extends AbstractTest { .toString()); assertEquals(topoUuid, topology.getUuid(), "incorrect topology uuid"); assertEquals(1, topology.getNode().size(), "Node list size should be 1"); - Name nodeName = topology.getNode().values().stream().findFirst().get().getName() + Name nodeName = topology.getNode().values().stream().findFirst().orElseThrow().getName() .get(new NameKey("Tpdr100g node name")); assertEquals("Tpdr100g over WDM node", nodeName.getValue(), "Node name should be 'Tpdr100g over WDM node'"); Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes(nodeName.getValue().getBytes(StandardCharsets.UTF_8)) .toString()); - assertEquals(nodeUuid, topology.getNode().values().stream().findFirst().get().getUuid(), "incorrect node uuid"); - long nb = topology.getNode().values().stream().findFirst().get().getOwnedNodeEdgePoint().size(); + assertEquals(nodeUuid, topology.getNode().values().stream().findFirst().orElseThrow().getUuid(), + "incorrect node uuid"); + long nb = topology.getNode().values().stream().findFirst().orElseThrow().getOwnedNodeEdgePoint().size(); assertEquals(2, nb, "'Transponder 100GE' node should have 2 neps"); - List nrgList = topology.getNode().values().stream().findFirst().get().nonnullNodeRuleGroup() - .values().stream().sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) + List nrgList = topology.getNode().values().stream().findFirst().orElseThrow() + .nonnullNodeRuleGroup().values().stream() + .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); assertEquals(1, nrgList.size(), "'Transponder 100GE' node should contain a single node rule groups"); List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); @@ -158,34 +174,36 @@ public class TapiTopologyImplTest extends AbstractTest { List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); - assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); - assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } @Test - void getTopologyDetailsForOtnTopologyWithOtnLinksWhenSuccessful() - throws ExecutionException, InterruptedException { - GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput( - TapiStringConstants.T0_MULTILAYER); - 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(); + 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); + ListenableFuture> result = new GetTopologyDetailsImpl(tapiContext, + topologyUtils, tapiLink, networkTransactionService) + .invoke(input); RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); assertNotNull(topology, "Topology should not be null"); - assertEquals(13, topology.getNode().size(), "Node list size should be 13"); + for (Map.Entry< + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey, + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> entry : + topology.getNode().entrySet()) { + LOG.debug("NODESDETECTED = {}",entry.getValue().getName().toString()); + } + assertEquals(7, topology.getNode().size(), "Node list size should be 7"); long nb1 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() - .equals("XPDR-A1-XPDR1+DSR")) + .equals("XPDR-A1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("100G-tpdr")))) .count(); @@ -193,7 +211,7 @@ public class TapiTopologyImplTest extends AbstractTest { long nb2 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() - .equals("SPDR-SA1-XPDR1+DSR")) + .equals("SPDR-SA1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("NodeEdgePoint_C")))) .count(); @@ -201,7 +219,7 @@ public class TapiTopologyImplTest extends AbstractTest { long nb3 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() - .equals("SPDR-SA1-XPDR1+DSR")) + .equals("SPDR-SA1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint_N")))) .count(); @@ -209,7 +227,7 @@ public class TapiTopologyImplTest extends AbstractTest { long nb4 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() - .equals("SPDR-SA1-XPDR2+DSR")) + .equals("SPDR-SA1-XPDR2+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("NodeEdgePoint_C")))) .count(); @@ -217,17 +235,45 @@ public class TapiTopologyImplTest extends AbstractTest { long nb5 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() - .equals("SPDR-SA1-XPDR2+DSR")) + .equals("SPDR-SA1-XPDR2+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint_N")))) .count(); assertEquals(2, nb5, "SPDR-SA1-XPDR2 (switch) should have 2 network neps"); - assertEquals(18, topology.getLink().size(), "Link list size should be 18"); + long nb7 = topology.getNode().values().stream() + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA) + && node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .filter(node -> node.getName().get(new NameKey("otsi node name")).getValue() + .equals("XPDR-A1-XPDR1+XPONDER")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint")))) + .count(); + assertEquals(1, nb7, "XPDR-A1-XPDR1 should only have 1 OTSI network nep"); + long nb8 = topology.getNode().values().stream() + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA) + && node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .filter(node -> node.getName().get(new NameKey("otsi node name")).getValue() + .equals("SPDR-SA1-XPDR1+XPONDER")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint")))) + .count(); + assertEquals(1, nb8, "SPDR-SA1-XPDR1 (mux) should have a single OTSI network nep"); + long nb9 = topology.getNode().values().stream() + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA) + && node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .filter(node -> node.getName().get(new NameKey("otsi node name")).getValue() + .equals("SPDR-SA1-XPDR2+XPONDER")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint")))) + .count(); + assertEquals(2, nb9, "SPDR-SA1-XPDR2 (switch) should have 2 OTSI network nep"); + + assertEquals(10, topology.getLink().size(), "Link list size should be 10, no more transitionnal links"); Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes("T0 - Multi-layer topology".getBytes()).toString()); assertEquals(topoUuid, topology.getUuid(), "incorrect topology uuid"); assertEquals( "T0 - Multi-layer topology", - topology.nonnullName().values().stream().findFirst().get().getValue(), + topology.nonnullName().values().stream().findFirst().orElseThrow().getValue(), "topology name should be T0 - Multi-layer topology"); long nbDsrOduNodes = topology.nonnullNode().values().stream() @@ -235,24 +281,21 @@ public class TapiTopologyImplTest extends AbstractTest { long nbPhotonicNodes = topology.nonnullNode().values().stream() .filter(n -> n.getName().containsKey(new NameKey("otsi node name"))).count(); assertEquals(6, nbDsrOduNodes, "Node list should contain 6 DSR-ODU nodes"); - assertEquals(7, nbPhotonicNodes, "Node list should contain 7 Photonics nodes"); - long nbTransititionalLinks = topology.getLink().values().stream() - .filter(l -> l.getName().containsKey(new NameKey("transitional link name"))).count(); - long nbOmsLinks = topology.getLink().values().stream() - .filter(l -> l.getName().containsKey(new NameKey("OMS link name"))).count(); + assertEquals(7, nbPhotonicNodes, "Node list should contain 7 Photonics node"); + long nbOtsLinks = topology.getLink().values().stream() + .filter(l -> l.getName().containsKey(new NameKey("OTS link name"))).count(); long nbOtnLinks = topology.getLink().values().stream() .filter(l -> l.getName().containsKey(new NameKey("otn link name"))).count(); - assertEquals(8, nbTransititionalLinks, "Link list should contain 8 transitional links"); - assertEquals(8, nbOmsLinks, "Link list should contain 8 transitional links"); + assertEquals(8, nbOtsLinks, "Link list should contain 8 OTS links"); assertEquals(2, nbOtnLinks, "Link list should contain 2 OTN links"); - Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(StandardCharsets.UTF_8)) + Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+XPONDER".getBytes(StandardCharsets.UTF_8)) .toString()); - Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+DSR".getBytes(StandardCharsets.UTF_8)) + Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+XPONDER".getBytes(StandardCharsets.UTF_8)) .toString()); - Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(StandardCharsets.UTF_8)) + Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+XPONDER".getBytes(StandardCharsets.UTF_8)) .toString()); - Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+OTSi".getBytes(StandardCharsets.UTF_8)) + Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+XPONDER".getBytes(StandardCharsets.UTF_8)) .toString()); Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1" .getBytes(StandardCharsets.UTF_8)).toString()); @@ -277,184 +320,172 @@ public class TapiTopologyImplTest extends AbstractTest { "SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1toSPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1"); checkOtnLink(links.get(1), topoUuid, node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, link2Uuid, "SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1toSPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1"); + } @Test void getTopologyDetailsForFullTapiTopologyWithLinksWhenSuccessful() throws ExecutionException, InterruptedException { - GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput( - TapiStringConstants.T0_FULL_MULTILAYER); - 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(); + Uuid topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER.getBytes( + Charset.forName("UTF-8"))).toString()); + LOG.info("T0FullMultilayerUuid = {}", topologyUuid); + GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput(topologyUuid); + ListenableFuture> result = new GetTopologyDetailsImpl(tapiContext, + topologyUtils, tapiLink, networkTransactionService) + .invoke(input); RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); assertNotNull(topology, "Topology should not be null"); - // 2 Nodes per Xpdr/Spdr node (DSR-ODU & PHOT) + 1 Node per Roadm - assertEquals(18, topology.getNode().size(), "Node list size should be 18"); + // 2 Nodes per Xpdr/Spdr node (DSR-ODU & PHOT) + 3 Node per Roadm + assertEquals(10, topology.getNode().size(), "Node list size should be 10"); + List> nodeNames = topology.getNode().values().stream() + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) + .map(Node::getName).collect(Collectors.toList()); + LOG.info("TopologyNodes = {}", nodeNames.toString()); + Node nodeTsp = topology.getNode().values().stream() + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("XPDR-A1-XPDR1+XPONDER")) + .findAny().orElseThrow(); + LOG.debug("XPDRA1 NEPs = {}", nodeTsp.getOwnedNodeEdgePoint().toString()); long nb1 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("XPDR-A1-XPDR1+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("XPDR-A1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("100G-tpdr")))) .count(); // 2 client ports in configuration -> removed the checkTp so we have 2 NEPs - assertEquals(2, nb1, "XPDR-A1-XPDR1+DSR should only have two client neps"); + assertEquals(2, nb1, "XPDR-A1-XPDR1+XPONDER should only have two client neps"); long inb1 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("XPDR-A1-XPDR1+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("XPDR-A1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint_N")))) .count(); - assertEquals(2, inb1, "XPDR-A1-XPDR1+DSR should only have two internal network neps"); + assertEquals(2, inb1, "XPDR-A1-XPDR1+XPONDER should only have two internal network neps"); long enb1 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("XPDR-A1-XPDR1+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("XPDR-A1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint_N")))) .count(); - assertEquals(2, enb1, "XPDR-A1-XPDR1+DSR should only have two external network neps"); + assertEquals(2, enb1, "XPDR-A1-XPDR1+XPONDER should only have two external network neps"); long nb2 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR1+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("SPDR-SA1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("NodeEdgePoint_C")))) .count(); - assertEquals(4, nb2, "SPDR-SA1-XPDR1+DSR (mux) should have 4 client neps"); + assertEquals(4, nb2, "SPDR-SA1-XPDR1+XPONDER (mux) should have 4 client neps"); long inb3 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR1+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("SPDR-SA1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint_N")))) .count(); - assertEquals(1, inb3, "SPDR-SA1-XPDR1+DSR (mux) should have a single internal network nep"); + assertEquals(1, inb3, "SPDR-SA1-XPDR1+XPONDER (mux) should have a single internal network nep"); long enb3 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR1+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("SPDR-SA1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint_N")))) .count(); - assertEquals(4, enb3, "SPDR-SA1-XPDR1+DSR (mux) should have 4 external network nep"); + assertEquals(4, enb3, "SPDR-SA1-XPDR1+XPONDER (mux) should have 4 external network nep"); long nb4 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR2+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("SPDR-SA1-XPDR2+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("NodeEdgePoint_C")))) .count(); - assertEquals(4, nb4, "SPDR-SA1-XPDR2+DSR (switch) should have 4 client neps"); + assertEquals(4, nb4, "SPDR-SA1-XPDR2+XPONDER (switch) should have 4 client neps"); long inb5 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR2+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("SPDR-SA1-XPDR2+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint_N")))) .count(); - assertEquals(4, inb5, "SPDR-SA1-XPDR2+DSR (switch) should have 4 internal network neps"); + assertEquals(4, inb5, "SPDR-SA1-XPDR2+XPONDER (switch) should have 4 internal network neps"); long enb5 = topology.getNode().values().stream() .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR2+DSR")) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("SPDR-SA1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint_N")))) .count(); - assertEquals(4, enb5, "SPDR-SA1-XPDR2+DSR (switch) should have 4 external network neps"); + assertEquals(4, enb5, "SPDR-SA1-XPDR2+XPONDER (switch) should have 4 external network neps"); - // Now lets check for the Photonic media nodes (same nodes as for DSR + 1 Roadm node) - nb1 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("XPDR-A1-XPDR1+OTSi")) - .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint")))) - .count(); - // 2 client ports in configuration -> removed the checkTp so we have 2 NEPs - assertEquals(2, nb1, "XPDR-A1-XPDR1+OTSi should only have two internal network neps"); inb1 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("XPDR-A1-XPDR1+OTSi")) + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("XPDR-A1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint")))) + .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint_N")))) .count(); - assertEquals(2, inb1, "XPDR-A1-XPDR1+OTSi should only have two external network neps"); + assertEquals(2, inb1, "XPDR-A1-XPDR1+XPONDER should only have two external network neps"); enb1 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("XPDR-A1-XPDR1+OTSi")) - .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().containsKey(new NameKey("PhotMedNodeEdgePoint")))) - .count(); - assertEquals(2, enb1, "XPDR-A1-XPDR1+OTSi should only have two photonic network neps"); - nb2 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR1+OTSi")) + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("XPDR-A1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint")))) + .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint_N")))) .count(); - assertEquals(1, nb2, "SPDR-SA1-XPDR1+OTSi (mux) should have a single internal network nep"); + assertEquals(2, enb1, "XPDR-A1-XPDR1+XPONDER should only have two photonic network neps"); inb3 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR1+OTSi")) + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("SPDR-SA1-XPDR1+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint")))) .count(); - assertEquals(1, inb3, "SPDR-SA1-XPDR1+OTSi (mux) should have a single external network nep"); - enb3 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR1+OTSi")) - .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().containsKey(new NameKey("PhotMedNodeEdgePoint")))) - .count(); - assertEquals(1, enb3, "SPDR-SA1-XPDR1+OTSi (mux) should have a single photonic network nep"); - nb4 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR2+OTSi")) - .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint")))) - .count(); - assertEquals(4, nb4, "SPDR-SA1-XPDR2+OTSi (switch) should have 4 internal network neps"); + assertEquals(1, inb3, "SPDR-SA1-XPDR1+XPONDER (mux) should have a single external network nep"); inb5 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR2+OTSi")) + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .filter(node -> node.getName().get(new NameKey("dsr/odu node name")).getValue() + .equals("SPDR-SA1-XPDR2+XPONDER")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint")))) .count(); - assertEquals(4, inb5, "SPDR-SA1-XPDR2+OTSi (switch) should have 4 external network neps"); - enb5 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals("SPDR-SA1-XPDR2+OTSi")) - .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().containsKey(new NameKey("PhotMedNodeEdgePoint")))) - .count(); - assertEquals(4, enb5, "SPDR-SA1-XPDR2+OTSi (switch) should have 4 photonic network neps"); - // We should have 3 neps per DEGREE-TTP port and 3 neps per SRG-PP port + assertEquals(4, inb5, "SPDR-SA1-XPDR2+XPONDER (switch) should have 4 external network neps"); long inb6 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals( - "ROADM-A1+PHOTONIC_MEDIA")) + .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")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().values().stream().findFirst().get().getValue().contains("DEG"))) + .filter(nep -> nep.getName().values().stream().findAny().orElseThrow().getValue().contains("DEG"))) .count(); - assertEquals(6, inb6, "ROADM-A1+PHOTONIC_MEDIA (DEGREE) should have 6 network neps"); + assertEquals(4, inb6, "ROADM-A1+PHOTONIC_MEDIA (DEGREE) should have 4 network neps"); long enb6 = topology.getNode().values().stream() - .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)) - .filter(node -> node.getName().values().stream().findFirst().get().getValue().equals( - "ROADM-A1+PHOTONIC_MEDIA")) + .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")) .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() - .filter(nep -> nep.getName().values().stream().findFirst().get().getValue().contains("SRG"))) + .filter(nep -> nep.getName().values().stream().findAny().orElseThrow().getValue().contains("SRG"))) .count(); - assertEquals(24, enb6, "ROADM-A1+PHOTONIC_MEDIA (SRG) should have 24 network neps"); + assertEquals(8, enb6, "ROADM-A1+PHOTONIC_MEDIA (SRG) should have 8 network neps (OTS)"); // Links in openroadm topology which include Roadm-to-Roadm and Xpdr-to-Roadm (ortopo / 2) - // + transitional links -> 1 per network port of Xpdr + OTN links / 2 - assertEquals(25, topology.getLink().size(), "Link list size should be 25"); + // + transitional links -> 0 per network port of Xpdr + OTN links / 2 + List linkList = new ArrayList<>(); + for (Map.Entry entry : topology.getLink().entrySet()) { + linkList.add(entry.getValue().getName().entrySet().iterator().next().getValue().toString()); + } + assertEquals(9, topology.getLink().size(), "Link list size should be 8 XPDR To SRG and 1 DEG2A-DEG1C"); Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes("T0 - Full Multi-layer topology".getBytes()).toString()); assertEquals(topoUuid, topology.getUuid(), "incorrect topology uuid"); assertEquals( "T0 - Full Multi-layer topology", - topology.nonnullName().values().stream().findFirst().get().getValue(), + topology.nonnullName().values().stream().findFirst().orElseThrow().getValue(), "topology name should be T0 - Full Multi-layer topology"); long nbDsrOduNodes = topology.nonnullNode().values().stream() @@ -465,69 +496,45 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals(8, nbDsrOduNodes, "Node list should contain 8 DSR-ODU nodes"); // We need to add the Roadms as Photonic nodes. Instead of 1 node as roadm infra we have 2 roadm nodes assertEquals(8, nbPhotonicNodes, "Node list should contain 8 Photonics nodes"); - long nbTransititionalLinks = topology.getLink().values().stream() - .filter(l -> l.getName().containsKey(new NameKey("transitional link name"))).count(); // Roadm-to-Roadm long nbOmsLinks = topology.getLink().values().stream() .filter(l -> l.getName().containsKey(new NameKey("OMS link name"))).count(); // Xpdr-to-Roadm long nbOmsLinks1 = topology.getLink().values().stream() .filter(l -> l.getName().containsKey(new NameKey("XPDR-RDM link name"))).count(); - // 1 transitional link per NETWORK port - assertEquals(16, nbTransititionalLinks, "Link list should contain 16 transitional links"); // 1 OMS per ROADM-to-ROADM link + Existing XPDR-tp-ROADM link in openroadm topology assertEquals(9, nbOmsLinks + nbOmsLinks1, "Link list should contain 9 OMS links"); } @Test - void getNodeAndNepsDetailsWhenSuccessful() - throws ExecutionException, InterruptedException { - GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput( - TapiStringConstants.T0_FULL_MULTILAYER); - 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(); + 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); + 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().get().getValue(); - GetNodeDetailsInput input1 = TapiTopologyDataUtils.buildGetNodeDetailsInput( - TapiStringConstants.T0_FULL_MULTILAYER, nodeName); - ListenableFuture> result1 = tapiTopoImpl.getNodeDetails(input1); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + Uuid nodeUuid = node.getUuid(); + GetNodeDetailsInput input1 = TapiTopologyDataUtils.buildGetNodeDetailsInput(topologyUuid, nodeUuid); + 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().get().getValue(); + Uuid onepUuid = onep.getUuid(); GetNodeEdgePointDetailsInput input2 = TapiTopologyDataUtils.buildGetNodeEdgePointDetailsInput( - TapiStringConstants.T0_FULL_MULTILAYER, nodeName, onepName); - ListenableFuture> result2 - = tapiTopoImpl.getNodeEdgePointDetails(input2); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + topologyUuid, nodeUuid, onepUuid); + ListenableFuture> result2 = + new GetNodeEdgePointDetailsImpl(tapiContext).invoke(input2); RpcResult rpcResult2 = result2.get(); org.opendaylight.yang.gen.v1 - .urn.onf.otcc.yang.tapi.topology.rev181210.get.node.edge.point.details.output.NodeEdgePoint + .urn.onf.otcc.yang.tapi.topology.rev221121.get.node.edge.point.details.output.NodeEdgePoint onep1 = rpcResult2.getResult().getNodeEdgePoint(); assertNotNull(onep1, "Node Edge Point should not be null"); } @@ -535,73 +542,45 @@ public class TapiTopologyImplTest extends AbstractTest { } @Test - void getLinkDetailsWhenSuccessful() - throws ExecutionException, InterruptedException { - GetTopologyDetailsInput input = TapiTopologyDataUtils.buildGetTopologyDetailsInput( - TapiStringConstants.T0_FULL_MULTILAYER); - 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(); + 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); + 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().get().getValue(); + Uuid linkUuid = link.getUuid(); GetLinkDetailsInput input1 = TapiTopologyDataUtils.buildGetLinkDetailsInput( - TapiStringConstants.T0_FULL_MULTILAYER, linkName); - ListenableFuture> result1 = tapiTopoImpl.getLinkDetails(input1); - result.addListener(new Runnable() { - @Override - public void run() { - endSignal.countDown(); - } - }, executorService); - endSignal.await(); + topologyUuid, linkUuid); + ListenableFuture> result1 = new GetLinkDetailsImpl(tapiContext) + .invoke(input1); RpcResult rpcResult1 = result1.get(); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.get.link.details.output.Link link1 + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.link.details.output.Link link1 = rpcResult1.getResult().getLink(); assertNotNull(link1, "Link should not be null"); } } @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.rev181210.get.service._interface.point.details.output.Sip sip1 + .urn.onf.otcc.yang.tapi.common.rev221121.get.service._interface.point.details.output.Sip sip1 = rpcResult1.getResult().getSip(); assertNotNull(sip1, "Sip should not be null"); } @@ -611,7 +590,7 @@ public class TapiTopologyImplTest extends AbstractTest { Uuid linkUuid, String linkName) { assertEquals(linkName, link.getName().get(new NameKey("otn link name")).getValue(), "bad name for the link"); assertEquals(linkUuid, link.getUuid(), "bad uuid for link"); - assertEquals(CapacityUnit.GBPS, link.getAvailableCapacity().getTotalSize().getUnit(), + assertEquals(CAPACITYUNITGBPS.VALUE, link.getAvailableCapacity().getTotalSize().getUnit(), "Available capacity unit should be MBPS"); String prefix = linkName.split("-")[0]; if ("OTU4".equals(prefix)) { @@ -621,22 +600,22 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals(Uint64.valueOf(100000), link.getAvailableCapacity().getTotalSize().getValue(), "Available capacity -total size value should be 100 000"); } - assertEquals(CapacityUnit.GBPS, link.getTotalPotentialCapacity().getTotalSize().getUnit(), + assertEquals(CAPACITYUNITGBPS.VALUE, link.getTotalPotentialCapacity().getTotalSize().getUnit(), "Total capacity unit should be GBPS"); - assertEquals(Uint64.valueOf(100), link.getTotalPotentialCapacity().getTotalSize().getValue(), + assertEquals(Decimal64.valueOf("100"), link.getTotalPotentialCapacity().getTotalSize().getValue(), "Total capacity -total size value should be 100"); if ("OTU4".equals(prefix)) { assertEquals("otn link should be between 2 nodes of protocol layers PHOTONIC_MEDIA", LayerProtocolName.PHOTONICMEDIA.getName(), - link.getLayerProtocolName().stream().findFirst().get().getName()); + link.getLayerProtocolName().stream().findFirst().orElseThrow().getName()); } else if ("ODTU4".equals(prefix)) { assertEquals("otn link should be between 2 nodes of protocol layers ODU", LayerProtocolName.ODU.getName(), - link.getLayerProtocolName().stream().findFirst().get().getName()); + link.getLayerProtocolName().stream().findFirst().orElseThrow().getName()); } assertEquals(ForwardingDirection.BIDIRECTIONAL, link.getDirection(), "transitional link should be BIDIRECTIONAL"); - List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); assertEquals(topoUuid, nodeEdgePointList.get(0).getTopologyUuid(), "topology uuid should be the same for the two termination point of the link");