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=fd339a28bf644051259cd71d3f3c7bcb7375427e;hb=ee81f24e14686bfb96cfa404592ad89117c01aa7;hp=86edb516b67f91223b4cf128974b1f5ec97d858f;hpb=227a39b7f2adf915fc6b8dc5277c1e8fe0b2b4ed;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 86edb516b..fd339a28b 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 @@ -9,89 +9,121 @@ package org.opendaylight.transportpce.tapi.topology; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.either; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +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; import java.util.List; +import java.util.Map; import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; -import org.junit.BeforeClass; -import org.junit.Test; -import org.opendaylight.transportpce.common.DataStoreContext; -import org.opendaylight.transportpce.common.DataStoreContextImpl; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.opendaylight.transportpce.common.InstanceIdentifiers; -import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.transportpce.tapi.utils.TopologyDataUtils; +import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; +import org.opendaylight.transportpce.common.network.NetworkTransactionService; +import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; +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.utils.TapiContext; +import org.opendaylight.transportpce.tapi.utils.TapiInitialORMapping; +import org.opendaylight.transportpce.tapi.utils.TapiLink; +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.LifecycleState; 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.PortDirection; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.PortRole; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TerminationDirection; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TerminationState; 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.dsr.rev181210.DIGITALSIGNALTYPE100GigE; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU4; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev181210.PHOTONICLAYERQUALIFIEROMS; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev181210.PHOTONICLAYERQUALIFIEROTSi; +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.topology.rev181210.topology.Node; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class TapiTopologyImplTest extends AbstractTest { private static final Logger LOG = LoggerFactory.getLogger(TapiTopologyImplTest.class); private static ListeningExecutorService executorService; private static CountDownLatch endSignal; private static final int NUM_THREADS = 3; - private static DataStoreContext dataStoreContextUtil; + private static NetworkTransactionService networkTransactionService; + private static TapiContext tapiContext; + private static TopologyUtils topologyUtils; + private static ConnectivityUtils connectivityUtils; + private static ServiceDataStoreOperations serviceDataStoreOperations; + private static TapiInitialORMapping tapiInitialORMapping; + private static TapiLink tapiLink; - @BeforeClass - public static void setUp() throws InterruptedException { + @BeforeAll + static void setUp() throws InterruptedException, ExecutionException { executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUM_THREADS)); endSignal = new CountDownLatch(1); - dataStoreContextUtil = new DataStoreContextImpl(); - TopologyDataUtils.writeTopologyFromFileToDatastore(dataStoreContextUtil, - TopologyDataUtils.OPENROADM_TOPOLOGY_FILE, InstanceIdentifiers.OVERLAY_NETWORK_II); - TopologyDataUtils.writeTopologyFromFileToDatastore(dataStoreContextUtil, - TopologyDataUtils.OTN_TOPOLOGY_FILE, InstanceIdentifiers.OTN_NETWORK_II); - TopologyDataUtils.writePortmappingFromFileToDatastore(dataStoreContextUtil); + TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), + TapiTopologyDataUtils.OPENROADM_TOPOLOGY_FILE, InstanceIdentifiers.OVERLAY_NETWORK_II); + TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), + TapiTopologyDataUtils.OPENROADM_NETWORK_FILE, InstanceIdentifiers.UNDERLAY_NETWORK_II); + TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), + TapiTopologyDataUtils.OTN_TOPOLOGY_FILE, InstanceIdentifiers.OTN_NETWORK_II); + TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil(), + TapiTopologyDataUtils.PORTMAPPING_FILE); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); + tapiLink = new TapiLink(networkTransactionService); + serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(getDataStoreContextUtil().getDataBroker()); + tapiContext = new TapiContext(networkTransactionService); + topologyUtils = new TopologyUtils(networkTransactionService, getDataStoreContextUtil().getDataBroker(), + tapiLink); + connectivityUtils = new ConnectivityUtils(serviceDataStoreOperations, new HashMap<>(), tapiContext, + networkTransactionService); + tapiInitialORMapping = new TapiInitialORMapping(topologyUtils, connectivityUtils, + tapiContext, serviceDataStoreOperations); + tapiInitialORMapping.performTopoInitialMapping(); LOG.info("setup done"); } @Test - public void getTopologyDetailsForOpenroadmTopologyWhenSuccessful() throws ExecutionException, InterruptedException { - GetTopologyDetailsInput input = TopologyDataUtils.buildGetTopologyDetailsInput(NetworkUtils.OVERLAY_NETWORK_ID); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(dataStoreContextUtil.getDataBroker()); + 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 @@ -103,26 +135,39 @@ public class TapiTopologyImplTest extends AbstractTest { RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); - assertNotNull("Topology should not be null", topology); - assertEquals("Nodes list size should be 1", 1, topology.getNode().size()); - assertEquals("Node name should be TAPI Ethernet Node", - "TAPI Ethernet Node", topology.getNode().get(0).getName().get(0).getValue()); - Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes("Ethernet Topology".getBytes()).toString()); - Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes("TAPI Ethernet Node".getBytes()).toString()); - assertEquals("incorrect topology uuid", topoUuid, topology.getUuid()); - assertEquals("incorrect node uuid", nodeUuid, topology.getNode().get(0).getUuid()); - Uuid onep1Uuid = new Uuid(UUID.nameUUIDFromBytes("OwnedNodeEdgePoint 0".getBytes()).toString()); - Uuid onep2Uuid = new Uuid(UUID.nameUUIDFromBytes("OwnedNodeEdgePoint 1".getBytes()).toString()); - assertEquals("incorrect uuid for nep1", - onep1Uuid, topology.getNode().get(0).getOwnedNodeEdgePoint().get(0).getUuid()); - assertEquals("incorrect uuid for nep1", - onep2Uuid, topology.getNode().get(0).getOwnedNodeEdgePoint().get(1).getUuid()); + assertNotNull(topology, "Topology should not be null"); + Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.TPDR_100G.getBytes(StandardCharsets.UTF_8)) + .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() + .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(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())) + .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()); + assertEquals(nb, nodeEdgePointList.size(), "'Transponder 100GE' node -rule-group should contain 2 NEPs"); + 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(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); } @Test - public void getTopologyDetailsForOtnTopologyWhenSuccessful() throws ExecutionException, InterruptedException { - GetTopologyDetailsInput input = TopologyDataUtils.buildGetTopologyDetailsInput(NetworkUtils.OTN_NETWORK_ID); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(dataStoreContextUtil.getDataBroker()); + 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 @@ -134,345 +179,482 @@ public class TapiTopologyImplTest extends AbstractTest { RpcResult rpcResult = result.get(); @Nullable Topology topology = rpcResult.getResult().getTopology(); - assertNotNull("Topology should not be null", topology); - assertEquals("Node list size should be 4", 4, topology.getNode().size()); - assertEquals("Link list size should be 5", 5, topology.getLink().size()); + assertNotNull(topology, "Topology should not be null"); + assertEquals(13, topology.getNode().size(), "Node list size should be 13"); + 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")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("100G-tpdr")))) + .count(); + assertEquals(1, nb1, "XPDR-A1-XPDR1 should only have one client nep"); + 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")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("NodeEdgePoint_C")))) + .count(); + assertEquals(4, nb2, "SPDR-SA1-XPDR1 (mux) should have 4 client neps"); + 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")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint_N")))) + .count(); + assertEquals(1, nb3, "SPDR-SA1-XPDR1 (mux) should have a single network nep"); + 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")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("NodeEdgePoint_C")))) + .count(); + assertEquals(4, nb4, "SPDR-SA1-XPDR2 (switch) should have 4 client neps"); + 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")) + .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"); Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes("T0 - Multi-layer topology".getBytes()).toString()); - assertEquals("incorrect topology uuid", topoUuid, topology.getUuid()); - assertEquals("topology name should be T0 - Multi-layer topology", + assertEquals(topoUuid, topology.getUuid(), "incorrect topology uuid"); + assertEquals( "T0 - Multi-layer topology", - topology.getName().get(0).getValue()); + topology.nonnullName().values().stream().findFirst().get().getValue(), + "topology name should be T0 - Multi-layer topology"); - List nodes = topology.getNode().stream() - .sorted((n1,n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) - .collect(Collectors.toList()); - Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + long nbDsrOduNodes = topology.nonnullNode().values().stream() + .filter(n -> n.getName().containsKey(new NameKey("dsr/odu node name"))).count(); + 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(); + 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(2, nbOtnLinks, "Link list should contain 2 OTN links"); + + Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(StandardCharsets.UTF_8)) .toString()); - checkDsrNode(nodes.get(0), node1Uuid, false); - Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+DSR".getBytes(Charset.forName("UTF-8"))) + Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+DSR".getBytes(StandardCharsets.UTF_8)) .toString()); - checkDsrNode(nodes.get(1), node2Uuid, true); - Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) + Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(StandardCharsets.UTF_8)) .toString()); - checkOtsiNode(nodes.get(2), node3Uuid, false); - Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+OTSi".getBytes(Charset.forName("UTF-8"))) + Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+OTSi".getBytes(StandardCharsets.UTF_8)) .toString()); - checkOtsiNode(nodes.get(3), node4Uuid, true); + Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1" + .getBytes(StandardCharsets.UTF_8)).toString()); + Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1" + .getBytes(StandardCharsets.UTF_8)).toString()); + Uuid tp3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1" + .getBytes(StandardCharsets.UTF_8)).toString()); + Uuid tp4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1" + .getBytes(StandardCharsets.UTF_8)).toString()); + Uuid link1Uuid = + new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1toSPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1" + .getBytes(StandardCharsets.UTF_8)).toString()); + Uuid link2Uuid = + new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1toSPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1" + .getBytes(StandardCharsets.UTF_8)).toString()); - List links = topology.getLink().stream() + List links = topology.nonnullLink().values().stream() + .filter(l -> l.getName().containsKey(new NameKey("otn link name"))) .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - checkTransitionalLink(links.get(0), topoUuid, node1Uuid, node3Uuid, "DSR+XPDR1-NETWORK1", - "iOTSi+XPDR1-NETWORK1"); - checkTransitionalLink(links.get(1), topoUuid, node2Uuid, node4Uuid, "DSR+XPDR2-NETWORK1", - "iOTSi+XPDR2-NETWORK1"); + checkOtnLink(links.get(0), topoUuid, node3Uuid, node4Uuid, tp3Uuid, tp4Uuid, link1Uuid, + "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"); } - private void checkDsrNode(Node node, Uuid nodeUuid, boolean isSwitch) { - assertEquals("incorrect node uuid", nodeUuid, node.getUuid()); - assertEquals("administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, node.getAdministrativeState()); - assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, node.getLifecycleState()); - assertEquals("operational state should be ENABLED", OperationalState.ENABLED, node.getOperationalState()); - assertEquals("value-name should be 'dsr/odu node name'", - "dsr/odu node name", node.getName().get(0).getValueName()); - assertEquals("dsr node should manage 2 protocol layers : dsr and odu", - 2, node.getLayerProtocolName().size()); - assertThat("dsr node should manage 2 protocol layers : dsr and odu", - node.getLayerProtocolName(), hasItems(LayerProtocolName.DSR, LayerProtocolName.ODU)); - List neps = node.getOwnedNodeEdgePoint().stream() - .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) - .collect(Collectors.toList()); - if (isSwitch) { - assertEquals("Switch-DSR node should have 8 NEPs", 8, neps.size()); - OwnedNodeEdgePoint nep1 = neps.get(5); - Uuid client4NepUuid = new Uuid( - UUID.nameUUIDFromBytes("DSR+XPDR2-CLIENT4".getBytes(Charset.forName("UTF-8"))).toString()); - checkNepClient100G(nep1, client4NepUuid, "XPDR2-CLIENT4", "NodeEdgePoint_C4"); - OwnedNodeEdgePoint nep2 = neps.get(1); - Uuid networkNepUuid = new Uuid( - UUID.nameUUIDFromBytes("DSR+XPDR2-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); - checkNepNetworkODU4(nep2, networkNepUuid, "XPDR2-NETWORK1", "NodeEdgePoint_N1"); - List nrgList = node.getNodeRuleGroup().stream() - .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) - .collect(Collectors.toList()); - checkNodeRuleGroupForSwitchDSR(nrgList, client4NepUuid, networkNepUuid, nodeUuid); - } else { - assertEquals("Mux-DSR node should have 5 NEPs", 5, neps.size()); - OwnedNodeEdgePoint nep1 = neps.get(0); - Uuid client4NepUuid = new Uuid( - UUID.nameUUIDFromBytes("DSR+XPDR1-CLIENT4".getBytes(Charset.forName("UTF-8"))).toString()); - checkNepClient10G(nep1, client4NepUuid, "XPDR1-CLIENT4", "NodeEdgePoint_C4"); - - OwnedNodeEdgePoint nep2 = neps.get(1); - Uuid networkNepUuid = new Uuid( - UUID.nameUUIDFromBytes("DSR+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); - checkNepNetworkODU4(nep2, networkNepUuid, "XPDR1-NETWORK1", "NodeEdgePoint_N1"); - List nrgList = node.getNodeRuleGroup().stream() - .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) - .collect(Collectors.toList()); - checkNodeRuleGroupForMuxDSR(nrgList, client4NepUuid, networkNepUuid, nodeUuid); - } - } + @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(); + 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"); + 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")) + .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"); + 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")) + .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"); + 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")) + .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"); + 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")) + .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"); + 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")) + .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"); + 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")) + .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"); + 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")) + .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"); + 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")) + .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"); + 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")) + .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"); - private void checkOtsiNode(Node node, Uuid nodeUuid, boolean isSwitch) { - assertEquals("incorrect node uuid", nodeUuid, node.getUuid()); - assertEquals("administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, node.getAdministrativeState()); - assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, node.getLifecycleState()); - assertEquals("operational state should be ENABLED", OperationalState.ENABLED, node.getOperationalState()); - assertEquals("value-name should be 'dsr/odu node name'", - "otsi node name", node.getName().get(0).getValueName()); - assertEquals("otsi node should manage a single protocol layer : PHOTONIC_MEDIA", - 1, node.getLayerProtocolName().size()); - assertEquals("otsi node should manage a single protocol layer : PHOTONIC_MEDIA", - LayerProtocolName.PHOTONICMEDIA, node.getLayerProtocolName().get(0)); - List neps = node.getOwnedNodeEdgePoint().stream() - .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) - .collect(Collectors.toList()); - if (isSwitch) { - assertEquals("Switch-OTSi node should have 8 NEPs", 8, neps.size()); - OwnedNodeEdgePoint nep1 = neps.get(0); - Uuid inepUuid = new Uuid( - UUID.nameUUIDFromBytes("iOTSi+XPDR2-NETWORK2".getBytes(Charset.forName("UTF-8"))).toString()); - checkNepOtsiNode(nep1, inepUuid, "XPDR2-NETWORK2", "iNodeEdgePoint_2"); - OwnedNodeEdgePoint nep2 = neps.get(5); - Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes("eOTSi+XPDR2-NETWORK2".getBytes(Charset.forName("UTF-8"))).toString()); - checkNepOtsiNode(nep2, enepUuid, "XPDR2-NETWORK2", "eNodeEdgePoint_2"); - List nrgList = node.getNodeRuleGroup().stream() - .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) - .collect(Collectors.toList()); - checkNodeRuleGroupForSwitchOTSi(nrgList, enepUuid, inepUuid, nodeUuid); - } else { - assertEquals("Mux-OTSi node should have 2 NEPs", 2, neps.size()); - OwnedNodeEdgePoint nep1 = neps.get(0); - Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes("eOTSi+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); - checkNepOtsiNode(nep1, enepUuid, "XPDR1-NETWORK1", "eNodeEdgePoint_1"); - OwnedNodeEdgePoint nep2 = neps.get(1); - Uuid inepUuid = new Uuid( - UUID.nameUUIDFromBytes("iOTSi+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); - checkNepOtsiNode(nep2, inepUuid, "XPDR1-NETWORK1", "iNodeEdgePoint_1"); - List nrgList = node.getNodeRuleGroup().stream() - .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) - .collect(Collectors.toList()); - checkNodeRuleGroupForMuxOTSi(nrgList, enepUuid, inepUuid, nodeUuid); - } - } + // 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")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("eNodeEdgePoint")))) + .count(); + assertEquals(2, inb1, "XPDR-A1-XPDR1+OTSi 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")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("iNodeEdgePoint")))) + .count(); + assertEquals(1, nb2, "SPDR-SA1-XPDR1+OTSi (mux) should have a single internal network nep"); + 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")) + .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"); + 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")) + .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 + 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")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().values().stream().findFirst().get().getValue().contains("DEG"))) + .count(); + assertEquals(6, inb6, "ROADM-A1+PHOTONIC_MEDIA (DEGREE) should have 6 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")) + .flatMap(node -> node.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().values().stream().findFirst().get().getValue().contains("SRG"))) + .count(); + assertEquals(24, enb6, "ROADM-A1+PHOTONIC_MEDIA (SRG) should have 24 network neps"); - private void checkNepClient10G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); - assertEquals("value of client nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); - assertEquals("Client nep should support 2 kind of cep", - 2, nep.getSupportedCepLayerProtocolQualifier().size()); - assertThat("client nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItems(ODUTYPEODU2E.class, DIGITALSIGNALTYPE10GigELAN.class)); - assertEquals("client nep should be of ETH protocol type", LayerProtocolName.ETH, nep.getLayerProtocolName()); - checkCommonPartOfNep(nep); - } + // 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"); + 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 name should be T0 - Full Multi-layer topology"); - private void checkNepNetworkODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); - assertEquals("value of network nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); - assertEquals("Network nep should support 1 kind of cep", - 1, nep.getSupportedCepLayerProtocolQualifier().size()); - assertThat("network nep should support 1 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItem(ODUTYPEODU4.class)); - assertEquals("network nep should be of ODU protocol type", LayerProtocolName.ODU, nep.getLayerProtocolName()); - checkCommonPartOfNep(nep); + long nbDsrOduNodes = topology.nonnullNode().values().stream() + .filter(n -> n.getName().containsKey(new NameKey("dsr/odu node name"))).count(); + long nbPhotonicNodes = topology.nonnullNode().values().stream() + .filter(n -> n.getName().containsKey(new NameKey("otsi node name"))).count(); + // In DSR/ODU we create one node per Xpdr (no filtering out) + 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"); } - private void checkNodeRuleGroupForMuxDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, - Uuid nodeUuid) { - assertEquals("muxponder DSR should contain 4 node rule group", 4, nrgList.size()); - for (NodeRuleGroup nodeRuleGroup : nrgList) { - assertEquals("each node-rule-group should contain 2 NEP for muxponder DSR", - 2, nodeRuleGroup.getNodeEdgePoint().size()); + @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(); + 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(); + 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(); + 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(); + RpcResult rpcResult2 = result2.get(); + org.opendaylight.yang.gen.v1 + .urn.onf.otcc.yang.tapi.topology.rev181210.get.node.edge.point.details.output.NodeEdgePoint + onep1 = rpcResult2.getResult().getNodeEdgePoint(); + assertNotNull(onep1, "Node Edge Point should not be null"); + } } - assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), - either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); - assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), - either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); - assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeUuid(), nodeUuid); - assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeUuid(), nodeUuid); - assertEquals("node-rule-group nb 2 should contain a single rule", 1, nrgList.get(1).getRule().size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(1).getRule().get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(1).getRule().get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(1).getRule().get(0).getRuleType()); } - private void checkNodeRuleGroupForSwitchDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, - Uuid nodeUuid) { - assertEquals("Switch-DSR should contain a single node rule group", 1, nrgList.size()); - assertEquals("Switch-DSR node-rule-group should contain 8 NEP", 8, nrgList.get(0).getNodeEdgePoint().size()); - List nrg = nrgList.get(0).getNodeEdgePoint().stream() - .sorted((nrg1, nrg2) -> nrg1.getNodeEdgePointUuid().getValue() - .compareTo(nrg2.getNodeEdgePointUuid().getValue())) - .collect(Collectors.toList()); - assertEquals("in the sorted node-rule-group, nep number 2 should be XPDR2-NETWORK1", - networkNepUuid, nrg.get(1).getNodeEdgePointUuid()); - assertEquals("in the sorted node-rule-group, nep number 6 should be XPDR2-CLIENT4", - clientNepUuid, nrg.get(5).getNodeEdgePointUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrg.get(1).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrg.get(5).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); - } - - private void checkNodeRuleGroupForMuxOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { - assertEquals("Mux-OTSi should contain a single node rule group", 1, nrgList.size()); - assertEquals("Mux-OTSi node-rule-group should contain 2 NEP", 2, nrgList.get(0).getNodeEdgePoint().size()); - assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", - nrgList.get(0).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), - either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); - assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", - nrgList.get(0).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), - either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(0).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(1).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); - } - - private void checkNodeRuleGroupForSwitchOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { - assertEquals("Switch-OTSi should contain 4 node rule group", 4, nrgList.size()); - for (NodeRuleGroup nodeRuleGroup : nrgList) { - assertEquals("each node-rule-group should contain 2 NEP for Switch-OTSi", - 2, nodeRuleGroup.getNodeEdgePoint().size()); + @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(); + 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(); + 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(); + RpcResult rpcResult1 = result1.get(); + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.get.link.details.output.Link link1 + = rpcResult1.getResult().getLink(); + assertNotNull(link1, "Link should not be null"); } - assertThat("Switch-OTSi node-rule-group nb 4 should be between eNEP and iNEP of XPDR2-NETWORK2", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), - either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); - assertThat("Switch-OTSi node-rule-group nb 4 should be between eNEP and iNEP of XPDR2-NETWORK2", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), - either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(0).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(1).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); } - private void checkNepClient100G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); - assertEquals("value of client nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); - assertEquals("Client nep should support 2 kind of cep", - 2, nep.getSupportedCepLayerProtocolQualifier().size()); - assertThat("client nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItems(ODUTYPEODU4.class, DIGITALSIGNALTYPE100GigE.class)); - assertEquals("client nep should be of ETH protocol type", LayerProtocolName.ETH, nep.getLayerProtocolName()); - checkCommonPartOfNep(nep); - } - - private void checkNepOtsiNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); - assertEquals("value of OTSi nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); - assertEquals("value-name of OTSi nep should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); - assertEquals("OTSi nep should support 2 kind of cep", - 2, nep.getSupportedCepLayerProtocolQualifier().size()); - assertThat("OTSi nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItems(PHOTONICLAYERQUALIFIEROMS.class, PHOTONICLAYERQUALIFIEROTSi.class)); - assertEquals("OTSi nep should be of PHOTONIC_MEDIA protocol type", - LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName()); - assertEquals("OTSi nep should support one SIP", 1, nep.getMappedServiceInterfacePoint().size()); - checkCommonPartOfNep(nep); - } - - private void checkCommonPartOfNep(OwnedNodeEdgePoint nep) { - assertEquals("link port direction should be DIRECTIONAL", - PortDirection.BIDIRECTIONAL, nep.getLinkPortDirection()); - assertEquals("administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, nep.getAdministrativeState()); - assertEquals("termination state should be TERMINATED BIDIRECTIONAL", - TerminationState.TERMINATEDBIDIRECTIONAL, nep.getTerminationState()); - assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, nep.getLifecycleState()); - assertEquals("client nep should support 1 SIP", 1, nep.getMappedServiceInterfacePoint().size()); - assertEquals("termination direction should be BIDIRECTIONAL", - TerminationDirection.BIDIRECTIONAL, nep.getTerminationDirection()); - assertEquals("operational state of client nep should be ENABLED", - OperationalState.ENABLED, nep.getOperationalState()); - assertEquals("link-port-role of client nep should be SYMMETRIC", - PortRole.SYMMETRIC, nep.getLinkPortRole()); + @Test + 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(); + 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(); + RpcResult rpcResult1 = result1.get(); + org.opendaylight.yang.gen.v1 + .urn.onf.otcc.yang.tapi.common.rev181210.get.service._interface.point.details.output.Sip sip1 + = rpcResult1.getResult().getSip(); + assertNotNull(sip1, "Sip should not be null"); + } } - private void checkTransitionalLink(Link link, Uuid topoUuid, Uuid node1Uuid, Uuid node2Uuid, String tp1, - String tp2) { - Uuid linkUuid = new Uuid(UUID.nameUUIDFromBytes((tp1 + "--" + tp2).getBytes(Charset.forName("UTF-8"))) - .toString()); - assertEquals("bad uuid for link between DSR node " + tp1 + " and iOTSI port " + tp2, linkUuid, link.getUuid()); - assertEquals("Available capacity unit should be GBPS", - CapacityUnit.GBPS, link.getAvailableCapacity().getTotalSize().getUnit()); - assertEquals("Available capacity -total size value should be 100", - Uint64.valueOf(100), link.getAvailableCapacity().getTotalSize().getValue()); - assertEquals("transitional link should be between 2 nodes of protocol layers ODU and PHOTONIC_MEDIA", - 2, link.getTransitionedLayerProtocolName().size()); - assertThat("transitional link should be between 2 nodes of protocol layers ODU and PHOTONIC_MEDIA", - link.getTransitionedLayerProtocolName(), - hasItems(LayerProtocolName.ODU.getName(), LayerProtocolName.PHOTONICMEDIA.getName())); - assertEquals("transitional link should be BIDIRECTIONAL", - ForwardingDirection.BIDIRECTIONAL, link.getDirection()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topoUuid, link.getNodeEdgePoint().get(0).getTopologyUuid()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topoUuid, link.getNodeEdgePoint().get(1).getTopologyUuid()); - assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(0).getNodeUuid().getValue(), + private void checkOtnLink(Link link, Uuid topoUuid, Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, + 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(), + "Available capacity unit should be MBPS"); + String prefix = linkName.split("-")[0]; + if ("OTU4".equals(prefix)) { + assertEquals(Uint64.valueOf(0), link.getAvailableCapacity().getTotalSize().getValue(), + "Available capacity -total size value should be 0"); + } else if ("ODTU4".equals(prefix)) { + assertEquals(Uint64.valueOf(100000), link.getAvailableCapacity().getTotalSize().getValue(), + "Available capacity -total size value should be 100 000"); + } + assertEquals(CapacityUnit.GBPS, link.getTotalPotentialCapacity().getTotalSize().getUnit(), + "Total capacity unit should be GBPS"); + assertEquals(Uint64.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()); + } 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()); + } + 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"); + assertEquals(topoUuid, nodeEdgePointList.get(1).getTopologyUuid(), + "topology uuid should be the same for the two termination point of the link"); + assertThat("otn links should terminate on two distinct nodes", + nodeEdgePointList.get(0).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); - assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(1).getNodeUuid().getValue(), + assertThat("otn links should terminate on two distinct nodes", + nodeEdgePointList.get(1).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); - Uuid nep1Uuid = new Uuid(UUID.nameUUIDFromBytes(tp1.getBytes(Charset.forName("UTF-8"))).toString()); - Uuid nep2Uuid = new Uuid(UUID.nameUUIDFromBytes(tp2.getBytes(Charset.forName("UTF-8"))).toString()); - assertThat("transitional links should terminate on " + tp1 + " and " + tp2 + " neps", - link.getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), - either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); - assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), - either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); + assertThat("otn links should terminate on two distinct tps", + nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), + either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue()))); + assertThat("otn links should terminate on two distinct tps", + nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), + either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue()))); + assertEquals(OperationalState.ENABLED, link.getOperationalState(), "operational state should be ENABLED"); + assertEquals(AdministrativeState.UNLOCKED, link.getAdministrativeState(), + "administrative state should be UNLOCKED"); } } \ No newline at end of file