X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Ftopology%2FConvertORTopoToTapiTopoTest.java;h=ce76cc983d309b658e47b8e4065cccef901c407e;hb=db87ba733190c2e59997e00e0fe9199c9c74234d;hp=d7d3a467a407cd71e0f9d7732f55d9947d6ad9c8;hpb=3e33c429ca86add1881d7586a2d0c3c60ddac3c7;p=transportpce.git diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java index d7d3a467a..ce76cc983 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java @@ -12,9 +12,9 @@ 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.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import com.google.common.util.concurrent.FluentFuture; import java.nio.charset.Charset; @@ -28,21 +28,26 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.InstanceIdentifiers; +import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; +import org.opendaylight.transportpce.common.network.NetworkTransactionService; +import org.opendaylight.transportpce.tapi.TapiStringConstants; +import org.opendaylight.transportpce.tapi.utils.TapiLink; +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.http.org.openroadm.common.network.rev200529.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Link1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.TerminationPoint1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmTpType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; @@ -58,41 +63,44 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey; -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.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.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.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.ODUTYPEODU2; -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.topology.rev181210.ForwardingRule; -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.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.OwnedNodeEdgePointKey; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePointKey; -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.Direction; +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.LAYERPROTOCOLQUALIFIER; +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.LifecycleState; +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.PortRole; +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.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.digital.otn.rev221121.ODUTYPEODU2; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.digital.otn.rev221121.ODUTYPEODU2E; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.digital.otn.rev221121.ODUTYPEODU4; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev221121.DIGITALSIGNALTYPE100GigE; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev221121.DIGITALSIGNALTYPE10GigELAN; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev221121.PHOTONICLAYERQUALIFIEROMS; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev221121.PHOTONICLAYERQUALIFIEROTS; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev221121.PHOTONICLAYERQUALIFIEROTSi; +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.RuleType; +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.OwnedNodeEdgePointKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.edge.point.MappedServiceInterfacePointKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.edge.point.SupportedCepLayerProtocolQualifierInstances; +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.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Decimal64; import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + public class ConvertORTopoToTapiTopoTest extends AbstractTest { private static final Logger LOG = LoggerFactory.getLogger(ConvertORTopoToTapiTopoTest.class); @@ -103,19 +111,18 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { private static Map otnLinks; private static Uuid topologyUuid; + private static NetworkTransactionService networkTransactionService; + private static TapiLink tapiLink; private static DataBroker dataBroker = getDataBroker(); - private static final String E_OTSI = "eOTSi"; - private static final String I_OTSI = "iOTSi"; - private static final String DSR = "DSR"; - @BeforeClass - public static void setUp() throws InterruptedException, ExecutionException { + @BeforeAll + static void setUp() throws InterruptedException, ExecutionException { TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), - TapiTopologyDataUtils.OPENROADM_TOPOLOGY_FILE, InstanceIdentifiers.OVERLAY_NETWORK_II); + TapiTopologyDataUtils.OPENROADM_TOPOLOGY_FILE, InstanceIdentifiers.OVERLAY_NETWORK_II); TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), - TapiTopologyDataUtils.OTN_TOPOLOGY_FILE, InstanceIdentifiers.OTN_NETWORK_II); + TapiTopologyDataUtils.OTN_TOPOLOGY_FILE, InstanceIdentifiers.OTN_NETWORK_II); TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil(), - TapiTopologyDataUtils.PORTMAPPING_FILE); + TapiTopologyDataUtils.PORTMAPPING_FILE); KeyedInstanceIdentifier muxAIID = InstanceIdentifier.create(Networks.class) .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network @@ -136,9 +143,9 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { FluentFuture> switchFuture = dataBroker.newReadOnlyTransaction() .read(LogicalDatastoreType.CONFIGURATION, switchIID); - otnMuxA = muxAFuture.get().get(); - otnMuxC = muxCFuture.get().get(); - otnSwitch = switchFuture.get().get(); + otnMuxA = muxAFuture.get().orElseThrow(); + otnMuxC = muxCFuture.get().orElseThrow(); + otnSwitch = switchFuture.get().orElseThrow(); KeyedInstanceIdentifier tpdrIID = InstanceIdentifier.create(Networks.class) .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network @@ -146,7 +153,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { .child(Node.class, new NodeKey(new NodeId("XPDR-A1-XPDR1"))); FluentFuture> tpdrFuture = dataBroker.newReadOnlyTransaction() .read(LogicalDatastoreType.CONFIGURATION, tpdrIID); - tpdr100G = tpdrFuture.get().get(); + tpdr100G = tpdrFuture.get().orElseThrow(); InstanceIdentifier linksIID = InstanceIdentifier.create(Networks.class) .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network @@ -154,15 +161,17 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { .augmentation(Network1.class); FluentFuture> linksFuture = dataBroker.newReadOnlyTransaction() .read(LogicalDatastoreType.CONFIGURATION, linksIID); - otnLinks = linksFuture.get().get().getLink(); + otnLinks = linksFuture.get().orElseThrow().getLink(); - topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TopologyUtils.T0_MULTILAYER.getBytes(Charset.forName("UTF-8"))) - .toString()); + topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_MULTILAYER.getBytes( + Charset.forName("UTF-8"))).toString()); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); + tapiLink = new TapiLinkImpl(networkTransactionService); LOG.info("TEST SETUP READY"); } @Test - public void convertNodeWhenNoStates() { + void convertNodeWhenNoStates() { Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", null, null); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) { @@ -170,43 +179,25 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { networkPortList.add(tp.getTpId().getValue()); } } - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(tpdr, networkPortList); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node dsrNode = tapiFactory + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node dsrNode = tapiFactory .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(dsrNodeUuid)); + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(dsrNodeUuid)); Uuid networkNepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+DSR+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); + UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) + .toString()); OwnedNodeEdgePoint nepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(networkNepUuid)); - assertNull("Administrative State should not be present", nepN.getAdministrativeState()); - assertNull("Operational State should not be present", nepN.getOperationalState()); - - Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) - .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node otsiNode = tapiFactory - .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(otsiNodeUuid)); - Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - Uuid inepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid)); - assertNull("Administrative State should not be present", enep.getAdministrativeState()); - assertNull("Operational State should not be present", enep.getOperationalState()); + assertNull(nepN.getAdministrativeState(), "Administrative State should not be present"); + assertNull(nepN.getOperationalState(), "Operational State should not be present"); - OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertNull("Administrative State should not be present", inep.getAdministrativeState()); - assertNull("Operational State should not be present", inep.getOperationalState()); } @Test - public void convertNodeWhenBadStates1() { + void convertNodeWhenBadStates1() { Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", AdminStates.OutOfService, State.OutOfService); List networkPortList = new ArrayList<>(); @@ -215,49 +206,25 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { networkPortList.add(tp.getTpId().getValue()); } } - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(tpdr, networkPortList); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node dsrNode = tapiFactory + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node dsrNode = tapiFactory .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(dsrNodeUuid)); + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(dsrNodeUuid)); Uuid networkNepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+DSR+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); + UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) + .toString()); OwnedNodeEdgePoint nepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(networkNepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, nepN.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, nepN.getOperationalState()); - - Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) - .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node otsiNode = tapiFactory - .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(otsiNodeUuid)); - Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - Uuid inepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, enep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, enep.getOperationalState()); - - OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, inep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, inep.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, nepN.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, nepN.getOperationalState(), "Operational State should be Disabled"); } @Test - public void convertNodeWhenBadStates2() { + void convertNodeWhenBadStates2() { Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", AdminStates.Maintenance, State.Degraded); List networkPortList = new ArrayList<>(); @@ -266,49 +233,25 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { networkPortList.add(tp.getTpId().getValue()); } } - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(tpdr, networkPortList); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node dsrNode = tapiFactory + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node dsrNode = tapiFactory .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(dsrNodeUuid)); + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(dsrNodeUuid)); Uuid networkNepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+DSR+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); + UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) + .toString()); OwnedNodeEdgePoint nepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(networkNepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, nepN.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, nepN.getOperationalState()); - - Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) - .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node otsiNode = tapiFactory - .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(otsiNodeUuid)); - Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - Uuid inepUuid = new Uuid( - UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, enep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, enep.getOperationalState()); - - OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertEquals("Administrative State should be Locked", - AdministrativeState.LOCKED, inep.getAdministrativeState()); - assertEquals("Operational State should be Disabled", - OperationalState.DISABLED, inep.getOperationalState()); + assertEquals(AdministrativeState.LOCKED, nepN.getAdministrativeState(), + "Administrative State should be Locked"); + assertEquals(OperationalState.DISABLED, nepN.getOperationalState(), "Operational State should be Disabled"); } @Test - public void convertOtnLinkWhenNoState() { + void convertOtnLinkWhenNoState() { HashMap otnLinksAlt = new HashMap<>(otnLinks); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link @@ -316,7 +259,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { new LinkId("ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"))), null, null); otnLinksAlt.replace(link.key(), link); - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -336,16 +279,16 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List tapiLinks = tapiFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertNull("Administrative State should not be present", tapiLinks.get(0).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(2).getAdministrativeState()); - assertNull("Operational State should not be present", tapiLinks.get(0).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(2).getOperationalState()); + assertNull(tapiLinks.get(1).getAdministrativeState(), "Administrative State should not be present"); + assertEquals(AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState(), + "Administrative state should be UNLOCKED"); + assertNull(tapiLinks.get(1).getOperationalState(), "Operational State should not be present"); + assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), + "Operational state should be ENABLED"); } @Test - public void convertOtnLinkWhenNoStateOnOppositeLink() { + void convertOtnLinkWhenNoStateOnOppositeLink() { HashMap otnLinksAlt = new HashMap<>(otnLinks); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link @@ -353,7 +296,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { new LinkId("ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1"))), null, null); otnLinksAlt.replace(link.key(), link); - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -373,16 +316,16 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List tapiLinks = tapiFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertNull("Administrative State should not be present", tapiLinks.get(0).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(2).getAdministrativeState()); - assertNull("Operational State should not be present", tapiLinks.get(0).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(2).getOperationalState()); + assertNull(tapiLinks.get(1).getAdministrativeState(), "Administrative State should not be present"); + assertEquals(AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState(), + "Administrative state should be UNLOCKED"); + assertNull(tapiLinks.get(1).getOperationalState(), "Operational State should not be present"); + assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), + "Operational state should be ENABLED"); } @Test - public void convertOtnLinkWhenBadState1() { + void convertOtnLinkWhenBadState1() { HashMap otnLinksAlt = new HashMap<>(otnLinks); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link @@ -391,7 +334,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { AdminStates.OutOfService, State.OutOfService); otnLinksAlt.replace(link.key(), link); - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -411,18 +354,19 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List tapiLinks = tapiFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Administrative state should be LOCKED", - AdministrativeState.LOCKED, tapiLinks.get(0).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(2).getAdministrativeState()); - assertEquals("Operational state should be DISABLED", - OperationalState.DISABLED, tapiLinks.get(0).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(2).getOperationalState()); + LOG.info("TapiLinks are as follow : {}", tapiLinks.toString()); + assertEquals(AdministrativeState.LOCKED, tapiLinks.get(1).getAdministrativeState(), + "Administrative state should be LOCKED"); + assertEquals(AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState(), + "Administrative state should be UNLOCKED"); + assertEquals(OperationalState.DISABLED, tapiLinks.get(1).getOperationalState(), + "Operational state should be DISABLED"); + assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), + "Operational state should be ENABLED"); } @Test - public void convertOtnLinkWhenBadState2() { + void convertOtnLinkWhenBadState2() { HashMap otnLinksAlt = new HashMap<>(otnLinks); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link @@ -431,7 +375,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { AdminStates.Maintenance, State.Degraded); otnLinksAlt.replace(link.key(), link); - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -451,18 +395,18 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List tapiLinks = tapiFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Administrative state should be LOCKED", - AdministrativeState.LOCKED, tapiLinks.get(0).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(2).getAdministrativeState()); - assertEquals("Operational state should be DISABLED", - OperationalState.DISABLED, tapiLinks.get(0).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(2).getOperationalState()); + assertEquals(AdministrativeState.LOCKED, tapiLinks.get(1).getAdministrativeState(), + "Administrative state should be LOCKED"); + assertEquals(AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState(), + "Administrative state should be UNLOCKED"); + assertEquals(OperationalState.DISABLED, tapiLinks.get(1).getOperationalState(), + "Operational state should be DISABLED"); + assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), + "Operational state should be ENABLED"); } @Test - public void convertOtnLinkWhenBadStateOnOppositeLink() { + void convertOtnLinkWhenBadStateOnOppositeLink() { HashMap otnLinksAlt = new HashMap<>(otnLinks); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link @@ -471,7 +415,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { AdminStates.OutOfService, State.OutOfService); otnLinksAlt.replace(link.key(), link); - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -491,19 +435,19 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List tapiLinks = tapiFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Administrative state should be LOCKED", - AdministrativeState.LOCKED, tapiLinks.get(0).getAdministrativeState()); - assertEquals("Administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, tapiLinks.get(2).getAdministrativeState()); - assertEquals("Operational state should be DISABLED", - OperationalState.DISABLED, tapiLinks.get(0).getOperationalState()); - assertEquals("Operational state should be ENABLED", - OperationalState.ENABLED, tapiLinks.get(2).getOperationalState()); + assertEquals(AdministrativeState.LOCKED, tapiLinks.get(1).getAdministrativeState(), + "Administrative state should be LOCKED"); + assertEquals(AdministrativeState.UNLOCKED, tapiLinks.get(0).getAdministrativeState(), + "Administrative state should be UNLOCKED"); + assertEquals(OperationalState.DISABLED, tapiLinks.get(1).getOperationalState(), + "Operational state should be DISABLED"); + assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), + "Operational state should be ENABLED"); } @Test - public void convertNodeForTransponder100G() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + void convertNodeForTransponder100G() { + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -511,31 +455,22 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(tpdr100G, networkPortList); - List tapiNodes + List tapiNodes = tapiFactory.getTapiNodes().values().stream() .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Node list size should be 2", 2, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 2", 2, tapiFactory.getTapiLinks().size()); + assertEquals(1, tapiFactory.getTapiNodes().size(), "Node list size should be 1 (DSR-ODU merged)"); + assertEquals(0, tapiFactory.getTapiLinks().size(), "Link list size should be 0 (no more transitional links)"); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) - .toString()); - checkDsrNode(tapiNodes.get(1), dsrNodeUuid, "tpdr", "XPDR-A1-XPDR1"); - Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) + Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - checkOtsiNode(tapiNodes.get(0), otsiNodeUuid, "tpdr", "XPDR-A1-XPDR1"); - - List tapiLinks = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - checkTransitionalLink(tapiLinks.get(1), dsrNodeUuid, otsiNodeUuid, - "XPDR-A1-XPDR1+DSR+XPDR1-NETWORK1", "XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1", "XPDR-A1-XPDR1"); + checkDsrNode(tapiNodes.get(getNodeRank("SPDR-SA1", tapiNodes)), dsrNodeUuid, "tpdr", "XPDR-A1-XPDR1+XPONDER"); } @Test - public void convertNodeForOtnMuxponder() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + void convertNodeForOtnMuxponder() { + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -543,30 +478,21 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxA, networkPortList); - List tapiNodes + List tapiNodes = tapiFactory.getTapiNodes().values().stream() .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Node list size should be 2", 2, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 1", 1, tapiFactory.getTapiLinks().size()); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + assertEquals(1, tapiFactory.getTapiNodes().size(), "Node list size should be 1 (DSR & ODU merged"); + assertEquals(0, tapiFactory.getTapiLinks().size(), "Link list size should be 0, no more transitional links"); + Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - checkDsrNode(tapiNodes.get(0), dsrNodeUuid, "mux", "SPDR-SA1-XPDR1"); - Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) - .toString()); - checkOtsiNode(tapiNodes.get(1), otsiNodeUuid, "mux", "SPDR-SA1-XPDR1"); - - List tapiLinks = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - checkTransitionalLink(tapiLinks.get(0), dsrNodeUuid, otsiNodeUuid, - "SPDR-SA1-XPDR1+DSR+XPDR1-NETWORK1", "SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1", "SPDR-SA1-XPDR1"); + checkDsrNode(tapiNodes.get(getNodeRank("SPDR-SA1", tapiNodes)), dsrNodeUuid, "mux", "SPDR-SA1-XPDR1+XPONDER"); } @Test - public void convertNodeForOtnSwitch() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + void convertNodeForOtnSwitch() { + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : otnSwitch.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -574,31 +500,24 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnSwitch, networkPortList); - List tapiNodes + List tapiNodes = tapiFactory.getTapiNodes().values().stream() .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Node list size should be 2", 2, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 4", 4, tapiFactory.getTapiLinks().size()); + assertEquals(1, tapiFactory.getTapiNodes().size(), "Node list size should be 1 (DSR/ODU merged)"); + assertEquals(0, tapiFactory.getTapiLinks().size(), "Link list size should be 0 : no more transitional link"); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+DSR".getBytes(Charset.forName("UTF-8"))) + Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - checkDsrNode(tapiNodes.get(0), dsrNodeUuid, "switch", "SPDR-SA1-XPDR2"); - Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+OTSi".getBytes(Charset.forName("UTF-8"))) - .toString()); - checkOtsiNode(tapiNodes.get(1), otsiNodeUuid, "switch", "SPDR-SA1-XPDR2"); - - List tapiLinks = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - checkTransitionalLink(tapiLinks.get(0), dsrNodeUuid, otsiNodeUuid, - "SPDR-SA1-XPDR2+DSR+XPDR2-NETWORK4", "SPDR-SA1-XPDR2+iOTSi+XPDR2-NETWORK4", "SPDR-SA1-XPDR2"); + //get(0) + checkDsrNode(tapiNodes.get(getNodeRank("SPDR-SA1", tapiNodes)), dsrNodeUuid, "switch", + "SPDR-SA1-XPDR2+XPONDER"); } @Test - public void convertOtnLink() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + void convertOtnLink() { + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -614,57 +533,59 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } tapiFactory.convertNode(otnMuxC, networkPortListC); tapiFactory.convertLinks(otnLinks); - assertEquals("Link list size should be 4", 4, tapiFactory.getTapiLinks().size()); + assertEquals(2, tapiFactory.getTapiLinks().size(), "Link list size should be 2 : no transitional link"); - Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) + Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) + Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); - Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR+XPDR1-NETWORK1" + Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1" .getBytes(Charset.forName("UTF-8"))).toString()); - Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+DSR+XPDR1-NETWORK1" + Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1" .getBytes(Charset.forName("UTF-8"))).toString()); Uuid tp3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1" .getBytes(Charset.forName("UTF-8"))).toString()); Uuid tp4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1" .getBytes(Charset.forName("UTF-8"))).toString()); Uuid link1Uuid = - new Uuid(UUID.nameUUIDFromBytes("ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1" + new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1toSPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1" .getBytes(Charset.forName("UTF-8"))).toString()); Uuid link2Uuid = - new Uuid(UUID.nameUUIDFromBytes("OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1" + new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1toSPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1" .getBytes(Charset.forName("UTF-8"))).toString()); List links = tapiFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - checkOtnLink(links.get(0), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, link1Uuid, - "ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"); - checkOtnLink(links.get(2), node3Uuid, node4Uuid, tp3Uuid, tp4Uuid, link2Uuid, - "OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"); + LOG.info("Node3 {}, Node4 = {},", node3Uuid.toString(), node4Uuid.toString()); + checkOtnLink(links.get(1), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, link1Uuid, + "SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1toSPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1"); + checkOtnLink(links.get(0), node3Uuid, node4Uuid, tp3Uuid, tp4Uuid, link2Uuid, + "SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1toSPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1"); + LOG.info("The link we check has name {}", links.get(0).getName().toString()); } @Test - public void convertRoadmInfrastructureWhenNoXponderAttached() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + void convertRoadmInfrastructureWhenNoXponderAttached() { + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertRoadmInfrastructure(); - assertEquals("Node list size should be 1", 1, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be empty", 0, tapiFactory.getTapiLinks().size()); - List tapiNodes + assertEquals(1, tapiFactory.getTapiNodes().size(), "Node list size should be 1"); + assertEquals(0, tapiFactory.getTapiLinks().size(), "Link list size should be empty"); + List tapiNodes = tapiFactory.getTapiNodes().values().stream().collect(Collectors.toList()); - Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-infra".getBytes(Charset.forName("UTF-8"))) + Uuid photNodeUuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-infra".getBytes(Charset.forName("UTF-8"))) .toString()); - checkOtsiNode(tapiNodes.get(0), otsiNodeUuid, "infra", "ROADM-infra"); + checkOtsiNode(tapiNodes.get(0), photNodeUuid, "infra", "ROADM-infra"); } @Test - public void convertRoadmInfrastructureWhenOtnMuxAttached() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid); + void convertRoadmInfrastructureWhenOtnMuxAttached() { + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -674,50 +595,53 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { tapiFactory.convertNode(otnMuxA, networkPortListA); tapiFactory.convertRoadmInfrastructure(); - assertEquals("Node list size should be 3", 3, tapiFactory.getTapiNodes().size()); - assertEquals("Link list size should be 2", 2, tapiFactory.getTapiLinks().size()); - List tapiNodes + assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2"); + assertEquals(1, tapiFactory.getTapiLinks().size(), "Link list size should be 1 : no more transitional links"); + List tapiNodes = tapiFactory.getTapiNodes().values().stream() - .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) - .collect(Collectors.toList()); + .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) + .collect(Collectors.toList()); Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-infra".getBytes(Charset.forName("UTF-8"))) .toString()); - checkOtsiNode(tapiNodes.get(2), otsiNodeUuid, "infra", "ROADM-infra"); + //get (2) + checkOtsiNode(tapiNodes.get(getNodeRank("ROADM", tapiNodes)), otsiNodeUuid, "infra", "ROADM-infra"); List links = tapiFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) + Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))) .toString()); Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-infra".getBytes(Charset.forName("UTF-8"))) .toString()); - Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+eOTSi+XPDR1-NETWORK1" + Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1" .getBytes(Charset.forName("UTF-8"))).toString()); Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes(("roadm node+nep+1") .getBytes(Charset.forName("UTF-8"))).toString()); + String str1 = "SPDR-SA1-XPDR1+XPONDER--SPDR-SA1-XPDR1+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1 and ROADM-infra-" + + "-NodeEdgePoint_1"; Uuid linkUuid = - new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1--XPDR1-NETWORK1 and ROADM-infra--NodeEdgePoint_1" - .getBytes(Charset.forName("UTF-8"))).toString()); - checkOmsLink(links.get(0), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, linkUuid, - "SPDR-SA1-XPDR1--XPDR1-NETWORK1 and ROADM-infra--NodeEdgePoint_1"); + new Uuid(UUID.nameUUIDFromBytes(str1.getBytes(Charset.forName("UTF-8"))).toString()); + LOG.info("LinksCheck 0 = {} ", links.get(0).getName().toString()); + checkOmsLink(links.get(0), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, linkUuid, str1); } - private void checkDsrNode(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node, - Uuid nodeUuid, String dsrNodeType, String nodeId) { - assertEquals("incorrect node uuid", nodeUuid, node.getUuid()); - assertEquals("incorrect node name", nodeId, node.getName().get(new NameKey("dsr/odu node name")).getValue()); - 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.nonnullName().values().stream().findFirst().get().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)); + private void checkDsrNode(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node, + Uuid nodeUuid, String dsrNodeType, String nodeId) { + assertEquals(nodeUuid, node.getUuid(), "incorrect node uuid"); + assertEquals(nodeId, node.getName().get(new NameKey("dsr/odu node name")).getValue(), "incorrect node name"); + assertEquals(AdministrativeState.UNLOCKED, node.getAdministrativeState(), + "administrative state should be UNLOCKED"); + assertEquals(LifecycleState.INSTALLED, node.getLifecycleState(), "life-cycle state should be INSTALLED"); + assertEquals(OperationalState.ENABLED, node.getOperationalState(), "operational state should be ENABLED"); + assertThat("one value-name should be 'dsr/odu node name'", + new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("dsr/odu node name"))); + assertEquals(4, node.getLayerProtocolName().size(), + "dsr node should manage 4 protocol layers : dsr, odu, DIGITALOTN and photonic"); + assertThat("dsr node should manage 3 protocol layers : dsr, odu and photonic", + node.getLayerProtocolName(), hasItems(LayerProtocolName.DSR, LayerProtocolName.ODU, + LayerProtocolName.PHOTONICMEDIA)); List nepsN = node.nonnullOwnedNodeEdgePoint().values().stream() - .filter(n -> n.getName().containsKey(new NameKey("NodeEdgePoint_N"))) + .filter(n -> n.getName().containsKey(new NameKey("iNodeEdgePoint_N"))) .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); List nepsC; @@ -727,20 +651,20 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { .filter(n -> n.getName().containsKey(new NameKey("NodeEdgePoint_C"))) .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Switch-DSR node should have 4 NEPs network", 4, nepsN.size()); - assertEquals("Switch-DSR node should have 4 NEPs client", 4, nepsC.size()); + assertEquals(4, nepsN.size(), "Switch-DSR node should have 4 NEPs network"); + assertEquals(4, nepsC.size(), "Switch-DSR node should have 4 NEPs client"); OwnedNodeEdgePoint nep1 = nepsC.get(2); Uuid client4NepUuid = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR2-CLIENT4").getBytes(Charset.forName("UTF-8"))) - .toString()); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+DSR+XPDR2-CLIENT4") + .getBytes(Charset.forName("UTF-8"))).toString()); checkNepClient100GSwitch(nep1, client4NepUuid, "XPDR2-CLIENT4", "NodeEdgePoint_C", - otnSwitch.getNodeId().getValue(), DSR); - OwnedNodeEdgePoint nep2 = nepsN.get(1); + otnSwitch.getNodeId().getValue(), TapiStringConstants.DSR); + OwnedNodeEdgePoint nep2 = nepsN.get(3); Uuid networkNepUuid = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR2-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepNetworkODU4(nep2, networkNepUuid, "XPDR2-NETWORK1", "NodeEdgePoint_N", - otnSwitch.getNodeId().getValue(), DSR); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+iODU+XPDR2-NETWORK1") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepNetworkODU4(nep2, networkNepUuid, "XPDR2-NETWORK1", "iNodeEdgePoint_N", + otnSwitch.getNodeId().getValue(), TapiStringConstants.I_ODU); List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); @@ -751,21 +675,21 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { .filter(n -> n.getName().containsKey(new NameKey("NodeEdgePoint_C"))) .sorted((nep3, nep4) -> nep3.getUuid().getValue().compareTo(nep4.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Mux-DSR node should have 1 NEP network", 1, nepsN.size()); - assertEquals("Mux-DSR node should have 4 NEPs client", 4, nepsC.size()); + assertEquals(1, nepsN.size(), "Mux-DSR node should have 1 NEP network"); + assertEquals(4, nepsC.size(), "Mux-DSR node should have 4 NEPs client"); OwnedNodeEdgePoint nep3 = nepsC.get(2); Uuid client3NepUuid = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR1-CLIENT3").getBytes(Charset.forName("UTF-8"))) - .toString()); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+DSR+XPDR1-CLIENT3") + .getBytes(Charset.forName("UTF-8"))).toString()); checkNepClient10G(nep3, client3NepUuid, "XPDR1-CLIENT3", "NodeEdgePoint_C", - otnMuxA.getNodeId().getValue(), DSR); + otnMuxA.getNodeId().getValue(), TapiStringConstants.DSR); OwnedNodeEdgePoint nep4 = nepsN.get(0); Uuid networkNepUuid2 = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepNetworkODU4(nep4, networkNepUuid2, "XPDR1-NETWORK1", "NodeEdgePoint_N", - otnMuxA.getNodeId().getValue(), DSR); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+iODU+XPDR1-NETWORK1") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepNetworkODU4(nep4, networkNepUuid2, "XPDR1-NETWORK1", "iNodeEdgePoint_N", + otnMuxA.getNodeId().getValue(), TapiStringConstants.I_ODU); List nrgList2 = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); @@ -776,21 +700,21 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { .filter(n -> n.getName().containsKey(new NameKey("100G-tpdr"))) .sorted((nep5, nep6) -> nep5.getUuid().getValue().compareTo(nep6.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals("Tpdr-DSR node should have 2 NEPs network", 2, nepsN.size()); - assertEquals("Tpdr-DSR node should have 2 NEPs client", 2, nepsC.size()); + assertEquals(2, nepsN.size(), "Tpdr-DSR node should have 2 NEPs network"); + assertEquals(2, nepsC.size(), "Tpdr-DSR node should have 2 NEPs client"); OwnedNodeEdgePoint nep5 = nepsC.get(0); Uuid client1NepUuid = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR1-CLIENT1").getBytes(Charset.forName("UTF-8"))) - .toString()); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+DSR+XPDR1-CLIENT1") + .getBytes(Charset.forName("UTF-8"))).toString()); checkNepClient100GTpdr(nep5, client1NepUuid, "XPDR1-CLIENT1", "100G-tpdr", - tpdr100G.getNodeId().getValue(), DSR); + tpdr100G.getNodeId().getValue(), TapiStringConstants.DSR); - OwnedNodeEdgePoint nep6 = nepsN.get(0); + OwnedNodeEdgePoint nep6 = nepsN.get(1); Uuid networkNepUuid3 = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepNetworkODU4(nep6, networkNepUuid3, "XPDR1-NETWORK1", "NodeEdgePoint_N", - tpdr100G.getNodeId().getValue(), DSR); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+iODU+XPDR1-NETWORK1") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepNetworkODU4(nep6, networkNepUuid3, "XPDR1-NETWORK1", "iNodeEdgePoint_N", + tpdr100G.getNodeId().getValue(), TapiStringConstants.I_ODU); List nrgList3 = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); @@ -803,20 +727,20 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } private void checkOtsiNode( - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node, + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node, Uuid nodeUuid, String otsiNodeType, String nodeId) { - assertEquals("incorrect node uuid", nodeUuid, node.getUuid()); - assertEquals("incorrect node name", nodeId, node.getName().get(new NameKey("otsi node name")).getValue()); - 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.nonnullName().values().stream().findFirst().get().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)); + assertEquals(nodeUuid, node.getUuid(), "incorrect node uuid"); + assertEquals(nodeId, node.getName().get(new NameKey("otsi node name")).getValue(), "incorrect node name"); + assertEquals(AdministrativeState.UNLOCKED, node.getAdministrativeState(), + "administrative state should be UNLOCKED"); + assertEquals(LifecycleState.INSTALLED, node.getLifecycleState(), "life-cycle state should be INSTALLED"); + assertEquals(OperationalState.ENABLED, node.getOperationalState(), "operational state should be ENABLED"); + assertThat("one value-name should be 'dsr/odu node name'", + new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("otsi node name"))); + assertEquals(1, node.getLayerProtocolName().size(), + "otsi node should manage a single protocol layer : PHOTONIC_MEDIA"); + assertEquals(LayerProtocolName.PHOTONICMEDIA, node.getLayerProtocolName().stream().findFirst().orElseThrow(), + "otsi node should manage a single protocol layer : PHOTONIC_MEDIA"); List nepsI = node.nonnullOwnedNodeEdgePoint().values().stream() .filter(n -> n.getName().containsKey(new NameKey("iNodeEdgePoint"))) .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) @@ -827,60 +751,60 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { .collect(Collectors.toList()); switch (otsiNodeType) { case "switch": - assertEquals("Switch-OTSi node should have 4 eNEPs", 4, nepsE.size()); - assertEquals("Switch-OTSi node should have 4 iNEPs", 4, nepsI.size()); + assertEquals(4, nepsE.size(), "Switch-OTSi node should have 4 eNEPs"); + assertEquals(4, nepsI.size(), "Switch-OTSi node should have 4 iNEPs"); OwnedNodeEdgePoint nep1 = nepsI.get(1); Uuid inepUuid = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+iOTSi+XPDR2-NETWORK2").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepOtsiNode(nep1, inepUuid, "XPDR2-NETWORK2", "iNodeEdgePoint", otnSwitch.getNodeId().getValue(), - I_OTSI); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+iOTSi+XPDR2-NETWORK2") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepOtsiNode(nep1, inepUuid, "XPDR2-NETWORK2", "iNodeEdgePoint", + otnSwitch.getNodeId().getValue(), TapiStringConstants.I_OTSI); OwnedNodeEdgePoint nep2 = nepsE.get(0); Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR2-NETWORK2").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepOtsiNode(nep2, enepUuid, "XPDR2-NETWORK2", "eNodeEdgePoint", otnSwitch.getNodeId().getValue(), - E_OTSI); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+PHOTONIC_MEDIA_OTS+XPDR2-NETWORK2") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepOtsiNode(nep2, enepUuid, "XPDR2-NETWORK2", "eNodeEdgePoint", + otnSwitch.getNodeId().getValue(), TapiStringConstants.PHTNC_MEDIA_OTS); List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForSwitchOTSi(nrgList, enepUuid, inepUuid, nodeUuid); break; case "mux": - assertEquals("Mux-OTSi node should have 1 eNEP", 1, nepsE.size()); - assertEquals("Mux-OTSi node should have 1 iNEPs", 1, nepsI.size()); + assertEquals(1, nepsE.size(), "Mux-OTSi node should have 1 eNEP"); + assertEquals(1, nepsI.size(), "Mux-OTSi node should have 1 iNEPs"); OwnedNodeEdgePoint nep3 = nepsE.get(0); Uuid enepUuid2 = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepOtsiNode(nep3, enepUuid2, "XPDR1-NETWORK1", "eNodeEdgePoint", otnMuxA.getNodeId().getValue(), - E_OTSI); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepOtsiNode(nep3, enepUuid2, "XPDR1-NETWORK1", "eNodeEdgePoint", + otnMuxA.getNodeId().getValue(), TapiStringConstants.PHTNC_MEDIA_OTS); OwnedNodeEdgePoint nep4 = nepsI.get(0); Uuid inepUuid2 = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepOtsiNode(nep4, inepUuid2, "XPDR1-NETWORK1", "iNodeEdgePoint", otnMuxA.getNodeId().getValue(), - I_OTSI); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+iOTSi+XPDR1-NETWORK1") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepOtsiNode(nep4, inepUuid2, "XPDR1-NETWORK1", "iNodeEdgePoint", + otnMuxA.getNodeId().getValue(), TapiStringConstants.I_OTSI); List nrgList2 = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForMuxOTSi(nrgList2, enepUuid2, inepUuid2, nodeUuid); break; case "tpdr": - assertEquals("Tpdr-OTSi node should have 2 eNEPs", 2, nepsE.size()); - assertEquals("Tpdr-OTSi node should have 2 iNEPs", 2, nepsI.size()); + assertEquals(2, nepsE.size(), "Tpdr-OTSi node should have 2 eNEPs"); + assertEquals(2, nepsI.size(), "Tpdr-OTSi node should have 2 iNEPs"); OwnedNodeEdgePoint nep5 = nepsE.get(0); Uuid enepUuid3 = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepOtsiNode(nep5, enepUuid3, "XPDR1-NETWORK1", "eNodeEdgePoint", tpdr100G.getNodeId().getValue(), - E_OTSI); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepOtsiNode(nep5, enepUuid3, "XPDR1-NETWORK1", "eNodeEdgePoint", + tpdr100G.getNodeId().getValue(), TapiStringConstants.PHTNC_MEDIA_OTS); OwnedNodeEdgePoint nep6 = nepsI.get(0); Uuid inepUuid3 = new Uuid( - UUID.nameUUIDFromBytes((nodeId + "+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) - .toString()); - checkNepOtsiNode(nep6, inepUuid3, "XPDR1-NETWORK1", "iNodeEdgePoint", tpdr100G.getNodeId().getValue(), - I_OTSI); + UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+iOTSi+XPDR1-NETWORK1") + .getBytes(Charset.forName("UTF-8"))).toString()); + checkNepOtsiNode(nep6, inepUuid3, "XPDR1-NETWORK1", "iNodeEdgePoint", + tpdr100G.getNodeId().getValue(), TapiStringConstants.I_OTSI); List nrgList3 = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); @@ -907,49 +831,56 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } private void checkNepClient10G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + String nodeId, String extension) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); Name name = nameList.get(0); - assertEquals("value of client nep should be '" + portName + "'", - portName, name.getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, name.getValueName()); - assertEquals("Client nep should support 3 kind of cep", - 3, nep.getSupportedCepLayerProtocolQualifier().size()); - assertThat("client nep should support 3 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItems(ODUTYPEODU2.class, ODUTYPEODU2E.class, DIGITALSIGNALTYPE10GigELAN.class)); - assertEquals("client nep should be of ETH protocol type", LayerProtocolName.ETH, nep.getLayerProtocolName()); + assertEquals(String.join("+", nodeId, extension, portName), name.getValue(), + "value of client nep should be '" + portName + "'"); + assertEquals(nepName, name.getValueName(), + "value-name of client nep for '" + portName + "' should be '" + nepName + "'"); + List lpql = new ArrayList<>(); + List lsclpqi = nep + .getSupportedCepLayerProtocolQualifierInstances(); + for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) { + lpql.add(entry.getLayerProtocolQualifier()); + } + assertEquals(3, lpql.size(), "Client nep should support 3 kind of cep"); + assertThat("client nep should support 3 kind of cep", lpql, + hasItems(ODUTYPEODU2.VALUE, ODUTYPEODU2E.VALUE, DIGITALSIGNALTYPE10GigELAN.VALUE)); + assertEquals(LayerProtocolName.ETH, nep.getLayerProtocolName(), "client nep should be of ETH protocol type"); checkCommonPartOfNep(nep, false); checkSIP(nep, portName, nodeId, extension); } private void checkNepNetworkODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + String nodeId, String extension) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); Name name = nameList.get(0); - assertEquals("value of network nep should be '" + portName + "'", - portName, name.getValue()); - assertEquals("value-name of network nep for '" + portName + "' should be '" + nepName + "'", - nepName, name.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()); + assertEquals(String.join("+", nodeId, extension, portName), name.getValue(), + "value of network nep should be '" + portName + "'"); + assertEquals(nepName, name.getValueName(), + "value-name of network nep for '" + portName + "' should be '" + nepName + "'"); + List lpql = new ArrayList<>(); + List lsclpqi = nep + .getSupportedCepLayerProtocolQualifierInstances(); + for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) { + lpql.add(entry.getLayerProtocolQualifier()); + } + assertEquals(1, lpql.size(), "Network nep should support 1 kind of cep"); + assertThat("network nep should support 1 kind of cep", lpql, hasItem(ODUTYPEODU4.VALUE)); + assertEquals(LayerProtocolName.ODU, nep.getLayerProtocolName(), "network nep should be of ODU protocol type"); checkCommonPartOfNep(nep, false); checkSIP(nep, portName, nodeId, extension); } private void checkNodeRuleGroupForTpdrDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, - Uuid nodeUuid) { - assertEquals("transponder DSR should contain 2 node rule group", 2, nrgList.size()); + Uuid nodeUuid) { + assertEquals(2, nrgList.size(), "transponder DSR should contain 2 node rule group"); for (NodeRuleGroup nodeRuleGroup : nrgList) { - assertEquals("each node-rule-group should contain 2 NEP for transponder DSR", - 2, nodeRuleGroup.getNodeEdgePoint().size()); + assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), + "each node-rule-group should contain 2 NEP for transponder DSR"); } List nodeEdgePointList = new ArrayList<>(nrgList.get(0).nonnullNodeEdgePoint().values()); assertThat("node-rule-group nb 1 should be between nep-client1 and nep-network1", @@ -958,26 +889,25 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertThat("node-rule-group nb 1 should be between nep-client1 and nep-network1", nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); - assertEquals("node-rule-group nb 1 should be between nep-client1 and nep-network1 of the same node", - nodeEdgePointList.get(0).getNodeUuid(), nodeUuid); - assertEquals("node-rule-group nb 1 should be between nep-client1 and nep-network1 of the same node", - nodeEdgePointList.get(1).getNodeUuid(), nodeUuid); + assertEquals(nodeEdgePointList.get(0).getNodeUuid(), nodeUuid, + "node-rule-group nb 1 should be between nep-client1 and nep-network1 of the same node"); + assertEquals(nodeEdgePointList.get(1).getNodeUuid(), nodeUuid, + "node-rule-group nb 1 should be between nep-client1 and nep-network1 of the same node"); List rule = new ArrayList<>(nrgList.get(1).nonnullRule().values()); - assertEquals("node-rule-group nb 1 should contain a single rule", 1, rule.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", rule.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, rule.get(0).getRuleType()); + assertEquals(1, rule.size(), "node-rule-group nb 1 should contain a single rule"); + assertEquals("forward", rule.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, rule.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForMuxDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, - Uuid nodeUuid) { - assertEquals("muxponder DSR should contain 4 node rule group", 4, nrgList.size()); + Uuid nodeUuid) { + assertEquals(4, nrgList.size(), "muxponder DSR should contain 4 node rule group"); for (NodeRuleGroup nodeRuleGroup : nrgList) { - assertEquals("each node-rule-group should contain 2 NEP for muxponder DSR", - 2, nodeRuleGroup.getNodeEdgePoint().size()); + assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), + "each node-rule-group should contain 2 NEP for muxponder DSR"); } List nodeEdgePointList = new ArrayList<>(nrgList.get(0).nonnullNodeEdgePoint().values()); assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", @@ -986,122 +916,117 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", nodeEdgePointList.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", - nodeEdgePointList.get(0).getNodeUuid(), nodeUuid); - assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nodeEdgePointList.get(1).getNodeUuid(), nodeUuid); + assertEquals(nodeEdgePointList.get(0).getNodeUuid(), nodeUuid, + "node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node"); + assertEquals(nodeEdgePointList.get(1).getNodeUuid(), nodeUuid, + "node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node"); List rule = new ArrayList<>(nrgList.get(1).nonnullRule().values()); - assertEquals("node-rule-group nb 2 should contain a single rule", 1, rule.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", rule.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, rule.get(0).getRuleType()); + assertEquals(1, rule.size(), "node-rule-group nb 2 should contain a single rule"); + assertEquals("forward", rule.get(0).getLocalId(), "local-id of the rule should be 'forward'"); + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, rule.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } 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()); + Uuid nodeUuid) { + assertEquals(1, nrgList.size(), "Switch-DSR should contain a single node rule group"); + assertEquals(8, nrgList.get(0).getNodeEdgePoint().size(), "Switch-DSR node-rule-group should contain 8 NEP"); List nrg = nrgList.get(0).nonnullNodeEdgePoint().values().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(4).getNodeEdgePointUuid()); - assertEquals("in the sorted node-rule-group, nep number 6 should be XPDR2-CLIENT4", - clientNepUuid, nrg.get(3).getNodeEdgePointUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrg.get(4).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrg.get(3).getNodeUuid()); + assertEquals(networkNepUuid, nrg.get(6).getNodeEdgePointUuid(), + "in the sorted node-rule-group, nep number 7 should be XPDR2-NETWORK1"); + assertEquals(clientNepUuid, nrg.get(5).getNodeEdgePointUuid(), + "in the sorted node-rule-group, nep number 6 should be XPDR2-CLIENT4"); + assertEquals(nodeUuid, nrg.get(4).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); + assertEquals(nodeUuid, nrg.get(3).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); @Nullable List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList.get(0).getRuleType()); + 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(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForRdmInfra(List nrgList, int nbNeps) { - assertEquals("RDM infra node - OTSi should contain a single node rule groups", 1, nrgList.size()); + assertEquals(1, nrgList.size(), "RDM infra node - OTSi should contain a single node rule groups"); if (nbNeps > 0) { List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); - assertEquals("RDM infra node -rule-group should contain " + nbNeps + " NEP", - nbNeps, nodeEdgePointList.size()); + assertEquals(nbNeps, nodeEdgePointList.size(), + "RDM infra node -rule-group should contain " + nbNeps + " NEP"); } else { - assertNull("RDM infra node -rule-group should contain no NEP", nrgList.get(0).getNodeEdgePoint()); + assertNull(nrgList.get(0).getNodeEdgePoint(), "RDM infra node -rule-group should contain no NEP"); } List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList.get(0).getRuleType()); + 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(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForTpdrOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { - assertEquals("Tpdr-OTSi should contain two node rule groups", 2, nrgList.size()); + Uuid nodeUuid) { + assertEquals(2, nrgList.size(), "Tpdr-OTSi should contain two node rule groups"); List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); - assertEquals("Tpdr-OTSi node-rule-group should contain 2 NEP", 2, nodeEdgePointList.size()); + assertEquals(2, nodeEdgePointList.size(), "Tpdr-OTSi node-rule-group should contain 2 NEP"); assertThat("Tpdr-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertThat("Tpdr-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", nodeEdgePointList.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, nodeEdgePointList.get(0).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList.get(1).getNodeUuid()); + assertEquals(nodeUuid, nodeEdgePointList.get(0).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); + assertEquals(nodeUuid, nodeEdgePointList.get(1).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList.get(0).getRuleType()); + 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(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForMuxOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { - assertEquals("Mux-OTSi should contain a single node rule group", 1, nrgList.size()); + Uuid nodeUuid) { + assertEquals(1, nrgList.size(), "Mux-OTSi should contain a single node rule group"); List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); - assertEquals("Mux-OTSi node-rule-group should contain 2 NEP", 2, nodeEdgePointList.size()); + assertEquals(2, nodeEdgePointList.size(), "Mux-OTSi node-rule-group should contain 2 NEP"); assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", nodeEdgePointList.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", nodeEdgePointList.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, nodeEdgePointList.get(0).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList.get(1).getNodeUuid()); + assertEquals(nodeUuid, nodeEdgePointList.get(0).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); + assertEquals(nodeUuid, nodeEdgePointList.get(1).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList.get(0).getRuleType()); + 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(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForSwitchOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { - assertEquals("Switch-OTSi should contain 4 node rule group", 4, nrgList.size()); + Uuid nodeUuid) { + assertEquals(4, nrgList.size(), "Switch-OTSi should contain 4 node rule group"); for (NodeRuleGroup nodeRuleGroup : nrgList) { - assertEquals("each node-rule-group should contain 2 NEP for Switch-OTSi", - 2, nodeRuleGroup.getNodeEdgePoint().size()); + assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), + "each node-rule-group should contain 2 NEP for Switch-OTSi"); } List nodeEdgePointList1 = new ArrayList<>(nrgList.get(3).nonnullNodeEdgePoint().values()); assertThat("Switch-OTSi node-rule-group nb 4 should be between eNEP and iNEP of XPDR2-NETWORK2", @@ -1111,72 +1036,81 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { nodeEdgePointList1.get(1).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); List nodeEdgePointList0 = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList0.get(0).getNodeUuid()); - assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nodeEdgePointList0.get(1).getNodeUuid()); + assertEquals(nodeUuid, nodeEdgePointList0.get(0).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); + assertEquals(nodeUuid, nodeEdgePointList0.get(1).getNodeUuid(), + "any item of the node-rule-group should have the same nodeUuid"); List ruleList0 = new ArrayList<>(nrgList.get(0).nonnullRule().values()); - assertEquals("node-rule-group should contain a single rule", 1, ruleList0.size()); - assertEquals("local-id of the rule should be 'forward'", - "forward", ruleList0.get(0).getLocalId()); - assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, ruleList0.get(0).getForwardingRule()); - assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, ruleList0.get(0).getRuleType()); + assertEquals(1, ruleList0.size(), "node-rule-group should contain a single rule"); + assertEquals("forward", ruleList0.get(0).getLocalId(),"local-id of the rule should be 'forward'"); + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList0.get(0).getForwardingRule(), + "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); + assertEquals(RuleType.FORWARDING, ruleList0.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } private void checkNepClient100GSwitch(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + String nodeId, String extension) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); - assertEquals("value of client nep should be '" + portName + "'", - portName, nameList.get(0).getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nameList.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()); + assertEquals(String.join("+", nodeId, extension, portName), nameList.get(0).getValue(), + "value of client nep should be '" + portName + "'"); + assertEquals(nepName, nameList.get(0).getValueName(), + "value-name of client nep for '" + portName + "' should be '" + nepName + "'"); + List lpql = new ArrayList<>(); + List lsclpqi = nep + .getSupportedCepLayerProtocolQualifierInstances(); + for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) { + lpql.add(entry.getLayerProtocolQualifier()); + } + assertEquals(2, lpql.size(), "Client nep should support 2 kind of cep"); + assertThat("client nep should support 2 kind of cep", lpql, + hasItems(ODUTYPEODU4.VALUE, DIGITALSIGNALTYPE100GigE.VALUE)); + assertEquals(LayerProtocolName.ETH, nep.getLayerProtocolName(), "client nep should be of ETH protocol type"); checkCommonPartOfNep(nep, false); checkSIP(nep, portName, nodeId, extension); } private void checkNepClient100GTpdr(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + String nodeId, String extension) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); - assertEquals("value of client nep should be '" + portName + "'", - portName, nameList.get(0).getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be 100G-tpdr'", - nepName, nameList.get(0).getValueName()); - assertEquals("Client nep should support 1 kind of cep", - 1, nep.getSupportedCepLayerProtocolQualifier().size()); - assertThat("client nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItems(DIGITALSIGNALTYPE100GigE.class)); - assertEquals("client nep should be of ETH protocol type", LayerProtocolName.ETH, nep.getLayerProtocolName()); + assertEquals(String.join("+", nodeId, extension, portName), nameList.get(0).getValue(), + "value of client nep should be '" + portName + "'"); + assertEquals(nepName, nameList.get(0).getValueName(), + "value-name of client nep for '" + portName + "' should be 100G-tpdr'"); + List lpql = new ArrayList<>(); + List lsclpqi = nep + .getSupportedCepLayerProtocolQualifierInstances(); + for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) { + lpql.add(entry.getLayerProtocolQualifier()); + } + assertEquals(1, lpql.size(), "Client nep should support 1 kind of cep"); + assertThat("client nep should support 2 kind of cep", lpql, hasItems(DIGITALSIGNALTYPE100GigE.VALUE)); + assertEquals(LayerProtocolName.ETH, nep.getLayerProtocolName(), "client nep should be of ETH protocol type"); checkCommonPartOfNep(nep, false); checkSIP(nep, portName, nodeId, extension); } private void checkNepOtsiNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + String nodeId, String extension) { + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); - assertEquals("value of OTSi nep should be '" + portName + "'", - portName, nameList.get(0).getValue()); - assertEquals("value-name of OTSi nep should be '" + nepName + "'", - nepName, nameList.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()); + assertEquals(String.join("+", nodeId, extension, portName), nameList.get(0).getValue(), + "value of OTSi nep should be '" + portName + "'"); + assertEquals(nepName, nameList.get(0).getValueName(), "value-name of OTSi nep should be '" + nepName + "'"); + List lpql = new ArrayList<>(); + List lsclpqi = nep + .getSupportedCepLayerProtocolQualifierInstances(); + for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) { + lpql.add(entry.getLayerProtocolQualifier()); + } + assertEquals(2, lpql.size(), "OTSi nep should support 2 kind of cep"); + assertThat("OTSi nep should support 2 kind of cep", lpql, + hasItems(PHOTONICLAYERQUALIFIEROMS.VALUE, PHOTONICLAYERQUALIFIEROTSi.VALUE)); + assertEquals(LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName(), + "OTSi nep should be of PHOTONIC_MEDIA protocol type"); + assertEquals(1, nep.getMappedServiceInterfacePoint().size(), "OTSi nep should support one SIP"); checkCommonPartOfNep(nep, false); checkSIP(nep, portName, nodeId, extension); } @@ -1184,119 +1118,92 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { private void checkSIP(OwnedNodeEdgePoint nep, String portName, String nodeId, String extension) { Uuid sipUuid = new Uuid(UUID.nameUUIDFromBytes((String.join("+", "SIP", nodeId, extension, portName)) .getBytes(Charset.forName("UTF-8"))).toString()); - assertEquals("service-interface-point-uuid of network nep for '" + portName + "' should be '" - + String.join("+", "SIP", nodeId, portName) + "'", sipUuid, nep.getMappedServiceInterfacePoint() - .get(new MappedServiceInterfacePointKey(sipUuid)).getServiceInterfacePointUuid()); + assertEquals( + sipUuid, + nep.getMappedServiceInterfacePoint().get(new MappedServiceInterfacePointKey(sipUuid)) + .getServiceInterfacePointUuid(), + "service-interface-point-uuid of network nep for '" + portName + "' should be '" + + String.join("+", "SIP", portName) + "'"); } private void checkNepOtsiRdmNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { - assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); - assertEquals("value of OTSi nep should be '" + portName + "'", - portName, nameList.get(0).getValue()); - assertEquals("value-name of OTSi nep should be '" + nepName + "'", - nepName, nameList.get(0).getValueName()); - assertEquals("OTSi nep of RDM infra node should support only 1 kind of cep", - 1, nep.getSupportedCepLayerProtocolQualifier().size()); - assertThat("OTSi nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItems(PHOTONICLAYERQUALIFIEROMS.class)); - assertEquals("OTSi nep should be of PHOTONIC_MEDIA protocol type", - LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName()); - assertEquals("OTSi nep of RDM infra should support no SIP", 0, nep.nonnullMappedServiceInterfacePoint().size()); + assertEquals(portName, nameList.get(0).getValue(), "value of OTSi nep should be '" + portName + "'"); + assertEquals(nepName, nameList.get(0).getValueName(), "value-name of OTSi nep should be '" + nepName + "'"); + List lpql = new ArrayList<>(); + List lsclpqi = nep + .getSupportedCepLayerProtocolQualifierInstances(); + for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) { + lpql.add(entry.getLayerProtocolQualifier()); + } + assertEquals(1, lpql.size(), "OTSi nep of RDM infra node should support only 1 kind of cep"); + assertThat("OTSi nep should support OTS cep", lpql, hasItems(PHOTONICLAYERQUALIFIEROTS.VALUE)); + assertEquals(LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName(), + "OTSi nep should be of PHOTONIC_MEDIA protocol type"); + assertEquals(0, nep.nonnullMappedServiceInterfacePoint().size(), "OTSi nep of RDM infra should support no SIP"); checkCommonPartOfNep(nep, true); } private void checkCommonPartOfNep(OwnedNodeEdgePoint nep, boolean isRdm) { - 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(Direction.BIDIRECTIONAL, nep.getDirection(), + "link port direction should be DIRECTIONAL"); + assertEquals(AdministrativeState.UNLOCKED, nep.getAdministrativeState(), + "administrative state should be UNLOCKED"); +// TODO: convert this test since terminationState is migrated to CEP attribute in TAPI 2.4 +// assertEquals(TerminationState.TERMINATEDBIDIRECTIONAL, nep.getTerminationState(), +// "termination state should be TERMINATED BIDIRECTIONAL"); + assertEquals(LifecycleState.INSTALLED, nep.getLifecycleState(), + "life-cycle state should be INSTALLED"); if (!isRdm) { - assertEquals("client nep should support 1 SIP", 1, nep.getMappedServiceInterfacePoint().size()); + assertEquals(1, nep.getMappedServiceInterfacePoint().size(), "client nep should support 1 SIP"); } - 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()); - } - - private void checkTransitionalLink(Link link, Uuid node1Uuid, Uuid node2Uuid, String tp1, String tp2, - String ietfNodeId) { - Uuid linkUuid = new Uuid(UUID.nameUUIDFromBytes((ietfNodeId + "--" + 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()); - List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(0).getTopologyUuid()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(1).getTopologyUuid()); - assertThat("transitional links should terminate on DSR node and Photonic node", - nodeEdgePointList.get(0).getNodeUuid().getValue(), - either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); - assertThat("transitional links should terminate on DSR node and Photonic node", - 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", - nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), - either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); - assertThat("transitional links should terminate on DSR node and Photonic node", - nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), - either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); +// TODO: convert this test since terminationState is migrated to CEP attribute in TAPI 2.4 +// assertEquals(TerminationDirection.BIDIRECTIONAL, nep.getTerminationDirection(), +// "termination direction should be BIDIRECTIONAL"); + assertEquals(OperationalState.ENABLED, nep.getOperationalState(), + "operational state of client nep should be ENABLED"); + assertEquals(PortRole.SYMMETRIC, nep.getLinkPortRole(), "link-port-role of client nep should be SYMMETRIC"); } private void checkOtnLink(Link link, Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, - String linkName) { - assertEquals("bad name for the link", linkName, link.getName().get(new NameKey("otn link name")).getValue()); - assertEquals("bad uuid for link", linkUuid, link.getUuid()); - assertEquals("Available capacity unit should be MBPS", - CapacityUnit.MBPS, link.getAvailableCapacity().getTotalSize().getUnit()); + 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(CAPACITYUNITGBPS.VALUE, link.getAvailableCapacity().getTotalSize().getUnit(), + "Available capacity unit should be MBPS"); String prefix = linkName.split("-")[0]; if ("OTU4".equals(prefix)) { - assertEquals("Available capacity -total size value should be 0", - Uint64.valueOf(0), link.getAvailableCapacity().getTotalSize().getValue()); + assertEquals(Uint64.valueOf(0), link.getAvailableCapacity().getTotalSize().getValue(), + "Available capacity -total size value should be 0"); } else if ("ODTU4".equals(prefix)) { - assertEquals("Available capacity -total size value should be 100 000", - Uint64.valueOf(100000), link.getAvailableCapacity().getTotalSize().getValue()); + assertEquals(Uint64.valueOf(100000), link.getAvailableCapacity().getTotalSize().getValue(), + "Available capacity -total size value should be 100 000"); } - assertEquals("Total capacity unit should be GBPS", - CapacityUnit.GBPS, link.getTotalPotentialCapacity().getTotalSize().getUnit()); - assertEquals("Total capacity -total size value should be 100", - Uint64.valueOf(100), link.getTotalPotentialCapacity().getTotalSize().getValue()); + assertEquals(CAPACITYUNITGBPS.VALUE, link.getTotalPotentialCapacity().getTotalSize().getUnit(), + "Total capacity unit should be GBPS"); + 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().get(0).getName()); + assertEquals( + LayerProtocolName.PHOTONICMEDIA.getName(), + link.getLayerProtocolName().stream().findFirst().orElseThrow().getName(), + "otn link should be between 2 nodes of protocol layers PHOTONIC_MEDIA"); } else if ("ODTU4".equals(prefix)) { - assertEquals("otn link should be between 2 nodes of protocol layers ODU", - LayerProtocolName.ODU.getName(), link.getLayerProtocolName().get(0).getName()); + assertEquals( + LayerProtocolName.ODU.getName(), + link.getLayerProtocolName().stream().findFirst().orElseThrow().getName(), + "otn link should be between 2 nodes of protocol layers ODU"); } - assertEquals("otn tapi link should be BIDIRECTIONAL", - ForwardingDirection.BIDIRECTIONAL, link.getDirection()); - List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(0).getTopologyUuid()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(1).getTopologyUuid()); + LOG.info("OUTPUT: Node1UUID = {}, Node2UU2D = {},", node1Uuid.toString(), node2Uuid.toString()); + LOG.info("NEPLIST = {}", nodeEdgePointList.toString()); + assertEquals(topologyUuid, nodeEdgePointList.get(0).getTopologyUuid(), + "topology uuid should be the same for the two termination point of the link"); + assertEquals(topologyUuid, 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()))); @@ -1309,27 +1216,27 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertThat("otn links should terminate on two distinct tps", nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue()))); - assertEquals("operational state should be ENABLED", - OperationalState.ENABLED, link.getOperationalState()); - assertEquals("administrative state should be UNLOCKED", - AdministrativeState.UNLOCKED, link.getAdministrativeState()); + assertEquals(OperationalState.ENABLED, link.getOperationalState(), "operational state should be ENABLED"); + assertEquals(AdministrativeState.UNLOCKED, link.getAdministrativeState(), + "administrative state should be UNLOCKED"); } private void checkOmsLink(Link link, Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, - String linkName) { - assertEquals("bad name for the link", linkName, link.getName().get(new NameKey("OMS link name")).getValue()); - assertEquals("bad uuid for link", linkUuid, link.getUuid()); - assertEquals("oms link should be between 2 nodes of protocol layers PHOTONIC_MEDIA", - LayerProtocolName.PHOTONICMEDIA.getName(), link.getLayerProtocolName().get(0).getName()); - assertEquals("otn tapi link should be BIDIRECTIONAL", - ForwardingDirection.BIDIRECTIONAL, link.getDirection()); - List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); - assertEquals("oms link should be between 2 neps",2 , nodeEdgePointList.size()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(0).getTopologyUuid()); - assertEquals("topology uuid should be the same for the two termination point of the link", - topologyUuid, nodeEdgePointList.get(1).getTopologyUuid()); + assertEquals(2, nodeEdgePointList.size(), "oms link should be between 2 neps"); + assertEquals(topologyUuid, nodeEdgePointList.get(0).getTopologyUuid(), + "topology uuid should be the same for the two termination point of the link"); + assertEquals(topologyUuid, nodeEdgePointList.get(1).getTopologyUuid(), + "topology uuid should be the same for the two termination point of the link"); assertThat("oms links should terminate on two distinct nodes", nodeEdgePointList.get(0).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); @@ -1347,10 +1254,10 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { private Node changeTerminationPointState(Node initialNode, String tpid, AdminStates admin, State oper) { org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder tpdr1Bldr = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder( - initialNode.augmentation(Node1.class)); + initialNode.augmentation(Node1.class)); Map tps = new HashMap<>(tpdr1Bldr.getTerminationPoint()); TerminationPointBuilder tpBldr = new TerminationPointBuilder( - tps.get(new TerminationPointKey(new TpId(tpid)))); + tps.get(new TerminationPointKey(new TpId(tpid)))); TerminationPoint1Builder tp1Bldr = new TerminationPoint1Builder(tpBldr.augmentation(TerminationPoint1.class)); tp1Bldr.setAdministrativeState(admin) .setOperationalState(oper); @@ -1375,4 +1282,20 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { linkBldr.addAugmentation(link1Bldr.build()); return linkBldr.build(); } -} + + private int getNodeRank(String searchedChar, + List nodeList) { + int foundAtRank = 0; + int rank = 0; + for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node: nodeList) { + for (Map.Entry entry: node.getName().entrySet()) { + if (entry.getValue().getValue().contains(searchedChar)) { + foundAtRank = rank; + } + } + rank++; + } + LOG.info("searched Char {} found at rank {}", searchedChar, foundAtRank); + return foundAtRank; + } +} \ No newline at end of file