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=395f9b34fc591f48940d9711660b1faff516de71;hb=652c9098f8d97e6f5a723a7c55929f9351bffb5b;hp=1eaf0022c0e89ac2a3e37ee96d25c8638aac555f;hpb=f3253f3398b27936e0d017f6b470b0360827b8f4;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 1eaf0022c..395f9b34f 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 @@ -14,6 +14,7 @@ import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import com.google.common.util.concurrent.FluentFuture; @@ -41,13 +42,13 @@ 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.rev211210.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.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.rev211210.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; @@ -63,41 +64,43 @@ 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); @@ -114,54 +117,64 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { @BeforeAll static void setUp() throws InterruptedException, ExecutionException { - TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), - TapiTopologyDataUtils.OPENROADM_TOPOLOGY_FILE, InstanceIdentifiers.OVERLAY_NETWORK_II); - TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), - TapiTopologyDataUtils.OTN_TOPOLOGY_FILE, InstanceIdentifiers.OTN_NETWORK_II); - TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil(), + TopologyDataUtils.writeTopologyFromFileToDatastore( + getDataStoreContextUtil(), + TapiTopologyDataUtils.OPENROADM_TOPOLOGY_FILE, + InstanceIdentifiers.OVERLAY_NETWORK_II); + TopologyDataUtils.writeTopologyFromFileToDatastore( + getDataStoreContextUtil(), + TapiTopologyDataUtils.OTN_TOPOLOGY_FILE, + InstanceIdentifiers.OTN_NETWORK_II); + TopologyDataUtils.writePortmappingFromFileToDatastore( + getDataStoreContextUtil(), 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 - .class, new NetworkKey(new NetworkId("otn-topology"))) - .child(Node.class, new NodeKey(new NodeId("SPDR-SA1-XPDR1"))); FluentFuture> muxAFuture = dataBroker.newReadOnlyTransaction() - .read(LogicalDatastoreType.CONFIGURATION, muxAIID); - KeyedInstanceIdentifier muxCIID = InstanceIdentifier.create(Networks.class) - .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network - .class, new NetworkKey(new NetworkId("otn-topology"))) - .child(Node.class, new NodeKey(new NodeId("SPDR-SC1-XPDR1"))); - FluentFuture> muxCFuture = dataBroker.newReadOnlyTransaction() - .read(LogicalDatastoreType.CONFIGURATION, muxCIID); - KeyedInstanceIdentifier switchIID = InstanceIdentifier.create(Networks.class) - .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network - .class, new NetworkKey(new NetworkId("otn-topology"))) - .child(Node.class, new NodeKey(new NodeId("SPDR-SA1-XPDR2"))); - FluentFuture> switchFuture = dataBroker.newReadOnlyTransaction() - .read(LogicalDatastoreType.CONFIGURATION, switchIID); - - otnMuxA = muxAFuture.get().get(); - otnMuxC = muxCFuture.get().get(); - otnSwitch = switchFuture.get().get(); - - KeyedInstanceIdentifier tpdrIID = InstanceIdentifier.create(Networks.class) - .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network - .class, new NetworkKey(new NetworkId("otn-topology"))) - .child(Node.class, new NodeKey(new NodeId("XPDR-A1-XPDR1"))); - FluentFuture> tpdrFuture = dataBroker.newReadOnlyTransaction() - .read(LogicalDatastoreType.CONFIGURATION, tpdrIID); - tpdr100G = tpdrFuture.get().get(); - - InstanceIdentifier linksIID = InstanceIdentifier.create(Networks.class) - .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network - .class, new NetworkKey(new NetworkId("otn-topology"))) - .augmentation(Network1.class); + .read(LogicalDatastoreType.CONFIGURATION, + //muxAIID + InstanceIdentifier.create(Networks.class) + .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226 + .networks.Network.class, + new NetworkKey(new NetworkId("otn-topology"))) + .child(Node.class, new NodeKey(new NodeId("SPDR-SA1-XPDR1")))); + FluentFuture> muxCFuture = + dataBroker.newReadOnlyTransaction().read(LogicalDatastoreType.CONFIGURATION, + //muxCIID + InstanceIdentifier.create(Networks.class) + .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226 + .networks.Network.class, + new NetworkKey(new NetworkId("otn-topology"))) + .child(Node.class, new NodeKey(new NodeId("SPDR-SC1-XPDR1")))); + FluentFuture> switchFuture = + dataBroker.newReadOnlyTransaction().read(LogicalDatastoreType.CONFIGURATION, + //switchIID + InstanceIdentifier.create(Networks.class) + .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226 + .networks.Network.class, + new NetworkKey(new NetworkId("otn-topology"))) + .child(Node.class, new NodeKey(new NodeId("SPDR-SA1-XPDR2")))); + otnMuxA = muxAFuture.get().orElseThrow(); + otnMuxC = muxCFuture.get().orElseThrow(); + otnSwitch = switchFuture.get().orElseThrow(); + FluentFuture> tpdrFuture = + dataBroker.newReadOnlyTransaction().read(LogicalDatastoreType.CONFIGURATION, + //tpdrIID + InstanceIdentifier.create(Networks.class) + .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226 + .networks.Network.class, + new NetworkKey(new NetworkId("otn-topology"))) + .child(Node.class, new NodeKey(new NodeId("XPDR-A1-XPDR1")))); + tpdr100G = tpdrFuture.get().orElseThrow(); FluentFuture> linksFuture = dataBroker.newReadOnlyTransaction() - .read(LogicalDatastoreType.CONFIGURATION, linksIID); - otnLinks = linksFuture.get().get().getLink(); - - topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_MULTILAYER.getBytes( - Charset.forName("UTF-8"))).toString()); + .read(LogicalDatastoreType.CONFIGURATION, + //linksIID + InstanceIdentifier.create(Networks.class) + .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226 + .networks.Network.class, + new NetworkKey(new NetworkId("otn-topology"))) + .augmentation(Network1.class)); + otnLinks = linksFuture.get().orElseThrow().getLink(); + 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"); @@ -176,14 +189,14 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { networkPortList.add(tp.getTpId().getValue()); } } - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); tapiFactory.convertNode(tpdr, networkPortList); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) - .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node dsrNode = tapiFactory - .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(dsrNodeUuid)); + Uuid dsrNodeUuid = new Uuid( + UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))).toString()); + var dsrNode = tapiFactory.getTapiNodes() + .get(new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121 + .topology.NodeKey(dsrNodeUuid)); Uuid networkNepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); @@ -191,44 +204,26 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertNull(nepN.getAdministrativeState(), "Administrative State should not be present"); assertNull(nepN.getOperationalState(), "Operational State should not be present"); - 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(enep.getAdministrativeState(), "Administrative State should not be present"); - assertNull(enep.getOperationalState(), "Operational State should not be present"); - - OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertNull(inep.getAdministrativeState(), "Administrative State should not be present"); - assertNull(inep.getOperationalState(), "Operational State should not be present"); } @Test void convertNodeWhenBadStates1() { - Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", AdminStates.OutOfService, - State.OutOfService); + Node tpdr = + changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", AdminStates.OutOfService, State.OutOfService); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { networkPortList.add(tp.getTpId().getValue()); } } - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); tapiFactory.convertNode(tpdr, networkPortList); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) - .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node dsrNode = tapiFactory - .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(dsrNodeUuid)); + Uuid dsrNodeUuid = new Uuid( + UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))).toString()); + var dsrNode = tapiFactory.getTapiNodes() + .get(new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121 + .topology.NodeKey(dsrNodeUuid)); Uuid networkNepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); @@ -236,47 +231,25 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertEquals(AdministrativeState.LOCKED, nepN.getAdministrativeState(), "Administrative State should be Locked"); assertEquals(OperationalState.DISABLED, nepN.getOperationalState(), "Operational State should be Disabled"); - - 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(AdministrativeState.LOCKED, enep.getAdministrativeState(), - "Administrative State should be Locked"); - assertEquals(OperationalState.DISABLED, enep.getOperationalState(), "Operational State should be Disabled"); - - OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertEquals(AdministrativeState.LOCKED, inep.getAdministrativeState(), - "Administrative State should be Locked"); - assertEquals(OperationalState.DISABLED, inep.getOperationalState(), "Operational State should be Disabled"); } @Test void convertNodeWhenBadStates2() { - Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", AdminStates.Maintenance, - State.Degraded); + Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", AdminStates.Maintenance, State.Degraded); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { networkPortList.add(tp.getTpId().getValue()); } } - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); tapiFactory.convertNode(tpdr, networkPortList); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) - .toString()); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node dsrNode = tapiFactory - .getTapiNodes().get(new - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey(dsrNodeUuid)); + Uuid dsrNodeUuid = new Uuid( + UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))).toString()); + var dsrNode = tapiFactory.getTapiNodes() + .get(new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121 + .topology.NodeKey(dsrNodeUuid)); Uuid networkNepUuid = new Uuid( UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) .toString()); @@ -284,46 +257,29 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertEquals(AdministrativeState.LOCKED, nepN.getAdministrativeState(), "Administrative State should be Locked"); assertEquals(OperationalState.DISABLED, nepN.getOperationalState(), "Operational State should be Disabled"); - - 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(AdministrativeState.LOCKED, enep.getAdministrativeState(), - "Administrative State should be Locked"); - assertEquals(OperationalState.DISABLED, enep.getOperationalState(), "Operational State should be Disabled"); - - OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid)); - assertEquals(AdministrativeState.LOCKED, inep.getAdministrativeState(), - "Administrative State should be Locked"); - assertEquals(OperationalState.DISABLED, inep.getOperationalState(), "Operational State should be Disabled"); } @Test 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 - link = changeOtnLinkState(otnLinks.get(new LinkKey( + HashMap otnLinksAlt = new HashMap<>(otnLinks); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .networks.network.Link link = + changeOtnLinkState(otnLinks.get(new LinkKey( new LinkId("ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"))), null, null); otnLinksAlt.replace(link.key(), link); - 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)) { networkPortListA.add(tp.getTpId().getValue()); } } + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); + ConvertORTopoToTapiTopo tapiAbsFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(otnMuxA, networkPortListA); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); List networkPortListC = new ArrayList<>(); for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -331,36 +287,41 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); + tapiAbsFactory.convertLinks(otnLinksAlt); - List tapiLinks = tapiFactory.getTapiLinks().values().stream() + List tapiLinks = tapiAbsFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertNull(tapiLinks.get(3).getAdministrativeState(), "Administrative State should not be present"); + 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(3).getOperationalState(), "Operational State should not be present"); + assertNull(tapiLinks.get(1).getOperationalState(), "Operational State should not be present"); assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), "Operational state should be ENABLED"); } @Test 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 - link = changeOtnLinkState(otnLinks.get(new LinkKey( + HashMap otnLinksAlt = new HashMap<>(otnLinks); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .networks.network.Link link = + changeOtnLinkState(otnLinks.get(new LinkKey( new LinkId("ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1"))), null, null); otnLinksAlt.replace(link.key(), link); - 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)) { networkPortListA.add(tp.getTpId().getValue()); } } + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); + ConvertORTopoToTapiTopo tapiAbsFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(otnMuxA, networkPortListA); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); List networkPortListC = new ArrayList<>(); for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -368,37 +329,41 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); + tapiAbsFactory.convertLinks(otnLinksAlt); - List tapiLinks = tapiFactory.getTapiLinks().values().stream() + List tapiLinks = tapiAbsFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertNull(tapiLinks.get(3).getAdministrativeState(), "Administrative State should not be present"); + 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(3).getOperationalState(), "Operational State should not be present"); + assertNull(tapiLinks.get(1).getOperationalState(), "Operational State should not be present"); assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), "Operational state should be ENABLED"); } @Test 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 - link = changeOtnLinkState(otnLinks.get(new LinkKey( + HashMap otnLinksAlt = new HashMap<>(otnLinks); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .networks.network.Link link = + changeOtnLinkState(otnLinks.get(new LinkKey( new LinkId("ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"))), AdminStates.OutOfService, State.OutOfService); otnLinksAlt.replace(link.key(), link); - - 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)) { networkPortListA.add(tp.getTpId().getValue()); } } + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); + ConvertORTopoToTapiTopo tapiAbsFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(otnMuxA, networkPortListA); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); List networkPortListC = new ArrayList<>(); for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -406,16 +371,17 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); - - List tapiLinks = tapiFactory.getTapiLinks().values().stream() + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); + tapiAbsFactory.convertLinks(otnLinksAlt); + List tapiLinks = tapiAbsFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals(AdministrativeState.LOCKED, tapiLinks.get(3).getAdministrativeState(), + LOG.info("TapiLinks are as follow : {}", tapiLinks); + 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(3).getOperationalState(), + assertEquals(OperationalState.DISABLED, tapiLinks.get(1).getOperationalState(), "Operational state should be DISABLED"); assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), "Operational state should be ENABLED"); @@ -423,22 +389,25 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { @Test 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 - link = changeOtnLinkState(otnLinks.get(new LinkKey( + HashMap otnLinksAlt = new HashMap<>(otnLinks); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .networks.network.Link link = + changeOtnLinkState(otnLinks.get(new LinkKey( new LinkId("ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"))), AdminStates.Maintenance, State.Degraded); otnLinksAlt.replace(link.key(), link); - - 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)) { networkPortListA.add(tp.getTpId().getValue()); } } + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); + ConvertORTopoToTapiTopo tapiAbsFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(otnMuxA, networkPortListA); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); List networkPortListC = new ArrayList<>(); for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -446,16 +415,16 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); - - List tapiLinks = tapiFactory.getTapiLinks().values().stream() + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); + tapiAbsFactory.convertLinks(otnLinksAlt); + List tapiLinks = tapiAbsFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals(AdministrativeState.LOCKED, tapiLinks.get(3).getAdministrativeState(), + 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(3).getOperationalState(), + assertEquals(OperationalState.DISABLED, tapiLinks.get(1).getOperationalState(), "Operational state should be DISABLED"); assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), "Operational state should be ENABLED"); @@ -463,22 +432,25 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { @Test 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 - link = changeOtnLinkState(otnLinks.get(new LinkKey( + HashMap otnLinksAlt = new HashMap<>(otnLinks); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .networks.network.Link link = + changeOtnLinkState(otnLinks.get(new LinkKey( new LinkId("ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1"))), AdminStates.OutOfService, State.OutOfService); otnLinksAlt.replace(link.key(), link); - - 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)) { networkPortListA.add(tp.getTpId().getValue()); } } + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); + ConvertORTopoToTapiTopo tapiAbsFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(otnMuxA, networkPortListA); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); List networkPortListC = new ArrayList<>(); for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -486,16 +458,17 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinksAlt); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); + tapiAbsFactory.convertLinks(otnLinksAlt); - List tapiLinks = tapiFactory.getTapiLinks().values().stream() + List tapiLinks = tapiAbsFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - assertEquals(AdministrativeState.LOCKED, tapiLinks.get(3).getAdministrativeState(), + 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(3).getOperationalState(), + assertEquals(OperationalState.DISABLED, tapiLinks.get(1).getOperationalState(), "Operational state should be DISABLED"); assertEquals(OperationalState.ENABLED, tapiLinks.get(0).getOperationalState(), "Operational state should be ENABLED"); @@ -503,7 +476,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { @Test void convertNodeForTransponder100G() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -511,31 +484,22 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(tpdr100G, networkPortList); - List tapiNodes - = tapiFactory.getTapiNodes().values().stream() - .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) - .collect(Collectors.toList()); + List tapiNodes = + tapiFactory.getTapiNodes().values().stream() + .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) + .collect(Collectors.toList()); - assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2"); - assertEquals(2, tapiFactory.getTapiLinks().size(), "Link list size should be 2"); + 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+DSR"); - Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) - .toString()); - checkOtsiNode(tapiNodes.get(0), otsiNodeUuid, "tpdr", "XPDR-A1-XPDR1+OTSi"); - - 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+iODU+XPDR1-NETWORK1", "XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1", "XPDR-A1-XPDR1"); + Uuid dsrNodeUuid = new Uuid( + UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))).toString()); + checkDsrNode(tapiNodes.get(getNodeRank("SPDR-SA1", tapiNodes)), dsrNodeUuid, "tpdr", "XPDR-A1-XPDR1+XPONDER"); } @Test void convertNodeForOtnMuxponder() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -543,30 +507,21 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxA, networkPortList); - List tapiNodes - = tapiFactory.getTapiNodes().values().stream() - .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) - .collect(Collectors.toList()); - - assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2"); - assertEquals(1, tapiFactory.getTapiLinks().size(), "Link list size should be 1"); - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) - .toString()); - checkDsrNode(tapiNodes.get(0), dsrNodeUuid, "mux", "SPDR-SA1-XPDR1+DSR"); - 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+OTSi"); - - 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+iODU+XPDR1-NETWORK1", "SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1", "SPDR-SA1-XPDR1"); + List tapiNodes = + tapiFactory.getTapiNodes().values().stream() + .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) + .collect(Collectors.toList()); + + 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(getNodeRank("SPDR-SA1", tapiNodes)), dsrNodeUuid, "mux", "SPDR-SA1-XPDR1+XPONDER"); } @Test void convertNodeForOtnSwitch() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); List networkPortList = new ArrayList<>(); for (TerminationPoint tp : otnSwitch.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -574,38 +529,32 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnSwitch, networkPortList); - List tapiNodes - = tapiFactory.getTapiNodes().values().stream() - .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) - .collect(Collectors.toList()); - - assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2"); - assertEquals(4, tapiFactory.getTapiLinks().size(), "Link list size should be 4"); - - Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+DSR".getBytes(Charset.forName("UTF-8"))) - .toString()); - checkDsrNode(tapiNodes.get(0), dsrNodeUuid, "switch", "SPDR-SA1-XPDR2+DSR"); - 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+OTSi"); - - List tapiLinks = tapiFactory.getTapiLinks().values().stream() - .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) - .collect(Collectors.toList()); - checkTransitionalLink(tapiLinks.get(2), dsrNodeUuid, otsiNodeUuid, - "SPDR-SA1-XPDR2+iODU+XPDR2-NETWORK4", "SPDR-SA1-XPDR2+iOTSi+XPDR2-NETWORK4", "SPDR-SA1-XPDR2"); + List tapiNodes = + tapiFactory.getTapiNodes().values().stream() + .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) + .collect(Collectors.toList()); + + 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+XPONDER".getBytes(Charset.forName("UTF-8"))).toString()); + checkDsrNode(tapiNodes.get(getNodeRank("SPDR-SA1", tapiNodes)), dsrNodeUuid, "switch", + "SPDR-SA1-XPDR2+XPONDER"); } @Test 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)) { networkPortListA.add(tp.getTpId().getValue()); } } + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); + ConvertORTopoToTapiTopo tapiAbsFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); tapiFactory.convertNode(otnMuxA, networkPortListA); + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); List networkPortListC = new ArrayList<>(); for (TerminationPoint tp : otnMuxC.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -613,58 +562,66 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxC, networkPortListC); - tapiFactory.convertLinks(otnLinks); - assertEquals(4, tapiFactory.getTapiLinks().size(), "Link list size should be 4"); - - Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) - .toString()); - Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) - .toString()); - Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) - .toString()); - Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) - .toString()); - 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+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("SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1toSPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1" - .getBytes(Charset.forName("UTF-8"))).toString()); - Uuid link2Uuid = - 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() + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); + + tapiAbsFactory.convertLinks(otnLinks); + assertEquals(2, tapiAbsFactory.getTapiLinks().size(), "Link list size should be 2 : no transitional link"); + + 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+XPONDER".getBytes(Charset.forName("UTF-8"))).toString()); + 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+XPONDER".getBytes(Charset.forName("UTF-8"))).toString()); + 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+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("SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1toSPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1" + .getBytes(Charset.forName("UTF-8"))) + .toString()); + Uuid link2Uuid = new Uuid( + UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1toSPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1" + .getBytes(Charset.forName("UTF-8"))) + .toString()); + List links = tapiAbsFactory.getTapiLinks().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - checkOtnLink(links.get(3), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, link1Uuid, + LOG.info("Node3 {}, Node4 = {},", node3Uuid, node4Uuid); + checkOtnLink(links.get(1), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, link1Uuid, "SPDR-SA1-XPDR1+eODU+XPDR1-NETWORK1toSPDR-SC1-XPDR1+eODU+XPDR1-NETWORK1"); - checkOtnLink(links.get(2), node3Uuid, node4Uuid, tp3Uuid, tp4Uuid, link2Uuid, + 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()); } @Test void convertRoadmInfrastructureWhenNoXponderAttached() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); - tapiFactory.convertRoadmInfrastructure(); - - 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"))) - .toString()); - checkOtsiNode(tapiNodes.get(0), otsiNodeUuid, "infra", "ROADM-infra"); + ConvertORTopoToTapiTopo tapiAbsFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + tapiAbsFactory.convertRoadmInfrastructure(); + + assertEquals(1, tapiAbsFactory.getTapiNodes().size(), "Node list size should be 1"); + assertEquals(0, tapiAbsFactory.getTapiLinks().size(), "Link list size should be empty"); + List tapiNodes = + tapiAbsFactory.getTapiNodes().values().stream().collect(Collectors.toList()); + Uuid photNodeUuid = new Uuid( + UUID.nameUUIDFromBytes("ROADM-infra".getBytes(Charset.forName("UTF-8"))).toString()); + checkOtsiNode(tapiNodes.get(0), photNodeUuid, "infra", "ROADM-infra"); } @Test void convertRoadmInfrastructureWhenOtnMuxAttached() { - ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + ConvertORTopoToTapiTopo tapiAbsFactory = new ConvertORTopoToTapiTopo(topologyUuid, tapiLink); + ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid); List networkPortListA = new ArrayList<>(); for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) { if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) { @@ -672,39 +629,52 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } tapiFactory.convertNode(otnMuxA, networkPortListA); - tapiFactory.convertRoadmInfrastructure(); - - assertEquals(3, tapiFactory.getTapiNodes().size(), "Node list size should be 3"); - assertEquals(2, tapiFactory.getTapiLinks().size(), "Link list size should be 2"); - List tapiNodes - = tapiFactory.getTapiNodes().values().stream() - .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"); - - List links = tapiFactory.getTapiLinks().values().stream() + tapiAbsFactory.setTapiNodes(tapiFactory.getTapiNodes()); + tapiAbsFactory.convertRoadmInfrastructure(); + LOG.info("ERRORLINK List of link = {}", tapiAbsFactory.getTapiLinks().toString()); + assertEquals(2, tapiAbsFactory.getTapiNodes().size(), + "Node list size should be 2"); + assertEquals(1, tapiAbsFactory.getTapiLinks().size(), "Link list size should be 1"); + + Map nodeMap = + tapiFactory.getTapiNodes(); + nodeMap.putAll(tapiAbsFactory.getTapiNodes()); + List tapiNodes = + nodeMap.values().stream() + .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) + .collect(Collectors.toList()); + checkOtsiNode( + tapiNodes.get(getNodeRank("ROADM", tapiNodes)), + //otsiNodeUuid, + new Uuid(UUID.nameUUIDFromBytes("ROADM-infra".getBytes(Charset.forName("UTF-8"))).toString()), + "infra", "ROADM-infra"); + List links = tapiAbsFactory.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"))) - .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" - .getBytes(Charset.forName("UTF-8"))).toString()); - Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes(("roadm node+nep+1") - .getBytes(Charset.forName("UTF-8"))).toString()); - Uuid linkUuid = - new Uuid(UUID.nameUUIDFromBytes( - "SPDR-SA1-XPDR1+OTSi--SPDR-SA1-XPDR1+eOTSi+XPDR1-NETWORK1 and ROADM-infra--NodeEdgePoint_1" - .getBytes(Charset.forName("UTF-8"))).toString()); - checkOmsLink(links.get(1), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, linkUuid, - "SPDR-SA1-XPDR1+OTSi--SPDR-SA1-XPDR1+eOTSi+XPDR1-NETWORK1 and ROADM-infra--NodeEdgePoint_1"); + String str1 = + "SPDR-SA1-XPDR1+XPONDER--SPDR-SA1-XPDR1+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1 and ROADM-infra--NodeEdgePoint_1"; + LOG.info("LinksCheck 0 = {} ", links.get(0).getName()); + checkOmsLink(links.get(0), + //node1Uuid, + new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8"))).toString()), + //node2Uuid, + new Uuid(UUID.nameUUIDFromBytes("ROADM-infra".getBytes(Charset.forName("UTF-8"))).toString()), + //tp1Uuid, + new Uuid( + UUID.nameUUIDFromBytes( + "SPDR-SA1-XPDR1+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))) + .toString()), + //tp2Uuid, + new Uuid(UUID.nameUUIDFromBytes(("roadm node+nep+1").getBytes(Charset.forName("UTF-8"))).toString()), + //linkUuid, + new Uuid(UUID.nameUUIDFromBytes(str1.getBytes(Charset.forName("UTF-8"))).toString()), + 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) { + 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(), @@ -713,10 +683,11 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { 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(2, node.getLayerProtocolName().size(), - "dsr node should manage 2 protocol layers : dsr and odu"); - assertThat("dsr node should manage 2 protocol layers : dsr and odu", - node.getLayerProtocolName(), hasItems(LayerProtocolName.DSR, LayerProtocolName.ODU)); + 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("iNodeEdgePoint_N"))) .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) @@ -804,8 +775,8 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } private void checkOtsiNode( - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node, - Uuid nodeUuid, String otsiNodeType, String nodeId) { + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node, + Uuid nodeUuid, String otsiNodeType, String nodeId) { 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(), @@ -816,7 +787,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { 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().get(), + 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"))) @@ -838,10 +809,10 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { otnSwitch.getNodeId().getValue(), TapiStringConstants.I_OTSI); OwnedNodeEdgePoint nep2 = nepsE.get(0); Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+eOTSi+XPDR2-NETWORK2") + 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.E_OTSI); + 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()); @@ -852,10 +823,10 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertEquals(1, nepsI.size(), "Mux-OTSi node should have 1 iNEPs"); OwnedNodeEdgePoint nep3 = nepsE.get(0); Uuid enepUuid2 = new Uuid( - UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+eOTSi+XPDR1-NETWORK1") + 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.E_OTSI); + otnMuxA.getNodeId().getValue(), TapiStringConstants.PHTNC_MEDIA_OTS); OwnedNodeEdgePoint nep4 = nepsI.get(0); Uuid inepUuid2 = new Uuid( UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+iOTSi+XPDR1-NETWORK1") @@ -872,10 +843,10 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertEquals(2, nepsI.size(), "Tpdr-OTSi node should have 2 iNEPs"); OwnedNodeEdgePoint nep5 = nepsE.get(0); Uuid enepUuid3 = new Uuid( - UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+eOTSi+XPDR1-NETWORK1") + 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.E_OTSI); + tpdr100G.getNodeId().getValue(), TapiStringConstants.PHTNC_MEDIA_OTS); OwnedNodeEdgePoint nep6 = nepsI.get(0); Uuid inepUuid3 = new Uuid( UUID.nameUUIDFromBytes((nodeId.split("\\+")[0] + "+iOTSi+XPDR1-NETWORK1") @@ -907,27 +878,30 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } } - private void checkNepClient10G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { + private void checkNepClient10G( + OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, 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(String.join("+", nodeId, extension, portName), name.getValue(), + Name name = new ArrayList<>(nep.nonnullName().values()).get(0); + 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 + "'"); - assertEquals(3, nep.getSupportedCepLayerProtocolQualifier().size(), - "Client nep should support 3 kind of cep"); - assertThat("client nep should support 3 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), + List lpql = new ArrayList<>(); + for (SupportedCepLayerProtocolQualifierInstances entry : nep.getSupportedCepLayerProtocolQualifierInstances()) { + 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"); + assertEquals(LayerProtocolName.DSR, nep.getLayerProtocolName(), "client nep should be of DSR(ETH) protocol "); checkCommonPartOfNep(nep, false); checkSIP(nep, portName, nodeId, extension); } - private void checkNepNetworkODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { + private void checkNepNetworkODU4( + OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, String nodeId, String extension) { assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); Name name = nameList.get(0); @@ -935,19 +909,20 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { "value of network nep should be '" + portName + "'"); assertEquals(nepName, name.getValueName(), "value-name of network nep for '" + portName + "' should be '" + nepName + "'"); - assertEquals(1, nep.getSupportedCepLayerProtocolQualifier().size(), - "Network nep should support 1 kind of cep"); - assertThat("network nep should support 1 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItem(ODUTYPEODU4.VALUE)); + List lpql = new ArrayList<>(); + for (SupportedCepLayerProtocolQualifierInstances entry :nep.getSupportedCepLayerProtocolQualifierInstances()) { + 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(2, nrgList.size(), "transponder DSR should contain 2 node rule group"); + private void checkNodeRuleGroupForTpdrDSR( + List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, Uuid nodeUuid) { + assertEquals(4, nrgList.size(), "transponder DSR should contain 4 node rule group (2*DSR/I_ODU+2*E_ODU/I_ODU)"); for (NodeRuleGroup nodeRuleGroup : nrgList) { assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), "each node-rule-group should contain 2 NEP for transponder DSR"); @@ -966,14 +941,15 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List rule = new ArrayList<>(nrgList.get(1).nonnullRule().values()); 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(ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule(), + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, rule.get(0).getForwardingRule(), "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); - assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); + 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(4, nrgList.size(), "muxponder DSR should contain 4 node rule group"); + private void checkNodeRuleGroupForMuxDSR( + List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, Uuid nodeUuid) { + assertEquals(8, nrgList.size(), "muxponder DSR should contain 8 node rule group (4*DSR/I_ODU + 4*E_ODU/I_ODU)"); for (NodeRuleGroup nodeRuleGroup : nrgList) { assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), "each node-rule-group should contain 2 NEP for muxponder DSR"); @@ -992,14 +968,15 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List rule = new ArrayList<>(nrgList.get(1).nonnullRule().values()); 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(ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule(), + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, rule.get(0).getForwardingRule(), "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); - assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); + 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(1, nrgList.size(), "Switch-DSR should contain a single node rule group"); + private void checkNodeRuleGroupForSwitchDSR( + List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, Uuid nodeUuid) { + assertEquals(2, nrgList.size(), "Switch-DSR should contain 2 node rule groups (DSR/I_ODU + E_ODU/I_ODU)"); 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() @@ -1017,13 +994,19 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); - assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); - assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } private void checkNodeRuleGroupForRdmInfra(List nrgList, int nbNeps) { - assertEquals(1, nrgList.size(), "RDM infra node - OTSi should contain a single node rule groups"); + // if no XPDR is connected, no OTS is created and no NodeRuleGroup is created + assertTrue(nrgList.size() <= 1, "RDM infra node - OTSi should contain maximum one node rule groups"); + // When a nrg is present it shall respect the following + if (nrgList.isEmpty()) { + return; + } if (nbNeps > 0) { List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); assertEquals(nbNeps, nodeEdgePointList.size(), @@ -1034,13 +1017,14 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); - assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); - assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } - private void checkNodeRuleGroupForTpdrOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { + private void checkNodeRuleGroupForTpdrOTSi( + List nrgList, Uuid enepUuid, Uuid inepUuid, Uuid nodeUuid) { assertEquals(2, nrgList.size(), "Tpdr-OTSi should contain two node rule groups"); List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); assertEquals(2, nodeEdgePointList.size(), "Tpdr-OTSi node-rule-group should contain 2 NEP"); @@ -1057,13 +1041,14 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); - assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); - assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } - private void checkNodeRuleGroupForMuxOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { + private void checkNodeRuleGroupForMuxOTSi( + List nrgList, Uuid enepUuid, Uuid inepUuid, 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(2, nodeEdgePointList.size(), "Mux-OTSi node-rule-group should contain 2 NEP"); @@ -1080,13 +1065,14 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule"); assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'"); - assertEquals(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule(), + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(), "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); - assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); + assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().iterator().next(), + "the rule type should be 'FORWARDING'"); } - private void checkNodeRuleGroupForSwitchOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, - Uuid nodeUuid) { + private void checkNodeRuleGroupForSwitchOTSi( + List nrgList, Uuid enepUuid, Uuid inepUuid, Uuid nodeUuid) { assertEquals(4, nrgList.size(), "Switch-OTSi should contain 4 node rule group"); for (NodeRuleGroup nodeRuleGroup : nrgList) { assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(), @@ -1107,55 +1093,64 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List ruleList0 = new ArrayList<>(nrgList.get(0).nonnullRule().values()); 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(ForwardingRule.MAYFORWARDACROSSGROUP, ruleList0.get(0).getForwardingRule(), + assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList0.get(0).getForwardingRule(), "the forwarding rule should be 'MAYFORWARDACROSSGROUP'"); - assertEquals(RuleType.FORWARDING, ruleList0.get(0).getRuleType(), "the rule type should be 'FORWARDING'"); + 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) { + private void checkNepClient100GSwitch( + OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, String nodeId, String extension) { assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); 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 + "'"); - assertEquals(2, nep.getSupportedCepLayerProtocolQualifier().size(), "Client nep should support 2 kind of cep"); - assertThat("client nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), + List lpql = new ArrayList<>(); + for (SupportedCepLayerProtocolQualifierInstances entry : nep.getSupportedCepLayerProtocolQualifierInstances()) { + 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"); + assertEquals(LayerProtocolName.DSR, nep.getLayerProtocolName(), "client nep should be of DSR(ETH) protocol"); checkCommonPartOfNep(nep, false); checkSIP(nep, portName, nodeId, extension); } - private void checkNepClient100GTpdr(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { + private void checkNepClient100GTpdr( + OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, String nodeId, String extension) { assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); 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'"); - assertEquals(1, nep.getSupportedCepLayerProtocolQualifier().size(), "Client nep should support 1 kind of cep"); - assertThat("client nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItems(DIGITALSIGNALTYPE100GigE.VALUE)); - assertEquals(LayerProtocolName.ETH, nep.getLayerProtocolName(), "client nep should be of ETH protocol type"); + List lpql = new ArrayList<>(); + for (SupportedCepLayerProtocolQualifierInstances entry : nep.getSupportedCepLayerProtocolQualifierInstances()) { + 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.DSR, nep.getLayerProtocolName(), "client nep should be of DSR(ETH) protocol"); checkCommonPartOfNep(nep, false); checkSIP(nep, portName, nodeId, extension); } - private void checkNepOtsiNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, - String nodeId, String extension) { + private void checkNepOtsiNode( + OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, String nodeId, String extension) { assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName); List nameList = new ArrayList<>(nep.nonnullName().values()); 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 + "'"); - assertEquals(2, nep.getSupportedCepLayerProtocolQualifier().size(), "OTSi nep should support 2 kind of cep"); - assertThat("OTSi nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), + List lpql = new ArrayList<>(); + for (SupportedCepLayerProtocolQualifierInstances entry : nep.getSupportedCepLayerProtocolQualifierInstances()) { + 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"); @@ -1165,8 +1160,10 @@ 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()); + Uuid sipUuid = new Uuid( + UUID.nameUUIDFromBytes((String.join("+", "SIP", nodeId, extension, portName)) + .getBytes(Charset.forName("UTF-8"))) + .toString()); assertEquals( sipUuid, nep.getMappedServiceInterfacePoint().get(new MappedServiceInterfacePointKey(sipUuid)) @@ -1180,11 +1177,12 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { List nameList = new ArrayList<>(nep.nonnullName().values()); 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 + "'"); - assertEquals(1, nep.getSupportedCepLayerProtocolQualifier().size(), - "OTSi nep of RDM infra node should support only 1 kind of cep"); - assertThat("OTSi nep should support 2 kind of cep", - nep.getSupportedCepLayerProtocolQualifier(), - hasItems(PHOTONICLAYERQUALIFIEROMS.VALUE)); + List lpql = new ArrayList<>(); + for (SupportedCepLayerProtocolQualifierInstances entry : nep.getSupportedCepLayerProtocolQualifierInstances()) { + 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"); @@ -1192,67 +1190,31 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { } private void checkCommonPartOfNep(OwnedNodeEdgePoint nep, boolean isRdm) { - assertEquals(PortDirection.BIDIRECTIONAL, nep.getLinkPortDirection(), + assertEquals(Direction.BIDIRECTIONAL, nep.getDirection(), "link port direction should be DIRECTIONAL"); assertEquals(AdministrativeState.UNLOCKED, nep.getAdministrativeState(), "administrative state should be UNLOCKED"); - assertEquals(TerminationState.TERMINATEDBIDIRECTIONAL, nep.getTerminationState(), - "termination state should be TERMINATED BIDIRECTIONAL"); +// 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(1, nep.getMappedServiceInterfacePoint().size(), "client nep should support 1 SIP"); } - assertEquals(TerminationDirection.BIDIRECTIONAL, nep.getTerminationDirection(), - "termination direction should be BIDIRECTIONAL"); +// 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 checkTransitionalLink(Link link, Uuid node1Uuid, Uuid node2Uuid, String tp1, String tp2, - String ietfNodeId) { - Uuid linkUuid = new Uuid(UUID.nameUUIDFromBytes((tp1 + "to" + tp2) - .getBytes(Charset.forName("UTF-8"))).toString()); - assertEquals(linkUuid, link.getUuid(), "bad uuid for link between DSR node " + tp1 + " and iOTSI port " + tp2); - assertEquals(CapacityUnit.GBPS, link.getAvailableCapacity().getTotalSize().getUnit(), - "Available capacity unit should be GBPS"); - assertEquals(Uint64.valueOf(100), link.getAvailableCapacity().getTotalSize().getValue(), - "Available capacity -total size value should be 100"); - assertEquals(2, link.getTransitionedLayerProtocolName().size(), - "transitional link should be between 2 nodes of protocol layers ODU and PHOTONIC_MEDIA"); - 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(ForwardingDirection.BIDIRECTIONAL, link.getDirection(), - "transitional link should be BIDIRECTIONAL"); - List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); - 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("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()))); - } - - private void checkOtnLink(Link link, Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, - String linkName) { + private void checkOtnLink( + Link link, Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, String linkName) { assertEquals(linkName, link.getName().get(new NameKey("otn link name")).getValue(), "bad name for the link"); assertEquals(linkUuid, link.getUuid(), "bad uuid for link"); - assertEquals(CapacityUnit.GBPS, link.getAvailableCapacity().getTotalSize().getUnit(), + assertEquals(CAPACITYUNITGBPS.VALUE, link.getAvailableCapacity().getTotalSize().getUnit(), "Available capacity unit should be MBPS"); String prefix = linkName.split("-")[0]; if ("OTU4".equals(prefix)) { @@ -1262,24 +1224,26 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { assertEquals(Uint64.valueOf(100000), link.getAvailableCapacity().getTotalSize().getValue(), "Available capacity -total size value should be 100 000"); } - assertEquals(CapacityUnit.GBPS, link.getTotalPotentialCapacity().getTotalSize().getUnit(), + assertEquals(CAPACITYUNITGBPS.VALUE, link.getTotalPotentialCapacity().getTotalSize().getUnit(), "Total capacity unit should be GBPS"); - assertEquals(Uint64.valueOf(100), link.getTotalPotentialCapacity().getTotalSize().getValue(), + assertEquals(Decimal64.valueOf("100"), link.getTotalPotentialCapacity().getTotalSize().getValue(), "Total capacity -total size value should be 100"); if ("OTU4".equals(prefix)) { assertEquals( LayerProtocolName.PHOTONICMEDIA.getName(), - link.getLayerProtocolName().stream().findFirst().get().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( LayerProtocolName.ODU.getName(), - link.getLayerProtocolName().stream().findFirst().get().getName(), + link.getLayerProtocolName().stream().findFirst().orElseThrow().getName(), "otn link should be between 2 nodes of protocol layers ODU"); } assertEquals(ForwardingDirection.BIDIRECTIONAL, link.getDirection(), "otn tapi link should be BIDIRECTIONAL"); - List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); + List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); + LOG.info("OUTPUT: Node1UUID = {}, Node2UU2D = {},", node1Uuid, node2Uuid); + LOG.info("NEPLIST = {}", nodeEdgePointList); 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(), @@ -1301,17 +1265,17 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { "administrative state should be UNLOCKED"); } - private void checkOmsLink(Link link, Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, - String linkName) { - assertEquals(linkName, link.getName().get(new NameKey("OMS link name")).getValue(), "bad name for the link"); + private void checkOmsLink( + Link link, Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, String linkName) { + assertEquals(linkName, link.getName().get(new NameKey("OTS link name")).getValue(), "bad name for the link"); assertEquals(linkUuid, link.getUuid(), "bad uuid for link"); assertEquals( LayerProtocolName.PHOTONICMEDIA.getName(), - link.getLayerProtocolName().stream().findFirst().get().getName(), + link.getLayerProtocolName().stream().findFirst().orElseThrow().getName(), "oms link should be between 2 nodes of protocol layers PHOTONIC_MEDIA"); assertEquals(ForwardingDirection.BIDIRECTIONAL, link.getDirection(), "otn tapi link should be BIDIRECTIONAL"); - List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); + List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); 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"); @@ -1332,34 +1296,50 @@ 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)); + var tpdr1Bldr = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .Node1Builder(initialNode.augmentation(Node1.class)); Map tps = new HashMap<>(tpdr1Bldr.getTerminationPoint()); - TerminationPointBuilder tpBldr = new TerminationPointBuilder( - tps.get(new TerminationPointKey(new TpId(tpid)))); - TerminationPoint1Builder tp1Bldr = new TerminationPoint1Builder(tpBldr.augmentation(TerminationPoint1.class)); - tp1Bldr.setAdministrativeState(admin) - .setOperationalState(oper); + TerminationPointBuilder tpBldr = new TerminationPointBuilder(tps.get(new TerminationPointKey(new TpId(tpid)))); + TerminationPoint1Builder tp1Bldr = + new TerminationPoint1Builder(tpBldr.augmentation(TerminationPoint1.class)) + .setAdministrativeState(admin) + .setOperationalState(oper); tpBldr.addAugmentation(tp1Bldr.build()); tps.replace(tpBldr.key(), tpBldr.build()); - tpdr1Bldr.setTerminationPoint(tps); - return new NodeBuilder(initialNode).addAugmentation(tpdr1Bldr.build()).build(); + return new NodeBuilder(initialNode).addAugmentation(tpdr1Bldr.setTerminationPoint(tps).build()).build(); } - private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network - .Link changeOtnLinkState( - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network - .Link initiallink, AdminStates admin, State oper) { + private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .networks.network.Link changeOtnLinkState( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .networks.network.Link initiallink, + AdminStates admin, + State oper) { + var linkBldr = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .networks.network.LinkBuilder(initiallink); + return linkBldr + .addAugmentation( + new Link1Builder(linkBldr.augmentation(Link1.class)) + .setAdministrativeState(admin) + .setOperationalState(oper) + .build()) + .build(); + } - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network - .LinkBuilder linkBldr = new - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network - .LinkBuilder(initiallink); - Link1Builder link1Bldr = new Link1Builder(linkBldr.augmentation(Link1.class)); - link1Bldr.setAdministrativeState(admin) - .setOperationalState(oper); - linkBldr.addAugmentation(link1Bldr.build()); - return linkBldr.build(); + private int getNodeRank( + String searchedChar, + List nodeList) { + int foundAtRank = 0; + int rank = 0; + for (var 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 +}